diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt index a802c513..e219f3c3 100644 --- a/ReleaseNotes.txt +++ b/ReleaseNotes.txt @@ -1,3 +1,44 @@ +------------------------------------------------------ +Version 2.2.8 +------------------------------------------------------ +New +- #1703 Forestry upgrades for DS armor (MatthiasM2) +- #746 Add speed downgrade for item conduits. Allows conduits to pull only one item at a time (MatthiasM2) +- #1731 All machines will now have progress tooltips on the progress animation (MatthiasM2) +- #85 Add hardened conduit facades. Have a higher hardness and blast resistance (TNT-proof) than normal facades. +- Add recipe to upgrade capacitors to the next tier + +Changes +- All blocks now support the vanilla breaking animation properly +- Conduit connectors combine into a single box, this fixes z-fighting issues (especially with texture packs) +- Split internal and external conduit connector textures +- Some more default hoes added to the config +- Localized GUI names, WAILA configs, and the rest of the tooltips (Adaptivity) +- Improve double chest support on the mod item filter snapshot +- Add support for sending grinding balls via IMC +- #1771 All Killer Joes will now have the same UUID, for server admin purposes +- Wither skeletons will now drop Tcon necrotic bones and respect Tcon beheading +- Improve efficiency of wireless chargers (MatthiasM2) +- Refactor how all EIO blocks drop themselves, should resolve all™ issues with such in the future +- It is now possible to use the yeta wrench shift+left click in creative mode (MatthiasM2) +- Alloy smelter will now give smelting achievements (iron, fish) (MatthiasM2) +- Wireless charger will now keep its stored energy when picked up (MatthiasM2) +- EnderIO GUIs with tabs will move NEI items out of the way (MatthiasM2) + +Bugs +- Fix crash with iguana tweaks level ups in farm +- Fix some crashes with facades and WAILA +- Painted slabs will no longer drop in creative mode (MatthiasM2) +- Fix enchanter and yeta wrench tooltips (MatthiasM2) +- Fix the alignment of the progress arrow in the slice'n'splice (MatthiasM2) +- Fix IItemDuct methods not checking filters. This should allow machines pushing to conduits to be filtered properly +- Fix wither skeletons not spawning and fix their equipment/rendering +- Fix tooltips rendering underneath the IO config +- Fix IO config changing NEI item lighting +- #1630 Item conduits pulling and preserving invalid stacksizes (fixes issues with filing cabinets) +- #1585 Fix blocks not dropping in explosions +- #1821 Fix buffers ignoring redstone mode + ------------------------------------------------------ Version 2.2.7 ------------------------------------------------------ diff --git a/build.gradle b/build.gradle index 313a82da..1eaf487b 100644 --- a/build.gradle +++ b/build.gradle @@ -106,7 +106,12 @@ task deobfJar(type: Jar) { classifier = 'dev' } -build.dependsOn sourceJar, deobfJar, apiJar +task exportJavadoc(type: Javadoc) { + include 'crazypants/enderio/api/**/*' + source = sourceSets.main.allSource +} + +build.dependsOn sourceJar, deobfJar, apiJar, exportJavadoc publishing { tasks.publish.dependsOn 'build' diff --git a/gradle.properties b/gradle.properties index 1a67e99f..a957b4b9 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,7 +1,7 @@ minecraft_version=1.7.10 -forge_version=10.13.0.1208 +forge_version=10.13.2.1291 -mod_version=2.2.7 +mod_version=2.2.8 #Comment out this line to get rid of the appendix #mod_appendix=beta diff --git a/resources/assets/enderio/config/OreDictionaryPreferences_Core.xml b/resources/assets/enderio/config/OreDictionaryPreferences_Core.xml index 8a6313da..136a1227 100644 --- a/resources/assets/enderio/config/OreDictionaryPreferences_Core.xml +++ b/resources/assets/enderio/config/OreDictionaryPreferences_Core.xml @@ -36,6 +36,7 @@ To write the contents of the ore dictionary to config/oreDictionaryRegistery.txt + diff --git a/resources/assets/enderio/config/SAGMillRecipes_Core.xml b/resources/assets/enderio/config/SAGMillRecipes_Core.xml index e4808788..121282a1 100644 --- a/resources/assets/enderio/config/SAGMillRecipes_Core.xml +++ b/resources/assets/enderio/config/SAGMillRecipes_Core.xml @@ -418,6 +418,16 @@ addOreDictionaryTooltips=true + + + + + + + + + + @@ -850,7 +860,7 @@ addOreDictionaryTooltips=true - + diff --git a/resources/assets/enderio/entity/enderCreeper.png b/resources/assets/enderio/entity/enderCreeper.png deleted file mode 100644 index 73404288..00000000 Binary files a/resources/assets/enderio/entity/enderCreeper.png and /dev/null differ diff --git a/resources/assets/enderio/entity/enderminy.png b/resources/assets/enderio/entity/enderminy.png deleted file mode 100644 index 9edb0891..00000000 Binary files a/resources/assets/enderio/entity/enderminy.png and /dev/null differ diff --git a/resources/assets/enderio/entity/enderminy_eyes.png b/resources/assets/enderio/entity/enderminy_eyes.png deleted file mode 100644 index 08044028..00000000 Binary files a/resources/assets/enderio/entity/enderminy_eyes.png and /dev/null differ diff --git a/resources/assets/enderio/lang/cs_CZ.lang b/resources/assets/enderio/lang/cs_CZ.lang index 1f10eb8c..05f12700 100644 --- a/resources/assets/enderio/lang/cs_CZ.lang +++ b/resources/assets/enderio/lang/cs_CZ.lang @@ -269,7 +269,7 @@ enderio.trans.power=Energie enderio.trans.item=Předmět enderio.trans.fluid=Tekutina -enderio.trans.recieving=Přijímám +enderio.trans.receiving=Přijímám enderio.trans.sending=Odesílám tile.blockPowerMonitor.name=Monitor energie @@ -587,8 +587,8 @@ enderio.darksteel.upgrade.nightVision.disabled=Noční vidění zakázáno enderio.gui.enabled=Povoleno enderio.gui.disabled=Zakázáno enderio.gui.send=Posílat -enderio.gui.recieve=Přijímat -enderio.gui.sendRecieve=Posílat & Přijímat +enderio.gui.receive=Přijímat +enderio.gui.sendReceive=Posílat & Přijímat //Redstone controls enderio.gui.tooltip.redstoneControlMode=Ruditový mód diff --git a/resources/assets/enderio/lang/de_DE.lang b/resources/assets/enderio/lang/de_DE.lang index 33bd812c..7745e140 100644 --- a/resources/assets/enderio/lang/de_DE.lang +++ b/resources/assets/enderio/lang/de_DE.lang @@ -432,8 +432,8 @@ enderio.darksteel.upgrade.nightVision.disabled=Nachtsicht Inaktiv enderio.gui.enabled=Aktiviert enderio.gui.disabled=Deaktiviert enderio.gui.send=Senden -enderio.gui.recieve=Empfangen -enderio.gui.sendRecieve=Senden & Empfangen +enderio.gui.receive=Empfangen +enderio.gui.sendReceive=Senden & Empfangen //Redstone controls enderio.gui.tooltip.redstoneControlMode=Redstone-Modus diff --git a/resources/assets/enderio/lang/en_US.lang b/resources/assets/enderio/lang/en_US.lang index ebfdd750..007e3608 100644 --- a/resources/assets/enderio/lang/en_US.lang +++ b/resources/assets/enderio/lang/en_US.lang @@ -2,6 +2,7 @@ //Power enderio.power.rf=RF +enderio.power.tmb=t/mB enderio.power.tick=/t enderio.power.maxOutput=Max Output enderio.power.generates=Generates @@ -20,10 +21,13 @@ item.enderio.itemEnderface.name=Enderface enderio.blockConduitBundle=Conduit Bundle enderio.blockConduitFacade=Conduit Facade item.enderio.itemConduitFacade.name=Conduit Facade +item.enderio.itemConduitFacade.hardened.name=Hardened Conduit Facade +enderio.item.itemConduitFacade.tooltip.notpainted=Not Painted item.enderio.itemConduitFacade.tooltip.detailed.line1=Painted in the Painting Machine item.enderio.itemConduitFacade.tooltip.detailed.line2=R-Click on a conduit to place item.enderio.itemConduitFacade.tooltip.detailed.line3=Hidden when a wrench or conduit item.enderio.itemConduitFacade.tooltip.detailed.line4=is equipped +item.enderio.itemConduitFacade.hardened.tooltip=Hardened: Resists breaking and explosions enderio.itemPowerConduit.name=Energy Conduit enderio.itemPowerConduitEnhanced.name=Enhanced Energy Conduit @@ -87,6 +91,11 @@ item.itemExtractSpeedUpgrade.tooltip.detailed.line1=Increases speed by 4 item.itemExtractSpeedUpgrade.tooltip.detailed.line2=items per extraction item.itemExtractSpeedUpgrade.tooltip.detailed.line3=Max upgrades is 15 +item.itemExtractSpeedDowngrade.name=Item Conduit Speed Downgrade +item.itemExtractSpeedDowngrade.tooltip.basic.line1=Downgrade for item conduits +item.itemExtractSpeedDowngrade.tooltip.detailed.line1=Reduces speed to 1 +item.itemExtractSpeedDowngrade.tooltip.detailed.line2=item per extraction + enderio.itemGasConduit.name=Gas Conduit enderio.itemGasConduit.tooltip.maxExtract=Max Extract: @@ -198,6 +207,7 @@ enderio.powderGold.name=Gold Powder enderio.powderCopper.name=Copper Powder enderio.powderTin.name=Tin Powder enderio.powderEnder.name=Ender Pearl Powder +enderio.powderObsidian.name=Obsidian Powder enderio.ingotEnderiumBase.name=Enderium Base //Capacitors @@ -328,7 +338,7 @@ enderio.trans.item=Item enderio.trans.fluid=Fluid enderio.trans.rail=Rail -enderio.trans.recieving=Recieving +enderio.trans.receiving=Receiving enderio.trans.sending=Sending tile.blockPowerMonitor.name=Power Monitor @@ -345,7 +355,7 @@ tile.blockVat.tooltip.detailed.line1=Used to brew EnderIO fluids tile.blockEnchanter.name=Enchanter tile.blockEnchanter.tooltip.detailed.line1=Uses XP to combine items tile.blockEnchanter.tooltip.detailed.line2=and a book and quill to -tile.blockEnchanter.tooltip.detailed.line2=created enchanted books +tile.blockEnchanter.tooltip.detailed.line3=created enchanted books tile.blockCombustionGenerator.name=Combustion Generator tile.blockCombustionGenerator.tooltip.detailed.line1=Burns liquid fuel to generate power @@ -408,6 +418,7 @@ tile.blockVacuumChest.tooltip.detailed.line2=into its inventory tile.blockPoweredSpawner.name=Powered Spawner tile.blockPoweredSpawner.tooltip.empty=Empty +enderio.tile.blockPoweredSpawner.tooltip.none=None tile.blockPoweredSpawner.empty.tooltip.detailed.line1=Combine with a broken tile.blockPoweredSpawner.empty.tooltip.detailed.line2=spawner in an anvil tile.blockPoweredSpawner.tooltip.detailed.line1=Supply with power to @@ -535,6 +546,7 @@ item.itemSoulVessel.name=Soul Vial enderio.item.itemSoulVessel.tooltip.health=Health: enderio.item.itemSoulVessel.tooltip.fluidname=Fluid Name: enderio.item.itemSoulVessel.tooltip.color=Color: +enderio.item.itemSoulVessel.tooltip.empty=Empty item.itemSoulVessel.tooltip.detailed.line1=R-Click on a mob to item.itemSoulVessel.tooltip.detailed.line2=capture its soul item.itemSoulVessel.tooltip.detailed.line3=R-Click again to release it @@ -682,11 +694,14 @@ enderio.darksteel.upgrade.solar_two.tooltip.detailed.line1=Generates power from enderio.gui.simple.in=Max In: enderio.gui.simple.out=Max Out: -enderio.gui.enabled=Enabled +enderio.gui.available=Available enderio.gui.disabled=Disabled +enderio.gui.enabled=Enabled +enderio.gui.max=Max: +enderio.gui.progress=Progress {0,number}% +enderio.gui.receive=Receive enderio.gui.send=Send -enderio.gui.recieve=Receive -enderio.gui.sendRecieve=Send & Receive +enderio.gui.sendReceive=Send & Receive //Redstone controls enderio.gui.tooltip.redstoneControlMode=Redstone Mode @@ -695,7 +710,20 @@ enderio.gui.tooltip.redstoneControlMode.on=Active with signal enderio.gui.tooltip.redstoneControlMode.off=Active without signal enderio.gui.tooltip.redstoneControlMode.never=Never active +enderio.gui.machine.button.storelevel=Store 1 +enderio.gui.machine.tooltip.storelevel=level of player XP +enderio.gui.machine.button.storelevels=Store 10 +enderio.gui.machine.tooltip.storelevels=levels of player XP +enderio.gui.machine.button.storeall=Store all +enderio.gui.machine.tooltip.storeall=player XP +enderio.gui.machine.button.retrievelevel=Retrieve 1 +enderio.gui.machine.tooltip.retrievelevel=player XP level +enderio.gui.machine.button.retrievelevels=Retrieve 10 +enderio.gui.machine.tooltip.retrievelevels=player XP levels +enderio.gui.machine.button.retrieveall=Retrieve all enderio.gui.machine.ioMode.overlay.tooltip=Configure IO +enderio.gui.machine.ioMode.overlay.tooltip.visible.line1=Shift click to reset all sides +enderio.gui.machine.ioMode.overlay.tooltip.visible.line2=to their default setting enderio.gui.machine.ioMode.none=None enderio.gui.machine.ioMode.pull=Pull enderio.gui.machine.ioMode.push=Push @@ -703,6 +731,16 @@ enderio.gui.machine.ioMode.disabled=Disabled enderio.gui.machine.ioMode.pullPush=Push / Pull enderio.gui.machine.ioMode.pullPush.colored=%sPush %s/ %sPull enderio.gui.machine.ioMode=Mode: %s +enderio.gui.machine.poweredspawner.capture=Capture +enderio.gui.machine.poweredspawner.spawn=Spawn +enderio.gui.machine.receivefilter=Receive Filter +enderio.gui.machine.sendfilter=Send Filter +enderio.gui.machine.sendReceivebuffer=Send/Receive Buffer +enderio.gui.machine.localbuffer=Local Buffer +enderio.gui.machine.upkeep=Upkeep: +enderio.gui.machine.bufferingstacks=Buffering item stacks +enderio.gui.machine.bufferingsingle=Buffering single items +enderio.gui.machine.percraft=Per Craft enderio.gui.machine.side=Side: %s enderio.gui.machine.side.north=North enderio.gui.machine.side.south=South @@ -813,6 +851,10 @@ enderio.gui.conduit.ioMode.disabled=Disabled enderio.gui.conduit.ioMode.notSet=Default tile.blockConduitBundle.name=Conduit Connector +enderio.gui.conduit.button.clear=Clear +enderio.gui.conduit.button.merge=Merge +enderio.gui.conduit.button.show=Show +enderio.gui.conduit.button.snap=Snapshot enderio.gui.conduit.item.insertionFilter=Insert enderio.gui.conduit.item.extractionFilter=Extract enderio.gui.conduit.item.sigCol=Signal Color @@ -900,19 +942,25 @@ enderio.config.fluid.tooltip=Pure liquid energy! enderio.config.spawner=PoweredSpawner Settings enderio.config.spawner.tooltip=I ran out of witty tooltips. -//Keybinds/Waila/NEI +//Keybinds/Waila/NEI/Tooltips enderio.category.darksteelarmor=Dark Steel Armor enderio.category.tools=Tools enderio.keybind.glidertoggle=Glider Toggle -enderio.keybind.soundlocator=Sound Locator -enderio.keybind.nightvision=Night Vision enderio.keybind.gogglesofrevealing=Goggles of Revealing -enderio.keybind.stepassist=Step Assist +enderio.keybind.nightvision=Night Vision +enderio.keybind.soundlocator=Sound Locator enderio.keybind.speed=Speed +enderio.keybind.stepassist=Step Assist enderio.keybind.yetawrenchmode=Yeta Wrench Mode enderio.nei.alloysmelter=Alloy Smelter enderio.nei.enchanter=Enchanter enderio.nei.sagmill=SAG Mill enderio.nei.slicensplice=Slice'N'Splice enderio.nei.soulbinder=Soul Binder -enderio.nei.vat=Vat \ No newline at end of file +enderio.nei.vat=Vat +enderio.tooltip.burntime=Burn Time: +enderio.tooltip.oredict=Ore Dictionary: +enderio.tooltip.meta=Meta: +enderio.tooltip.uid=UID: +enderio.tooltip.anvilupgrades=Anvil Upgrades: +enderio.waila.config.hiddenfacades=Sneaky Facades diff --git a/resources/assets/enderio/lang/fr_FR.lang b/resources/assets/enderio/lang/fr_FR.lang index 452239fe..347ea3e7 100644 --- a/resources/assets/enderio/lang/fr_FR.lang +++ b/resources/assets/enderio/lang/fr_FR.lang @@ -117,8 +117,8 @@ enderio.itemEnderface.noSync=Le Masque d'Ender n'est pas synchronisé avec l'End enderio.gui.enabled=Activé enderio.gui.disabled=Désactivé enderio.gui.send=Envoyer -enderio.gui.recieve=Recevoir -enderio.gui.sendRecieve=Envoyer & Recevoir +enderio.gui.receive=Recevoir +enderio.gui.sendReceive=Envoyer & Recevoir //Redstone controls enderio.gui.tooltip.redstoneControlMode=Mode Redstone diff --git a/resources/assets/enderio/lang/ko_KR.lang b/resources/assets/enderio/lang/ko_KR.lang index 3413f989..f2d968fd 100644 --- a/resources/assets/enderio/lang/ko_KR.lang +++ b/resources/assets/enderio/lang/ko_KR.lang @@ -300,7 +300,7 @@ enderio.trans.power=전력 enderio.trans.item=아이템 enderio.trans.fluid=유체 -enderio.trans.recieving=수신 +enderio.trans.receiving=수신 enderio.trans.sending=송신 tile.blockPowerMonitor.name=전력 모니터 @@ -625,8 +625,8 @@ enderio.darksteel.upgrade.nightVision.disabled=Night Vision Disabled enderio.gui.enabled=활성화 enderio.gui.disabled=비활성화 enderio.gui.send=발신 -enderio.gui.recieve=수신 -enderio.gui.sendRecieve=수신 & 발신 +enderio.gui.receive=수신 +enderio.gui.sendReceive=수신 & 발신 //Redstone controls enderio.gui.tooltip.redstoneControlMode=레드스톤 모드 diff --git a/resources/assets/enderio/lang/pl_PL.lang b/resources/assets/enderio/lang/pl_PL.lang index cdf8c466..8e5870c3 100644 --- a/resources/assets/enderio/lang/pl_PL.lang +++ b/resources/assets/enderio/lang/pl_PL.lang @@ -140,8 +140,8 @@ enderio.color.white=Biały enderio.gui.enabled=Włączony enderio.gui.disabled=Wyłączony enderio.gui.send=Wysyłaj -enderio.gui.recieve=Odbieraj -enderio.gui.sendRecieve=Wysyłaj i odbieraj +enderio.gui.receive=Odbieraj +enderio.gui.sendReceive=Wysyłaj i odbieraj //Redstone controls enderio.gui.tooltip.redstoneControlMode=Tryb włącznika diff --git a/resources/assets/enderio/lang/pt_BR.lang b/resources/assets/enderio/lang/pt_BR.lang index 8ff1692a..00a692c9 100644 --- a/resources/assets/enderio/lang/pt_BR.lang +++ b/resources/assets/enderio/lang/pt_BR.lang @@ -331,7 +331,7 @@ enderio.trans.item=Item enderio.trans.fluid=Fluido enderio.trans.rail=Trilho -enderio.trans.recieving=Recebendo +enderio.trans.receiving=Recebendo enderio.trans.sending=Enviando tile.blockPowerMonitor.name=Monitor de Força @@ -672,8 +672,8 @@ enderio.gui.simple.out=Saída Máxima: enderio.gui.enabled=Ativado enderio.gui.disabled=Desativado enderio.gui.send=Enviar -enderio.gui.recieve=Receber -enderio.gui.sendRecieve=Enviar & Receber +enderio.gui.receive=Receber +enderio.gui.sendReceive=Enviar & Receber //Redstone controls enderio.gui.tooltip.redstoneControlMode=Modo de Redstone diff --git a/resources/assets/enderio/lang/ru_RU.lang b/resources/assets/enderio/lang/ru_RU.lang index 1f3e984e..0a1f53be 100644 --- a/resources/assets/enderio/lang/ru_RU.lang +++ b/resources/assets/enderio/lang/ru_RU.lang @@ -2,6 +2,7 @@ //Power enderio.power.rf=RF +enderio.power.tmb=тик/мВ enderio.power.tick=/тик enderio.power.maxOutput=Макс. выход enderio.power.generates=Генерирует @@ -20,6 +21,7 @@ item.enderio.itemEnderface.name=Лицо Края enderio.blockConduitBundle=Связка труб enderio.blockConduitFacade=Фасад для труб item.enderio.itemConduitFacade.name=Фасад для труб +enderio.item.itemConduitFacade.tooltip.notpainted=Не покрашен item.enderio.itemConduitFacade.tooltip.detailed.line1=Окрашивается в покрасочном механизме item.enderio.itemConduitFacade.tooltip.detailed.line2=ПКМ по трубе, чтобы поставить item.enderio.itemConduitFacade.tooltip.detailed.line3=Скрыт, когда гаечный ключ или труба @@ -84,9 +86,14 @@ item.itemPowerItemFilter.tooltip.detailed.line2=количества RF в пр item.itemExtractSpeedUpgrade.name=Улучшение скорости для предметной трубы item.itemExtractSpeedUpgrade.tooltip.basic.line1=Улучшение для предметных труб item.itemExtractSpeedUpgrade.tooltip.detailed.line1=Увеличивает скорость на 4 -item.itemExtractSpeedUpgrade.tooltip.detailed.line2=предметов за извлечение +item.itemExtractSpeedUpgrade.tooltip.detailed.line2=предмета за извлечение item.itemExtractSpeedUpgrade.tooltip.detailed.line3=Макс. улучшений - 15 +item.itemExtractSpeedDowngrade.name=Снижение скорости для предметной трубы +item.itemExtractSpeedDowngrade.tooltip.basic.line1=Снижает скорость предметных труб +item.itemExtractSpeedDowngrade.tooltip.detailed.line1=Снижает скорость на 1 +item.itemExtractSpeedDowngrade.tooltip.detailed.line2=предмет за извлечение + enderio.itemGasConduit.name=Газовая труба enderio.itemGasConduit.tooltip.maxExtract=Макс. извлечение: @@ -110,7 +117,7 @@ tile.blockEndermanSkull.name=Череп странника Края tile.blockEndermanSkull.base.name=Голова странника Края tile.blockEndermanSkull.reanimated.name=Реанимированная голова странника Края tile.blockEndermanSkull.tormented.name=Измученная голова странника Края -enderio.blastResistant=Взрывоустойчивая +enderio.blastResistant=Взрывоустойчиво enderio.lightEmitter=Излучает свет enderio.tooltip.isBeaconBase=Может быть использовано, как основа для маяка @@ -202,7 +209,7 @@ enderio.ingotEnderiumBase.name=Основа Края //Capacitors enderio.itemBasicCapacitor.name=Конденсатор -enderio.basicCapacitor.name=Базовый конденсатор +enderio.basicCapacitor.name=Основной конденсатор enderio.activatedCapacitor.name=Двухслойный конденсатор enderio.enderCapacitor.name=Восьмислойный конденсатор @@ -229,7 +236,7 @@ tile.blockAlloySmelter.name=Завод сплавов tile.blockAlloySmelter.tooltip.detailed.line1=Используется для создания сплавов EnderIO tile.blockAlloySmelter.tooltip.detailed.line2=Может также использоваться как печь, tile.blockAlloySmelter.tooltip.detailed.line3=питающаяся энергией -tile.blockAlloySmelter.tooltip.detailed.line4=Улучшите конденсаторами, чтобы увеличить +tile.blockAlloySmelter.tooltip.detailed.line4=Добавьте конденсаторы, чтобы увеличить tile.blockAlloySmelter.tooltip.detailed.line5=скорость и хранилище энергии tile.blockSolarPanel.name=Фотовольтовая ячейка @@ -279,7 +286,7 @@ tile.blockCapBank.simple.name=Основной блок конденсаторо tile.blockCapBank.activated.name=Блок конденсаторов tile.blockCapBank.vibrant.name=Вибрирующий блок конденсаторов tile.blockCapBank.tooltip.detailed.line1=Мульти-блок для хранения энергии. -tile.blockCapBank.tooltip.detailed.line2=Может заряжать РФ-предметы. +tile.blockCapBank.tooltip.detailed.line2=Может заряжать RF-предметы. tile.blockCapBank.tooltip.detailed.line3=Shift-ПКМ, по экрану пустой рукой, tile.blockCapBank.tooltip.detailed.line4=чтобы изменить отображаемую информацию tile.blockCapBank.tooltipPrefix=Содержит @@ -296,11 +303,11 @@ tile.blockWirelessCharger.name=Беспроводной зарядник tile.blockWirelessCharger.tooltip.detailed.line1=Заряжает ближайшие предметы tile.blockWirelessCharger.tooltip.detailed.line2=в инвентарях игроков -tile.blockSagMill.name=Дробилка +tile.blockSagMill.name=Дробитель tile.blockSagMill.tooltip.detailed.line1=Дробит руду и другие предметы tile.blockSagMill.tooltip.detailed.line2=Добавьте измельчающие шарики, чтобы увеличить tile.blockSagMill.tooltip.detailed.line3=выход и эффективность -tile.blockSagMill.tooltip.detailed.line4=Улучшите конденсаторами, чтобы увеличить +tile.blockSagMill.tooltip.detailed.line4=Добавьте конденсаторы, чтобы увеличить tile.blockSagMill.tooltip.detailed.line5=скорость и хранилище энергии tile.blockSagMill.tooltipPrefix=Содержит @@ -328,7 +335,7 @@ enderio.trans.item=Предмет enderio.trans.fluid=Жидкость enderio.trans.rail=Рельс -enderio.trans.recieving=Получение +enderio.trans.receiving=Получение enderio.trans.sending=Отправка tile.blockPowerMonitor.name=Индикатор мощности @@ -343,9 +350,9 @@ tile.blockVat.name=Чан tile.blockVat.tooltip.detailed.line1=Используется для варки жидкостей EnderIO tile.blockEnchanter.name=Зачарователь -tile.blockEnchanter.tooltip.detailed.line1=Использует опыт, чтобы комбинировать предметы -tile.blockEnchanter.tooltip.detailed.line2=Книга и перо создаёт -tile.blockEnchanter.tooltip.detailed.line2=зачарованные книги +tile.blockEnchanter.tooltip.detailed.line1=Использует опыт, чтобы объединять +tile.blockEnchanter.tooltip.detailed.line2=предметы с книгой и пером для создания +tile.blockEnchanter.tooltip.detailed.line3=зачарованных книг tile.blockCombustionGenerator.name=Генератор внутреннего сгорания tile.blockCombustionGenerator.tooltip.detailed.line1=Сжигает жидкое топливо для производства энергии @@ -378,7 +385,7 @@ tile.blockFarmStation.tooltip.detailed.line2=Требует энергию и tile.blockFarmStation.tooltip.detailed.line3=надлежащие инструменты (мотыгу, топор) tile.blockFarmStation.tooltip.detailed.line4=Добыча / Удача на инструментах tile.blockFarmStation.tooltip.detailed.line5=применяется при сборе урожая -tile.blockFarmStation.tooltip.detailed.line6=Улучшите конденсаторами, чтобы увеличить +tile.blockFarmStation.tooltip.detailed.line6=Добавьте конденсаторы, чтобы увеличить tile.blockFarmStation.tooltip.detailed.line7=дальность, улучшение также повышает потребление энергии enderio.farm.note.outputFull=Выход полон @@ -408,15 +415,16 @@ tile.blockVacuumChest.tooltip.detailed.line2=в свой инвентарь tile.blockPoweredSpawner.name=Электрический спаунер tile.blockPoweredSpawner.tooltip.empty=Пустой +enderio.tile.blockPoweredSpawner.tooltip.none=Нет tile.blockPoweredSpawner.empty.tooltip.detailed.line1=Объедините со сломанным tile.blockPoweredSpawner.empty.tooltip.detailed.line2=спаунером в наковальне tile.blockPoweredSpawner.tooltip.detailed.line1=Подайте питание, чтобы tile.blockPoweredSpawner.tooltip.detailed.line2=активировать -tile.blockPoweredSpawner.tooltip.detailed.line3=Улучшите конденсаторами, чтобы увеличить +tile.blockPoweredSpawner.tooltip.detailed.line3=Добавьте конденсаторы, чтобы увеличить tile.blockPoweredSpawner.tooltip.detailed.line4=скорость и хранилище энергии item.itemBrokenSpawner.name=Сломанный спаунер -item.itemBrokenSpawner.tooltip.detailed.line1=Объедините электрический спаунер +item.itemBrokenSpawner.tooltip.detailed.line1=Объедините с электрическим спаунером item.itemBrokenSpawner.tooltip.detailed.line2=в наковальне, чтобы установить тип спауна tile.blockSoulBinder.name=Связыватель душ @@ -482,8 +490,8 @@ enderio.blockTravelPlatform.outOfRange=Место назначения за пр item.itemTravelStaff.name=Посох путешествия item.itemTravelStaff.tooltip.detailed.line1=Когда якори путешествия и EnderIO экипированы item.itemTravelStaff.tooltip.detailed.line2=блоки становятся видимыми и могут быть -item.itemTravelStaff.tooltip.detailed.line3=активированы -item.itemTravelStaff.tooltip.detailed.line4= телепортирует +item.itemTravelStaff.tooltip.detailed.line3=активированы ПКМ +item.itemTravelStaff.tooltip.detailed.line4=Shift-ПКМ телепортирует item.itemTravelStaff.tooltip.detailed.line5=игрока на короткую дистанцию enderio.itemTravelStaff.notEnoughPower=Недостаточно энергии @@ -510,11 +518,11 @@ tile.blockPainter.tooltip.detailed.line6=якорей путешествия //Items item.itemYetaWrench.name=Гаечный ключ Yeta item.itemYetaWrench.tooltip.detailed.line1=Скрывает фасады труб, когда в руке -item.itemYetaWrench.tooltip.detailed.line2=Shift-ПКМ, чтобы демонтировать механизмы -item.itemYetaWrench.tooltip.detailed.line3=и трубы моментально -item.itemYetaWrench.tooltip.detailed.line4=Используйте Shift-колёсико мыши, чтобы отображать -item.itemYetaWrench.tooltip.detailed.line5=одиночный тип трубы -item.itemYetaWrench.tooltip.detailed.line6=Используйте Shift-колёсико мыши или 'Y', чтобы +item.itemYetaWrench.tooltip.detailed.line2=Shift-ПКМ, чтобы моментально демонтировать +item.itemYetaWrench.tooltip.detailed.line3=механизм или трубы +item.itemYetaWrench.tooltip.detailed.line4=Shift-ЛКМ по трубе, чтобы +item.itemYetaWrench.tooltip.detailed.line5=открыть интерфейс настроек +item.itemYetaWrench.tooltip.detailed.line6=Используйте Shift-колёсико мыши или '%s', чтобы item.itemYetaWrench.tooltip.detailed.line7=отображать только один вид труб item.itemMagnet.name=Электромагнит @@ -534,6 +542,8 @@ item.enderio.itemConduitProbe.tooltip.detailed.line6=Используйте Shif item.itemSoulVessel.name=Флакон для душ enderio.item.itemSoulVessel.tooltip.health=Здоровье: enderio.item.itemSoulVessel.tooltip.fluidname=Название жидкости: +enderio.item.itemSoulVessel.tooltip.color=Цвет: +enderio.item.itemSoulVessel.tooltip.empty=Пустой item.itemSoulVessel.tooltip.detailed.line1=ПКМ по мобу, чтобы item.itemSoulVessel.tooltip.detailed.line2=захватить его душу item.itemSoulVessel.tooltip.detailed.line3=Нажмите ПКМ снова, чтобы выпустить её @@ -568,7 +578,7 @@ enderio.item.darkSteel_pickaxe.tooltip.effObs=Эффективность уни enderio.item.darkSteel_axe.tooltip.multiHarvest=Присядьте, чтобы срубить несколько брёвен -enderio.item.darkSteel_sword.tooltip.line1=Увеличено выпадение черепов жемчуга Края. +enderio.item.darkSteel_sword.tooltip.line1=Увеличено выпадение черепов и жемчуга Края. enderio.item.darkSteel_sword.tooltip.line2=Странник Края не может телепортироваться после удара. enderio.item.darkSteel_sword.tooltip.line3=+1 Урон, при питании @@ -620,9 +630,24 @@ enderio.darksteel.upgrade.sound.disabled=Звуколокатор отключе enderio.darksteel.upgrade.gogglesOfRevealing.name=Откровение enderio.darksteel.upgrade.gogglesOfRevealing.tooltip.detailed.line1=Снижение затрат Вис: 5% +enderio.darksteel.upgrade.naturalistEye.name=Глаз натуралиста +enderio.darksteel.upgrade.naturalistEye.tooltip.detailed.line1=Показывает опылённую листву + +enderio.darksteel.upgrade.apiaristArmor.helmet.name=Шапка пчеловода +enderio.darksteel.upgrade.apiaristArmor.helmet.tooltip.detailed.line1=Защита от пчёл + +enderio.darksteel.upgrade.apiaristArmor.chestplate.name=Рубашка пчеловода +enderio.darksteel.upgrade.apiaristArmor.chestplate.tooltip.detailed.line1=Защита от пчёл + +enderio.darksteel.upgrade.apiaristArmor.leggings.name=Брюки пчеловода +enderio.darksteel.upgrade.apiaristArmor.leggings.tooltip.detailed.line1=Защита от пчёл + +enderio.darksteel.upgrade.apiaristArmor.boots.name=Обувь пчеловода +enderio.darksteel.upgrade.apiaristArmor.boots.tooltip.detailed.line1=Защита от пчёл + item.itemGliderWing.name=Крыло планёра item.itemGliderWings.name=Крылья планёра -item.itemGliderWings.tooltip.detailed.line1=Улучшите кирасой +item.itemGliderWings.tooltip.detailed.line1=Улучшается кирасой item.itemGliderWings.tooltip.detailed.line2=из чёрной стали enderio.darksteel.upgrade.jump_one.name=Прыжок @@ -666,11 +691,14 @@ enderio.darksteel.upgrade.solar_two.tooltip.detailed.line1==Генерирует enderio.gui.simple.in=Макс. вход: enderio.gui.simple.out=Макс. выход: -enderio.gui.enabled=Включено +enderio.gui.available=Доступно enderio.gui.disabled=Выключено +enderio.gui.enabled=Включено +enderio.gui.max=Макс: +enderio.gui.progress=Прогресс {0,number}% +enderio.gui.receive=Получать enderio.gui.send=Отправлять -enderio.gui.recieve=Получать -enderio.gui.sendRecieve=Отправлять и получать +enderio.gui.sendReceive=Отправлять и получать //Redstone controls enderio.gui.tooltip.redstoneControlMode=Режим красного камня @@ -679,6 +707,17 @@ enderio.gui.tooltip.redstoneControlMode.on=Активен по сигналу enderio.gui.tooltip.redstoneControlMode.off=Активен без сигнала enderio.gui.tooltip.redstoneControlMode.never=Всегда выключен +enderio.gui.machine.button.storelevel=Отдать 1 +enderio.gui.machine.tooltip.storelevel=уровень опыта игрока +enderio.gui.machine.button.storelevels=Отдать 10 +enderio.gui.machine.tooltip.storelevels=уровней опыта игрока +enderio.gui.machine.button.storeall=Отдать весь +enderio.gui.machine.tooltip.storeall=опыт игрока +enderio.gui.machine.button.retrievelevel=Забрать 1 +enderio.gui.machine.tooltip.retrievelevel=уровень опыта игрока +enderio.gui.machine.button.retrievelevels=Забрать 10 +enderio.gui.machine.tooltip.retrievelevels=уровней опыта игрока +enderio.gui.machine.button.retrieveall=Забрать весь опыт enderio.gui.machine.ioMode.overlay.tooltip=Настроить вход/выход enderio.gui.machine.ioMode.none=Нет enderio.gui.machine.ioMode.pull=Тянуть @@ -687,6 +726,16 @@ enderio.gui.machine.ioMode.disabled=Отключен enderio.gui.machine.ioMode.pullPush=Толкать/Тянуть enderio.gui.machine.ioMode.pullPush.colored=%sТолкать %s/ %sТянуть enderio.gui.machine.ioMode=Режим: %s +enderio.gui.machine.poweredspawner.capture=Захватить +enderio.gui.machine.poweredspawner.spawn=Призывать +enderio.gui.machine.receivefilter=Фильтр приёма +enderio.gui.machine.sendfilter=Фильтр отправки +enderio.gui.machine.sendReceivebuffer=Буфер отправки/приёма +enderio.gui.machine.localbuffer=Местный буфер +enderio.gui.machine.upkeep=Upkeep: +enderio.gui.machine.bufferingstacks=Буферизация стаков +enderio.gui.machine.bufferingsingle=Буферизация одиночных предметов +enderio.gui.machine.percraft=за создание enderio.gui.machine.side=Сторона: %s enderio.gui.machine.side.north=Север enderio.gui.machine.side.south=Юг @@ -797,20 +846,24 @@ enderio.gui.conduit.ioMode.disabled=Отключен enderio.gui.conduit.ioMode.notSet=По-умолчанию tile.blockConduitBundle.name=Коннектор для труб -enderio.gui.conduit.item.insertionFilter=Фильтр на помещение -enderio.gui.conduit.item.extractionFilter=Фильтр на извлечение +enderio.gui.conduit.button.clear=Очистить +enderio.gui.conduit.button.merge=Соединить +enderio.gui.conduit.button.show=Показать +enderio.gui.conduit.button.snap=Снимок +enderio.gui.conduit.item.insertionFilter=Помещение +enderio.gui.conduit.item.extractionFilter=Извлечение enderio.gui.conduit.item.sigCol=Цвет сигнала enderio.gui.conduit.item.channel=Канал enderio.gui.conduit.item.ignoreMetaData=Игнорировать метаданные enderio.gui.conduit.item.matchMetaData=Соблюдать метаданные enderio.gui.conduit.item.whitelist=Белый список enderio.gui.conduit.item.blacklist=Чёрный список -enderio.gui.conduit.item.stickyEnabled=Включён "липкий" режим|Выбранные предметы будут|отправляться только на|"липкие" выходы. +enderio.gui.conduit.item.stickyEnabled=Включён "липкий" режим|Выбранные предметы будут|отправляться только на этот|или другие "липкие" выходы. enderio.gui.conduit.item.stickyDisbaled="Липкий" режим выключен enderio.gui.conduit.item.ignoreNBT=Игнорировать NBT enderio.gui.conduit.item.matchNBT=Соблюдать NBT -enderio.gui.conduit.item.oreDicEnabled=Использовать Ore Dictionary -enderio.gui.conduit.item.oreDicDisabled=Игнорировать Ore Dictionary +enderio.gui.conduit.item.oreDicEnabled=Использовать словарь руд +enderio.gui.conduit.item.oreDicDisabled=Игнорировать словарь руд enderio.gui.conduit.item.selfFeedEnabled=Авто-подача активна enderio.gui.conduit.item.selfFeedDisabled=Авто-подача отключена enderio.gui.conduit.item.roundRobinEnabled=Цикл включён @@ -824,6 +877,8 @@ enderio.gui.conduit.redstone.signalStrengh.tooltip=Испускает сильн enderio.gui.conduit.fluid.autoExtract=Авто-извлечение enderio.gui.conduit.fluid.filter=Фильтр +enderio.gui.conduit.fluid.whitelist=Белый список +enderio.gui.conduit.fluid.blacklist=Чёрный список enderio.gui.conduit.gas.autoExtract=Авто-извлечение @@ -876,19 +931,25 @@ enderio.config.fluid.tooltip=Чистая энергия жидкостей! enderio.config.spawner=Настройки электрического спаунера enderio.config.spawner.tooltip=У меня закончились остроумные подсказки. -//Keybinds/Waila/NEI +//Keybinds/Waila/NEI/Tooltips enderio.category.darksteelarmor=Броня из тёмной стали enderio.category.tools=Инструменты enderio.keybind.glidertoggle=Переключить планер -enderio.keybind.soundlocator=Звуколокатор -enderio.keybind.nightvision=Ночное зрение enderio.keybind.gogglesofrevealing=Очки откровения -enderio.keybind.stepassist=Шаг вверх +enderio.keybind.nightvision=Ночное зрение +enderio.keybind.soundlocator=Звуколокатор enderio.keybind.speed=Скорость +enderio.keybind.stepassist=Шаг вверх enderio.keybind.yetawrenchmode=Режим ключа Yeta enderio.nei.alloysmelter=Завод сплавов enderio.nei.enchanter=Зачарователь enderio.nei.sagmill=Дробилка enderio.nei.slicensplice=«Отрубатель и сращиватель» enderio.nei.soulbinder=Связыватель душ -enderio.nei.vat=Чан \ No newline at end of file +enderio.nei.vat=Чан +enderio.tooltip.burntime=Время горения: +enderio.tooltip.oredict=Словарь руд: +enderio.tooltip.meta=Метаданные: +enderio.tooltip.uid=UID: +enderio.tooltip.anvilupgrades=Улучшения на наковальне: +enderio.waila.config.hiddenfacades=Скрытые фасады \ No newline at end of file diff --git a/resources/assets/enderio/lang/zh_CN.lang b/resources/assets/enderio/lang/zh_CN.lang index 30363e9a..0ad2fd5d 100644 --- a/resources/assets/enderio/lang/zh_CN.lang +++ b/resources/assets/enderio/lang/zh_CN.lang @@ -2,8 +2,11 @@ //Power enderio.power.rf=RF +enderio.power.tmb=t/mB enderio.power.tick=/t enderio.power.maxOutput=最大输出 +enderio.power.generates=产能 +enderio.power.generation_rate=速率 //Ender IO / Enderface tile.blockEnderIo.name=末影接口 @@ -18,10 +21,13 @@ item.enderio.itemEnderface.name=末影面板 enderio.blockConduitBundle=导管接口 enderio.blockConduitFacade=导管框架 item.enderio.itemConduitFacade.name=导管框架 -item.enderio.itemConduitFacade.tooltip.detailed.line1=可放入粉刷机粉刷 +item.enderio.itemConduitFacade.hardened.name=硬化导管框架 +enderio.item.itemConduitFacade.tooltip.notpainted=未喷涂 +item.enderio.itemConduitFacade.tooltip.detailed.line1=可放入喷涂机喷涂 item.enderio.itemConduitFacade.tooltip.detailed.line2=右击一个导管可放置 item.enderio.itemConduitFacade.tooltip.detailed.line3=当手里拿着一个扳手或者导管时 item.enderio.itemConduitFacade.tooltip.detailed.line4=导管框架隐藏 +item.enderio.itemConduitFacade.hardened.tooltip=硬化: 抵抗破坏以及爆炸 enderio.itemPowerConduit.name=能量导管 enderio.itemPowerConduitEnhanced.name=强化能量导管 @@ -32,10 +38,11 @@ enderio.itemRedstoneConduitSwitch.name=导管开关 enderio.itemRedstoneConduitInsulated.name=绝缘红石导管 enderio.itemLiquidConduit.name=液体导管 -enderio.itemLiquidConduitAdvanced.name=加压液体导管 +enderio.itemLiquidConduitAdvanced.name=高压液体导管 enderio.itemLiquidConduitEnder.name=末影液体导管 enderio.itemLiquidConduit.lockedType=液体种类锁定为 -enderio.itemLiquidConduit.unlockedType=液体种类解锁 +enderio.itemLiquidConduit.unlockedType=液体种类解锁 +enderio.itemLiquidConduit.lockedWaila=锁定为 enderio.itemLiquidConduit.tooltip.maxExtract=最大提取: enderio.itemLiquidConduit.tooltip.maxIo=最大流速: @@ -53,7 +60,6 @@ enderio.filterUpgradeBasic.name=基础物品过滤器 enderio.filterUpgradeAdvanced.name=高级物品过滤器 enderio.itemConduitFilterUpgrade=物品导管升级 - enderio.itemConduitFilterUpgrade.configured=已配置 enderio.itemConduitFilterUpgrade.clearConfigMethod=放到合成格里面清除 enderio.itemConduitFilterUpgrade.clearConfigWarning=这会清除所有存储的数据! @@ -62,18 +68,34 @@ item.itemExistingItemFilter.name=现有物品过滤器 item.itemExistingItemFilter.tooltip.basic.line1=给物品导管使用的升级 item.itemExistingItemFilter.tooltip.detailed.line1=筛选已在物品栏中 item.itemExistingItemFilter.tooltip.detailed.line2=的物品 +item.itemExistingItemFilter.tooltip.detailed.line3=潜行时右击一 +item.itemExistingItemFilter.tooltip.detailed.line4=容器来将其内 +item.itemExistingItemFilter.tooltip.detailed.line5=物品添入快照 + +enderio.item.itemExistingItemFilter.filterUpdated=新物品已添入快照 +enderio.item.itemExistingItemFilter.filterNotUpdated=快照已包含容器中的所有物品 item.itemModItemFilter.name=模组物品过滤器 item.itemModItemFilter.tooltip.basic.line1=给物品导管使用的升级 item.itemModItemFilter.tooltip.detailed.line1=只筛选一个或几个 item.itemModItemFilter.tooltip.detailed.line2=特定mod里的物品 +item.itemPowerItemFilter.name=充能物品过滤器 +item.itemPowerItemFilter.tooltip.basic.line1=物品导管的升级 +item.itemPowerItemFilter.tooltip.detailed.line1=根据存储的RF来 +item.itemPowerItemFilter.tooltip.detailed.line2=过滤可充能的物品 + item.itemExtractSpeedUpgrade.name=物品导管速度升级 item.itemExtractSpeedUpgrade.tooltip.basic.line1=给物品导管使用的升级 item.itemExtractSpeedUpgrade.tooltip.detailed.line1=每次提取 item.itemExtractSpeedUpgrade.tooltip.detailed.line2=速度增加4组 item.itemExtractSpeedUpgrade.tooltip.detailed.line3=最大升级数为15 +item.itemExtractSpeedDowngrade.name=物品导管速度降级 +item.itemExtractSpeedDowngrade.tooltip.basic.line1=给物品导管使用的降级 +item.itemExtractSpeedDowngrade.tooltip.detailed.line1=将每次提取的速度 +item.itemExtractSpeedDowngrade.tooltip.detailed.line2=减至1 + enderio.itemGasConduit.name=气体导管 enderio.itemGasConduit.tooltip.maxExtract=最大提取: @@ -81,6 +103,10 @@ enderio.itemGasConduit.tooltip.maxIo=最大IO: enderio.itemGasConduit.tooltip.detailed.line1=传送和通用机械兼容的气体 enderio.itemMEConduit.name=ME导管 +enderio.itemMEConduitDense.name=密集ME导管 + +//Entity +entity.witherSkeleton.name=凋零骷髅 //Materials enderio.itemMaterial.name=材料 @@ -115,7 +141,6 @@ fluid.eio.xpjuice=液态XP tile.fluid.eio.xpjuice.name=液态XP item.bucketXpjuice.name=桶装液态XP - enderio.fluid.millibucket.abr=mB enderio.fuel.tooltip.heading=燃料详情 @@ -125,7 +150,6 @@ coolant.tooltip.heading=冷却剂 enderio.fuel.tooltip.degreesPerBucket=deg per bucket enderio.gas.gasTick=Gas/t - //Materials enderio.itemMachinePart.name=机器零件 enderio.machineChassi.name=机器框架 @@ -183,6 +207,8 @@ enderio.powderGold.name=金粉 enderio.powderCopper.name=铜粉 enderio.powderTin.name=锡粉 enderio.powderEnder.name=末影珍珠粉 +enderio.powderObsidian.name=黑曜石粉 +enderio.ingotEnderiumBase.name=Enderium Base //Capacitors enderio.itemBasicCapacitor.name=电容 @@ -258,9 +284,23 @@ tile.blockCapacitorBank.tooltip.detailed.line1=多方块能量存储. tile.blockCapacitorBank.tooltip.detailed.line2=可以给使用RF能量的物品充能. tile.blockCapacitorBank.tooltipPrefix=包含 +tile.blockCapBank.creative.name=创造模式电容库 +tile.blockCapBank.simple.name=基础电容库 +tile.blockCapBank.activated.name=电容库 +tile.blockCapBank.vibrant.name=谐振电容库 +tile.blockCapBank.tooltip.detailed.line1=多方块能量存储. +tile.blockCapBank.tooltip.detailed.line2=可以给使用RF能量的物品充能. +tile.blockCapBank.tooltip.detailed.line3=空手shift右击一面 +tile.blockCapBank.tooltip.detailed.line4=来改变显示的信息 +tile.blockCapBank.tooltipPrefix=包含 + enderio.capbank.maxIO=最大输入/输出 enderio.capbank.maxIn=最大输入 enderio.capbank.maxOut=最大输出 +enderio.capbank.change=I/O +enderio.capbank.iodisplay.stable=I/O +enderio.capbank.iodisplay.gain=In +enderio.capbank.iodisplay.loss=Out tile.blockWirelessCharger.name=无线充能器 tile.blockWirelessCharger.tooltip.detailed.line1=给附近玩家物品 @@ -296,6 +336,7 @@ enderio.trans.showChannels=<按下Shift显示频道> enderio.trans.power=能量 enderio.trans.item=物品 enderio.trans.fluid=流体 +enderio.trans.rail=轨道 enderio.trans.recieving=接收 enderio.trans.sending=发送 @@ -357,7 +398,7 @@ enderio.farm.note.noHoe=无锄头 enderio.farm.note.noPower=能量不足 tile.blockTank.name=流体箱 -tile.blockTank.advanced.name=加压流体箱 +tile.blockTank.advanced.name=高压流体箱 tile.blockTank.tooltip.detailed.line1=便携式流体箱 tile.blockTank.tooltip.detailed.line2=可用于清空或 tile.blockTank.tooltip.detailed.line3=注满液体容器 @@ -377,6 +418,7 @@ tile.blockVacuumChest.tooltip.detailed.line2=吸入其中 tile.blockPoweredSpawner.name=电动刷怪笼 tile.blockPoweredSpawner.tooltip.empty=空 +enderio.tile.blockPoweredSpawner.tooltip.none=无 tile.blockPoweredSpawner.empty.tooltip.detailed.line1=与破损的刷怪笼 tile.blockPoweredSpawner.empty.tooltip.detailed.line2=在铁砧里结合 tile.blockPoweredSpawner.tooltip.detailed.line1=提供能量 @@ -403,24 +445,27 @@ tile.blockSpawnGuard.tooltip.detailed.line1=在它的工作范围 tile.blockSpawnGuard.tooltip.detailed.line2=阻止生物的刷出 tile.blockExperienceObelisk.name=经验交换装置 -tile.blockExperienceObelisk.tooltip.detailed.line1=放在流体箱上 -tile.blockExperienceObelisk.tooltip.detailed.line2=右击使用储存的液态XP -tile.blockExperienceObelisk.tooltip.detailed.line3=用空手Shift右击 -tile.blockExperienceObelisk.tooltip.detailed.line4=从自身抽取XP -tile.blockExperienceObelisk.tooltip.detailed.line5=左击抽取玩家1级的XP +tile.blockExperienceObelisk.tooltip.detailed.line1=用于储存经验 +tile.blockExperienceObelisk.tooltip.detailed.line2=可将液态XP输出 +tile.blockExperienceObelisk.tooltip.detailed.line3=至相邻的储罐中 + +tile.blockBuffer.item.name=物品缓存器 +tile.blockBuffer.power.name=能量缓存器 +tile.blockBuffer.omni.name=多功能缓存器 +tile.blockBuffer.creative.name=创造缓存器 enderio.machine.tooltip.configured=(已配置) //Blocks tile.blockDarkSteelPressurePlate.name=玄钢压力板 tile.blockDarkSteelPressurePlate.tooltip.detailed.line1=只能被玩家激活 -tile.blockDarkSteelPressurePlate.tooltip.detailed.line2=可在粉刷机内粉刷, -tile.blockDarkSteelPressurePlate.tooltip.detailed.line3=当使用纯净玻璃粉刷 +tile.blockDarkSteelPressurePlate.tooltip.detailed.line2=可在喷涂机内喷涂, +tile.blockDarkSteelPressurePlate.tooltip.detailed.line3=当使用纯净玻璃喷涂 tile.blockDarkSteelPressurePlate.tooltip.detailed.line4=时,玄钢压力板能隐形 tile.blockDarkSteelPressurePlate.silent.tooltip.common.line1=无声 tile.blockDarkSteelPressurePlate.silent.tooltip.detailed.line1=只能被玩家激活 -tile.blockDarkSteelPressurePlate.silent.tooltip.detailed.line2=可在粉刷机内粉刷, -tile.blockDarkSteelPressurePlate.silent.tooltip.detailed.line3=当使用纯净玻璃粉刷时, +tile.blockDarkSteelPressurePlate.silent.tooltip.detailed.line2=可在喷涂机内喷涂, +tile.blockDarkSteelPressurePlate.silent.tooltip.detailed.line3=当使用纯净玻璃喷涂时, tile.blockDarkSteelPressurePlate.silent.tooltip.detailed.line4=无声玄钢压力板能隐形 tile.blockDarkSteelAnvil.intact.name=玄铁砧 @@ -430,6 +475,9 @@ tile.blockDarkSteelAnvil.tooltip.common.line1=经久耐用 tile.blockDarkSteelAnvil.tooltip.detailed.line1=比原版的铁砧 tile.blockDarkSteelAnvil.tooltip.detailed.line2=更加结实耐用 +tile.blockDarkSteelLadder.name=玄铁梯子 +tile.blockDarkSteelLadder.tooltip.common.line1=比普通的梯子更易攀爬 + //Travel tile.blockTravelAnchor.name=旅行锚 tile.blockTravelAnchor.tooltip.detailed.line1=允许在锚点之间传送 @@ -437,7 +485,7 @@ tile.blockTravelAnchor.tooltip.detailed.line2=站在一个锚上, 看着 tile.blockTravelAnchor.tooltip.detailed.line3=另外一个,然后跳跃即可传送 tile.blockTravelAnchor.tooltip.detailed.line4=也可以使用旅行权杖 tile.blockTravelAnchor.tooltip.detailed.line5=来使用旅行锚 -tile.blockTravelAnchor.tooltip.detailed.line6=可在粉刷机内粉刷 +tile.blockTravelAnchor.tooltip.detailed.line6=可在喷涂机内喷涂 enderio.blockTravelPlatform.invalidTarget=目标受阻 enderio.blockTravelPlatform.outOfRange=目标太远 @@ -451,19 +499,19 @@ item.itemTravelStaff.tooltip.detailed.line5=可短距离传送玩家 enderio.itemTravelStaff.notEnoughPower=能量不足 //Painter -tile.blockPainter.name=粉刷机 -enderio.blockPainter.paintedWith=粉刷: -tile.blockPaintedFence.name=粉刷栅栏 -tile.blockPaintedFenceGate.name=粉刷门 -tile.blockPaintedWall.name=粉刷墙 -tile.blockPaintedStair.name=粉刷楼梯 -tile.blockPaintedSlab.name=粉刷台阶 -tile.blockPaintedDoubleSlab.name=粉刷台阶 -tile.blockPaintedGlowstone.name=粉刷萤石 -tile.blockPaintedCarpet.name=粉刷地毯 +tile.blockPainter.name=喷涂机 +enderio.blockPainter.paintedWith=喷涂: +tile.blockPaintedFence.name=喷涂栅栏 +tile.blockPaintedFenceGate.name=喷涂门 +tile.blockPaintedWall.name=喷涂墙 +tile.blockPaintedStair.name=喷涂楼梯 +tile.blockPaintedSlab.name=喷涂台阶 +tile.blockPaintedDoubleSlab.name=喷涂台阶 +tile.blockPaintedGlowstone.name=喷涂萤石 +tile.blockPaintedCarpet.name=喷涂地毯 enderio.painter.tooltip.wasPainted=§o你认为这是干嘛用的? -tile.blockPainter.tooltip.detailed.line1=用于粉刷: +tile.blockPainter.tooltip.detailed.line1=用于喷涂: tile.blockPainter.tooltip.detailed.line2=导管框架, 楼梯, 栅栏, tile.blockPainter.tooltip.detailed.line3=门, 台阶, 圆石墙, tile.blockPainter.tooltip.detailed.line4=玻璃框, 萤石, 地毯 @@ -495,6 +543,10 @@ item.enderio.itemConduitProbe.tooltip.detailed.line5=右击以粘贴 item.enderio.itemConduitProbe.tooltip.detailed.line6=使用shift加鼠标滚轮或Y键切换模式 item.itemSoulVessel.name=灵魂瓶 +enderio.item.itemSoulVessel.tooltip.health=生命: +enderio.item.itemSoulVessel.tooltip.fluidname=流体名: +enderio.item.itemSoulVessel.tooltip.color=颜色: +enderio.item.itemSoulVessel.tooltip.empty=空 item.itemSoulVessel.tooltip.detailed.line1=右击一个怪物 item.itemSoulVessel.tooltip.detailed.line2=可捕获其灵魂 item.itemSoulVessel.tooltip.detailed.line3=再次右击则释放 @@ -559,7 +611,6 @@ enderio.darksteel.upgrade.empowered_four.tooltip.detailed.line1=能量: $P enderio.darksteel.upgrade.empowered_four.tooltip.detailed.line2=能量吸收抵消一半的 enderio.darksteel.upgrade.empowered_four.tooltip.detailed.line3=耐久损伤 - enderio.darksteel.upgrade.travel.name=旅行 enderio.darksteel.upgrade.travel.tooltip.detailed.line1=按住shift右击来传送或 enderio.darksteel.upgrade.travel.tooltip.detailed.line2=激活旅行锚和末影接口 @@ -582,6 +633,21 @@ enderio.darksteel.upgrade.sound.disabled=声波定位禁用 enderio.darksteel.upgrade.gogglesOfRevealing.name=揭示 enderio.darksteel.upgrade.gogglesOfRevealing.tooltip.detailed.line1=要素减免: 5% +enderio.darksteel.upgrade.naturalistEye.name=自然之眼 +enderio.darksteel.upgrade.naturalistEye.tooltip.detailed.line1=显示已授粉的树叶 + +enderio.darksteel.upgrade.apiaristArmor.helmet.name=养蜂人之帽 +enderio.darksteel.upgrade.apiaristArmor.helmet.tooltip.detailed.line1=提供保护以减少蜜蜂的伤害 + +enderio.darksteel.upgrade.apiaristArmor.chestplate.name=养蜂人之衣 +enderio.darksteel.upgrade.apiaristArmor.chestplate.tooltip.detailed.line1=提供保护以减少蜜蜂的伤害 + +enderio.darksteel.upgrade.apiaristArmor.leggings.name=养蜂人之裤 +enderio.darksteel.upgrade.apiaristArmor.leggings.tooltip.detailed.line1=提供保护以减少蜜蜂的伤害 + +enderio.darksteel.upgrade.apiaristArmor.boots.name=养蜂人之鞋 +enderio.darksteel.upgrade.apiaristArmor.boots.tooltip.detailed.line1=提供保护以减少蜜蜂的伤害 + item.itemGliderWing.name=滑翔翼 item.itemGliderWings.name=滑翔翼 item.itemGliderWings.tooltip.detailed.line1=用于升级 @@ -617,15 +683,25 @@ enderio.darksteel.upgrade.nightVision.name=夜视 enderio.darksteel.upgrade.nightVision.enabled=夜视已启用 enderio.darksteel.upgrade.nightVision.disabled=夜视已禁用 +enderio.darksteel.upgrade.solar_one.name=太阳能 I +enderio.darksteel.upgrade.solar_one.tooltip.detailed.line1=利用阳光产能. + +enderio.darksteel.upgrade.solar_two.name=太阳能 II +enderio.darksteel.upgrade.solar_two.tooltip.detailed.line1=利用阳光产能. + //------GUI -enderio.enderio.gui.enabled=启用 -enderio.enderio.gui.disabled=禁用 -enderio.gui.enabled=启用 +enderio.gui.simple.in=最大输入: +enderio.gui.simple.out=最大输出: + +enderio.gui.available=可用 enderio.gui.disabled=禁用 +enderio.gui.enabled=启用 +enderio.gui.max=最大: +enderio.gui.progress=进程 {0,number}% +enderio.gui.receive=接收 enderio.gui.send=发送 -enderio.gui.recieve=接收 -enderio.gui.sendRecieve=发送和接收 +enderio.gui.sendReceive=发送和接收 //Redstone controls enderio.gui.tooltip.redstoneControlMode=红石模式 @@ -634,6 +710,17 @@ enderio.gui.tooltip.redstoneControlMode.on=收到信号工作 enderio.gui.tooltip.redstoneControlMode.off=收到信号不工作 enderio.gui.tooltip.redstoneControlMode.never=从不工作 +enderio.gui.machine.button.storelevel=储存1级 +enderio.gui.machine.tooltip.storelevel=玩家XP +enderio.gui.machine.button.storelevels=储存10级 +enderio.gui.machine.tooltip.storelevels=玩家XP +enderio.gui.machine.button.storeall=储存玩家 +enderio.gui.machine.tooltip.storeall=全部XP +enderio.gui.machine.button.retrievelevel=取出1级 +enderio.gui.machine.tooltip.retrievelevel=玩家XP级数 +enderio.gui.machine.button.retrievelevels=取出10级 +enderio.gui.machine.tooltip.retrievelevels=玩家XP级数 +enderio.gui.machine.button.retrieveall=取出全部 enderio.gui.machine.ioMode.overlay.tooltip=配置IO enderio.gui.machine.ioMode.none=无 enderio.gui.machine.ioMode.pull=拉 @@ -642,7 +729,17 @@ enderio.gui.machine.ioMode.disabled=禁用 enderio.gui.machine.ioMode.pullPush=推 / 拉 enderio.gui.machine.ioMode.pullPush.colored=%s推 %s/ %s拉 enderio.gui.machine.ioMode=模式: %s -enderio.gui.machine.side=侧面: %s +enderio.gui.machine.poweredspawner.capture=收获 +enderio.gui.machine.poweredspawner.spawn=生成 +enderio.gui.machine.receivefilter=接收过滤 +enderio.gui.machine.sendfilter=发送过滤 +enderio.gui.machine.sendReceivebuffer=发送/接收缓存 +enderio.gui.machine.localbuffer=本地缓存 +enderio.gui.machine.upkeep=维持: +enderio.gui.machine.bufferingstacks=缓冲多个物品 +enderio.gui.machine.bufferingsingle=缓冲单个物品 +enderio.gui.machine.percraft=每次合成 +enderio.gui.machine.side=所在面: %s enderio.gui.machine.side.north=北 enderio.gui.machine.side.south=南 enderio.gui.machine.side.west=西 @@ -726,6 +823,8 @@ enderio.combustionGenerator.output=产能速率: //Stirling Gen enderio.stirlingGenerator.output=产能速率: enderio.stirlingGenerator.burnRate=燃烧速率: +enderio.stirlingGenerator.upgradeslot=升级栏 +enderio.stirlingGenerator.upgrades={0} 提供 {2}{1,number,#.#}x{3} 的效率 //Travel Blocks enderio.gui.travelAccessable.privateBlock1=只有 @@ -750,6 +849,10 @@ enderio.gui.conduit.ioMode.disabled=关闭 enderio.gui.conduit.ioMode.notSet=默认 tile.blockConduitBundle.name=导管接口 +enderio.gui.conduit.button.clear=清空 +enderio.gui.conduit.button.merge=合并 +enderio.gui.conduit.button.show=显示 +enderio.gui.conduit.button.snap=快照 enderio.gui.conduit.item.insertionFilter=加入物品过滤 enderio.gui.conduit.item.extractionFilter=提取物品过滤 enderio.gui.conduit.item.sigCol=信号颜色 @@ -777,9 +880,14 @@ enderio.gui.conduit.redstone.signalStrengh.tooltip=输出强红石信号 enderio.gui.conduit.fluid.autoExtract=自动提取 enderio.gui.conduit.fluid.filter=过滤器 +enderio.gui.conduit.fluid.whitelist=白名单 +enderio.gui.conduit.fluid.blacklist=黑名单 enderio.gui.conduit.gas.autoExtract=自动提取 +//Enchants +enchantment.enderio.soulBound=灵魂绑定 +description.enchantment.enderio.soulBound=该附魔使物品免于死亡掉落 //Configuration enderio.config.title=末影接口配置文件 @@ -825,3 +933,26 @@ enderio.config.fluid.tooltip=纯净的液态能量! enderio.config.spawner=电动刷怪笼设置 enderio.config.spawner.tooltip=我已经想不出什么有趣的提示文本了. + +//Keybinds/Waila/NEI/Tooltips +enderio.category.darksteelarmor=玄铁护甲 +enderio.category.tools=工具 +enderio.keybind.glidertoggle=滑翔开关 +enderio.keybind.gogglesofrevealing=揭示护目镜 +enderio.keybind.nightvision=夜视 +enderio.keybind.soundlocator=声波定位 +enderio.keybind.speed=速度 +enderio.keybind.stepassist=Step Assist +enderio.keybind.yetawrenchmode=以太扳手模式 +enderio.nei.alloysmelter=合金炉 +enderio.nei.enchanter=附魔器 +enderio.nei.sagmill=SAG磨粉机 +enderio.nei.slicensplice=头颅装配机 +enderio.nei.soulbinder=灵魂绑定器 +enderio.nei.vat=酿液锅 +enderio.tooltip.burntime=燃烧时间: +enderio.tooltip.oredict=矿物辞典: +enderio.tooltip.meta=Meta: +enderio.tooltip.uid=UID: +enderio.tooltip.anvilupgrades=铁砧升级: +enderio.waila.config.hiddenfacades=隐形栅栏 diff --git a/resources/assets/enderio/lang/zh_TW.lang b/resources/assets/enderio/lang/zh_TW.lang index 2307a540..3259511d 100644 --- a/resources/assets/enderio/lang/zh_TW.lang +++ b/resources/assets/enderio/lang/zh_TW.lang @@ -644,8 +644,8 @@ enderio.darksteel.upgrade.solar_two.tooltip.detailed.line1=太陽能發電產生 enderio.gui.enabled=啟用 enderio.gui.disabled=停用 enderio.gui.send=發送 -enderio.gui.recieve=接收 -enderio.gui.sendRecieve=發送和接收 +enderio.gui.receive=接收 +enderio.gui.sendReceive=發送和接收 //Redstone controls enderio.gui.tooltip.redstoneControlMode=紅石模式 diff --git a/resources/assets/enderio/textures/blocks/conduitConnectorExternal.png b/resources/assets/enderio/textures/blocks/conduitConnectorExternal.png new file mode 100644 index 00000000..ac56f926 Binary files /dev/null and b/resources/assets/enderio/textures/blocks/conduitConnectorExternal.png differ diff --git a/resources/assets/enderio/textures/blocks/gasConduit.png b/resources/assets/enderio/textures/blocks/gasConduit.png index a19312c7..fc3b3b22 100644 Binary files a/resources/assets/enderio/textures/blocks/gasConduit.png and b/resources/assets/enderio/textures/blocks/gasConduit.png differ diff --git a/resources/assets/enderio/textures/blocks/gasConduitCore.png b/resources/assets/enderio/textures/blocks/gasConduitCore.png index cb770b71..9953d665 100644 Binary files a/resources/assets/enderio/textures/blocks/gasConduitCore.png and b/resources/assets/enderio/textures/blocks/gasConduitCore.png differ diff --git a/resources/assets/enderio/textures/blocks/gasConduitEdge.png b/resources/assets/enderio/textures/blocks/gasConduitEdge.png index d46d17ea..84c55715 100644 Binary files a/resources/assets/enderio/textures/blocks/gasConduitEdge.png and b/resources/assets/enderio/textures/blocks/gasConduitEdge.png differ diff --git a/resources/assets/enderio/textures/blocks/gasConduitInput.png b/resources/assets/enderio/textures/blocks/gasConduitInput.png index 3202f5ec..fcba49a2 100644 Binary files a/resources/assets/enderio/textures/blocks/gasConduitInput.png and b/resources/assets/enderio/textures/blocks/gasConduitInput.png differ diff --git a/resources/assets/enderio/textures/blocks/gasConduitOutput.png b/resources/assets/enderio/textures/blocks/gasConduitOutput.png index a718dfa1..12ad42a6 100644 Binary files a/resources/assets/enderio/textures/blocks/gasConduitOutput.png and b/resources/assets/enderio/textures/blocks/gasConduitOutput.png differ diff --git a/resources/assets/enderio/textures/blocks/itemConduit.png b/resources/assets/enderio/textures/blocks/itemConduit.png index 44b48a86..23113e58 100644 Binary files a/resources/assets/enderio/textures/blocks/itemConduit.png and b/resources/assets/enderio/textures/blocks/itemConduit.png differ diff --git a/resources/assets/enderio/textures/blocks/itemConduitCore.png b/resources/assets/enderio/textures/blocks/itemConduitCore.png index 58f042cc..2011146b 100644 Binary files a/resources/assets/enderio/textures/blocks/itemConduitCore.png and b/resources/assets/enderio/textures/blocks/itemConduitCore.png differ diff --git a/resources/assets/enderio/textures/blocks/itemConduitCoreAdvanced.png b/resources/assets/enderio/textures/blocks/itemConduitCoreAdvanced.png index f55aef6b..4f9a6d19 100644 Binary files a/resources/assets/enderio/textures/blocks/itemConduitCoreAdvanced.png and b/resources/assets/enderio/textures/blocks/itemConduitCoreAdvanced.png differ diff --git a/resources/assets/enderio/textures/blocks/itemConduitCore_alt.png b/resources/assets/enderio/textures/blocks/itemConduitCore_alt.png new file mode 100644 index 00000000..1d49ceda Binary files /dev/null and b/resources/assets/enderio/textures/blocks/itemConduitCore_alt.png differ diff --git a/resources/assets/enderio/textures/blocks/itemConduitInOut.png b/resources/assets/enderio/textures/blocks/itemConduitInOut.png index 945f403a..b5edd837 100644 Binary files a/resources/assets/enderio/textures/blocks/itemConduitInOut.png and b/resources/assets/enderio/textures/blocks/itemConduitInOut.png differ diff --git a/resources/assets/enderio/textures/blocks/itemConduitInOut_In.png b/resources/assets/enderio/textures/blocks/itemConduitInOut_In.png index e87240a7..7aa7e0b3 100644 Binary files a/resources/assets/enderio/textures/blocks/itemConduitInOut_In.png and b/resources/assets/enderio/textures/blocks/itemConduitInOut_In.png differ diff --git a/resources/assets/enderio/textures/blocks/itemConduitInOut_Out.png b/resources/assets/enderio/textures/blocks/itemConduitInOut_Out.png index ab68c07c..a6023e41 100644 Binary files a/resources/assets/enderio/textures/blocks/itemConduitInOut_Out.png and b/resources/assets/enderio/textures/blocks/itemConduitInOut_Out.png differ diff --git a/resources/assets/enderio/textures/blocks/itemConduitInput.png b/resources/assets/enderio/textures/blocks/itemConduitInput.png index 89d25ca7..77828dc0 100644 Binary files a/resources/assets/enderio/textures/blocks/itemConduitInput.png and b/resources/assets/enderio/textures/blocks/itemConduitInput.png differ diff --git a/resources/assets/enderio/textures/blocks/itemConduitOutput.png b/resources/assets/enderio/textures/blocks/itemConduitOutput.png index ee69f206..53af81c7 100644 Binary files a/resources/assets/enderio/textures/blocks/itemConduitOutput.png and b/resources/assets/enderio/textures/blocks/itemConduitOutput.png differ diff --git a/resources/assets/enderio/textures/blocks/liquidConduitAdvanced.png b/resources/assets/enderio/textures/blocks/liquidConduitAdvanced.png index 42118471..5f5dbbe1 100644 Binary files a/resources/assets/enderio/textures/blocks/liquidConduitAdvanced.png and b/resources/assets/enderio/textures/blocks/liquidConduitAdvanced.png differ diff --git a/resources/assets/enderio/textures/blocks/liquidConduitAdvancedInOut.png b/resources/assets/enderio/textures/blocks/liquidConduitAdvancedInOut.png index 5924befe..dd1807a7 100644 Binary files a/resources/assets/enderio/textures/blocks/liquidConduitAdvancedInOut.png and b/resources/assets/enderio/textures/blocks/liquidConduitAdvancedInOut.png differ diff --git a/resources/assets/enderio/textures/blocks/liquidConduitAdvancedInput.png b/resources/assets/enderio/textures/blocks/liquidConduitAdvancedInput.png index 3202f5ec..6b46d89d 100644 Binary files a/resources/assets/enderio/textures/blocks/liquidConduitAdvancedInput.png and b/resources/assets/enderio/textures/blocks/liquidConduitAdvancedInput.png differ diff --git a/resources/assets/enderio/textures/blocks/liquidConduitAdvancedLocked.png b/resources/assets/enderio/textures/blocks/liquidConduitAdvancedLocked.png index 59c67737..fd9d5fcf 100644 Binary files a/resources/assets/enderio/textures/blocks/liquidConduitAdvancedLocked.png and b/resources/assets/enderio/textures/blocks/liquidConduitAdvancedLocked.png differ diff --git a/resources/assets/enderio/textures/blocks/liquidConduitAdvancedOutput.png b/resources/assets/enderio/textures/blocks/liquidConduitAdvancedOutput.png index a718dfa1..340b20fd 100644 Binary files a/resources/assets/enderio/textures/blocks/liquidConduitAdvancedOutput.png and b/resources/assets/enderio/textures/blocks/liquidConduitAdvancedOutput.png differ diff --git a/resources/assets/enderio/textures/blocks/liquidConduitCore.png b/resources/assets/enderio/textures/blocks/liquidConduitCore.png index 6a1ad198..ef8c4fc6 100644 Binary files a/resources/assets/enderio/textures/blocks/liquidConduitCore.png and b/resources/assets/enderio/textures/blocks/liquidConduitCore.png differ diff --git a/resources/assets/enderio/textures/blocks/liquidConduitCoreAdvanced.png b/resources/assets/enderio/textures/blocks/liquidConduitCoreAdvanced.png index 137593a7..127ba659 100644 Binary files a/resources/assets/enderio/textures/blocks/liquidConduitCoreAdvanced.png and b/resources/assets/enderio/textures/blocks/liquidConduitCoreAdvanced.png differ diff --git a/resources/assets/enderio/textures/blocks/liquidConduitCoreEnder.png b/resources/assets/enderio/textures/blocks/liquidConduitCoreEnder.png index a86f42fb..dfa54c47 100644 Binary files a/resources/assets/enderio/textures/blocks/liquidConduitCoreEnder.png and b/resources/assets/enderio/textures/blocks/liquidConduitCoreEnder.png differ diff --git a/resources/assets/enderio/textures/blocks/meConduit.png b/resources/assets/enderio/textures/blocks/meConduit.png index f9df5fe2..11d63ce0 100644 Binary files a/resources/assets/enderio/textures/blocks/meConduit.png and b/resources/assets/enderio/textures/blocks/meConduit.png differ diff --git a/resources/assets/enderio/textures/blocks/meConduitCore.png b/resources/assets/enderio/textures/blocks/meConduitCore.png index c74e1f1d..96c77ce3 100644 Binary files a/resources/assets/enderio/textures/blocks/meConduitCore.png and b/resources/assets/enderio/textures/blocks/meConduitCore.png differ diff --git a/resources/assets/enderio/textures/blocks/meConduitCoreDense.png b/resources/assets/enderio/textures/blocks/meConduitCoreDense.png index e4f8db39..8965c6af 100644 Binary files a/resources/assets/enderio/textures/blocks/meConduitCoreDense.png and b/resources/assets/enderio/textures/blocks/meConduitCoreDense.png differ diff --git a/resources/assets/enderio/textures/blocks/meConduitDense.png b/resources/assets/enderio/textures/blocks/meConduitDense.png index da8ef2c1..15fa4eda 100644 Binary files a/resources/assets/enderio/textures/blocks/meConduitDense.png and b/resources/assets/enderio/textures/blocks/meConduitDense.png differ diff --git a/resources/assets/enderio/textures/blocks/conduitBundle.png b/resources/assets/enderio/textures/blocks/old/conduitBundle.png similarity index 100% rename from resources/assets/enderio/textures/blocks/conduitBundle.png rename to resources/assets/enderio/textures/blocks/old/conduitBundle.png diff --git a/resources/assets/enderio/textures/blocks/old/gasConduit.png b/resources/assets/enderio/textures/blocks/old/gasConduit.png new file mode 100644 index 00000000..a19312c7 Binary files /dev/null and b/resources/assets/enderio/textures/blocks/old/gasConduit.png differ diff --git a/resources/assets/enderio/textures/blocks/old/gasConduitCore.png b/resources/assets/enderio/textures/blocks/old/gasConduitCore.png new file mode 100644 index 00000000..cb770b71 Binary files /dev/null and b/resources/assets/enderio/textures/blocks/old/gasConduitCore.png differ diff --git a/resources/assets/enderio/textures/blocks/old/gasConduitEdge.png b/resources/assets/enderio/textures/blocks/old/gasConduitEdge.png new file mode 100644 index 00000000..d46d17ea Binary files /dev/null and b/resources/assets/enderio/textures/blocks/old/gasConduitEdge.png differ diff --git a/resources/assets/enderio/textures/blocks/old/gasConduitInput.png b/resources/assets/enderio/textures/blocks/old/gasConduitInput.png new file mode 100644 index 00000000..3202f5ec Binary files /dev/null and b/resources/assets/enderio/textures/blocks/old/gasConduitInput.png differ diff --git a/resources/assets/enderio/textures/blocks/old/gasConduitOutput.png b/resources/assets/enderio/textures/blocks/old/gasConduitOutput.png new file mode 100644 index 00000000..a718dfa1 Binary files /dev/null and b/resources/assets/enderio/textures/blocks/old/gasConduitOutput.png differ diff --git a/resources/assets/enderio/textures/blocks/old/itemConduit.png b/resources/assets/enderio/textures/blocks/old/itemConduit.png new file mode 100644 index 00000000..44b48a86 Binary files /dev/null and b/resources/assets/enderio/textures/blocks/old/itemConduit.png differ diff --git a/resources/assets/enderio/textures/blocks/old/itemConduitCore.png b/resources/assets/enderio/textures/blocks/old/itemConduitCore.png new file mode 100644 index 00000000..58f042cc Binary files /dev/null and b/resources/assets/enderio/textures/blocks/old/itemConduitCore.png differ diff --git a/resources/assets/enderio/textures/blocks/old/itemConduitCoreAdvanced.png b/resources/assets/enderio/textures/blocks/old/itemConduitCoreAdvanced.png new file mode 100644 index 00000000..f55aef6b Binary files /dev/null and b/resources/assets/enderio/textures/blocks/old/itemConduitCoreAdvanced.png differ diff --git a/resources/assets/enderio/textures/blocks/old/itemConduitInOut.png b/resources/assets/enderio/textures/blocks/old/itemConduitInOut.png new file mode 100644 index 00000000..945f403a Binary files /dev/null and b/resources/assets/enderio/textures/blocks/old/itemConduitInOut.png differ diff --git a/resources/assets/enderio/textures/blocks/old/itemConduitInOut_In.png b/resources/assets/enderio/textures/blocks/old/itemConduitInOut_In.png new file mode 100644 index 00000000..e87240a7 Binary files /dev/null and b/resources/assets/enderio/textures/blocks/old/itemConduitInOut_In.png differ diff --git a/resources/assets/enderio/textures/blocks/old/itemConduitInOut_Out.png b/resources/assets/enderio/textures/blocks/old/itemConduitInOut_Out.png new file mode 100644 index 00000000..ab68c07c Binary files /dev/null and b/resources/assets/enderio/textures/blocks/old/itemConduitInOut_Out.png differ diff --git a/resources/assets/enderio/textures/blocks/old/itemConduitInput.png b/resources/assets/enderio/textures/blocks/old/itemConduitInput.png new file mode 100644 index 00000000..89d25ca7 Binary files /dev/null and b/resources/assets/enderio/textures/blocks/old/itemConduitInput.png differ diff --git a/resources/assets/enderio/textures/blocks/old/itemConduitIoConnector.png b/resources/assets/enderio/textures/blocks/old/itemConduitIoConnector.png new file mode 100644 index 00000000..e9380465 Binary files /dev/null and b/resources/assets/enderio/textures/blocks/old/itemConduitIoConnector.png differ diff --git a/resources/assets/enderio/textures/blocks/old/itemConduitOutput.png b/resources/assets/enderio/textures/blocks/old/itemConduitOutput.png new file mode 100644 index 00000000..ee69f206 Binary files /dev/null and b/resources/assets/enderio/textures/blocks/old/itemConduitOutput.png differ diff --git a/resources/assets/enderio/textures/blocks/old/liquidConduitAdvanced.png b/resources/assets/enderio/textures/blocks/old/liquidConduitAdvanced.png new file mode 100644 index 00000000..42118471 Binary files /dev/null and b/resources/assets/enderio/textures/blocks/old/liquidConduitAdvanced.png differ diff --git a/resources/assets/enderio/textures/blocks/old/liquidConduitAdvancedInOut.png b/resources/assets/enderio/textures/blocks/old/liquidConduitAdvancedInOut.png new file mode 100644 index 00000000..5924befe Binary files /dev/null and b/resources/assets/enderio/textures/blocks/old/liquidConduitAdvancedInOut.png differ diff --git a/resources/assets/enderio/textures/blocks/old/liquidConduitAdvancedInput.png b/resources/assets/enderio/textures/blocks/old/liquidConduitAdvancedInput.png new file mode 100644 index 00000000..3202f5ec Binary files /dev/null and b/resources/assets/enderio/textures/blocks/old/liquidConduitAdvancedInput.png differ diff --git a/resources/assets/enderio/textures/blocks/old/liquidConduitAdvancedLocked.png b/resources/assets/enderio/textures/blocks/old/liquidConduitAdvancedLocked.png new file mode 100644 index 00000000..59c67737 Binary files /dev/null and b/resources/assets/enderio/textures/blocks/old/liquidConduitAdvancedLocked.png differ diff --git a/resources/assets/enderio/textures/blocks/old/liquidConduitAdvancedOutput.png b/resources/assets/enderio/textures/blocks/old/liquidConduitAdvancedOutput.png new file mode 100644 index 00000000..a718dfa1 Binary files /dev/null and b/resources/assets/enderio/textures/blocks/old/liquidConduitAdvancedOutput.png differ diff --git a/resources/assets/enderio/textures/blocks/old/liquidConduitCore.png b/resources/assets/enderio/textures/blocks/old/liquidConduitCore.png new file mode 100644 index 00000000..6a1ad198 Binary files /dev/null and b/resources/assets/enderio/textures/blocks/old/liquidConduitCore.png differ diff --git a/resources/assets/enderio/textures/blocks/old/liquidConduitCoreAdvanced.png b/resources/assets/enderio/textures/blocks/old/liquidConduitCoreAdvanced.png new file mode 100644 index 00000000..137593a7 Binary files /dev/null and b/resources/assets/enderio/textures/blocks/old/liquidConduitCoreAdvanced.png differ diff --git a/resources/assets/enderio/textures/blocks/old/liquidConduitCoreEnder.png b/resources/assets/enderio/textures/blocks/old/liquidConduitCoreEnder.png new file mode 100644 index 00000000..a86f42fb Binary files /dev/null and b/resources/assets/enderio/textures/blocks/old/liquidConduitCoreEnder.png differ diff --git a/resources/assets/enderio/textures/blocks/old/liquidConduitEnder.png b/resources/assets/enderio/textures/blocks/old/liquidConduitEnder.png new file mode 100644 index 00000000..ee9fac8c Binary files /dev/null and b/resources/assets/enderio/textures/blocks/old/liquidConduitEnder.png differ diff --git a/resources/assets/enderio/textures/blocks/liquidConduitExtract.png b/resources/assets/enderio/textures/blocks/old/liquidConduitExtract.png similarity index 100% rename from resources/assets/enderio/textures/blocks/liquidConduitExtract.png rename to resources/assets/enderio/textures/blocks/old/liquidConduitExtract.png diff --git a/resources/assets/enderio/textures/blocks/liquidConduitInsert.png b/resources/assets/enderio/textures/blocks/old/liquidConduitInsert.png similarity index 100% rename from resources/assets/enderio/textures/blocks/liquidConduitInsert.png rename to resources/assets/enderio/textures/blocks/old/liquidConduitInsert.png diff --git a/resources/assets/enderio/textures/blocks/liquidConduitLocked.png b/resources/assets/enderio/textures/blocks/old/liquidConduitLocked.png similarity index 100% rename from resources/assets/enderio/textures/blocks/liquidConduitLocked.png rename to resources/assets/enderio/textures/blocks/old/liquidConduitLocked.png diff --git a/resources/assets/enderio/textures/blocks/lock.png b/resources/assets/enderio/textures/blocks/old/lock.png similarity index 100% rename from resources/assets/enderio/textures/blocks/lock.png rename to resources/assets/enderio/textures/blocks/old/lock.png diff --git a/resources/assets/enderio/textures/blocks/old/meConduit.png b/resources/assets/enderio/textures/blocks/old/meConduit.png new file mode 100644 index 00000000..f9df5fe2 Binary files /dev/null and b/resources/assets/enderio/textures/blocks/old/meConduit.png differ diff --git a/resources/assets/enderio/textures/blocks/old/meConduitCore.png b/resources/assets/enderio/textures/blocks/old/meConduitCore.png new file mode 100644 index 00000000..c74e1f1d Binary files /dev/null and b/resources/assets/enderio/textures/blocks/old/meConduitCore.png differ diff --git a/resources/assets/enderio/textures/blocks/old/meConduitCoreDense.png b/resources/assets/enderio/textures/blocks/old/meConduitCoreDense.png new file mode 100644 index 00000000..e4f8db39 Binary files /dev/null and b/resources/assets/enderio/textures/blocks/old/meConduitCoreDense.png differ diff --git a/resources/assets/enderio/textures/blocks/old/meConduitDense.png b/resources/assets/enderio/textures/blocks/old/meConduitDense.png new file mode 100644 index 00000000..da8ef2c1 Binary files /dev/null and b/resources/assets/enderio/textures/blocks/old/meConduitDense.png differ diff --git a/resources/assets/enderio/textures/blocks/old/powerConduit.png b/resources/assets/enderio/textures/blocks/old/powerConduit.png new file mode 100644 index 00000000..a1f27cda Binary files /dev/null and b/resources/assets/enderio/textures/blocks/old/powerConduit.png differ diff --git a/resources/assets/enderio/textures/blocks/powerConduitCore.pdn b/resources/assets/enderio/textures/blocks/old/powerConduitCore.pdn similarity index 100% rename from resources/assets/enderio/textures/blocks/powerConduitCore.pdn rename to resources/assets/enderio/textures/blocks/old/powerConduitCore.pdn diff --git a/resources/assets/enderio/textures/blocks/old/powerConduitCore.png b/resources/assets/enderio/textures/blocks/old/powerConduitCore.png new file mode 100644 index 00000000..1a34f41e Binary files /dev/null and b/resources/assets/enderio/textures/blocks/old/powerConduitCore.png differ diff --git a/resources/assets/enderio/textures/blocks/old/powerConduitCoreEnder.png b/resources/assets/enderio/textures/blocks/old/powerConduitCoreEnder.png new file mode 100644 index 00000000..5b86a7e4 Binary files /dev/null and b/resources/assets/enderio/textures/blocks/old/powerConduitCoreEnder.png differ diff --git a/resources/assets/enderio/textures/blocks/old/powerConduitCoreEnhanced.png b/resources/assets/enderio/textures/blocks/old/powerConduitCoreEnhanced.png new file mode 100644 index 00000000..4e322468 Binary files /dev/null and b/resources/assets/enderio/textures/blocks/old/powerConduitCoreEnhanced.png differ diff --git a/resources/assets/enderio/textures/blocks/old/powerConduitEnder.png b/resources/assets/enderio/textures/blocks/old/powerConduitEnder.png new file mode 100644 index 00000000..7c760fab Binary files /dev/null and b/resources/assets/enderio/textures/blocks/old/powerConduitEnder.png differ diff --git a/resources/assets/enderio/textures/blocks/old/powerConduitEnhanced.png b/resources/assets/enderio/textures/blocks/old/powerConduitEnhanced.png new file mode 100644 index 00000000..be4daac1 Binary files /dev/null and b/resources/assets/enderio/textures/blocks/old/powerConduitEnhanced.png differ diff --git a/resources/assets/enderio/textures/blocks/old/powerConduitInput.png b/resources/assets/enderio/textures/blocks/old/powerConduitInput.png new file mode 100644 index 00000000..3202f5ec Binary files /dev/null and b/resources/assets/enderio/textures/blocks/old/powerConduitInput.png differ diff --git a/resources/assets/enderio/textures/blocks/old/powerConduitInputEnder.png b/resources/assets/enderio/textures/blocks/old/powerConduitInputEnder.png new file mode 100644 index 00000000..3202f5ec Binary files /dev/null and b/resources/assets/enderio/textures/blocks/old/powerConduitInputEnder.png differ diff --git a/resources/assets/enderio/textures/blocks/old/powerConduitInputEnhanced.png b/resources/assets/enderio/textures/blocks/old/powerConduitInputEnhanced.png new file mode 100644 index 00000000..3202f5ec Binary files /dev/null and b/resources/assets/enderio/textures/blocks/old/powerConduitInputEnhanced.png differ diff --git a/resources/assets/enderio/textures/blocks/old/powerConduitOutput.png b/resources/assets/enderio/textures/blocks/old/powerConduitOutput.png new file mode 100644 index 00000000..a718dfa1 Binary files /dev/null and b/resources/assets/enderio/textures/blocks/old/powerConduitOutput.png differ diff --git a/resources/assets/enderio/textures/blocks/old/powerConduitOutputEnder.png b/resources/assets/enderio/textures/blocks/old/powerConduitOutputEnder.png new file mode 100644 index 00000000..a718dfa1 Binary files /dev/null and b/resources/assets/enderio/textures/blocks/old/powerConduitOutputEnder.png differ diff --git a/resources/assets/enderio/textures/blocks/old/powerConduitOutputEnhanced.png b/resources/assets/enderio/textures/blocks/old/powerConduitOutputEnhanced.png new file mode 100644 index 00000000..a718dfa1 Binary files /dev/null and b/resources/assets/enderio/textures/blocks/old/powerConduitOutputEnhanced.png differ diff --git a/resources/assets/enderio/textures/blocks/powerConduitTransmission.png b/resources/assets/enderio/textures/blocks/old/powerConduitTransmission.png similarity index 100% rename from resources/assets/enderio/textures/blocks/powerConduitTransmission.png rename to resources/assets/enderio/textures/blocks/old/powerConduitTransmission.png diff --git a/resources/assets/enderio/textures/blocks/old/redstoneConduit.png b/resources/assets/enderio/textures/blocks/old/redstoneConduit.png new file mode 100644 index 00000000..d0a98301 Binary files /dev/null and b/resources/assets/enderio/textures/blocks/old/redstoneConduit.png differ diff --git a/resources/assets/enderio/textures/blocks/old/redstoneConduitCoreOff.png b/resources/assets/enderio/textures/blocks/old/redstoneConduitCoreOff.png new file mode 100644 index 00000000..c87b56bf Binary files /dev/null and b/resources/assets/enderio/textures/blocks/old/redstoneConduitCoreOff.png differ diff --git a/resources/assets/enderio/textures/blocks/redstoneConduitCoreOn.pdn b/resources/assets/enderio/textures/blocks/old/redstoneConduitCoreOn.pdn similarity index 100% rename from resources/assets/enderio/textures/blocks/redstoneConduitCoreOn.pdn rename to resources/assets/enderio/textures/blocks/old/redstoneConduitCoreOn.pdn diff --git a/resources/assets/enderio/textures/blocks/old/redstoneConduitCoreOn.png b/resources/assets/enderio/textures/blocks/old/redstoneConduitCoreOn.png new file mode 100644 index 00000000..90fdbf2b Binary files /dev/null and b/resources/assets/enderio/textures/blocks/old/redstoneConduitCoreOn.png differ diff --git a/resources/assets/enderio/textures/blocks/redstoneConduitSwitch.pdn b/resources/assets/enderio/textures/blocks/old/redstoneConduitSwitch.pdn similarity index 100% rename from resources/assets/enderio/textures/blocks/redstoneConduitSwitch.pdn rename to resources/assets/enderio/textures/blocks/old/redstoneConduitSwitch.pdn diff --git a/resources/assets/enderio/textures/blocks/old/redstoneConduitSwitchOff.png b/resources/assets/enderio/textures/blocks/old/redstoneConduitSwitchOff.png new file mode 100644 index 00000000..cb43ea33 Binary files /dev/null and b/resources/assets/enderio/textures/blocks/old/redstoneConduitSwitchOff.png differ diff --git a/resources/assets/enderio/textures/blocks/old/redstoneConduitSwitchOn.png b/resources/assets/enderio/textures/blocks/old/redstoneConduitSwitchOn.png new file mode 100644 index 00000000..61ddc4bd Binary files /dev/null and b/resources/assets/enderio/textures/blocks/old/redstoneConduitSwitchOn.png differ diff --git a/resources/assets/enderio/textures/blocks/old/redstoneConduitTransmission.png b/resources/assets/enderio/textures/blocks/old/redstoneConduitTransmission.png new file mode 100644 index 00000000..4b90e500 Binary files /dev/null and b/resources/assets/enderio/textures/blocks/old/redstoneConduitTransmission.png differ diff --git a/resources/assets/enderio/textures/blocks/old/redstoneInsulatedConduit.png b/resources/assets/enderio/textures/blocks/old/redstoneInsulatedConduit.png new file mode 100644 index 00000000..44b48a86 Binary files /dev/null and b/resources/assets/enderio/textures/blocks/old/redstoneInsulatedConduit.png differ diff --git a/resources/assets/enderio/textures/blocks/old/redstoneInsulatedConduitCoreOff.png b/resources/assets/enderio/textures/blocks/old/redstoneInsulatedConduitCoreOff.png new file mode 100644 index 00000000..e272fe23 Binary files /dev/null and b/resources/assets/enderio/textures/blocks/old/redstoneInsulatedConduitCoreOff.png differ diff --git a/resources/assets/enderio/textures/blocks/old/redstoneInsulatedConduitCoreOn.png b/resources/assets/enderio/textures/blocks/old/redstoneInsulatedConduitCoreOn.png new file mode 100644 index 00000000..87a18185 Binary files /dev/null and b/resources/assets/enderio/textures/blocks/old/redstoneInsulatedConduitCoreOn.png differ diff --git a/resources/assets/enderio/textures/blocks/powerConduit.png b/resources/assets/enderio/textures/blocks/powerConduit.png index a1f27cda..c0b840f1 100644 Binary files a/resources/assets/enderio/textures/blocks/powerConduit.png and b/resources/assets/enderio/textures/blocks/powerConduit.png differ diff --git a/resources/assets/enderio/textures/blocks/powerConduitCore.png b/resources/assets/enderio/textures/blocks/powerConduitCore.png index 1a34f41e..35537d2e 100644 Binary files a/resources/assets/enderio/textures/blocks/powerConduitCore.png and b/resources/assets/enderio/textures/blocks/powerConduitCore.png differ diff --git a/resources/assets/enderio/textures/blocks/powerConduitCoreEnder.png b/resources/assets/enderio/textures/blocks/powerConduitCoreEnder.png index 5b86a7e4..774507c9 100644 Binary files a/resources/assets/enderio/textures/blocks/powerConduitCoreEnder.png and b/resources/assets/enderio/textures/blocks/powerConduitCoreEnder.png differ diff --git a/resources/assets/enderio/textures/blocks/powerConduitCoreEnhanced.png b/resources/assets/enderio/textures/blocks/powerConduitCoreEnhanced.png index 4e322468..52cefdec 100644 Binary files a/resources/assets/enderio/textures/blocks/powerConduitCoreEnhanced.png and b/resources/assets/enderio/textures/blocks/powerConduitCoreEnhanced.png differ diff --git a/resources/assets/enderio/textures/blocks/powerConduitEnder.png b/resources/assets/enderio/textures/blocks/powerConduitEnder.png index 7c760fab..e038273f 100644 Binary files a/resources/assets/enderio/textures/blocks/powerConduitEnder.png and b/resources/assets/enderio/textures/blocks/powerConduitEnder.png differ diff --git a/resources/assets/enderio/textures/blocks/powerConduitEnhanced.png b/resources/assets/enderio/textures/blocks/powerConduitEnhanced.png index be4daac1..b9d3794f 100644 Binary files a/resources/assets/enderio/textures/blocks/powerConduitEnhanced.png and b/resources/assets/enderio/textures/blocks/powerConduitEnhanced.png differ diff --git a/resources/assets/enderio/textures/blocks/powerConduitInput.png b/resources/assets/enderio/textures/blocks/powerConduitInput.png index 3202f5ec..af74d1b9 100644 Binary files a/resources/assets/enderio/textures/blocks/powerConduitInput.png and b/resources/assets/enderio/textures/blocks/powerConduitInput.png differ diff --git a/resources/assets/enderio/textures/blocks/powerConduitInputEnder.png b/resources/assets/enderio/textures/blocks/powerConduitInputEnder.png index 3202f5ec..0757e2f8 100644 Binary files a/resources/assets/enderio/textures/blocks/powerConduitInputEnder.png and b/resources/assets/enderio/textures/blocks/powerConduitInputEnder.png differ diff --git a/resources/assets/enderio/textures/blocks/powerConduitInputEnhanced.png b/resources/assets/enderio/textures/blocks/powerConduitInputEnhanced.png index 3202f5ec..31f4a865 100644 Binary files a/resources/assets/enderio/textures/blocks/powerConduitInputEnhanced.png and b/resources/assets/enderio/textures/blocks/powerConduitInputEnhanced.png differ diff --git a/resources/assets/enderio/textures/blocks/powerConduitOutput.png b/resources/assets/enderio/textures/blocks/powerConduitOutput.png index a718dfa1..2ae14000 100644 Binary files a/resources/assets/enderio/textures/blocks/powerConduitOutput.png and b/resources/assets/enderio/textures/blocks/powerConduitOutput.png differ diff --git a/resources/assets/enderio/textures/blocks/powerConduitOutputEnder.png b/resources/assets/enderio/textures/blocks/powerConduitOutputEnder.png index a718dfa1..ad5c4683 100644 Binary files a/resources/assets/enderio/textures/blocks/powerConduitOutputEnder.png and b/resources/assets/enderio/textures/blocks/powerConduitOutputEnder.png differ diff --git a/resources/assets/enderio/textures/blocks/powerConduitOutputEnhanced.png b/resources/assets/enderio/textures/blocks/powerConduitOutputEnhanced.png index a718dfa1..0159ef54 100644 Binary files a/resources/assets/enderio/textures/blocks/powerConduitOutputEnhanced.png and b/resources/assets/enderio/textures/blocks/powerConduitOutputEnhanced.png differ diff --git a/resources/assets/enderio/textures/blocks/redstoneConduitCoreOff.png b/resources/assets/enderio/textures/blocks/redstoneConduitCoreOff.png index c87b56bf..b8712498 100644 Binary files a/resources/assets/enderio/textures/blocks/redstoneConduitCoreOff.png and b/resources/assets/enderio/textures/blocks/redstoneConduitCoreOff.png differ diff --git a/resources/assets/enderio/textures/blocks/redstoneConduitCoreOn.png b/resources/assets/enderio/textures/blocks/redstoneConduitCoreOn.png index 90fdbf2b..106d48a3 100644 Binary files a/resources/assets/enderio/textures/blocks/redstoneConduitCoreOn.png and b/resources/assets/enderio/textures/blocks/redstoneConduitCoreOn.png differ diff --git a/resources/assets/enderio/textures/blocks/redstoneConduitSwitchOff.png b/resources/assets/enderio/textures/blocks/redstoneConduitSwitchOff.png index cb43ea33..a2db897f 100644 Binary files a/resources/assets/enderio/textures/blocks/redstoneConduitSwitchOff.png and b/resources/assets/enderio/textures/blocks/redstoneConduitSwitchOff.png differ diff --git a/resources/assets/enderio/textures/blocks/redstoneConduitSwitchOn.png b/resources/assets/enderio/textures/blocks/redstoneConduitSwitchOn.png index 61ddc4bd..a91432d4 100644 Binary files a/resources/assets/enderio/textures/blocks/redstoneConduitSwitchOn.png and b/resources/assets/enderio/textures/blocks/redstoneConduitSwitchOn.png differ diff --git a/resources/assets/enderio/textures/blocks/redstoneConduitTransmission.png b/resources/assets/enderio/textures/blocks/redstoneConduitTransmission.png index 4b90e500..ae9cb224 100644 Binary files a/resources/assets/enderio/textures/blocks/redstoneConduitTransmission.png and b/resources/assets/enderio/textures/blocks/redstoneConduitTransmission.png differ diff --git a/resources/assets/enderio/textures/blocks/redstoneInsulatedConduit.png b/resources/assets/enderio/textures/blocks/redstoneInsulatedConduit.png index 44b48a86..bc15f4b3 100644 Binary files a/resources/assets/enderio/textures/blocks/redstoneInsulatedConduit.png and b/resources/assets/enderio/textures/blocks/redstoneInsulatedConduit.png differ diff --git a/resources/assets/enderio/textures/blocks/redstoneInsulatedConduitCoreOff.png b/resources/assets/enderio/textures/blocks/redstoneInsulatedConduitCoreOff.png index e272fe23..ecd8c3c1 100644 Binary files a/resources/assets/enderio/textures/blocks/redstoneInsulatedConduitCoreOff.png and b/resources/assets/enderio/textures/blocks/redstoneInsulatedConduitCoreOff.png differ diff --git a/resources/assets/enderio/textures/blocks/redstoneInsulatedConduitCoreOn.png b/resources/assets/enderio/textures/blocks/redstoneInsulatedConduitCoreOn.png index 87a18185..415bb10a 100644 Binary files a/resources/assets/enderio/textures/blocks/redstoneInsulatedConduitCoreOn.png and b/resources/assets/enderio/textures/blocks/redstoneInsulatedConduitCoreOn.png differ diff --git a/resources/assets/enderio/textures/gui/externalConduitConnection.png b/resources/assets/enderio/textures/gui/externalConduitConnection.png index 1ffad5ee..6221124d 100644 Binary files a/resources/assets/enderio/textures/gui/externalConduitConnection.png and b/resources/assets/enderio/textures/gui/externalConduitConnection.png differ diff --git a/resources/assets/enderio/textures/gui/cog.png b/resources/assets/enderio/textures/gui/old/cog.png similarity index 100% rename from resources/assets/enderio/textures/gui/cog.png rename to resources/assets/enderio/textures/gui/old/cog.png diff --git a/resources/assets/enderio/textures/gui/lockLocked.png b/resources/assets/enderio/textures/gui/old/lockLocked.png similarity index 100% rename from resources/assets/enderio/textures/gui/lockLocked.png rename to resources/assets/enderio/textures/gui/old/lockLocked.png diff --git a/resources/assets/enderio/textures/gui/lockUnlocked.png b/resources/assets/enderio/textures/gui/old/lockUnlocked.png similarity index 100% rename from resources/assets/enderio/textures/gui/lockUnlocked.png rename to resources/assets/enderio/textures/gui/old/lockUnlocked.png diff --git a/resources/assets/enderio/textures/gui/old/widgets.png b/resources/assets/enderio/textures/gui/old/widgets.png new file mode 100644 index 00000000..62f5e115 Binary files /dev/null and b/resources/assets/enderio/textures/gui/old/widgets.png differ diff --git a/resources/assets/enderio/textures/gui/sliceAndSplice.png b/resources/assets/enderio/textures/gui/sliceAndSplice.png index 8559f204..770c359b 100644 Binary files a/resources/assets/enderio/textures/gui/sliceAndSplice.png and b/resources/assets/enderio/textures/gui/sliceAndSplice.png differ diff --git a/resources/assets/enderio/textures/gui/widgets.png b/resources/assets/enderio/textures/gui/widgets.png deleted file mode 100644 index c364a301..00000000 Binary files a/resources/assets/enderio/textures/gui/widgets.png and /dev/null differ diff --git a/resources/assets/enderio/textures/gui/widgetsv2.png b/resources/assets/enderio/textures/gui/widgetsv2.png new file mode 100644 index 00000000..e383f0dc Binary files /dev/null and b/resources/assets/enderio/textures/gui/widgetsv2.png differ diff --git a/resources/assets/enderio/textures/items/activatedCapacitor.png b/resources/assets/enderio/textures/items/activatedCapacitor.png index 113f5b4a..2b86c6a5 100644 Binary files a/resources/assets/enderio/textures/items/activatedCapacitor.png and b/resources/assets/enderio/textures/items/activatedCapacitor.png differ diff --git a/resources/assets/enderio/textures/items/attractorCrystal.png b/resources/assets/enderio/textures/items/attractorCrystal.png index 5c8dc4d0..c3079100 100644 Binary files a/resources/assets/enderio/textures/items/attractorCrystal.png and b/resources/assets/enderio/textures/items/attractorCrystal.png differ diff --git a/resources/assets/enderio/textures/items/basicCapacitor.png b/resources/assets/enderio/textures/items/basicCapacitor.png index 446858a3..4097ab67 100644 Binary files a/resources/assets/enderio/textures/items/basicCapacitor.png and b/resources/assets/enderio/textures/items/basicCapacitor.png differ diff --git a/resources/assets/enderio/textures/items/basicGear.png b/resources/assets/enderio/textures/items/basicGear.png index 16e22c06..c48dfb8a 100644 Binary files a/resources/assets/enderio/textures/items/basicGear.png and b/resources/assets/enderio/textures/items/basicGear.png differ diff --git a/resources/assets/enderio/textures/items/binderComposite.png b/resources/assets/enderio/textures/items/binderComposite.png index f391063a..ea5f1585 100644 Binary files a/resources/assets/enderio/textures/items/binderComposite.png and b/resources/assets/enderio/textures/items/binderComposite.png differ diff --git a/resources/assets/enderio/textures/items/bucketFire_water.png b/resources/assets/enderio/textures/items/bucketFire_water.png index 85cffc6a..76da1916 100644 Binary files a/resources/assets/enderio/textures/items/bucketFire_water.png and b/resources/assets/enderio/textures/items/bucketFire_water.png differ diff --git a/resources/assets/enderio/textures/items/bucketHootch.png b/resources/assets/enderio/textures/items/bucketHootch.png index bdc4b57c..6a30d57a 100644 Binary files a/resources/assets/enderio/textures/items/bucketHootch.png and b/resources/assets/enderio/textures/items/bucketHootch.png differ diff --git a/resources/assets/enderio/textures/items/bucketNutrient_distillation.png b/resources/assets/enderio/textures/items/bucketNutrient_distillation.png index 5727d706..15b71e96 100644 Binary files a/resources/assets/enderio/textures/items/bucketNutrient_distillation.png and b/resources/assets/enderio/textures/items/bucketNutrient_distillation.png differ diff --git a/resources/assets/enderio/textures/items/bucketRocket_fuel.png b/resources/assets/enderio/textures/items/bucketRocket_fuel.png index 48de6970..5d2a59d8 100644 Binary files a/resources/assets/enderio/textures/items/bucketRocket_fuel.png and b/resources/assets/enderio/textures/items/bucketRocket_fuel.png differ diff --git a/resources/assets/enderio/textures/items/bucketXpjuice.png b/resources/assets/enderio/textures/items/bucketXpjuice.png index 877f6d5a..4b79e90a 100644 Binary files a/resources/assets/enderio/textures/items/bucketXpjuice.png and b/resources/assets/enderio/textures/items/bucketXpjuice.png differ diff --git a/resources/assets/enderio/textures/items/conductiveIron.png b/resources/assets/enderio/textures/items/conductiveIron.png index 24e77d5a..7d1cd4b0 100644 Binary files a/resources/assets/enderio/textures/items/conductiveIron.png and b/resources/assets/enderio/textures/items/conductiveIron.png differ diff --git a/resources/assets/enderio/textures/items/conduitFacade.png b/resources/assets/enderio/textures/items/conduitFacade.png index 568a98bf..f9449edf 100644 Binary files a/resources/assets/enderio/textures/items/conduitFacade.png and b/resources/assets/enderio/textures/items/conduitFacade.png differ diff --git a/resources/assets/enderio/textures/items/conduitFacadeHardened.png b/resources/assets/enderio/textures/items/conduitFacadeHardened.png new file mode 100644 index 00000000..65813686 Binary files /dev/null and b/resources/assets/enderio/textures/items/conduitFacadeHardened.png differ diff --git a/resources/assets/enderio/textures/items/conduitFacadeOverlay.png b/resources/assets/enderio/textures/items/conduitFacadeOverlay.png index 15e679b9..609095a1 100644 Binary files a/resources/assets/enderio/textures/items/conduitFacadeOverlay.png and b/resources/assets/enderio/textures/items/conduitFacadeOverlay.png differ diff --git a/resources/assets/enderio/textures/items/darkGrindingBall.png b/resources/assets/enderio/textures/items/darkGrindingBall.png index 549c827b..54f5d3de 100644 Binary files a/resources/assets/enderio/textures/items/darkGrindingBall.png and b/resources/assets/enderio/textures/items/darkGrindingBall.png differ diff --git a/resources/assets/enderio/textures/items/darkSteel.png b/resources/assets/enderio/textures/items/darkSteel.png index 2934c638..72108b9c 100644 Binary files a/resources/assets/enderio/textures/items/darkSteel.png and b/resources/assets/enderio/textures/items/darkSteel.png differ diff --git a/resources/assets/enderio/textures/items/darkSteel_axe.png b/resources/assets/enderio/textures/items/darkSteel_axe.png index 6f0014cc..6da64056 100644 Binary files a/resources/assets/enderio/textures/items/darkSteel_axe.png and b/resources/assets/enderio/textures/items/darkSteel_axe.png differ diff --git a/resources/assets/enderio/textures/items/darkSteel_boots.png b/resources/assets/enderio/textures/items/darkSteel_boots.png index d314d206..71783534 100644 Binary files a/resources/assets/enderio/textures/items/darkSteel_boots.png and b/resources/assets/enderio/textures/items/darkSteel_boots.png differ diff --git a/resources/assets/enderio/textures/items/darkSteel_chestplate.png b/resources/assets/enderio/textures/items/darkSteel_chestplate.png index 2a5e2682..3fd823b3 100644 Binary files a/resources/assets/enderio/textures/items/darkSteel_chestplate.png and b/resources/assets/enderio/textures/items/darkSteel_chestplate.png differ diff --git a/resources/assets/enderio/textures/items/darkSteel_helmet.png b/resources/assets/enderio/textures/items/darkSteel_helmet.png index def672f5..ad0a38bf 100644 Binary files a/resources/assets/enderio/textures/items/darkSteel_helmet.png and b/resources/assets/enderio/textures/items/darkSteel_helmet.png differ diff --git a/resources/assets/enderio/textures/items/darkSteel_hoe.png b/resources/assets/enderio/textures/items/darkSteel_hoe.png index 2c54c646..9a97d090 100644 Binary files a/resources/assets/enderio/textures/items/darkSteel_hoe.png and b/resources/assets/enderio/textures/items/darkSteel_hoe.png differ diff --git a/resources/assets/enderio/textures/items/darkSteel_leggings.png b/resources/assets/enderio/textures/items/darkSteel_leggings.png index e11c0236..03097b91 100644 Binary files a/resources/assets/enderio/textures/items/darkSteel_leggings.png and b/resources/assets/enderio/textures/items/darkSteel_leggings.png differ diff --git a/resources/assets/enderio/textures/items/darkSteel_pickaxe.png b/resources/assets/enderio/textures/items/darkSteel_pickaxe.png index a00fdac1..39fd6b9d 100644 Binary files a/resources/assets/enderio/textures/items/darkSteel_pickaxe.png and b/resources/assets/enderio/textures/items/darkSteel_pickaxe.png differ diff --git a/resources/assets/enderio/textures/items/darkSteel_shovel.png b/resources/assets/enderio/textures/items/darkSteel_shovel.png index ab07642a..e2774bfd 100644 Binary files a/resources/assets/enderio/textures/items/darkSteel_shovel.png and b/resources/assets/enderio/textures/items/darkSteel_shovel.png differ diff --git a/resources/assets/enderio/textures/items/darkSteel_sword.png b/resources/assets/enderio/textures/items/darkSteel_sword.png index e86ce901..837d059a 100644 Binary files a/resources/assets/enderio/textures/items/darkSteel_sword.png and b/resources/assets/enderio/textures/items/darkSteel_sword.png differ diff --git a/resources/assets/enderio/textures/items/darkSteel_swordAlt.png b/resources/assets/enderio/textures/items/darkSteel_swordAlt.png new file mode 100644 index 00000000..c5120061 Binary files /dev/null and b/resources/assets/enderio/textures/items/darkSteel_swordAlt.png differ diff --git a/resources/assets/enderio/textures/items/darkSteel_swordAlt2.png b/resources/assets/enderio/textures/items/darkSteel_swordAlt2.png new file mode 100644 index 00000000..abaaff6a Binary files /dev/null and b/resources/assets/enderio/textures/items/darkSteel_swordAlt2.png differ diff --git a/resources/assets/enderio/textures/items/electricalSteel.png b/resources/assets/enderio/textures/items/electricalSteel.png index fab794d1..487276c6 100644 Binary files a/resources/assets/enderio/textures/items/electricalSteel.png and b/resources/assets/enderio/textures/items/electricalSteel.png differ diff --git a/resources/assets/enderio/textures/items/enderCapacitor.png b/resources/assets/enderio/textures/items/enderCapacitor.png index ba24c67d..ef832f0f 100644 Binary files a/resources/assets/enderio/textures/items/enderCapacitor.png and b/resources/assets/enderio/textures/items/enderCapacitor.png differ diff --git a/resources/assets/enderio/textures/items/enderCrystal.png b/resources/assets/enderio/textures/items/enderCrystal.png index 8007d153..af708ece 100644 Binary files a/resources/assets/enderio/textures/items/enderCrystal.png and b/resources/assets/enderio/textures/items/enderCrystal.png differ diff --git a/resources/assets/enderio/textures/items/enderface.png b/resources/assets/enderio/textures/items/enderface.png index d372f408..d1c90057 100644 Binary files a/resources/assets/enderio/textures/items/enderface.png and b/resources/assets/enderio/textures/items/enderface.png differ diff --git a/resources/assets/enderio/textures/items/endermanSkull.png b/resources/assets/enderio/textures/items/endermanSkull.png index 7c95a77b..4201e1e5 100644 Binary files a/resources/assets/enderio/textures/items/endermanSkull.png and b/resources/assets/enderio/textures/items/endermanSkull.png differ diff --git a/resources/assets/enderio/textures/items/energeticAlloy.png b/resources/assets/enderio/textures/items/energeticAlloy.png index 71e58884..68e6cf43 100644 Binary files a/resources/assets/enderio/textures/items/energeticAlloy.png and b/resources/assets/enderio/textures/items/energeticAlloy.png differ diff --git a/resources/assets/enderio/textures/items/existingItemFilter.png b/resources/assets/enderio/textures/items/existingItemFilter.png index 6b446ee3..15e2288f 100644 Binary files a/resources/assets/enderio/textures/items/existingItemFilter.png and b/resources/assets/enderio/textures/items/existingItemFilter.png differ diff --git a/resources/assets/enderio/textures/items/extractSpeedDowngrade.png b/resources/assets/enderio/textures/items/extractSpeedDowngrade.png new file mode 100644 index 00000000..0a98aedb Binary files /dev/null and b/resources/assets/enderio/textures/items/extractSpeedDowngrade.png differ diff --git a/resources/assets/enderio/textures/items/extractSpeedUpgrade.png b/resources/assets/enderio/textures/items/extractSpeedUpgrade.png index af53a3a7..202c21db 100644 Binary files a/resources/assets/enderio/textures/items/extractSpeedUpgrade.png and b/resources/assets/enderio/textures/items/extractSpeedUpgrade.png differ diff --git a/resources/assets/enderio/textures/items/filterUpgradeAdvanced.png b/resources/assets/enderio/textures/items/filterUpgradeAdvanced.png index 3e66086e..74d14998 100644 Binary files a/resources/assets/enderio/textures/items/filterUpgradeAdvanced.png and b/resources/assets/enderio/textures/items/filterUpgradeAdvanced.png differ diff --git a/resources/assets/enderio/textures/items/filterUpgradeBasic.png b/resources/assets/enderio/textures/items/filterUpgradeBasic.png index e9faeb65..f0b617a0 100644 Binary files a/resources/assets/enderio/textures/items/filterUpgradeBasic.png and b/resources/assets/enderio/textures/items/filterUpgradeBasic.png differ diff --git a/resources/assets/enderio/textures/items/itemGasConduit.png b/resources/assets/enderio/textures/items/itemGasConduit.png index cb770b71..7cd181f6 100644 Binary files a/resources/assets/enderio/textures/items/itemGasConduit.png and b/resources/assets/enderio/textures/items/itemGasConduit.png differ diff --git a/resources/assets/enderio/textures/items/itemItemConduit.png b/resources/assets/enderio/textures/items/itemItemConduit.png index d43b90a6..650d6342 100644 Binary files a/resources/assets/enderio/textures/items/itemItemConduit.png and b/resources/assets/enderio/textures/items/itemItemConduit.png differ diff --git a/resources/assets/enderio/textures/items/itemItemConduitAdvanced.png b/resources/assets/enderio/textures/items/itemItemConduitAdvanced.png index 68109c64..7bca7828 100644 Binary files a/resources/assets/enderio/textures/items/itemItemConduitAdvanced.png and b/resources/assets/enderio/textures/items/itemItemConduitAdvanced.png differ diff --git a/resources/assets/enderio/textures/items/itemLiquidConduit.png b/resources/assets/enderio/textures/items/itemLiquidConduit.png index 6a1ad198..c91656bb 100644 Binary files a/resources/assets/enderio/textures/items/itemLiquidConduit.png and b/resources/assets/enderio/textures/items/itemLiquidConduit.png differ diff --git a/resources/assets/enderio/textures/items/itemLiquidConduitAdvanced.png b/resources/assets/enderio/textures/items/itemLiquidConduitAdvanced.png index 137593a7..50b010df 100644 Binary files a/resources/assets/enderio/textures/items/itemLiquidConduitAdvanced.png and b/resources/assets/enderio/textures/items/itemLiquidConduitAdvanced.png differ diff --git a/resources/assets/enderio/textures/items/itemLiquidConduitEnder.png b/resources/assets/enderio/textures/items/itemLiquidConduitEnder.png index a86f42fb..de3de255 100644 Binary files a/resources/assets/enderio/textures/items/itemLiquidConduitEnder.png and b/resources/assets/enderio/textures/items/itemLiquidConduitEnder.png differ diff --git a/resources/assets/enderio/textures/items/itemMeConduit.png b/resources/assets/enderio/textures/items/itemMeConduit.png index c74e1f1d..9558453d 100644 Binary files a/resources/assets/enderio/textures/items/itemMeConduit.png and b/resources/assets/enderio/textures/items/itemMeConduit.png differ diff --git a/resources/assets/enderio/textures/items/itemMeConduitDense.png b/resources/assets/enderio/textures/items/itemMeConduitDense.png index e4f8db39..5f142125 100644 Binary files a/resources/assets/enderio/textures/items/itemMeConduitDense.png and b/resources/assets/enderio/textures/items/itemMeConduitDense.png differ diff --git a/resources/assets/enderio/textures/items/itemPowerConduit.png b/resources/assets/enderio/textures/items/itemPowerConduit.png index 1a34f41e..5aa5ec44 100644 Binary files a/resources/assets/enderio/textures/items/itemPowerConduit.png and b/resources/assets/enderio/textures/items/itemPowerConduit.png differ diff --git a/resources/assets/enderio/textures/items/itemPowerConduitEnder.png b/resources/assets/enderio/textures/items/itemPowerConduitEnder.png index b9e9bc3a..c7ed6097 100644 Binary files a/resources/assets/enderio/textures/items/itemPowerConduitEnder.png and b/resources/assets/enderio/textures/items/itemPowerConduitEnder.png differ diff --git a/resources/assets/enderio/textures/items/itemPowerConduitEnhanced.png b/resources/assets/enderio/textures/items/itemPowerConduitEnhanced.png index 4e322468..1557249d 100644 Binary files a/resources/assets/enderio/textures/items/itemPowerConduitEnhanced.png and b/resources/assets/enderio/textures/items/itemPowerConduitEnhanced.png differ diff --git a/resources/assets/enderio/textures/items/itemRedstoneConduit.png b/resources/assets/enderio/textures/items/itemRedstoneConduit.png index d0a98301..d5438395 100644 Binary files a/resources/assets/enderio/textures/items/itemRedstoneConduit.png and b/resources/assets/enderio/textures/items/itemRedstoneConduit.png differ diff --git a/resources/assets/enderio/textures/items/itemRedstoneInsulatedConduit.png b/resources/assets/enderio/textures/items/itemRedstoneInsulatedConduit.png index e272fe23..319b4348 100644 Binary files a/resources/assets/enderio/textures/items/itemRedstoneInsulatedConduit.png and b/resources/assets/enderio/textures/items/itemRedstoneInsulatedConduit.png differ diff --git a/resources/assets/enderio/textures/items/itemRedstoneSwitch.png b/resources/assets/enderio/textures/items/itemRedstoneSwitch.png index 7e0c10c3..1fcf7018 100644 Binary files a/resources/assets/enderio/textures/items/itemRedstoneSwitch.png and b/resources/assets/enderio/textures/items/itemRedstoneSwitch.png differ diff --git a/resources/assets/enderio/textures/items/itemTravelStaff.png b/resources/assets/enderio/textures/items/itemTravelStaff.png index fca985bb..fe4730e9 100644 Binary files a/resources/assets/enderio/textures/items/itemTravelStaff.png and b/resources/assets/enderio/textures/items/itemTravelStaff.png differ diff --git a/resources/assets/enderio/textures/items/itemTravelStaff_long.png b/resources/assets/enderio/textures/items/itemTravelStaff_long.png new file mode 100644 index 00000000..699439f0 Binary files /dev/null and b/resources/assets/enderio/textures/items/itemTravelStaff_long.png differ diff --git a/resources/assets/enderio/textures/items/mJReader.png b/resources/assets/enderio/textures/items/mJReader.png index 59365b8e..6b23b881 100644 Binary files a/resources/assets/enderio/textures/items/mJReader.png and b/resources/assets/enderio/textures/items/mJReader.png differ diff --git a/resources/assets/enderio/textures/items/mJReader_alt1.png b/resources/assets/enderio/textures/items/mJReader_alt1.png new file mode 100644 index 00000000..3319e008 Binary files /dev/null and b/resources/assets/enderio/textures/items/mJReader_alt1.png differ diff --git a/resources/assets/enderio/textures/items/mJReader_alt2.png b/resources/assets/enderio/textures/items/mJReader_alt2.png new file mode 100644 index 00000000..38a31bf0 Binary files /dev/null and b/resources/assets/enderio/textures/items/mJReader_alt2.png differ diff --git a/resources/assets/enderio/textures/items/machineChassi.png b/resources/assets/enderio/textures/items/machineChassi.png index 21a81bf9..7daee9cd 100644 Binary files a/resources/assets/enderio/textures/items/machineChassi.png and b/resources/assets/enderio/textures/items/machineChassi.png differ diff --git a/resources/assets/enderio/textures/items/magnet.png b/resources/assets/enderio/textures/items/magnet.png index 0c95ca71..5fb0014d 100644 Binary files a/resources/assets/enderio/textures/items/magnet.png and b/resources/assets/enderio/textures/items/magnet.png differ diff --git a/resources/assets/enderio/textures/items/modItemFilter.png b/resources/assets/enderio/textures/items/modItemFilter.png index 6568d262..e1956c63 100644 Binary files a/resources/assets/enderio/textures/items/modItemFilter.png and b/resources/assets/enderio/textures/items/modItemFilter.png differ diff --git a/resources/assets/enderio/textures/items/old/activatedCapacitor.png b/resources/assets/enderio/textures/items/old/activatedCapacitor.png new file mode 100644 index 00000000..113f5b4a Binary files /dev/null and b/resources/assets/enderio/textures/items/old/activatedCapacitor.png differ diff --git a/resources/assets/enderio/textures/items/old/attractorCrystal.png b/resources/assets/enderio/textures/items/old/attractorCrystal.png new file mode 100644 index 00000000..5c8dc4d0 Binary files /dev/null and b/resources/assets/enderio/textures/items/old/attractorCrystal.png differ diff --git a/resources/assets/enderio/textures/items/old/basicCapacitor.png b/resources/assets/enderio/textures/items/old/basicCapacitor.png new file mode 100644 index 00000000..446858a3 Binary files /dev/null and b/resources/assets/enderio/textures/items/old/basicCapacitor.png differ diff --git a/resources/assets/enderio/textures/items/old/basicGear.png b/resources/assets/enderio/textures/items/old/basicGear.png new file mode 100644 index 00000000..16e22c06 Binary files /dev/null and b/resources/assets/enderio/textures/items/old/basicGear.png differ diff --git a/resources/assets/enderio/textures/items/old/binderComposite.png b/resources/assets/enderio/textures/items/old/binderComposite.png new file mode 100644 index 00000000..f391063a Binary files /dev/null and b/resources/assets/enderio/textures/items/old/binderComposite.png differ diff --git a/resources/assets/enderio/textures/items/blueSteel.png b/resources/assets/enderio/textures/items/old/blueSteel.png similarity index 100% rename from resources/assets/enderio/textures/items/blueSteel.png rename to resources/assets/enderio/textures/items/old/blueSteel.png diff --git a/resources/assets/enderio/textures/items/old/bucketFire_water.png b/resources/assets/enderio/textures/items/old/bucketFire_water.png new file mode 100644 index 00000000..85cffc6a Binary files /dev/null and b/resources/assets/enderio/textures/items/old/bucketFire_water.png differ diff --git a/resources/assets/enderio/textures/items/old/bucketHootch.png b/resources/assets/enderio/textures/items/old/bucketHootch.png new file mode 100644 index 00000000..bdc4b57c Binary files /dev/null and b/resources/assets/enderio/textures/items/old/bucketHootch.png differ diff --git a/resources/assets/enderio/textures/items/old/bucketNutrient_distillation.png b/resources/assets/enderio/textures/items/old/bucketNutrient_distillation.png new file mode 100644 index 00000000..5727d706 Binary files /dev/null and b/resources/assets/enderio/textures/items/old/bucketNutrient_distillation.png differ diff --git a/resources/assets/enderio/textures/items/old/bucketRocket_fuel.png b/resources/assets/enderio/textures/items/old/bucketRocket_fuel.png new file mode 100644 index 00000000..48de6970 Binary files /dev/null and b/resources/assets/enderio/textures/items/old/bucketRocket_fuel.png differ diff --git a/resources/assets/enderio/textures/items/old/bucketXpjuice.png b/resources/assets/enderio/textures/items/old/bucketXpjuice.png new file mode 100644 index 00000000..877f6d5a Binary files /dev/null and b/resources/assets/enderio/textures/items/old/bucketXpjuice.png differ diff --git a/resources/assets/enderio/textures/items/old/conductiveIron.png b/resources/assets/enderio/textures/items/old/conductiveIron.png new file mode 100644 index 00000000..24e77d5a Binary files /dev/null and b/resources/assets/enderio/textures/items/old/conductiveIron.png differ diff --git a/resources/assets/enderio/textures/items/old/conduitBinder.png b/resources/assets/enderio/textures/items/old/conduitBinder.png new file mode 100644 index 00000000..b92bc13c Binary files /dev/null and b/resources/assets/enderio/textures/items/old/conduitBinder.png differ diff --git a/resources/assets/enderio/textures/items/old/conduitFacade.png b/resources/assets/enderio/textures/items/old/conduitFacade.png new file mode 100644 index 00000000..568a98bf Binary files /dev/null and b/resources/assets/enderio/textures/items/old/conduitFacade.png differ diff --git a/resources/assets/enderio/textures/items/old/conduitFacadeOverlay.png b/resources/assets/enderio/textures/items/old/conduitFacadeOverlay.png new file mode 100644 index 00000000..15e679b9 Binary files /dev/null and b/resources/assets/enderio/textures/items/old/conduitFacadeOverlay.png differ diff --git a/resources/assets/enderio/textures/items/old/darkGrindingBall.png b/resources/assets/enderio/textures/items/old/darkGrindingBall.png new file mode 100644 index 00000000..549c827b Binary files /dev/null and b/resources/assets/enderio/textures/items/old/darkGrindingBall.png differ diff --git a/resources/assets/enderio/textures/items/old/darkSteel.png b/resources/assets/enderio/textures/items/old/darkSteel.png new file mode 100644 index 00000000..2934c638 Binary files /dev/null and b/resources/assets/enderio/textures/items/old/darkSteel.png differ diff --git a/resources/assets/enderio/textures/items/old/darkSteel_axe.png b/resources/assets/enderio/textures/items/old/darkSteel_axe.png new file mode 100644 index 00000000..6f0014cc Binary files /dev/null and b/resources/assets/enderio/textures/items/old/darkSteel_axe.png differ diff --git a/resources/assets/enderio/textures/items/old/darkSteel_boots.png b/resources/assets/enderio/textures/items/old/darkSteel_boots.png new file mode 100644 index 00000000..d314d206 Binary files /dev/null and b/resources/assets/enderio/textures/items/old/darkSteel_boots.png differ diff --git a/resources/assets/enderio/textures/items/old/darkSteel_chestplate.png b/resources/assets/enderio/textures/items/old/darkSteel_chestplate.png new file mode 100644 index 00000000..2a5e2682 Binary files /dev/null and b/resources/assets/enderio/textures/items/old/darkSteel_chestplate.png differ diff --git a/resources/assets/enderio/textures/items/old/darkSteel_helmet.png b/resources/assets/enderio/textures/items/old/darkSteel_helmet.png new file mode 100644 index 00000000..def672f5 Binary files /dev/null and b/resources/assets/enderio/textures/items/old/darkSteel_helmet.png differ diff --git a/resources/assets/enderio/textures/items/old/darkSteel_hoe.png b/resources/assets/enderio/textures/items/old/darkSteel_hoe.png new file mode 100644 index 00000000..2c54c646 Binary files /dev/null and b/resources/assets/enderio/textures/items/old/darkSteel_hoe.png differ diff --git a/resources/assets/enderio/textures/items/old/darkSteel_leggings.png b/resources/assets/enderio/textures/items/old/darkSteel_leggings.png new file mode 100644 index 00000000..e11c0236 Binary files /dev/null and b/resources/assets/enderio/textures/items/old/darkSteel_leggings.png differ diff --git a/resources/assets/enderio/textures/items/old/darkSteel_pickaxe.png b/resources/assets/enderio/textures/items/old/darkSteel_pickaxe.png new file mode 100644 index 00000000..a00fdac1 Binary files /dev/null and b/resources/assets/enderio/textures/items/old/darkSteel_pickaxe.png differ diff --git a/resources/assets/enderio/textures/items/old/darkSteel_shovel.png b/resources/assets/enderio/textures/items/old/darkSteel_shovel.png new file mode 100644 index 00000000..ab07642a Binary files /dev/null and b/resources/assets/enderio/textures/items/old/darkSteel_shovel.png differ diff --git a/resources/assets/enderio/textures/items/old/darkSteel_sword.png b/resources/assets/enderio/textures/items/old/darkSteel_sword.png new file mode 100644 index 00000000..e86ce901 Binary files /dev/null and b/resources/assets/enderio/textures/items/old/darkSteel_sword.png differ diff --git a/resources/assets/enderio/textures/items/old/electricalSteel.png b/resources/assets/enderio/textures/items/old/electricalSteel.png new file mode 100644 index 00000000..fab794d1 Binary files /dev/null and b/resources/assets/enderio/textures/items/old/electricalSteel.png differ diff --git a/resources/assets/enderio/textures/items/old/enderCapacitor.png b/resources/assets/enderio/textures/items/old/enderCapacitor.png new file mode 100644 index 00000000..ba24c67d Binary files /dev/null and b/resources/assets/enderio/textures/items/old/enderCapacitor.png differ diff --git a/resources/assets/enderio/textures/items/old/enderCrystal.png b/resources/assets/enderio/textures/items/old/enderCrystal.png new file mode 100644 index 00000000..8007d153 Binary files /dev/null and b/resources/assets/enderio/textures/items/old/enderCrystal.png differ diff --git a/resources/assets/enderio/textures/items/enderface2Off.png b/resources/assets/enderio/textures/items/old/enderface.png similarity index 100% rename from resources/assets/enderio/textures/items/enderface2Off.png rename to resources/assets/enderio/textures/items/old/enderface.png diff --git a/resources/assets/enderio/textures/items/old/enderface2Off.png b/resources/assets/enderio/textures/items/old/enderface2Off.png new file mode 100644 index 00000000..d372f408 Binary files /dev/null and b/resources/assets/enderio/textures/items/old/enderface2Off.png differ diff --git a/resources/assets/enderio/textures/items/enderface2On.png b/resources/assets/enderio/textures/items/old/enderface2On.png similarity index 100% rename from resources/assets/enderio/textures/items/enderface2On.png rename to resources/assets/enderio/textures/items/old/enderface2On.png diff --git a/resources/assets/enderio/textures/items/old/endermanSkull.png b/resources/assets/enderio/textures/items/old/endermanSkull.png new file mode 100644 index 00000000..7c95a77b Binary files /dev/null and b/resources/assets/enderio/textures/items/old/endermanSkull.png differ diff --git a/resources/assets/enderio/textures/items/old/energeticAlloy.png b/resources/assets/enderio/textures/items/old/energeticAlloy.png new file mode 100644 index 00000000..71e58884 Binary files /dev/null and b/resources/assets/enderio/textures/items/old/energeticAlloy.png differ diff --git a/resources/assets/enderio/textures/items/old/existingItemFilter.png b/resources/assets/enderio/textures/items/old/existingItemFilter.png new file mode 100644 index 00000000..6b446ee3 Binary files /dev/null and b/resources/assets/enderio/textures/items/old/existingItemFilter.png differ diff --git a/resources/assets/enderio/textures/items/old/extractSpeedUpgrade.png b/resources/assets/enderio/textures/items/old/extractSpeedUpgrade.png new file mode 100644 index 00000000..af53a3a7 Binary files /dev/null and b/resources/assets/enderio/textures/items/old/extractSpeedUpgrade.png differ diff --git a/resources/assets/enderio/textures/items/old/filterUpgradeAdvanced.png b/resources/assets/enderio/textures/items/old/filterUpgradeAdvanced.png new file mode 100644 index 00000000..3e66086e Binary files /dev/null and b/resources/assets/enderio/textures/items/old/filterUpgradeAdvanced.png differ diff --git a/resources/assets/enderio/textures/items/old/filterUpgradeBasic.png b/resources/assets/enderio/textures/items/old/filterUpgradeBasic.png new file mode 100644 index 00000000..e9faeb65 Binary files /dev/null and b/resources/assets/enderio/textures/items/old/filterUpgradeBasic.png differ diff --git a/resources/assets/enderio/textures/items/ingotBronze.png b/resources/assets/enderio/textures/items/old/ingotBronze.png similarity index 100% rename from resources/assets/enderio/textures/items/ingotBronze.png rename to resources/assets/enderio/textures/items/old/ingotBronze.png diff --git a/resources/assets/enderio/textures/items/ingotCopper.png b/resources/assets/enderio/textures/items/old/ingotCopper.png similarity index 100% rename from resources/assets/enderio/textures/items/ingotCopper.png rename to resources/assets/enderio/textures/items/old/ingotCopper.png diff --git a/resources/assets/enderio/textures/items/ingotElectrum.png b/resources/assets/enderio/textures/items/old/ingotElectrum.png similarity index 100% rename from resources/assets/enderio/textures/items/ingotElectrum.png rename to resources/assets/enderio/textures/items/old/ingotElectrum.png diff --git a/resources/assets/enderio/textures/items/ingotLead.png b/resources/assets/enderio/textures/items/old/ingotLead.png similarity index 100% rename from resources/assets/enderio/textures/items/ingotLead.png rename to resources/assets/enderio/textures/items/old/ingotLead.png diff --git a/resources/assets/enderio/textures/items/ingotSilver.png b/resources/assets/enderio/textures/items/old/ingotSilver.png similarity index 100% rename from resources/assets/enderio/textures/items/ingotSilver.png rename to resources/assets/enderio/textures/items/old/ingotSilver.png diff --git a/resources/assets/enderio/textures/items/ingotTin.png b/resources/assets/enderio/textures/items/old/ingotTin.png similarity index 100% rename from resources/assets/enderio/textures/items/ingotTin.png rename to resources/assets/enderio/textures/items/old/ingotTin.png diff --git a/resources/assets/enderio/textures/items/old/itemGasConduit.png b/resources/assets/enderio/textures/items/old/itemGasConduit.png new file mode 100644 index 00000000..cb770b71 Binary files /dev/null and b/resources/assets/enderio/textures/items/old/itemGasConduit.png differ diff --git a/resources/assets/enderio/textures/items/old/itemItemConduit.png b/resources/assets/enderio/textures/items/old/itemItemConduit.png new file mode 100644 index 00000000..d43b90a6 Binary files /dev/null and b/resources/assets/enderio/textures/items/old/itemItemConduit.png differ diff --git a/resources/assets/enderio/textures/items/old/itemItemConduit.png.mcmeta b/resources/assets/enderio/textures/items/old/itemItemConduit.png.mcmeta new file mode 100644 index 00000000..7ceb3639 --- /dev/null +++ b/resources/assets/enderio/textures/items/old/itemItemConduit.png.mcmeta @@ -0,0 +1,45 @@ +{ + "animation": { + "frametime": 2, + "frames": [ + 0, + 1, + 2, + 3, + 4, + 5, + 6, + 7, + 8, + 9, + 10, + 11, + 12, + 13, + 14, + 15, + 16, + 17, + 18, + 19, + 18, + 17, + 16, + 15, + 14, + 13, + 12, + 11, + 10, + 9, + 8, + 7, + 6, + 5, + 4, + 3, + 2, + 1 + ] + } +} \ No newline at end of file diff --git a/resources/assets/enderio/textures/items/old/itemItemConduitAdvanced.png b/resources/assets/enderio/textures/items/old/itemItemConduitAdvanced.png new file mode 100644 index 00000000..68109c64 Binary files /dev/null and b/resources/assets/enderio/textures/items/old/itemItemConduitAdvanced.png differ diff --git a/resources/assets/enderio/textures/items/old/itemItemConduitAdvanced.png.mcmeta b/resources/assets/enderio/textures/items/old/itemItemConduitAdvanced.png.mcmeta new file mode 100644 index 00000000..7ceb3639 --- /dev/null +++ b/resources/assets/enderio/textures/items/old/itemItemConduitAdvanced.png.mcmeta @@ -0,0 +1,45 @@ +{ + "animation": { + "frametime": 2, + "frames": [ + 0, + 1, + 2, + 3, + 4, + 5, + 6, + 7, + 8, + 9, + 10, + 11, + 12, + 13, + 14, + 15, + 16, + 17, + 18, + 19, + 18, + 17, + 16, + 15, + 14, + 13, + 12, + 11, + 10, + 9, + 8, + 7, + 6, + 5, + 4, + 3, + 2, + 1 + ] + } +} \ No newline at end of file diff --git a/resources/assets/enderio/textures/items/old/itemLiquidConduit.png b/resources/assets/enderio/textures/items/old/itemLiquidConduit.png new file mode 100644 index 00000000..6a1ad198 Binary files /dev/null and b/resources/assets/enderio/textures/items/old/itemLiquidConduit.png differ diff --git a/resources/assets/enderio/textures/items/old/itemLiquidConduitAdvanced.png b/resources/assets/enderio/textures/items/old/itemLiquidConduitAdvanced.png new file mode 100644 index 00000000..137593a7 Binary files /dev/null and b/resources/assets/enderio/textures/items/old/itemLiquidConduitAdvanced.png differ diff --git a/resources/assets/enderio/textures/items/old/itemLiquidConduitEnder.png b/resources/assets/enderio/textures/items/old/itemLiquidConduitEnder.png new file mode 100644 index 00000000..a86f42fb Binary files /dev/null and b/resources/assets/enderio/textures/items/old/itemLiquidConduitEnder.png differ diff --git a/resources/assets/enderio/textures/items/old/itemMeConduit.png b/resources/assets/enderio/textures/items/old/itemMeConduit.png new file mode 100644 index 00000000..c74e1f1d Binary files /dev/null and b/resources/assets/enderio/textures/items/old/itemMeConduit.png differ diff --git a/resources/assets/enderio/textures/items/old/itemMeConduitDense.png b/resources/assets/enderio/textures/items/old/itemMeConduitDense.png new file mode 100644 index 00000000..e4f8db39 Binary files /dev/null and b/resources/assets/enderio/textures/items/old/itemMeConduitDense.png differ diff --git a/resources/assets/enderio/textures/items/old/itemPowerConduit.png b/resources/assets/enderio/textures/items/old/itemPowerConduit.png new file mode 100644 index 00000000..1a34f41e Binary files /dev/null and b/resources/assets/enderio/textures/items/old/itemPowerConduit.png differ diff --git a/resources/assets/enderio/textures/items/old/itemPowerConduitEnder.png b/resources/assets/enderio/textures/items/old/itemPowerConduitEnder.png new file mode 100644 index 00000000..b9e9bc3a Binary files /dev/null and b/resources/assets/enderio/textures/items/old/itemPowerConduitEnder.png differ diff --git a/resources/assets/enderio/textures/items/old/itemPowerConduitEnhanced.png b/resources/assets/enderio/textures/items/old/itemPowerConduitEnhanced.png new file mode 100644 index 00000000..4e322468 Binary files /dev/null and b/resources/assets/enderio/textures/items/old/itemPowerConduitEnhanced.png differ diff --git a/resources/assets/enderio/textures/items/old/itemRedstoneConduit.png b/resources/assets/enderio/textures/items/old/itemRedstoneConduit.png new file mode 100644 index 00000000..d0a98301 Binary files /dev/null and b/resources/assets/enderio/textures/items/old/itemRedstoneConduit.png differ diff --git a/resources/assets/enderio/textures/items/old/itemRedstoneInsulatedConduit.png b/resources/assets/enderio/textures/items/old/itemRedstoneInsulatedConduit.png new file mode 100644 index 00000000..e272fe23 Binary files /dev/null and b/resources/assets/enderio/textures/items/old/itemRedstoneInsulatedConduit.png differ diff --git a/resources/assets/enderio/textures/items/old/itemRedstoneSwitch.png b/resources/assets/enderio/textures/items/old/itemRedstoneSwitch.png new file mode 100644 index 00000000..7e0c10c3 Binary files /dev/null and b/resources/assets/enderio/textures/items/old/itemRedstoneSwitch.png differ diff --git a/resources/assets/enderio/textures/items/old/itemTravelStaff.png b/resources/assets/enderio/textures/items/old/itemTravelStaff.png new file mode 100644 index 00000000..fca985bb Binary files /dev/null and b/resources/assets/enderio/textures/items/old/itemTravelStaff.png differ diff --git a/resources/assets/enderio/textures/items/old/mJReader.png b/resources/assets/enderio/textures/items/old/mJReader.png new file mode 100644 index 00000000..59365b8e Binary files /dev/null and b/resources/assets/enderio/textures/items/old/mJReader.png differ diff --git a/resources/assets/enderio/textures/items/old/machineChassi.png b/resources/assets/enderio/textures/items/old/machineChassi.png new file mode 100644 index 00000000..21a81bf9 Binary files /dev/null and b/resources/assets/enderio/textures/items/old/machineChassi.png differ diff --git a/resources/assets/enderio/textures/items/old/magnet.png b/resources/assets/enderio/textures/items/old/magnet.png new file mode 100644 index 00000000..0c95ca71 Binary files /dev/null and b/resources/assets/enderio/textures/items/old/magnet.png differ diff --git a/resources/assets/enderio/textures/items/old/modItemFilter.png b/resources/assets/enderio/textures/items/old/modItemFilter.png new file mode 100644 index 00000000..6568d262 Binary files /dev/null and b/resources/assets/enderio/textures/items/old/modItemFilter.png differ diff --git a/resources/assets/enderio/textures/items/old/phasedGold.png b/resources/assets/enderio/textures/items/old/phasedGold.png new file mode 100644 index 00000000..79d8fd03 Binary files /dev/null and b/resources/assets/enderio/textures/items/old/phasedGold.png differ diff --git a/resources/assets/enderio/textures/items/old/phasedIron.png b/resources/assets/enderio/textures/items/old/phasedIron.png new file mode 100644 index 00000000..0eb91098 Binary files /dev/null and b/resources/assets/enderio/textures/items/old/phasedIron.png differ diff --git a/resources/assets/enderio/textures/items/old/phasedIronNugget.png b/resources/assets/enderio/textures/items/old/phasedIronNugget.png new file mode 100644 index 00000000..8fc23da8 Binary files /dev/null and b/resources/assets/enderio/textures/items/old/phasedIronNugget.png differ diff --git a/resources/assets/enderio/textures/items/powderBronze.png b/resources/assets/enderio/textures/items/old/powderBronze.png similarity index 100% rename from resources/assets/enderio/textures/items/powderBronze.png rename to resources/assets/enderio/textures/items/old/powderBronze.png diff --git a/resources/assets/enderio/textures/items/old/powderCoal.png b/resources/assets/enderio/textures/items/old/powderCoal.png new file mode 100644 index 00000000..e916944a Binary files /dev/null and b/resources/assets/enderio/textures/items/old/powderCoal.png differ diff --git a/resources/assets/enderio/textures/items/old/powderCopper.png b/resources/assets/enderio/textures/items/old/powderCopper.png new file mode 100644 index 00000000..6533d8f1 Binary files /dev/null and b/resources/assets/enderio/textures/items/old/powderCopper.png differ diff --git a/resources/assets/enderio/textures/items/old/powderEnder.png b/resources/assets/enderio/textures/items/old/powderEnder.png new file mode 100644 index 00000000..6571483e Binary files /dev/null and b/resources/assets/enderio/textures/items/old/powderEnder.png differ diff --git a/resources/assets/enderio/textures/items/old/powderGold.png b/resources/assets/enderio/textures/items/old/powderGold.png new file mode 100644 index 00000000..e30d0078 Binary files /dev/null and b/resources/assets/enderio/textures/items/old/powderGold.png differ diff --git a/resources/assets/enderio/textures/items/old/powderIron.png b/resources/assets/enderio/textures/items/old/powderIron.png new file mode 100644 index 00000000..bbc13dd6 Binary files /dev/null and b/resources/assets/enderio/textures/items/old/powderIron.png differ diff --git a/resources/assets/enderio/textures/items/powderLead.png b/resources/assets/enderio/textures/items/old/powderLead.png similarity index 100% rename from resources/assets/enderio/textures/items/powderLead.png rename to resources/assets/enderio/textures/items/old/powderLead.png diff --git a/resources/assets/enderio/textures/items/powderSilver.png b/resources/assets/enderio/textures/items/old/powderSilver.png similarity index 100% rename from resources/assets/enderio/textures/items/powderSilver.png rename to resources/assets/enderio/textures/items/old/powderSilver.png diff --git a/resources/assets/enderio/textures/items/old/powderTin.png b/resources/assets/enderio/textures/items/old/powderTin.png new file mode 100644 index 00000000..1508387f Binary files /dev/null and b/resources/assets/enderio/textures/items/old/powderTin.png differ diff --git a/resources/assets/enderio/textures/items/old/pulsatingCrystal.png b/resources/assets/enderio/textures/items/old/pulsatingCrystal.png new file mode 100644 index 00000000..19d3174a Binary files /dev/null and b/resources/assets/enderio/textures/items/old/pulsatingCrystal.png differ diff --git a/resources/assets/enderio/textures/items/old/redstoneAlloy.png b/resources/assets/enderio/textures/items/old/redstoneAlloy.png new file mode 100644 index 00000000..5c33ae2f Binary files /dev/null and b/resources/assets/enderio/textures/items/old/redstoneAlloy.png differ diff --git a/resources/assets/enderio/textures/items/old/silicon.png b/resources/assets/enderio/textures/items/old/silicon.png new file mode 100644 index 00000000..c47990cf Binary files /dev/null and b/resources/assets/enderio/textures/items/old/silicon.png differ diff --git a/resources/assets/enderio/textures/items/old/skullEnderResonator.png b/resources/assets/enderio/textures/items/old/skullEnderResonator.png new file mode 100644 index 00000000..50ec3066 Binary files /dev/null and b/resources/assets/enderio/textures/items/old/skullEnderResonator.png differ diff --git a/resources/assets/enderio/textures/items/old/skullZombieController.png b/resources/assets/enderio/textures/items/old/skullZombieController.png new file mode 100644 index 00000000..d36fb1c7 Binary files /dev/null and b/resources/assets/enderio/textures/items/old/skullZombieController.png differ diff --git a/resources/assets/enderio/textures/items/old/skullZombieElectrode.png b/resources/assets/enderio/textures/items/old/skullZombieElectrode.png new file mode 100644 index 00000000..943224e3 Binary files /dev/null and b/resources/assets/enderio/textures/items/old/skullZombieElectrode.png differ diff --git a/resources/assets/enderio/textures/items/old/soulVessel.png b/resources/assets/enderio/textures/items/old/soulVessel.png new file mode 100644 index 00000000..745a2625 Binary files /dev/null and b/resources/assets/enderio/textures/items/old/soulVessel.png differ diff --git a/resources/assets/enderio/textures/items/old/soulVesselFilled.png b/resources/assets/enderio/textures/items/old/soulVesselFilled.png new file mode 100644 index 00000000..64b4c8f7 Binary files /dev/null and b/resources/assets/enderio/textures/items/old/soulVesselFilled.png differ diff --git a/resources/assets/enderio/textures/items/old/soularium.png b/resources/assets/enderio/textures/items/old/soularium.png new file mode 100644 index 00000000..0a955d3e Binary files /dev/null and b/resources/assets/enderio/textures/items/old/soularium.png differ diff --git a/resources/assets/enderio/textures/items/old/upgradeBlank.png b/resources/assets/enderio/textures/items/old/upgradeBlank.png new file mode 100644 index 00000000..730f875f Binary files /dev/null and b/resources/assets/enderio/textures/items/old/upgradeBlank.png differ diff --git a/resources/assets/enderio/textures/items/upgradeEfficieny.png b/resources/assets/enderio/textures/items/old/upgradeEfficieny.png similarity index 100% rename from resources/assets/enderio/textures/items/upgradeEfficieny.png rename to resources/assets/enderio/textures/items/old/upgradeEfficieny.png diff --git a/resources/assets/enderio/textures/items/upgradeEnergy_1.png b/resources/assets/enderio/textures/items/old/upgradeEnergy_1.png similarity index 100% rename from resources/assets/enderio/textures/items/upgradeEnergy_1.png rename to resources/assets/enderio/textures/items/old/upgradeEnergy_1.png diff --git a/resources/assets/enderio/textures/items/upgradeEnergy_2.png b/resources/assets/enderio/textures/items/old/upgradeEnergy_2.png similarity index 100% rename from resources/assets/enderio/textures/items/upgradeEnergy_2.png rename to resources/assets/enderio/textures/items/old/upgradeEnergy_2.png diff --git a/resources/assets/enderio/textures/items/upgradeEnergy_3.png b/resources/assets/enderio/textures/items/old/upgradeEnergy_3.png similarity index 100% rename from resources/assets/enderio/textures/items/upgradeEnergy_3.png rename to resources/assets/enderio/textures/items/old/upgradeEnergy_3.png diff --git a/resources/assets/enderio/textures/items/old/vibrantCrystal.png b/resources/assets/enderio/textures/items/old/vibrantCrystal.png new file mode 100644 index 00000000..61225886 Binary files /dev/null and b/resources/assets/enderio/textures/items/old/vibrantCrystal.png differ diff --git a/resources/assets/enderio/textures/items/old/vibrantNugget.png b/resources/assets/enderio/textures/items/old/vibrantNugget.png new file mode 100644 index 00000000..473bb546 Binary files /dev/null and b/resources/assets/enderio/textures/items/old/vibrantNugget.png differ diff --git a/resources/assets/enderio/textures/items/old/xpTransfer.png b/resources/assets/enderio/textures/items/old/xpTransfer.png new file mode 100644 index 00000000..afa10e5a Binary files /dev/null and b/resources/assets/enderio/textures/items/old/xpTransfer.png differ diff --git a/resources/assets/enderio/textures/items/old/yetaWrench.png b/resources/assets/enderio/textures/items/old/yetaWrench.png new file mode 100644 index 00000000..c4eccccf Binary files /dev/null and b/resources/assets/enderio/textures/items/old/yetaWrench.png differ diff --git a/resources/assets/enderio/textures/items/phasedGold.png b/resources/assets/enderio/textures/items/phasedGold.png index 79d8fd03..9c258173 100644 Binary files a/resources/assets/enderio/textures/items/phasedGold.png and b/resources/assets/enderio/textures/items/phasedGold.png differ diff --git a/resources/assets/enderio/textures/items/phasedIron.png b/resources/assets/enderio/textures/items/phasedIron.png index 0eb91098..d85ac8f0 100644 Binary files a/resources/assets/enderio/textures/items/phasedIron.png and b/resources/assets/enderio/textures/items/phasedIron.png differ diff --git a/resources/assets/enderio/textures/items/phasedIronNugget.png b/resources/assets/enderio/textures/items/phasedIronNugget.png index 8fc23da8..c161172a 100644 Binary files a/resources/assets/enderio/textures/items/phasedIronNugget.png and b/resources/assets/enderio/textures/items/phasedIronNugget.png differ diff --git a/resources/assets/enderio/textures/items/powderCoal.png b/resources/assets/enderio/textures/items/powderCoal.png index e916944a..5cedfe58 100644 Binary files a/resources/assets/enderio/textures/items/powderCoal.png and b/resources/assets/enderio/textures/items/powderCoal.png differ diff --git a/resources/assets/enderio/textures/items/powderCopper.png b/resources/assets/enderio/textures/items/powderCopper.png index 6533d8f1..86283916 100644 Binary files a/resources/assets/enderio/textures/items/powderCopper.png and b/resources/assets/enderio/textures/items/powderCopper.png differ diff --git a/resources/assets/enderio/textures/items/powderEnder.png b/resources/assets/enderio/textures/items/powderEnder.png index 6571483e..075306e3 100644 Binary files a/resources/assets/enderio/textures/items/powderEnder.png and b/resources/assets/enderio/textures/items/powderEnder.png differ diff --git a/resources/assets/enderio/textures/items/powderGold.png b/resources/assets/enderio/textures/items/powderGold.png index e30d0078..6b4843e4 100644 Binary files a/resources/assets/enderio/textures/items/powderGold.png and b/resources/assets/enderio/textures/items/powderGold.png differ diff --git a/resources/assets/enderio/textures/items/powderIron.png b/resources/assets/enderio/textures/items/powderIron.png index bbc13dd6..2cf64bbd 100644 Binary files a/resources/assets/enderio/textures/items/powderIron.png and b/resources/assets/enderio/textures/items/powderIron.png differ diff --git a/resources/assets/enderio/textures/items/powderObsidian.png b/resources/assets/enderio/textures/items/powderObsidian.png new file mode 100644 index 00000000..d501046f Binary files /dev/null and b/resources/assets/enderio/textures/items/powderObsidian.png differ diff --git a/resources/assets/enderio/textures/items/powderTin.png b/resources/assets/enderio/textures/items/powderTin.png index 1508387f..cad618c8 100644 Binary files a/resources/assets/enderio/textures/items/powderTin.png and b/resources/assets/enderio/textures/items/powderTin.png differ diff --git a/resources/assets/enderio/textures/items/pulsatingCrystal.png b/resources/assets/enderio/textures/items/pulsatingCrystal.png index 19d3174a..6fb0bf65 100644 Binary files a/resources/assets/enderio/textures/items/pulsatingCrystal.png and b/resources/assets/enderio/textures/items/pulsatingCrystal.png differ diff --git a/resources/assets/enderio/textures/items/redstoneAlloy.png b/resources/assets/enderio/textures/items/redstoneAlloy.png index 5c33ae2f..de99b3a7 100644 Binary files a/resources/assets/enderio/textures/items/redstoneAlloy.png and b/resources/assets/enderio/textures/items/redstoneAlloy.png differ diff --git a/resources/assets/enderio/textures/items/silicon.png b/resources/assets/enderio/textures/items/silicon.png index c47990cf..c840d947 100644 Binary files a/resources/assets/enderio/textures/items/silicon.png and b/resources/assets/enderio/textures/items/silicon.png differ diff --git a/resources/assets/enderio/textures/items/skullZombieController.png b/resources/assets/enderio/textures/items/skullZombieController.png index d36fb1c7..d7eb2e33 100644 Binary files a/resources/assets/enderio/textures/items/skullZombieController.png and b/resources/assets/enderio/textures/items/skullZombieController.png differ diff --git a/resources/assets/enderio/textures/items/skullZombieElectrode.png b/resources/assets/enderio/textures/items/skullZombieElectrode.png index 943224e3..d167dff7 100644 Binary files a/resources/assets/enderio/textures/items/skullZombieElectrode.png and b/resources/assets/enderio/textures/items/skullZombieElectrode.png differ diff --git a/resources/assets/enderio/textures/items/soulVessel.png b/resources/assets/enderio/textures/items/soulVessel.png index 745a2625..6b55bad0 100644 Binary files a/resources/assets/enderio/textures/items/soulVessel.png and b/resources/assets/enderio/textures/items/soulVessel.png differ diff --git a/resources/assets/enderio/textures/items/soulVesselFilled.png b/resources/assets/enderio/textures/items/soulVesselFilled.png index 64b4c8f7..04a8401f 100644 Binary files a/resources/assets/enderio/textures/items/soulVesselFilled.png and b/resources/assets/enderio/textures/items/soulVesselFilled.png differ diff --git a/resources/assets/enderio/textures/items/soularium.png b/resources/assets/enderio/textures/items/soularium.png index 0a955d3e..c458d880 100644 Binary files a/resources/assets/enderio/textures/items/soularium.png and b/resources/assets/enderio/textures/items/soularium.png differ diff --git a/resources/assets/enderio/textures/items/upgradeBlank.png b/resources/assets/enderio/textures/items/upgradeBlank.png index 730f875f..01b25013 100644 Binary files a/resources/assets/enderio/textures/items/upgradeBlank.png and b/resources/assets/enderio/textures/items/upgradeBlank.png differ diff --git a/resources/assets/enderio/textures/items/upgradeBlank_alt.png b/resources/assets/enderio/textures/items/upgradeBlank_alt.png new file mode 100644 index 00000000..9f5086a2 Binary files /dev/null and b/resources/assets/enderio/textures/items/upgradeBlank_alt.png differ diff --git a/resources/assets/enderio/textures/items/vibrantCrystal.png b/resources/assets/enderio/textures/items/vibrantCrystal.png index 61225886..7907efd4 100644 Binary files a/resources/assets/enderio/textures/items/vibrantCrystal.png and b/resources/assets/enderio/textures/items/vibrantCrystal.png differ diff --git a/resources/assets/enderio/textures/items/vibrantNugget.png b/resources/assets/enderio/textures/items/vibrantNugget.png index 473bb546..b27ea1ae 100644 Binary files a/resources/assets/enderio/textures/items/vibrantNugget.png and b/resources/assets/enderio/textures/items/vibrantNugget.png differ diff --git a/resources/assets/enderio/textures/items/xpTransfer.png b/resources/assets/enderio/textures/items/xpTransfer.png index afa10e5a..11c1afa7 100644 Binary files a/resources/assets/enderio/textures/items/xpTransfer.png and b/resources/assets/enderio/textures/items/xpTransfer.png differ diff --git a/resources/assets/enderio/textures/items/xpTransfer_alt.png b/resources/assets/enderio/textures/items/xpTransfer_alt.png new file mode 100644 index 00000000..cd0507bb Binary files /dev/null and b/resources/assets/enderio/textures/items/xpTransfer_alt.png differ diff --git a/resources/assets/enderio/textures/items/yetaWrench.png b/resources/assets/enderio/textures/items/yetaWrench.png index c4eccccf..56988b58 100644 Binary files a/resources/assets/enderio/textures/items/yetaWrench.png and b/resources/assets/enderio/textures/items/yetaWrench.png differ diff --git a/resources/assets/enderio/textures/items/yetaWrench_alt.png b/resources/assets/enderio/textures/items/yetaWrench_alt.png new file mode 100644 index 00000000..6ecff0bd Binary files /dev/null and b/resources/assets/enderio/textures/items/yetaWrench_alt.png differ diff --git a/src/api/java/appeng/api/AEApi.java b/src/api/java/appeng/api/AEApi.java index 1a2e31bc..89ab041c 100644 --- a/src/api/java/appeng/api/AEApi.java +++ b/src/api/java/appeng/api/AEApi.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api; /** @@ -15,7 +38,7 @@ public class AEApi /** * API Entry Point. * - * @return the {@link IAppEngApi} or null if the instance could not be retrieved + * @return the {@link IAppEngApi} or null if the INSTANCE could not be retrieved */ public static IAppEngApi instance() { @@ -24,7 +47,7 @@ public class AEApi try { Class c = Class.forName( "appeng.core.Api" ); - api = (IAppEngApi) c.getField( "instance" ).get( c ); + api = (IAppEngApi) c.getField( "INSTANCE" ).get( c ); } catch (Throwable e) { diff --git a/src/api/java/appeng/api/IAppEngApi.java b/src/api/java/appeng/api/IAppEngApi.java index c8546bdb..f791028a 100644 --- a/src/api/java/appeng/api/IAppEngApi.java +++ b/src/api/java/appeng/api/IAppEngApi.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api; import appeng.api.definitions.Blocks; diff --git a/src/api/java/appeng/api/README.md b/src/api/java/appeng/api/README.md deleted file mode 100644 index 2c43544e..00000000 --- a/src/api/java/appeng/api/README.md +++ /dev/null @@ -1,19 +0,0 @@ -Applied-Energistics-2-API -========================= - -The API for Applied Energistics 2. It is open source to discuss changes, improve documentation, and provide better add-on support in general. - -Development and standard builds can be obtained [Here](http://ae2.ae-mod.info/Downloads/). - -Maven -========================= - -When compiling against the AE2 API you can use gradle dependencies, just add - -dependencies { - compile "appeng:appliedenergistics2:rv_-_____-__:dev" -} - -or add the compile line to your existing dependencies task to your build.gradle - -Where the __ are filled in with the correct version criteria; AE2 is available from the default forge maven so no additional repositories are necessary. diff --git a/src/api/java/appeng/api/config/AccessRestriction.java b/src/api/java/appeng/api/config/AccessRestriction.java index 4867b539..12ff41e4 100644 --- a/src/api/java/appeng/api/config/AccessRestriction.java +++ b/src/api/java/appeng/api/config/AccessRestriction.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.config; public enum AccessRestriction @@ -7,27 +30,27 @@ public enum AccessRestriction private final int permissionBit; private AccessRestriction(int v) { - permissionBit = v; + this.permissionBit = v; } public boolean hasPermission(AccessRestriction ar) { - return (permissionBit & ar.permissionBit) == ar.permissionBit; + return ( this.permissionBit & ar.permissionBit) == ar.permissionBit; } public AccessRestriction restrictPermissions(AccessRestriction ar) { - return getPermByBit( permissionBit & ar.permissionBit); + return this.getPermByBit( this.permissionBit & ar.permissionBit); } public AccessRestriction addPermissions(AccessRestriction ar) { - return getPermByBit( permissionBit | ar.permissionBit); + return this.getPermByBit( this.permissionBit | ar.permissionBit); } public AccessRestriction removePermissions(AccessRestriction ar) { - return getPermByBit( permissionBit & (~ar.permissionBit) ); + return this.getPermByBit( this.permissionBit & (~ar.permissionBit) ); } private AccessRestriction getPermByBit(int bit) diff --git a/src/api/java/appeng/api/config/ActionItems.java b/src/api/java/appeng/api/config/ActionItems.java index 1a565910..07f2cc50 100644 --- a/src/api/java/appeng/api/config/ActionItems.java +++ b/src/api/java/appeng/api/config/ActionItems.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.config; public enum ActionItems diff --git a/src/api/java/appeng/api/config/Actionable.java b/src/api/java/appeng/api/config/Actionable.java index ce798f62..92089aed 100644 --- a/src/api/java/appeng/api/config/Actionable.java +++ b/src/api/java/appeng/api/config/Actionable.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.config; public enum Actionable diff --git a/src/api/java/appeng/api/config/CondenserOutput.java b/src/api/java/appeng/api/config/CondenserOutput.java index e2c501d4..db2b3983 100644 --- a/src/api/java/appeng/api/config/CondenserOutput.java +++ b/src/api/java/appeng/api/config/CondenserOutput.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.config; diff --git a/src/api/java/appeng/api/config/CopyMode.java b/src/api/java/appeng/api/config/CopyMode.java index 31cda813..45d0f7bb 100644 --- a/src/api/java/appeng/api/config/CopyMode.java +++ b/src/api/java/appeng/api/config/CopyMode.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.config; public enum CopyMode diff --git a/src/api/java/appeng/api/config/FullnessMode.java b/src/api/java/appeng/api/config/FullnessMode.java index 43b22bc4..3bd9ed64 100644 --- a/src/api/java/appeng/api/config/FullnessMode.java +++ b/src/api/java/appeng/api/config/FullnessMode.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.config; public enum FullnessMode diff --git a/src/api/java/appeng/api/config/FuzzyMode.java b/src/api/java/appeng/api/config/FuzzyMode.java index e5fa8ce7..37c68d35 100644 --- a/src/api/java/appeng/api/config/FuzzyMode.java +++ b/src/api/java/appeng/api/config/FuzzyMode.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.config; public enum FuzzyMode @@ -9,13 +32,13 @@ public enum FuzzyMode final public float percentage; private FuzzyMode(float p) { - percentage = p; - breakPoint = p / 100.0f; + this.percentage = p; + this.breakPoint = p / 100.0f; } public int calculateBreakPoint(int maxDamage) { - return (int) ((percentage * maxDamage) / 100.0f); + return (int) (( this.percentage * maxDamage) / 100.0f); } } \ No newline at end of file diff --git a/src/api/java/appeng/api/config/IncludeExclude.java b/src/api/java/appeng/api/config/IncludeExclude.java index 3e74db9a..07a3e12f 100644 --- a/src/api/java/appeng/api/config/IncludeExclude.java +++ b/src/api/java/appeng/api/config/IncludeExclude.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.config; public enum IncludeExclude diff --git a/src/api/java/appeng/api/config/LevelEmitterMode.java b/src/api/java/appeng/api/config/LevelEmitterMode.java index 46709c8a..70606ff0 100644 --- a/src/api/java/appeng/api/config/LevelEmitterMode.java +++ b/src/api/java/appeng/api/config/LevelEmitterMode.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.config; public enum LevelEmitterMode diff --git a/src/api/java/appeng/api/config/LevelType.java b/src/api/java/appeng/api/config/LevelType.java index 58d1a6b1..ee2671ba 100644 --- a/src/api/java/appeng/api/config/LevelType.java +++ b/src/api/java/appeng/api/config/LevelType.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.config; public enum LevelType diff --git a/src/api/java/appeng/api/config/ModSettings.java b/src/api/java/appeng/api/config/ModSettings.java index 9b578dc0..5d6db7e0 100644 --- a/src/api/java/appeng/api/config/ModSettings.java +++ b/src/api/java/appeng/api/config/ModSettings.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.config; public enum ModSettings diff --git a/src/api/java/appeng/api/config/NetworkEmitterMode.java b/src/api/java/appeng/api/config/NetworkEmitterMode.java index 19ae7023..85e1cc74 100644 --- a/src/api/java/appeng/api/config/NetworkEmitterMode.java +++ b/src/api/java/appeng/api/config/NetworkEmitterMode.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.config; public enum NetworkEmitterMode diff --git a/src/api/java/appeng/api/config/OperationMode.java b/src/api/java/appeng/api/config/OperationMode.java index f6d80ea5..ea4ebb0d 100644 --- a/src/api/java/appeng/api/config/OperationMode.java +++ b/src/api/java/appeng/api/config/OperationMode.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.config; public enum OperationMode diff --git a/src/api/java/appeng/api/config/OutputMode.java b/src/api/java/appeng/api/config/OutputMode.java index ebb8cda8..5a645e2a 100644 --- a/src/api/java/appeng/api/config/OutputMode.java +++ b/src/api/java/appeng/api/config/OutputMode.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.config; public enum OutputMode diff --git a/src/api/java/appeng/api/config/PowerMultiplier.java b/src/api/java/appeng/api/config/PowerMultiplier.java index d1a6800c..28b7e06f 100644 --- a/src/api/java/appeng/api/config/PowerMultiplier.java +++ b/src/api/java/appeng/api/config/PowerMultiplier.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.config; public enum PowerMultiplier @@ -11,11 +34,11 @@ public enum PowerMultiplier public double multiply(double in) { - return in * multiplier; + return in * this.multiplier; } public double divide(double in) { - return in / multiplier; + return in / this.multiplier; } } diff --git a/src/api/java/appeng/api/config/PowerUnits.java b/src/api/java/appeng/api/config/PowerUnits.java index edcf5d71..614d3feb 100644 --- a/src/api/java/appeng/api/config/PowerUnits.java +++ b/src/api/java/appeng/api/config/PowerUnits.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.config; public enum PowerUnits @@ -10,7 +33,7 @@ public enum PowerUnits MK("gui.appliedenergistics2.units.mekanism"); // Mekanism - Joules private PowerUnits(String un) { - unlocalizedName = un; + this.unlocalizedName = un; } /** @@ -36,7 +59,7 @@ public enum PowerUnits */ public double convertTo(PowerUnits target, double value) { - return (value * conversionRatio) / target.conversionRatio; + return (value * this.conversionRatio ) / target.conversionRatio; } } \ No newline at end of file diff --git a/src/api/java/appeng/api/config/RedstoneMode.java b/src/api/java/appeng/api/config/RedstoneMode.java index 91be1156..7aadd911 100644 --- a/src/api/java/appeng/api/config/RedstoneMode.java +++ b/src/api/java/appeng/api/config/RedstoneMode.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.config; public enum RedstoneMode diff --git a/src/api/java/appeng/api/config/RelativeDirection.java b/src/api/java/appeng/api/config/RelativeDirection.java index 6b02c3de..41909d6d 100644 --- a/src/api/java/appeng/api/config/RelativeDirection.java +++ b/src/api/java/appeng/api/config/RelativeDirection.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.config; public enum RelativeDirection diff --git a/src/api/java/appeng/api/config/SearchBoxMode.java b/src/api/java/appeng/api/config/SearchBoxMode.java index 64fc28f6..29766196 100644 --- a/src/api/java/appeng/api/config/SearchBoxMode.java +++ b/src/api/java/appeng/api/config/SearchBoxMode.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.config; public enum SearchBoxMode diff --git a/src/api/java/appeng/api/config/SecurityPermissions.java b/src/api/java/appeng/api/config/SecurityPermissions.java index 85d35740..cd76ad1a 100644 --- a/src/api/java/appeng/api/config/SecurityPermissions.java +++ b/src/api/java/appeng/api/config/SecurityPermissions.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.config; /** @@ -33,15 +56,15 @@ public enum SecurityPermissions */ SECURITY; - final private String unlocalizedName = "gui.appliedenergistics2.security." + name().toLowerCase(); + final private String unlocalizedName = "gui.appliedenergistics2.security." + this.name().toLowerCase(); public String getUnlocalizedName() { - return unlocalizedName + ".name"; + return this.unlocalizedName + ".name"; } public String getUnlocalizedTip() { - return unlocalizedName + ".tip"; + return this.unlocalizedName + ".tip"; } } diff --git a/src/api/java/appeng/api/config/Settings.java b/src/api/java/appeng/api/config/Settings.java index 691ad807..f755c7c0 100644 --- a/src/api/java/appeng/api/config/Settings.java +++ b/src/api/java/appeng/api/config/Settings.java @@ -1,46 +1,72 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.config; + import java.util.EnumSet; + public enum Settings { - LEVEL_EMITTER_MODE(EnumSet.allOf( LevelEmitterMode.class )), + LEVEL_EMITTER_MODE( EnumSet.allOf( LevelEmitterMode.class ) ), - REDSTONE_EMITTER(EnumSet.of( RedstoneMode.HIGH_SIGNAL, RedstoneMode.LOW_SIGNAL )), REDSTONE_CONTROLLED(EnumSet.allOf( RedstoneMode.class )), + REDSTONE_EMITTER( EnumSet.of( RedstoneMode.HIGH_SIGNAL, RedstoneMode.LOW_SIGNAL ) ), REDSTONE_CONTROLLED( EnumSet.allOf( RedstoneMode.class ) ), - CONDENSER_OUTPUT(EnumSet.allOf( CondenserOutput.class )), + CONDENSER_OUTPUT( EnumSet.allOf( CondenserOutput.class ) ), - POWER_UNITS(EnumSet.allOf( PowerUnits.class )), ACCESS(EnumSet.of( AccessRestriction.READ_WRITE, AccessRestriction.READ, AccessRestriction.WRITE )), + POWER_UNITS( EnumSet.allOf( PowerUnits.class ) ), ACCESS( EnumSet.of( AccessRestriction.READ_WRITE, AccessRestriction.READ, AccessRestriction.WRITE ) ), - SORT_DIRECTION(EnumSet.allOf( SortDir.class )), SORT_BY(EnumSet.allOf( SortOrder.class )), + SORT_DIRECTION( EnumSet.allOf( SortDir.class ) ), SORT_BY( EnumSet.allOf( SortOrder.class ) ), - SEARCH_TOOLTIPS(EnumSet.of( YesNo.YES, YesNo.NO )), VIEW_MODE(EnumSet.allOf( ViewItems.class )), SEARCH_MODE(EnumSet.allOf( SearchBoxMode.class )), + SEARCH_TOOLTIPS( EnumSet.of( YesNo.YES, YesNo.NO ) ), VIEW_MODE( EnumSet.allOf( ViewItems.class ) ), SEARCH_MODE( EnumSet.allOf( SearchBoxMode.class ) ), - ACTIONS(EnumSet.allOf( ActionItems.class )), IO_DIRECTION(EnumSet.of( RelativeDirection.LEFT, RelativeDirection.RIGHT )), + ACTIONS( EnumSet.allOf( ActionItems.class ) ), IO_DIRECTION( EnumSet.of( RelativeDirection.LEFT, RelativeDirection.RIGHT ) ), - BLOCK(EnumSet.of( YesNo.YES, YesNo.NO )), OPERATION_MODE(EnumSet.allOf( OperationMode.class )), + BLOCK( EnumSet.of( YesNo.YES, YesNo.NO ) ), OPERATION_MODE( EnumSet.allOf( OperationMode.class ) ), - FULLNESS_MODE(EnumSet.allOf( FullnessMode.class )), CRAFT_ONLY(EnumSet.of( YesNo.YES, YesNo.NO )), + FULLNESS_MODE( EnumSet.allOf( FullnessMode.class ) ), CRAFT_ONLY( EnumSet.of( YesNo.YES, YesNo.NO ) ), - FUZZY_MODE(EnumSet.allOf( FuzzyMode.class )), LEVEL_TYPE(EnumSet.allOf( LevelType.class )), + FUZZY_MODE( EnumSet.allOf( FuzzyMode.class ) ), LEVEL_TYPE( EnumSet.allOf( LevelType.class ) ), - TERMINAL_STYLE(EnumSet.of( TerminalStyle.TALL, TerminalStyle.SMALL )), COPY_MODE(EnumSet.allOf( CopyMode.class )), + TERMINAL_STYLE( EnumSet.of( TerminalStyle.TALL, TerminalStyle.SMALL ) ), COPY_MODE( EnumSet.allOf( CopyMode.class ) ), - INTERFACE_TERMINAL(EnumSet.of( YesNo.YES, YesNo.NO )), CRAFT_VIA_REDSTONE(EnumSet.of( YesNo.YES, YesNo.NO )), + INTERFACE_TERMINAL( EnumSet.of( YesNo.YES, YesNo.NO ) ), CRAFT_VIA_REDSTONE( EnumSet.of( YesNo.YES, YesNo.NO ) ), - STORAGE_FILTER(EnumSet.allOf( StorageFilter.class )); + STORAGE_FILTER( EnumSet.allOf( StorageFilter.class ) ), PLACE_BLOCK( EnumSet.of( YesNo.YES, YesNo.NO ) ); - private EnumSet values; + private final EnumSet values; public EnumSet getPossibleValues() { - return values; + return this.values; } - private Settings(EnumSet set) { + private Settings( EnumSet set ) + { if ( set == null || set.isEmpty() ) throw new RuntimeException( "Invalid configuration." ); - values = set; + this.values = set; } } diff --git a/src/api/java/appeng/api/config/SortDir.java b/src/api/java/appeng/api/config/SortDir.java index 140393bb..71f36b45 100644 --- a/src/api/java/appeng/api/config/SortDir.java +++ b/src/api/java/appeng/api/config/SortDir.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.config; public enum SortDir diff --git a/src/api/java/appeng/api/config/SortOrder.java b/src/api/java/appeng/api/config/SortOrder.java index 90d72c96..a2f3f937 100644 --- a/src/api/java/appeng/api/config/SortOrder.java +++ b/src/api/java/appeng/api/config/SortOrder.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.config; public enum SortOrder diff --git a/src/api/java/appeng/api/config/StorageFilter.java b/src/api/java/appeng/api/config/StorageFilter.java index 3b8f588f..1dfabea5 100644 --- a/src/api/java/appeng/api/config/StorageFilter.java +++ b/src/api/java/appeng/api/config/StorageFilter.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.config; public enum StorageFilter diff --git a/src/api/java/appeng/api/config/TerminalStyle.java b/src/api/java/appeng/api/config/TerminalStyle.java index 147aa9c9..b941e24c 100644 --- a/src/api/java/appeng/api/config/TerminalStyle.java +++ b/src/api/java/appeng/api/config/TerminalStyle.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.config; public enum TerminalStyle diff --git a/src/api/java/appeng/api/config/TunnelType.java b/src/api/java/appeng/api/config/TunnelType.java index f45b9874..f4b39999 100644 --- a/src/api/java/appeng/api/config/TunnelType.java +++ b/src/api/java/appeng/api/config/TunnelType.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.config; public enum TunnelType diff --git a/src/api/java/appeng/api/config/Upgrades.java b/src/api/java/appeng/api/config/Upgrades.java index cd3a2d22..e5287398 100644 --- a/src/api/java/appeng/api/config/Upgrades.java +++ b/src/api/java/appeng/api/config/Upgrades.java @@ -1,26 +1,54 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.config; + import java.util.HashMap; import net.minecraft.item.ItemStack; +import appeng.api.util.AEItemDefinition; + + public enum Upgrades { /** * Gold Tier Upgrades. */ - CAPACITY(0), REDSTONE(0), CRAFTING(0), + CAPACITY( 0 ), REDSTONE( 0 ), CRAFTING( 0 ), /** * Diamond Tier Upgrades. */ - FUZZY(1), SPEED(1), INVERTER(1); + FUZZY( 1 ), SPEED( 1 ), INVERTER( 1 ); public final int myTier; public final HashMap supportedMax = new HashMap(); - private Upgrades(int tier) { - myTier = tier; + private Upgrades( int tier ) + { + this.myTier = tier; } /** @@ -28,12 +56,26 @@ public enum Upgrades */ public HashMap getSupported() { - return supportedMax; + return this.supportedMax; } - public void registerItem(ItemStack myItem, int maxSupported) + + + public void registerItem( AEItemDefinition myItem, int maxSupported ) { if ( myItem != null ) - supportedMax.put( myItem, maxSupported ); + { + final ItemStack stack = myItem.stack( 1 ); + + this.registerItem( stack, maxSupported ); + } + } + + public void registerItem( ItemStack stack, int maxSupported ) + { + if ( stack != null ) + { + this.supportedMax.put( stack, maxSupported ); + } } } diff --git a/src/api/java/appeng/api/config/ViewItems.java b/src/api/java/appeng/api/config/ViewItems.java index ffb2e203..6f39dcb0 100644 --- a/src/api/java/appeng/api/config/ViewItems.java +++ b/src/api/java/appeng/api/config/ViewItems.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.config; public enum ViewItems diff --git a/src/api/java/appeng/api/config/YesNo.java b/src/api/java/appeng/api/config/YesNo.java index ccb35bd5..e4990e6f 100644 --- a/src/api/java/appeng/api/config/YesNo.java +++ b/src/api/java/appeng/api/config/YesNo.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.config; public enum YesNo diff --git a/src/api/java/appeng/api/definitions/Blocks.java b/src/api/java/appeng/api/definitions/Blocks.java index d850e6dc..06f1cc86 100644 --- a/src/api/java/appeng/api/definitions/Blocks.java +++ b/src/api/java/appeng/api/definitions/Blocks.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.definitions; import appeng.api.util.AEItemDefinition; diff --git a/src/api/java/appeng/api/definitions/Items.java b/src/api/java/appeng/api/definitions/Items.java index f0b6a2ab..cfb53797 100644 --- a/src/api/java/appeng/api/definitions/Items.java +++ b/src/api/java/appeng/api/definitions/Items.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.definitions; import appeng.api.util.AEColoredItemDefinition; diff --git a/src/api/java/appeng/api/definitions/Materials.java b/src/api/java/appeng/api/definitions/Materials.java index b6ae52c4..ad00f9c1 100644 --- a/src/api/java/appeng/api/definitions/Materials.java +++ b/src/api/java/appeng/api/definitions/Materials.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.definitions; import appeng.api.util.AEItemDefinition; diff --git a/src/api/java/appeng/api/definitions/Parts.java b/src/api/java/appeng/api/definitions/Parts.java index 00d6dad2..d6905418 100644 --- a/src/api/java/appeng/api/definitions/Parts.java +++ b/src/api/java/appeng/api/definitions/Parts.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.definitions; import appeng.api.util.AEColoredItemDefinition; @@ -50,5 +73,4 @@ public class Parts public AEItemDefinition partTerminal; public AEItemDefinition partStorageMonitor; public AEItemDefinition partConversionMonitor; - } diff --git a/src/api/java/appeng/api/events/LocatableEventAnnounce.java b/src/api/java/appeng/api/events/LocatableEventAnnounce.java index af9b6f85..7dca6d38 100644 --- a/src/api/java/appeng/api/events/LocatableEventAnnounce.java +++ b/src/api/java/appeng/api/events/LocatableEventAnnounce.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.events; import appeng.api.features.ILocatable; @@ -21,8 +44,8 @@ public class LocatableEventAnnounce extends Event final public LocatableEvent change; public LocatableEventAnnounce(ILocatable o, LocatableEvent ev) { - target = o; - change = ev; + this.target = o; + this.change = ev; } } diff --git a/src/api/java/appeng/api/exceptions/AppEngException.java b/src/api/java/appeng/api/exceptions/AppEngException.java index 9c3d9ea9..9b00693f 100644 --- a/src/api/java/appeng/api/exceptions/AppEngException.java +++ b/src/api/java/appeng/api/exceptions/AppEngException.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.exceptions; public class AppEngException extends Exception diff --git a/src/api/java/appeng/api/exceptions/FailedConnection.java b/src/api/java/appeng/api/exceptions/FailedConnection.java index f4abed64..53c71866 100644 --- a/src/api/java/appeng/api/exceptions/FailedConnection.java +++ b/src/api/java/appeng/api/exceptions/FailedConnection.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.exceptions; public class FailedConnection extends Exception diff --git a/src/api/java/appeng/api/exceptions/MissingIngredientError.java b/src/api/java/appeng/api/exceptions/MissingIngredientError.java index 51a200a0..6cc411bc 100644 --- a/src/api/java/appeng/api/exceptions/MissingIngredientError.java +++ b/src/api/java/appeng/api/exceptions/MissingIngredientError.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.exceptions; public class MissingIngredientError extends Exception { diff --git a/src/api/java/appeng/api/exceptions/ModNotInstalled.java b/src/api/java/appeng/api/exceptions/ModNotInstalled.java index 7744a1fb..f0b5ff1c 100644 --- a/src/api/java/appeng/api/exceptions/ModNotInstalled.java +++ b/src/api/java/appeng/api/exceptions/ModNotInstalled.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.exceptions; public class ModNotInstalled extends Exception diff --git a/src/api/java/appeng/api/exceptions/RecipeError.java b/src/api/java/appeng/api/exceptions/RecipeError.java index a07f6438..d92ac2d9 100644 --- a/src/api/java/appeng/api/exceptions/RecipeError.java +++ b/src/api/java/appeng/api/exceptions/RecipeError.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.exceptions; public class RecipeError extends Exception diff --git a/src/api/java/appeng/api/exceptions/RegistrationError.java b/src/api/java/appeng/api/exceptions/RegistrationError.java index 30592ba0..a8cd023e 100644 --- a/src/api/java/appeng/api/exceptions/RegistrationError.java +++ b/src/api/java/appeng/api/exceptions/RegistrationError.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.exceptions; public class RegistrationError extends Exception diff --git a/src/api/java/appeng/api/features/IGrinderEntry.java b/src/api/java/appeng/api/features/IGrinderEntry.java index a7549f2f..e5215f4e 100644 --- a/src/api/java/appeng/api/features/IGrinderEntry.java +++ b/src/api/java/appeng/api/features/IGrinderEntry.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.features; import net.minecraft.item.ItemStack; diff --git a/src/api/java/appeng/api/features/IGrinderRegistry.java b/src/api/java/appeng/api/features/IGrinderRegistry.java index e34a9225..0a13d7eb 100644 --- a/src/api/java/appeng/api/features/IGrinderRegistry.java +++ b/src/api/java/appeng/api/features/IGrinderRegistry.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.features; import net.minecraft.item.ItemStack; diff --git a/src/api/java/appeng/api/features/IItemComparison.java b/src/api/java/appeng/api/features/IItemComparison.java index 856049cc..73c898e5 100644 --- a/src/api/java/appeng/api/features/IItemComparison.java +++ b/src/api/java/appeng/api/features/IItemComparison.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.features; public interface IItemComparison diff --git a/src/api/java/appeng/api/features/IItemComparisonProvider.java b/src/api/java/appeng/api/features/IItemComparisonProvider.java index 6b7a11b1..d574807d 100644 --- a/src/api/java/appeng/api/features/IItemComparisonProvider.java +++ b/src/api/java/appeng/api/features/IItemComparisonProvider.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.features; import net.minecraft.item.ItemStack; diff --git a/src/api/java/appeng/api/features/ILocatable.java b/src/api/java/appeng/api/features/ILocatable.java index e81ff42e..6a42822a 100644 --- a/src/api/java/appeng/api/features/ILocatable.java +++ b/src/api/java/appeng/api/features/ILocatable.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.features; import appeng.api.events.LocatableEventAnnounce; diff --git a/src/api/java/appeng/api/features/ILocatableRegistry.java b/src/api/java/appeng/api/features/ILocatableRegistry.java index c07b2300..1531379f 100644 --- a/src/api/java/appeng/api/features/ILocatableRegistry.java +++ b/src/api/java/appeng/api/features/ILocatableRegistry.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.features; /** diff --git a/src/api/java/appeng/api/features/IMatterCannonAmmoRegistry.java b/src/api/java/appeng/api/features/IMatterCannonAmmoRegistry.java index 18d9683c..46c2af72 100644 --- a/src/api/java/appeng/api/features/IMatterCannonAmmoRegistry.java +++ b/src/api/java/appeng/api/features/IMatterCannonAmmoRegistry.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.features; import net.minecraft.item.ItemStack; diff --git a/src/api/java/appeng/api/features/INetworkEncodable.java b/src/api/java/appeng/api/features/INetworkEncodable.java index 2fa66bf9..b172c046 100644 --- a/src/api/java/appeng/api/features/INetworkEncodable.java +++ b/src/api/java/appeng/api/features/INetworkEncodable.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.features; import net.minecraft.item.ItemStack; diff --git a/src/api/java/appeng/api/features/IP2PTunnelRegistry.java b/src/api/java/appeng/api/features/IP2PTunnelRegistry.java index e1c85c71..d1e3fba9 100644 --- a/src/api/java/appeng/api/features/IP2PTunnelRegistry.java +++ b/src/api/java/appeng/api/features/IP2PTunnelRegistry.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.features; import net.minecraft.item.ItemStack; diff --git a/src/api/java/appeng/api/features/IPlayerRegistry.java b/src/api/java/appeng/api/features/IPlayerRegistry.java index d52b0a03..c2c0d254 100644 --- a/src/api/java/appeng/api/features/IPlayerRegistry.java +++ b/src/api/java/appeng/api/features/IPlayerRegistry.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.features; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/api/java/appeng/api/features/IRecipeHandlerRegistry.java b/src/api/java/appeng/api/features/IRecipeHandlerRegistry.java index ee8324bb..2332982b 100644 --- a/src/api/java/appeng/api/features/IRecipeHandlerRegistry.java +++ b/src/api/java/appeng/api/features/IRecipeHandlerRegistry.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.features; import appeng.api.recipes.ICraftHandler; diff --git a/src/api/java/appeng/api/features/IRegistryContainer.java b/src/api/java/appeng/api/features/IRegistryContainer.java index c2a74e7f..ada1d22b 100644 --- a/src/api/java/appeng/api/features/IRegistryContainer.java +++ b/src/api/java/appeng/api/features/IRegistryContainer.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.features; import appeng.api.movable.IMovableRegistry; diff --git a/src/api/java/appeng/api/features/ISpecialComparisonRegistry.java b/src/api/java/appeng/api/features/ISpecialComparisonRegistry.java index c51d85b4..eb274f33 100644 --- a/src/api/java/appeng/api/features/ISpecialComparisonRegistry.java +++ b/src/api/java/appeng/api/features/ISpecialComparisonRegistry.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.features; import net.minecraft.item.ItemStack; diff --git a/src/api/java/appeng/api/features/IWirelessTermHandler.java b/src/api/java/appeng/api/features/IWirelessTermHandler.java index 7c29ea48..0fa499b8 100644 --- a/src/api/java/appeng/api/features/IWirelessTermHandler.java +++ b/src/api/java/appeng/api/features/IWirelessTermHandler.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.features; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/api/java/appeng/api/features/IWirelessTermRegistry.java b/src/api/java/appeng/api/features/IWirelessTermRegistry.java index 9d6d911b..078f58e2 100644 --- a/src/api/java/appeng/api/features/IWirelessTermRegistry.java +++ b/src/api/java/appeng/api/features/IWirelessTermRegistry.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.features; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/api/java/appeng/api/features/IWorldGen.java b/src/api/java/appeng/api/features/IWorldGen.java index cadc56a7..5dfbb512 100644 --- a/src/api/java/appeng/api/features/IWorldGen.java +++ b/src/api/java/appeng/api/features/IWorldGen.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.features; import net.minecraft.world.World; diff --git a/src/api/java/appeng/api/implementations/ICraftingPatternItem.java b/src/api/java/appeng/api/implementations/ICraftingPatternItem.java index c3d0a52e..db98ffe5 100644 --- a/src/api/java/appeng/api/implementations/ICraftingPatternItem.java +++ b/src/api/java/appeng/api/implementations/ICraftingPatternItem.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.implementations; import net.minecraft.item.Item; diff --git a/src/api/java/appeng/api/implementations/IPowerChannelState.java b/src/api/java/appeng/api/implementations/IPowerChannelState.java index b17f9251..77522db2 100644 --- a/src/api/java/appeng/api/implementations/IPowerChannelState.java +++ b/src/api/java/appeng/api/implementations/IPowerChannelState.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.implementations; /** diff --git a/src/api/java/appeng/api/implementations/IUpgradeableHost.java b/src/api/java/appeng/api/implementations/IUpgradeableHost.java index 45a98af1..553c98b8 100644 --- a/src/api/java/appeng/api/implementations/IUpgradeableHost.java +++ b/src/api/java/appeng/api/implementations/IUpgradeableHost.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.implementations; import appeng.api.util.IConfigurableObject; diff --git a/src/api/java/appeng/api/implementations/TransitionResult.java b/src/api/java/appeng/api/implementations/TransitionResult.java index bc1e5e1f..f9fd8370 100644 --- a/src/api/java/appeng/api/implementations/TransitionResult.java +++ b/src/api/java/appeng/api/implementations/TransitionResult.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.implementations; /** @@ -10,7 +33,7 @@ public class TransitionResult public final double energyUsage; public TransitionResult(boolean _success, double power) { - success = _success; - energyUsage = power; + this.success = _success; + this.energyUsage = power; } } diff --git a/src/api/java/appeng/api/implementations/guiobjects/IGuiItem.java b/src/api/java/appeng/api/implementations/guiobjects/IGuiItem.java index 5ee7a832..bbc0c88e 100644 --- a/src/api/java/appeng/api/implementations/guiobjects/IGuiItem.java +++ b/src/api/java/appeng/api/implementations/guiobjects/IGuiItem.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.implementations.guiobjects; import net.minecraft.item.ItemStack; diff --git a/src/api/java/appeng/api/implementations/guiobjects/IGuiItemObject.java b/src/api/java/appeng/api/implementations/guiobjects/IGuiItemObject.java index 1b1dfe64..88023fa0 100644 --- a/src/api/java/appeng/api/implementations/guiobjects/IGuiItemObject.java +++ b/src/api/java/appeng/api/implementations/guiobjects/IGuiItemObject.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.implementations.guiobjects; import net.minecraft.item.ItemStack; diff --git a/src/api/java/appeng/api/implementations/guiobjects/INetworkTool.java b/src/api/java/appeng/api/implementations/guiobjects/INetworkTool.java index b4d19999..ef6a0ac3 100644 --- a/src/api/java/appeng/api/implementations/guiobjects/INetworkTool.java +++ b/src/api/java/appeng/api/implementations/guiobjects/INetworkTool.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.implementations.guiobjects; import net.minecraft.inventory.IInventory; diff --git a/src/api/java/appeng/api/implementations/guiobjects/IPortableCell.java b/src/api/java/appeng/api/implementations/guiobjects/IPortableCell.java index 779e741c..b3f18c93 100644 --- a/src/api/java/appeng/api/implementations/guiobjects/IPortableCell.java +++ b/src/api/java/appeng/api/implementations/guiobjects/IPortableCell.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.implementations.guiobjects; import appeng.api.networking.energy.IEnergySource; diff --git a/src/api/java/appeng/api/implementations/items/IAEItemPowerStorage.java b/src/api/java/appeng/api/implementations/items/IAEItemPowerStorage.java index 5ab2ac99..999e696b 100644 --- a/src/api/java/appeng/api/implementations/items/IAEItemPowerStorage.java +++ b/src/api/java/appeng/api/implementations/items/IAEItemPowerStorage.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.implementations.items; import net.minecraft.item.ItemStack; diff --git a/src/api/java/appeng/api/implementations/items/IAEWrench.java b/src/api/java/appeng/api/implementations/items/IAEWrench.java index 9f913fa7..9ce24714 100644 --- a/src/api/java/appeng/api/implementations/items/IAEWrench.java +++ b/src/api/java/appeng/api/implementations/items/IAEWrench.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.implementations.items; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/api/java/appeng/api/implementations/items/IBiometricCard.java b/src/api/java/appeng/api/implementations/items/IBiometricCard.java index bbf8f8e5..4e9f8d52 100644 --- a/src/api/java/appeng/api/implementations/items/IBiometricCard.java +++ b/src/api/java/appeng/api/implementations/items/IBiometricCard.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.implementations.items; import appeng.api.config.SecurityPermissions; diff --git a/src/api/java/appeng/api/implementations/items/IGrowableCrystal.java b/src/api/java/appeng/api/implementations/items/IGrowableCrystal.java index 391482ee..6b08ee76 100644 --- a/src/api/java/appeng/api/implementations/items/IGrowableCrystal.java +++ b/src/api/java/appeng/api/implementations/items/IGrowableCrystal.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.implementations.items; import net.minecraft.block.Block; diff --git a/src/api/java/appeng/api/implementations/items/IItemGroup.java b/src/api/java/appeng/api/implementations/items/IItemGroup.java index 2dce5719..d12f7b8e 100644 --- a/src/api/java/appeng/api/implementations/items/IItemGroup.java +++ b/src/api/java/appeng/api/implementations/items/IItemGroup.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.implementations.items; import net.minecraft.item.ItemStack; diff --git a/src/api/java/appeng/api/implementations/items/IMemoryCard.java b/src/api/java/appeng/api/implementations/items/IMemoryCard.java index 14692313..f04c2301 100644 --- a/src/api/java/appeng/api/implementations/items/IMemoryCard.java +++ b/src/api/java/appeng/api/implementations/items/IMemoryCard.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.implementations.items; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/api/java/appeng/api/implementations/items/ISpatialStorageCell.java b/src/api/java/appeng/api/implementations/items/ISpatialStorageCell.java index 5aaf997a..d296a846 100644 --- a/src/api/java/appeng/api/implementations/items/ISpatialStorageCell.java +++ b/src/api/java/appeng/api/implementations/items/ISpatialStorageCell.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.implementations.items; import net.minecraft.item.Item; diff --git a/src/api/java/appeng/api/implementations/items/IStorageCell.java b/src/api/java/appeng/api/implementations/items/IStorageCell.java index ef0d8420..ba2eaa78 100644 --- a/src/api/java/appeng/api/implementations/items/IStorageCell.java +++ b/src/api/java/appeng/api/implementations/items/IStorageCell.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.implementations.items; import net.minecraft.item.ItemStack; @@ -19,8 +42,8 @@ public interface IStorageCell extends ICellWorkbenchItem { /** - * If this returns something where N % 8 != 0 Then you will be shot on - * sight, or your car will explode, something like that least... + * It wont work if the return is not a multiple of 8. + * The limit is ({@link Integer#MAX_VALUE} + 1) / 8. * * @param cellItem item * @return number of bytes diff --git a/src/api/java/appeng/api/implementations/items/IStorageComponent.java b/src/api/java/appeng/api/implementations/items/IStorageComponent.java index 497d2768..24bfd7b3 100644 --- a/src/api/java/appeng/api/implementations/items/IStorageComponent.java +++ b/src/api/java/appeng/api/implementations/items/IStorageComponent.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.implementations.items; import net.minecraft.item.Item; diff --git a/src/api/java/appeng/api/implementations/items/IUpgradeModule.java b/src/api/java/appeng/api/implementations/items/IUpgradeModule.java index 55a8166b..5721e011 100644 --- a/src/api/java/appeng/api/implementations/items/IUpgradeModule.java +++ b/src/api/java/appeng/api/implementations/items/IUpgradeModule.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.implementations.items; import net.minecraft.item.ItemStack; diff --git a/src/api/java/appeng/api/implementations/items/MemoryCardMessages.java b/src/api/java/appeng/api/implementations/items/MemoryCardMessages.java index 6a7f958e..2c0326ab 100644 --- a/src/api/java/appeng/api/implementations/items/MemoryCardMessages.java +++ b/src/api/java/appeng/api/implementations/items/MemoryCardMessages.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.implementations.items; /** diff --git a/src/api/java/appeng/api/implementations/parts/IPartCable.java b/src/api/java/appeng/api/implementations/parts/IPartCable.java index 16009ca4..1c17ca0d 100644 --- a/src/api/java/appeng/api/implementations/parts/IPartCable.java +++ b/src/api/java/appeng/api/implementations/parts/IPartCable.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.implementations.parts; import appeng.api.networking.IGridHost; diff --git a/src/api/java/appeng/api/implementations/parts/IPartMonitor.java b/src/api/java/appeng/api/implementations/parts/IPartMonitor.java index 2bf93661..af75756e 100644 --- a/src/api/java/appeng/api/implementations/parts/IPartMonitor.java +++ b/src/api/java/appeng/api/implementations/parts/IPartMonitor.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.implementations.parts; import appeng.api.networking.IGridHost; diff --git a/src/api/java/appeng/api/implementations/parts/IPartStorageMonitor.java b/src/api/java/appeng/api/implementations/parts/IPartStorageMonitor.java index 44def099..acafc256 100644 --- a/src/api/java/appeng/api/implementations/parts/IPartStorageMonitor.java +++ b/src/api/java/appeng/api/implementations/parts/IPartStorageMonitor.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.implementations.parts; import appeng.api.networking.IGridHost; @@ -16,7 +39,7 @@ public interface IPartStorageMonitor extends IPartMonitor, IPart, IGridHost, INe * IAEFluidStack the quantity is important remember to use getStackSize() on the IAEStack, and not on the * FluidStack/ItemStack acquired from it. */ - IAEStack getDisplayed(); + IAEStack getDisplayed(); /** * @return the current locked state of the Storage Monitor diff --git a/src/api/java/appeng/api/implementations/tiles/IChestOrDrive.java b/src/api/java/appeng/api/implementations/tiles/IChestOrDrive.java index 0b1388b9..30aed321 100644 --- a/src/api/java/appeng/api/implementations/tiles/IChestOrDrive.java +++ b/src/api/java/appeng/api/implementations/tiles/IChestOrDrive.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.implementations.tiles; import appeng.api.networking.IGridHost; diff --git a/src/api/java/appeng/api/implementations/tiles/IColorableTile.java b/src/api/java/appeng/api/implementations/tiles/IColorableTile.java index 03874ae2..c7de98b2 100644 --- a/src/api/java/appeng/api/implementations/tiles/IColorableTile.java +++ b/src/api/java/appeng/api/implementations/tiles/IColorableTile.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.implementations.tiles; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/api/java/appeng/api/implementations/tiles/ICraftingMachine.java b/src/api/java/appeng/api/implementations/tiles/ICraftingMachine.java index 2f6071f5..20e4d5c7 100644 --- a/src/api/java/appeng/api/implementations/tiles/ICraftingMachine.java +++ b/src/api/java/appeng/api/implementations/tiles/ICraftingMachine.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.implementations.tiles; import net.minecraft.inventory.InventoryCrafting; diff --git a/src/api/java/appeng/api/implementations/tiles/ICrankable.java b/src/api/java/appeng/api/implementations/tiles/ICrankable.java index b709e23d..07f37d0b 100644 --- a/src/api/java/appeng/api/implementations/tiles/ICrankable.java +++ b/src/api/java/appeng/api/implementations/tiles/ICrankable.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.implementations.tiles; import net.minecraftforge.common.util.ForgeDirection; diff --git a/src/api/java/appeng/api/implementations/tiles/ICrystalGrowthAccelerator.java b/src/api/java/appeng/api/implementations/tiles/ICrystalGrowthAccelerator.java index a9cccf8c..e7aa1585 100644 --- a/src/api/java/appeng/api/implementations/tiles/ICrystalGrowthAccelerator.java +++ b/src/api/java/appeng/api/implementations/tiles/ICrystalGrowthAccelerator.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.implementations.tiles; public interface ICrystalGrowthAccelerator diff --git a/src/api/java/appeng/api/implementations/tiles/IMEChest.java b/src/api/java/appeng/api/implementations/tiles/IMEChest.java index 71a7ec3a..2d9cb4ec 100644 --- a/src/api/java/appeng/api/implementations/tiles/IMEChest.java +++ b/src/api/java/appeng/api/implementations/tiles/IMEChest.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.implementations.tiles; import appeng.api.networking.energy.IEnergySource; diff --git a/src/api/java/appeng/api/implementations/tiles/ISegmentedInventory.java b/src/api/java/appeng/api/implementations/tiles/ISegmentedInventory.java index b985b044..b32966e3 100644 --- a/src/api/java/appeng/api/implementations/tiles/ISegmentedInventory.java +++ b/src/api/java/appeng/api/implementations/tiles/ISegmentedInventory.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.implementations.tiles; import net.minecraft.inventory.IInventory; diff --git a/src/api/java/appeng/api/implementations/tiles/ITileStorageMonitorable.java b/src/api/java/appeng/api/implementations/tiles/ITileStorageMonitorable.java index f6ef62fb..4dc062dd 100644 --- a/src/api/java/appeng/api/implementations/tiles/ITileStorageMonitorable.java +++ b/src/api/java/appeng/api/implementations/tiles/ITileStorageMonitorable.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.implementations.tiles; import net.minecraftforge.common.util.ForgeDirection; diff --git a/src/api/java/appeng/api/implementations/tiles/IViewCellStorage.java b/src/api/java/appeng/api/implementations/tiles/IViewCellStorage.java index ab926a4e..4f0a5470 100644 --- a/src/api/java/appeng/api/implementations/tiles/IViewCellStorage.java +++ b/src/api/java/appeng/api/implementations/tiles/IViewCellStorage.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.implementations.tiles; import net.minecraft.inventory.IInventory; diff --git a/src/api/java/appeng/api/implementations/tiles/IWirelessAccessPoint.java b/src/api/java/appeng/api/implementations/tiles/IWirelessAccessPoint.java index bd9ed9a0..36b03631 100644 --- a/src/api/java/appeng/api/implementations/tiles/IWirelessAccessPoint.java +++ b/src/api/java/appeng/api/implementations/tiles/IWirelessAccessPoint.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.implementations.tiles; import appeng.api.networking.IGrid; diff --git a/src/api/java/appeng/api/integration/IBeeComparison.java b/src/api/java/appeng/api/integration/IBeeComparison.java index ab1ccb44..8a9b2c38 100644 --- a/src/api/java/appeng/api/integration/IBeeComparison.java +++ b/src/api/java/appeng/api/integration/IBeeComparison.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.integration; /** diff --git a/src/api/java/appeng/api/movable/IMovableHandler.java b/src/api/java/appeng/api/movable/IMovableHandler.java index 78817bb0..973c024e 100644 --- a/src/api/java/appeng/api/movable/IMovableHandler.java +++ b/src/api/java/appeng/api/movable/IMovableHandler.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.movable; import net.minecraft.tileentity.TileEntity; diff --git a/src/api/java/appeng/api/movable/IMovableRegistry.java b/src/api/java/appeng/api/movable/IMovableRegistry.java index 6a0d4a9f..f874d3c1 100644 --- a/src/api/java/appeng/api/movable/IMovableRegistry.java +++ b/src/api/java/appeng/api/movable/IMovableRegistry.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.movable; import net.minecraft.block.Block; diff --git a/src/api/java/appeng/api/movable/IMovableTile.java b/src/api/java/appeng/api/movable/IMovableTile.java index 9139a41b..6f28ee45 100644 --- a/src/api/java/appeng/api/movable/IMovableTile.java +++ b/src/api/java/appeng/api/movable/IMovableTile.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.movable; /** diff --git a/src/api/java/appeng/api/networking/GridFlags.java b/src/api/java/appeng/api/networking/GridFlags.java index 6351ee95..d3a64a7a 100644 --- a/src/api/java/appeng/api/networking/GridFlags.java +++ b/src/api/java/appeng/api/networking/GridFlags.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.networking; /** diff --git a/src/api/java/appeng/api/networking/GridNotification.java b/src/api/java/appeng/api/networking/GridNotification.java index 78c4d19d..bdd834d7 100644 --- a/src/api/java/appeng/api/networking/GridNotification.java +++ b/src/api/java/appeng/api/networking/GridNotification.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.networking; public enum GridNotification diff --git a/src/api/java/appeng/api/networking/IGrid.java b/src/api/java/appeng/api/networking/IGrid.java index 72c61154..e34853c5 100644 --- a/src/api/java/appeng/api/networking/IGrid.java +++ b/src/api/java/appeng/api/networking/IGrid.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.networking; import appeng.api.networking.events.MENetworkEvent; diff --git a/src/api/java/appeng/api/networking/IGridBlock.java b/src/api/java/appeng/api/networking/IGridBlock.java index a8d7df17..3f54772b 100644 --- a/src/api/java/appeng/api/networking/IGridBlock.java +++ b/src/api/java/appeng/api/networking/IGridBlock.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.networking; import appeng.api.parts.IPart; diff --git a/src/api/java/appeng/api/networking/IGridCache.java b/src/api/java/appeng/api/networking/IGridCache.java index f920d5ae..ba1cdbfb 100644 --- a/src/api/java/appeng/api/networking/IGridCache.java +++ b/src/api/java/appeng/api/networking/IGridCache.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.networking; /** diff --git a/src/api/java/appeng/api/networking/IGridCacheRegistry.java b/src/api/java/appeng/api/networking/IGridCacheRegistry.java index 8061f8cb..9f7b9c1f 100644 --- a/src/api/java/appeng/api/networking/IGridCacheRegistry.java +++ b/src/api/java/appeng/api/networking/IGridCacheRegistry.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.networking; import java.util.HashMap; @@ -16,7 +39,7 @@ public interface IGridCacheRegistry void registerGridCache(Class iface, Class implementation); /** - * requests a new instance of a grid cache for use, used internally + * requests a new INSTANCE of a grid cache for use, used internally * * @param grid grid * diff --git a/src/api/java/appeng/api/networking/IGridConnection.java b/src/api/java/appeng/api/networking/IGridConnection.java index 9d5bb666..b688d4c3 100644 --- a/src/api/java/appeng/api/networking/IGridConnection.java +++ b/src/api/java/appeng/api/networking/IGridConnection.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.networking; import net.minecraftforge.common.util.ForgeDirection; diff --git a/src/api/java/appeng/api/networking/IGridConnectionVisitor.java b/src/api/java/appeng/api/networking/IGridConnectionVisitor.java index d79ce670..ea3c24d6 100644 --- a/src/api/java/appeng/api/networking/IGridConnectionVisitor.java +++ b/src/api/java/appeng/api/networking/IGridConnectionVisitor.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.networking; public interface IGridConnectionVisitor extends IGridVisitor diff --git a/src/api/java/appeng/api/networking/IGridHost.java b/src/api/java/appeng/api/networking/IGridHost.java index 4af28c9a..08381c04 100644 --- a/src/api/java/appeng/api/networking/IGridHost.java +++ b/src/api/java/appeng/api/networking/IGridHost.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.networking; import net.minecraft.tileentity.TileEntity; @@ -23,7 +46,7 @@ public interface IGridHost * feel free to ignore this, most blocks will use the same node * for every side. * @return a new IGridNode, create these with - * AEApi.instance().createGridNode( MyIGridBlock ) + * AEApi.INSTANCE().createGridNode( MyIGridBlock ) */ public IGridNode getGridNode(ForgeDirection dir); diff --git a/src/api/java/appeng/api/networking/IGridMultiblock.java b/src/api/java/appeng/api/networking/IGridMultiblock.java index 83f580e7..2852e0ce 100644 --- a/src/api/java/appeng/api/networking/IGridMultiblock.java +++ b/src/api/java/appeng/api/networking/IGridMultiblock.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.networking; import java.util.Iterator; diff --git a/src/api/java/appeng/api/networking/IGridNode.java b/src/api/java/appeng/api/networking/IGridNode.java index 21bd2c20..fc76af45 100644 --- a/src/api/java/appeng/api/networking/IGridNode.java +++ b/src/api/java/appeng/api/networking/IGridNode.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.networking; import appeng.api.IAppEngApi; diff --git a/src/api/java/appeng/api/networking/IGridStorage.java b/src/api/java/appeng/api/networking/IGridStorage.java index c4c7c1e7..a566cac5 100644 --- a/src/api/java/appeng/api/networking/IGridStorage.java +++ b/src/api/java/appeng/api/networking/IGridStorage.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.networking; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/api/java/appeng/api/networking/IGridVisitor.java b/src/api/java/appeng/api/networking/IGridVisitor.java index 2593160f..1a0859b9 100644 --- a/src/api/java/appeng/api/networking/IGridVisitor.java +++ b/src/api/java/appeng/api/networking/IGridVisitor.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.networking; /** diff --git a/src/api/java/appeng/api/networking/IMachineSet.java b/src/api/java/appeng/api/networking/IMachineSet.java index 080eeb2b..f879d532 100644 --- a/src/api/java/appeng/api/networking/IMachineSet.java +++ b/src/api/java/appeng/api/networking/IMachineSet.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.networking; import appeng.api.util.IReadOnlyCollection; diff --git a/src/api/java/appeng/api/networking/crafting/CraftingItemList.java b/src/api/java/appeng/api/networking/crafting/CraftingItemList.java index 1b2db3a2..7ae0a907 100644 --- a/src/api/java/appeng/api/networking/crafting/CraftingItemList.java +++ b/src/api/java/appeng/api/networking/crafting/CraftingItemList.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.networking.crafting; public enum CraftingItemList diff --git a/src/api/java/appeng/api/networking/crafting/ICraftingCPU.java b/src/api/java/appeng/api/networking/crafting/ICraftingCPU.java index 0f00e53a..2e8d6362 100644 --- a/src/api/java/appeng/api/networking/crafting/ICraftingCPU.java +++ b/src/api/java/appeng/api/networking/crafting/ICraftingCPU.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.networking.crafting; import appeng.api.networking.security.BaseActionSource; diff --git a/src/api/java/appeng/api/networking/crafting/ICraftingCallback.java b/src/api/java/appeng/api/networking/crafting/ICraftingCallback.java index e61ae2cc..86e2d243 100644 --- a/src/api/java/appeng/api/networking/crafting/ICraftingCallback.java +++ b/src/api/java/appeng/api/networking/crafting/ICraftingCallback.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.networking.crafting; public interface ICraftingCallback diff --git a/src/api/java/appeng/api/networking/crafting/ICraftingGrid.java b/src/api/java/appeng/api/networking/crafting/ICraftingGrid.java index 8ac1dc83..6ed869a4 100644 --- a/src/api/java/appeng/api/networking/crafting/ICraftingGrid.java +++ b/src/api/java/appeng/api/networking/crafting/ICraftingGrid.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.networking.crafting; import appeng.api.networking.IGrid; diff --git a/src/api/java/appeng/api/networking/crafting/ICraftingJob.java b/src/api/java/appeng/api/networking/crafting/ICraftingJob.java index 8eeb29eb..91c092d4 100644 --- a/src/api/java/appeng/api/networking/crafting/ICraftingJob.java +++ b/src/api/java/appeng/api/networking/crafting/ICraftingJob.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.networking.crafting; import appeng.api.storage.data.IAEItemStack; diff --git a/src/api/java/appeng/api/networking/crafting/ICraftingLink.java b/src/api/java/appeng/api/networking/crafting/ICraftingLink.java index be7f4f38..946ef703 100644 --- a/src/api/java/appeng/api/networking/crafting/ICraftingLink.java +++ b/src/api/java/appeng/api/networking/crafting/ICraftingLink.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.networking.crafting; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/api/java/appeng/api/networking/crafting/ICraftingMedium.java b/src/api/java/appeng/api/networking/crafting/ICraftingMedium.java index b84e7937..cfe57aa6 100644 --- a/src/api/java/appeng/api/networking/crafting/ICraftingMedium.java +++ b/src/api/java/appeng/api/networking/crafting/ICraftingMedium.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.networking.crafting; import net.minecraft.inventory.InventoryCrafting; diff --git a/src/api/java/appeng/api/networking/crafting/ICraftingPatternDetails.java b/src/api/java/appeng/api/networking/crafting/ICraftingPatternDetails.java index 0fb4eb34..8b7bfa2e 100644 --- a/src/api/java/appeng/api/networking/crafting/ICraftingPatternDetails.java +++ b/src/api/java/appeng/api/networking/crafting/ICraftingPatternDetails.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.networking.crafting; import net.minecraft.inventory.InventoryCrafting; @@ -9,7 +32,7 @@ import appeng.api.storage.data.IAEItemStack; /** * do not implement provided by {@link ICraftingPatternItem} * - * caching this instance will increase performance of validation and checks. + * caching this INSTANCE will increase performance of validation and checks. */ public interface ICraftingPatternDetails { @@ -59,7 +82,7 @@ public interface ICraftingPatternDetails boolean canSubstitute(); /** - * Allow using this instance of the pattern details to preform the crafting action with performance enhancements. + * Allow using this INSTANCE of the pattern details to preform the crafting action with performance enhancements. * * @param craftingInv inventory * @param world crafting world diff --git a/src/api/java/appeng/api/networking/crafting/ICraftingProvider.java b/src/api/java/appeng/api/networking/crafting/ICraftingProvider.java index edd05177..5341309a 100644 --- a/src/api/java/appeng/api/networking/crafting/ICraftingProvider.java +++ b/src/api/java/appeng/api/networking/crafting/ICraftingProvider.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.networking.crafting; import appeng.api.networking.events.MENetworkCraftingPatternChange; diff --git a/src/api/java/appeng/api/networking/crafting/ICraftingProviderHelper.java b/src/api/java/appeng/api/networking/crafting/ICraftingProviderHelper.java index f31a01a8..0e041b65 100644 --- a/src/api/java/appeng/api/networking/crafting/ICraftingProviderHelper.java +++ b/src/api/java/appeng/api/networking/crafting/ICraftingProviderHelper.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.networking.crafting; import appeng.api.storage.data.IAEItemStack; diff --git a/src/api/java/appeng/api/networking/crafting/ICraftingRequester.java b/src/api/java/appeng/api/networking/crafting/ICraftingRequester.java index 0f29bdcf..e156a274 100644 --- a/src/api/java/appeng/api/networking/crafting/ICraftingRequester.java +++ b/src/api/java/appeng/api/networking/crafting/ICraftingRequester.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.networking.crafting; import appeng.api.config.Actionable; diff --git a/src/api/java/appeng/api/networking/crafting/ICraftingWatcher.java b/src/api/java/appeng/api/networking/crafting/ICraftingWatcher.java index 64cffd3e..bcfb38c9 100644 --- a/src/api/java/appeng/api/networking/crafting/ICraftingWatcher.java +++ b/src/api/java/appeng/api/networking/crafting/ICraftingWatcher.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.networking.crafting; import java.util.Collection; diff --git a/src/api/java/appeng/api/networking/crafting/ICraftingWatcherHost.java b/src/api/java/appeng/api/networking/crafting/ICraftingWatcherHost.java index b5ae4384..757f98fb 100644 --- a/src/api/java/appeng/api/networking/crafting/ICraftingWatcherHost.java +++ b/src/api/java/appeng/api/networking/crafting/ICraftingWatcherHost.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.networking.crafting; import appeng.api.storage.data.IAEItemStack; diff --git a/src/api/java/appeng/api/networking/energy/IAEPowerStorage.java b/src/api/java/appeng/api/networking/energy/IAEPowerStorage.java index a97c5e60..13b680b8 100644 --- a/src/api/java/appeng/api/networking/energy/IAEPowerStorage.java +++ b/src/api/java/appeng/api/networking/energy/IAEPowerStorage.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.networking.energy; import appeng.api.config.AccessRestriction; diff --git a/src/api/java/appeng/api/networking/energy/IEnergyGrid.java b/src/api/java/appeng/api/networking/energy/IEnergyGrid.java index 38f9bbd1..eeca67da 100644 --- a/src/api/java/appeng/api/networking/energy/IEnergyGrid.java +++ b/src/api/java/appeng/api/networking/energy/IEnergyGrid.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.networking.energy; import appeng.api.config.Actionable; diff --git a/src/api/java/appeng/api/networking/energy/IEnergyGridProvider.java b/src/api/java/appeng/api/networking/energy/IEnergyGridProvider.java index a7412630..ce13a367 100644 --- a/src/api/java/appeng/api/networking/energy/IEnergyGridProvider.java +++ b/src/api/java/appeng/api/networking/energy/IEnergyGridProvider.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.networking.energy; import java.util.Set; diff --git a/src/api/java/appeng/api/networking/energy/IEnergySource.java b/src/api/java/appeng/api/networking/energy/IEnergySource.java index 52a8c272..ee96dff2 100644 --- a/src/api/java/appeng/api/networking/energy/IEnergySource.java +++ b/src/api/java/appeng/api/networking/energy/IEnergySource.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.networking.energy; import appeng.api.config.Actionable; diff --git a/src/api/java/appeng/api/networking/energy/IEnergyWatcher.java b/src/api/java/appeng/api/networking/energy/IEnergyWatcher.java index 20e7a8ec..b4fdd2de 100644 --- a/src/api/java/appeng/api/networking/energy/IEnergyWatcher.java +++ b/src/api/java/appeng/api/networking/energy/IEnergyWatcher.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.networking.energy; import java.util.Collection; diff --git a/src/api/java/appeng/api/networking/energy/IEnergyWatcherHost.java b/src/api/java/appeng/api/networking/energy/IEnergyWatcherHost.java index 775380ca..7b6bd0df 100644 --- a/src/api/java/appeng/api/networking/energy/IEnergyWatcherHost.java +++ b/src/api/java/appeng/api/networking/energy/IEnergyWatcherHost.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.networking.energy; public interface IEnergyWatcherHost diff --git a/src/api/java/appeng/api/networking/events/MENetworkBootingStatusChange.java b/src/api/java/appeng/api/networking/events/MENetworkBootingStatusChange.java index 284c64e4..fc82f162 100644 --- a/src/api/java/appeng/api/networking/events/MENetworkBootingStatusChange.java +++ b/src/api/java/appeng/api/networking/events/MENetworkBootingStatusChange.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.networking.events; import appeng.api.networking.IGridNode; diff --git a/src/api/java/appeng/api/networking/events/MENetworkCellArrayUpdate.java b/src/api/java/appeng/api/networking/events/MENetworkCellArrayUpdate.java index aec90e78..e12e006f 100644 --- a/src/api/java/appeng/api/networking/events/MENetworkCellArrayUpdate.java +++ b/src/api/java/appeng/api/networking/events/MENetworkCellArrayUpdate.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.networking.events; /** diff --git a/src/api/java/appeng/api/networking/events/MENetworkChannelChanged.java b/src/api/java/appeng/api/networking/events/MENetworkChannelChanged.java index bce30749..a6675d8f 100644 --- a/src/api/java/appeng/api/networking/events/MENetworkChannelChanged.java +++ b/src/api/java/appeng/api/networking/events/MENetworkChannelChanged.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.networking.events; import appeng.api.networking.IGridNode; @@ -12,7 +35,7 @@ public class MENetworkChannelChanged extends MENetworkEvent public final IGridNode node; public MENetworkChannelChanged(IGridNode n) { - node = n; + this.node = n; } } diff --git a/src/api/java/appeng/api/networking/events/MENetworkChannelsChanged.java b/src/api/java/appeng/api/networking/events/MENetworkChannelsChanged.java index ebfed6cb..07161d24 100644 --- a/src/api/java/appeng/api/networking/events/MENetworkChannelsChanged.java +++ b/src/api/java/appeng/api/networking/events/MENetworkChannelsChanged.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.networking.events; import appeng.api.networking.IGridHost; diff --git a/src/api/java/appeng/api/networking/events/MENetworkControllerChange.java b/src/api/java/appeng/api/networking/events/MENetworkControllerChange.java index 97db1648..7e4a4b22 100644 --- a/src/api/java/appeng/api/networking/events/MENetworkControllerChange.java +++ b/src/api/java/appeng/api/networking/events/MENetworkControllerChange.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.networking.events; /** diff --git a/src/api/java/appeng/api/networking/events/MENetworkCraftingCpuChange.java b/src/api/java/appeng/api/networking/events/MENetworkCraftingCpuChange.java index a52eab52..5bc716fa 100644 --- a/src/api/java/appeng/api/networking/events/MENetworkCraftingCpuChange.java +++ b/src/api/java/appeng/api/networking/events/MENetworkCraftingCpuChange.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.networking.events; import appeng.api.networking.IGridNode; @@ -8,7 +31,7 @@ public class MENetworkCraftingCpuChange extends MENetworkEvent public final IGridNode node; public MENetworkCraftingCpuChange(IGridNode n) { - node = n; + this.node = n; } } diff --git a/src/api/java/appeng/api/networking/events/MENetworkCraftingPatternChange.java b/src/api/java/appeng/api/networking/events/MENetworkCraftingPatternChange.java index 13f735fd..871d7c1e 100644 --- a/src/api/java/appeng/api/networking/events/MENetworkCraftingPatternChange.java +++ b/src/api/java/appeng/api/networking/events/MENetworkCraftingPatternChange.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.networking.events; import appeng.api.networking.IGridNode; @@ -10,8 +33,8 @@ public class MENetworkCraftingPatternChange extends MENetworkEvent public final IGridNode node; public MENetworkCraftingPatternChange(ICraftingProvider p, IGridNode n) { - provider = p; - node = n; + this.provider = p; + this.node = n; } } diff --git a/src/api/java/appeng/api/networking/events/MENetworkEvent.java b/src/api/java/appeng/api/networking/events/MENetworkEvent.java index 34a2731d..1ba95a35 100644 --- a/src/api/java/appeng/api/networking/events/MENetworkEvent.java +++ b/src/api/java/appeng/api/networking/events/MENetworkEvent.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.networking.events; import appeng.api.networking.IGrid; @@ -18,7 +41,7 @@ public class MENetworkEvent */ public void cancel() { - canceled = true; + this.canceled = true; } /** @@ -28,7 +51,7 @@ public class MENetworkEvent */ public boolean isCanceled() { - return canceled; + return this.canceled; } /** @@ -38,7 +61,7 @@ public class MENetworkEvent */ public int getVisitedObjects() { - return visited; + return this.visited; } /** @@ -48,6 +71,6 @@ public class MENetworkEvent */ public void setVisitedObjects(int v) { - visited = v; + this.visited = v; } } diff --git a/src/api/java/appeng/api/networking/events/MENetworkEventSubscribe.java b/src/api/java/appeng/api/networking/events/MENetworkEventSubscribe.java index b3b8fb9a..eae8e0aa 100644 --- a/src/api/java/appeng/api/networking/events/MENetworkEventSubscribe.java +++ b/src/api/java/appeng/api/networking/events/MENetworkEventSubscribe.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.networking.events; import java.lang.annotation.Retention; diff --git a/src/api/java/appeng/api/networking/events/MENetworkPostCacheConstruction.java b/src/api/java/appeng/api/networking/events/MENetworkPostCacheConstruction.java index 05b28128..6a05fc07 100644 --- a/src/api/java/appeng/api/networking/events/MENetworkPostCacheConstruction.java +++ b/src/api/java/appeng/api/networking/events/MENetworkPostCacheConstruction.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.networking.events; /** diff --git a/src/api/java/appeng/api/networking/events/MENetworkPowerIdleChange.java b/src/api/java/appeng/api/networking/events/MENetworkPowerIdleChange.java index 803c5a7e..15ae375e 100644 --- a/src/api/java/appeng/api/networking/events/MENetworkPowerIdleChange.java +++ b/src/api/java/appeng/api/networking/events/MENetworkPowerIdleChange.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.networking.events; import appeng.api.networking.IGridNode; @@ -15,7 +38,7 @@ public class MENetworkPowerIdleChange extends MENetworkEvent public final IGridNode node; public MENetworkPowerIdleChange(IGridNode nodeThatChanged) { - node = nodeThatChanged; + this.node = nodeThatChanged; } } diff --git a/src/api/java/appeng/api/networking/events/MENetworkPowerStatusChange.java b/src/api/java/appeng/api/networking/events/MENetworkPowerStatusChange.java index c89db973..9b90ebaa 100644 --- a/src/api/java/appeng/api/networking/events/MENetworkPowerStatusChange.java +++ b/src/api/java/appeng/api/networking/events/MENetworkPowerStatusChange.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.networking.events; import appeng.api.networking.IGridNode; diff --git a/src/api/java/appeng/api/networking/events/MENetworkPowerStorage.java b/src/api/java/appeng/api/networking/events/MENetworkPowerStorage.java index 34643450..317e69b6 100644 --- a/src/api/java/appeng/api/networking/events/MENetworkPowerStorage.java +++ b/src/api/java/appeng/api/networking/events/MENetworkPowerStorage.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.networking.events; import appeng.api.networking.energy.IAEPowerStorage; @@ -31,8 +54,8 @@ public class MENetworkPowerStorage extends MENetworkEvent public final PowerEventType type; public MENetworkPowerStorage(IAEPowerStorage t, PowerEventType y) { - storage = t; - type = y; + this.storage = t; + this.type = y; } } diff --git a/src/api/java/appeng/api/networking/events/MENetworkSecurityChange.java b/src/api/java/appeng/api/networking/events/MENetworkSecurityChange.java index b872f03b..f5c971dd 100644 --- a/src/api/java/appeng/api/networking/events/MENetworkSecurityChange.java +++ b/src/api/java/appeng/api/networking/events/MENetworkSecurityChange.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.networking.events; /** diff --git a/src/api/java/appeng/api/networking/events/MENetworkSpatialEvent.java b/src/api/java/appeng/api/networking/events/MENetworkSpatialEvent.java index ba487aee..9cb430f7 100644 --- a/src/api/java/appeng/api/networking/events/MENetworkSpatialEvent.java +++ b/src/api/java/appeng/api/networking/events/MENetworkSpatialEvent.java @@ -1,9 +1,32 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.networking.events; import appeng.api.networking.IGridHost; /** - * An event that is posted whenever a spatial IO is actived, called for IGridCache + * An event that is posted whenever a spatial IO is active, called for IGridCache */ public class MENetworkSpatialEvent extends MENetworkEvent { @@ -11,12 +34,12 @@ public class MENetworkSpatialEvent extends MENetworkEvent public final double spatialEnergyUsage; /** - * @param SpatialIO ( instance of the SpatialIO block ) + * @param SpatialIO ( INSTANCE of the SpatialIO block ) * @param EnergyUsage ( the amount of energy that the SpatialIO uses) */ public MENetworkSpatialEvent(IGridHost SpatialIO, double EnergyUsage) { - host = SpatialIO; - spatialEnergyUsage = EnergyUsage; + this.host = SpatialIO; + this.spatialEnergyUsage = EnergyUsage; } } diff --git a/src/api/java/appeng/api/networking/events/MENetworkStorageEvent.java b/src/api/java/appeng/api/networking/events/MENetworkStorageEvent.java index 36a93624..0901e6d8 100644 --- a/src/api/java/appeng/api/networking/events/MENetworkStorageEvent.java +++ b/src/api/java/appeng/api/networking/events/MENetworkStorageEvent.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.networking.events; import appeng.api.storage.IMEMonitor; @@ -18,8 +41,8 @@ public class MENetworkStorageEvent extends MENetworkEvent public final StorageChannel channel; public MENetworkStorageEvent(IMEMonitor o, StorageChannel chan) { - monitor = o; - channel = chan; + this.monitor = o; + this.channel = chan; } } diff --git a/src/api/java/appeng/api/networking/pathing/ControllerState.java b/src/api/java/appeng/api/networking/pathing/ControllerState.java index 37042720..eb18eeec 100644 --- a/src/api/java/appeng/api/networking/pathing/ControllerState.java +++ b/src/api/java/appeng/api/networking/pathing/ControllerState.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.networking.pathing; public enum ControllerState diff --git a/src/api/java/appeng/api/networking/pathing/IPathingGrid.java b/src/api/java/appeng/api/networking/pathing/IPathingGrid.java index 90f30e04..18b335be 100644 --- a/src/api/java/appeng/api/networking/pathing/IPathingGrid.java +++ b/src/api/java/appeng/api/networking/pathing/IPathingGrid.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.networking.pathing; import appeng.api.networking.IGridCache; @@ -17,7 +40,7 @@ public interface IPathingGrid extends IGridCache ControllerState getControllerState(); /** - * trigger a network reset, booting, pathfinding and all. + * trigger a network reset, booting, path-finding and all. */ void repath(); diff --git a/src/api/java/appeng/api/networking/security/BaseActionSource.java b/src/api/java/appeng/api/networking/security/BaseActionSource.java index 193b37e8..4a8622aa 100644 --- a/src/api/java/appeng/api/networking/security/BaseActionSource.java +++ b/src/api/java/appeng/api/networking/security/BaseActionSource.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.networking.security; public class BaseActionSource diff --git a/src/api/java/appeng/api/networking/security/IActionHost.java b/src/api/java/appeng/api/networking/security/IActionHost.java index e6aa7a19..f25fda27 100644 --- a/src/api/java/appeng/api/networking/security/IActionHost.java +++ b/src/api/java/appeng/api/networking/security/IActionHost.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.networking.security; import appeng.api.networking.IGridHost; diff --git a/src/api/java/appeng/api/networking/security/ISecurityGrid.java b/src/api/java/appeng/api/networking/security/ISecurityGrid.java index aed72a7c..67463992 100644 --- a/src/api/java/appeng/api/networking/security/ISecurityGrid.java +++ b/src/api/java/appeng/api/networking/security/ISecurityGrid.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.networking.security; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/api/java/appeng/api/networking/security/ISecurityProvider.java b/src/api/java/appeng/api/networking/security/ISecurityProvider.java index be9ad4a8..e76b2e9e 100644 --- a/src/api/java/appeng/api/networking/security/ISecurityProvider.java +++ b/src/api/java/appeng/api/networking/security/ISecurityProvider.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.networking.security; import appeng.api.config.SecurityPermissions; diff --git a/src/api/java/appeng/api/networking/security/ISecurityRegistry.java b/src/api/java/appeng/api/networking/security/ISecurityRegistry.java index b1abf80c..7db244c0 100644 --- a/src/api/java/appeng/api/networking/security/ISecurityRegistry.java +++ b/src/api/java/appeng/api/networking/security/ISecurityRegistry.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.networking.security; import appeng.api.config.SecurityPermissions; diff --git a/src/api/java/appeng/api/networking/security/MachineSource.java b/src/api/java/appeng/api/networking/security/MachineSource.java index ddce68fa..68fa5d95 100644 --- a/src/api/java/appeng/api/networking/security/MachineSource.java +++ b/src/api/java/appeng/api/networking/security/MachineSource.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.networking.security; public class MachineSource extends BaseActionSource @@ -12,7 +35,7 @@ public class MachineSource extends BaseActionSource } public MachineSource(IActionHost v) { - via = v; + this.via = v; } } diff --git a/src/api/java/appeng/api/networking/security/PlayerSource.java b/src/api/java/appeng/api/networking/security/PlayerSource.java index 335a16ae..03dc9358 100644 --- a/src/api/java/appeng/api/networking/security/PlayerSource.java +++ b/src/api/java/appeng/api/networking/security/PlayerSource.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.networking.security; import net.minecraft.entity.player.EntityPlayer; @@ -15,8 +38,8 @@ public class PlayerSource extends BaseActionSource } public PlayerSource(EntityPlayer p, IActionHost v) { - player = p; - via = v; + this.player = p; + this.via = v; } } diff --git a/src/api/java/appeng/api/networking/spatial/ISpatialCache.java b/src/api/java/appeng/api/networking/spatial/ISpatialCache.java index 2921553f..7fadac67 100644 --- a/src/api/java/appeng/api/networking/spatial/ISpatialCache.java +++ b/src/api/java/appeng/api/networking/spatial/ISpatialCache.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.networking.spatial; import appeng.api.networking.IGridCache; diff --git a/src/api/java/appeng/api/networking/storage/IBaseMonitor.java b/src/api/java/appeng/api/networking/storage/IBaseMonitor.java index 9f1848f6..58e8f174 100644 --- a/src/api/java/appeng/api/networking/storage/IBaseMonitor.java +++ b/src/api/java/appeng/api/networking/storage/IBaseMonitor.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.networking.storage; import appeng.api.storage.IMEMonitorHandlerReceiver; diff --git a/src/api/java/appeng/api/networking/storage/IStackWatcher.java b/src/api/java/appeng/api/networking/storage/IStackWatcher.java index f27ecf77..8ec1e0ac 100644 --- a/src/api/java/appeng/api/networking/storage/IStackWatcher.java +++ b/src/api/java/appeng/api/networking/storage/IStackWatcher.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.networking.storage; import java.util.Collection; diff --git a/src/api/java/appeng/api/networking/storage/IStackWatcherHost.java b/src/api/java/appeng/api/networking/storage/IStackWatcherHost.java index 62b2541f..d6d071c7 100644 --- a/src/api/java/appeng/api/networking/storage/IStackWatcherHost.java +++ b/src/api/java/appeng/api/networking/storage/IStackWatcherHost.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.networking.storage; import appeng.api.networking.security.BaseActionSource; diff --git a/src/api/java/appeng/api/networking/storage/IStorageGrid.java b/src/api/java/appeng/api/networking/storage/IStorageGrid.java index 774e96dc..6e9d3134 100644 --- a/src/api/java/appeng/api/networking/storage/IStorageGrid.java +++ b/src/api/java/appeng/api/networking/storage/IStorageGrid.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.networking.storage; import appeng.api.networking.IGridCache; diff --git a/src/api/java/appeng/api/networking/ticking/IGridTickable.java b/src/api/java/appeng/api/networking/ticking/IGridTickable.java index 66d3c898..10460cba 100644 --- a/src/api/java/appeng/api/networking/ticking/IGridTickable.java +++ b/src/api/java/appeng/api/networking/ticking/IGridTickable.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.networking.ticking; import appeng.api.networking.IGridNode; diff --git a/src/api/java/appeng/api/networking/ticking/ITickManager.java b/src/api/java/appeng/api/networking/ticking/ITickManager.java index d5cbbf0b..ae0eb214 100644 --- a/src/api/java/appeng/api/networking/ticking/ITickManager.java +++ b/src/api/java/appeng/api/networking/ticking/ITickManager.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.networking.ticking; import appeng.api.networking.IGridCache; diff --git a/src/api/java/appeng/api/networking/ticking/TickRateModulation.java b/src/api/java/appeng/api/networking/ticking/TickRateModulation.java index 1298b5ab..7ec673f8 100644 --- a/src/api/java/appeng/api/networking/ticking/TickRateModulation.java +++ b/src/api/java/appeng/api/networking/ticking/TickRateModulation.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.networking.ticking; public enum TickRateModulation diff --git a/src/api/java/appeng/api/networking/ticking/TickingRequest.java b/src/api/java/appeng/api/networking/ticking/TickingRequest.java index 02ac54e6..388e657a 100644 --- a/src/api/java/appeng/api/networking/ticking/TickingRequest.java +++ b/src/api/java/appeng/api/networking/ticking/TickingRequest.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.networking.ticking; /** @@ -45,10 +68,10 @@ public class TickingRequest public final boolean canBeAlerted; public TickingRequest(int min, int max, boolean sleep, boolean alertable) { - minTickRate = min; - maxTickRate = max; - isSleeping = sleep; - canBeAlerted = alertable; + this.minTickRate = min; + this.maxTickRate = max; + this.isSleeping = sleep; + this.canBeAlerted = alertable; } } diff --git a/src/api/java/appeng/api/package-info.java b/src/api/java/appeng/api/package-info.java index 0e52e08c..a04fb86d 100644 --- a/src/api/java/appeng/api/package-info.java +++ b/src/api/java/appeng/api/package-info.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + @API(apiVersion = "rv2", owner = "appliedenergistics2", provides = "appliedenergistics2|API") package appeng.api; diff --git a/src/api/java/appeng/api/parts/BusSupport.java b/src/api/java/appeng/api/parts/BusSupport.java index 1702bbce..6a193818 100644 --- a/src/api/java/appeng/api/parts/BusSupport.java +++ b/src/api/java/appeng/api/parts/BusSupport.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.parts; public enum BusSupport diff --git a/src/api/java/appeng/api/parts/CableRenderMode.java b/src/api/java/appeng/api/parts/CableRenderMode.java index 2e64f356..5061eb4b 100644 --- a/src/api/java/appeng/api/parts/CableRenderMode.java +++ b/src/api/java/appeng/api/parts/CableRenderMode.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.parts; public enum CableRenderMode @@ -12,6 +35,6 @@ public enum CableRenderMode private CableRenderMode(boolean hideFacades) { this.transparentFacades = hideFacades; - opaqueFacades = !hideFacades; + this.opaqueFacades = !hideFacades; } } diff --git a/src/api/java/appeng/api/parts/IAlphaPassItem.java b/src/api/java/appeng/api/parts/IAlphaPassItem.java index b2dba861..dc8a3156 100644 --- a/src/api/java/appeng/api/parts/IAlphaPassItem.java +++ b/src/api/java/appeng/api/parts/IAlphaPassItem.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.parts; import net.minecraft.item.ItemStack; diff --git a/src/api/java/appeng/api/parts/IBoxProvider.java b/src/api/java/appeng/api/parts/IBoxProvider.java index 653089a9..91faa619 100644 --- a/src/api/java/appeng/api/parts/IBoxProvider.java +++ b/src/api/java/appeng/api/parts/IBoxProvider.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.parts; public interface IBoxProvider diff --git a/src/api/java/appeng/api/parts/IFacadeContainer.java b/src/api/java/appeng/api/parts/IFacadeContainer.java index 397fbecc..bd240049 100644 --- a/src/api/java/appeng/api/parts/IFacadeContainer.java +++ b/src/api/java/appeng/api/parts/IFacadeContainer.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.parts; import io.netty.buffer.ByteBuf; diff --git a/src/api/java/appeng/api/parts/IFacadePart.java b/src/api/java/appeng/api/parts/IFacadePart.java index cbe647ae..7237c725 100644 --- a/src/api/java/appeng/api/parts/IFacadePart.java +++ b/src/api/java/appeng/api/parts/IFacadePart.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.parts; import net.minecraft.client.renderer.RenderBlocks; diff --git a/src/api/java/appeng/api/parts/IPart.java b/src/api/java/appeng/api/parts/IPart.java index fdc4e0da..15a990ce 100644 --- a/src/api/java/appeng/api/parts/IPart.java +++ b/src/api/java/appeng/api/parts/IPart.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.parts; import appeng.api.networking.IGridNode; diff --git a/src/api/java/appeng/api/parts/IPartCollisionHelper.java b/src/api/java/appeng/api/parts/IPartCollisionHelper.java index c7fcb9a6..174b6992 100644 --- a/src/api/java/appeng/api/parts/IPartCollisionHelper.java +++ b/src/api/java/appeng/api/parts/IPartCollisionHelper.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.parts; import net.minecraftforge.common.util.ForgeDirection; diff --git a/src/api/java/appeng/api/parts/IPartHelper.java b/src/api/java/appeng/api/parts/IPartHelper.java index 7cf451ed..23374621 100644 --- a/src/api/java/appeng/api/parts/IPartHelper.java +++ b/src/api/java/appeng/api/parts/IPartHelper.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.parts; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/api/java/appeng/api/parts/IPartHost.java b/src/api/java/appeng/api/parts/IPartHost.java index b18712dc..1dce8c02 100644 --- a/src/api/java/appeng/api/parts/IPartHost.java +++ b/src/api/java/appeng/api/parts/IPartHost.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.parts; import appeng.api.util.AEColor; @@ -60,7 +83,7 @@ public interface IPartHost * * @param side side of part * @param suppressUpdate - * - used if you need to replace a part's instance, without really removing it first. + * - used if you need to replace a part's INSTANCE, without really removing it first. */ void removePart(ForgeDirection side, boolean suppressUpdate); diff --git a/src/api/java/appeng/api/parts/IPartItem.java b/src/api/java/appeng/api/parts/IPartItem.java index ca7a4b4f..5829ed84 100644 --- a/src/api/java/appeng/api/parts/IPartItem.java +++ b/src/api/java/appeng/api/parts/IPartItem.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.parts; import net.minecraft.item.ItemStack; @@ -6,7 +29,7 @@ import net.minecraft.item.ItemStack; /** * This is a pretty basic requirement, once you implement the interface, and createPartFromItemStack * - * you must register your bus with the Bus renderer, using AEApi.instance().partHelper().setItemBusRenderer( this ); + * you must register your bus with the Bus renderer, using AEApi.INSTANCE().partHelper().setItemBusRenderer( this ); * * then simply add these two methods, which tell MC to use the Block Textures, and call AE's Bus Placement Code. * @@ -22,7 +45,7 @@ import net.minecraft.item.ItemStack; * {@literal @}Override * public boolean onItemUse(ItemStack is, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ) * { - * return AEApi.instance().partHelper().placeBus( is, x, y, z, side, player, world ); + * return AEApi.INSTANCE().partHelper().placeBus( is, x, y, z, side, player, world ); * } * * @@ -32,7 +55,7 @@ public interface IPartItem { /** - * create a new part instance, from the item stack. + * create a new part INSTANCE, from the item stack. * * @param is item * @return part from item diff --git a/src/api/java/appeng/api/parts/IPartRenderHelper.java b/src/api/java/appeng/api/parts/IPartRenderHelper.java index b00a7ca6..20d32b73 100644 --- a/src/api/java/appeng/api/parts/IPartRenderHelper.java +++ b/src/api/java/appeng/api/parts/IPartRenderHelper.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.parts; import cpw.mods.fml.relauncher.Side; diff --git a/src/api/java/appeng/api/parts/ISimplifiedBundle.java b/src/api/java/appeng/api/parts/ISimplifiedBundle.java index ad093459..725dc8cc 100644 --- a/src/api/java/appeng/api/parts/ISimplifiedBundle.java +++ b/src/api/java/appeng/api/parts/ISimplifiedBundle.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.parts; diff --git a/src/api/java/appeng/api/parts/LayerBase.java b/src/api/java/appeng/api/parts/LayerBase.java index e976654b..8dd8eb13 100644 --- a/src/api/java/appeng/api/parts/LayerBase.java +++ b/src/api/java/appeng/api/parts/LayerBase.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.parts; import net.minecraft.tileentity.TileEntity; diff --git a/src/api/java/appeng/api/parts/LayerFlags.java b/src/api/java/appeng/api/parts/LayerFlags.java index 08d720be..52a75d33 100644 --- a/src/api/java/appeng/api/parts/LayerFlags.java +++ b/src/api/java/appeng/api/parts/LayerFlags.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.parts; public enum LayerFlags diff --git a/src/api/java/appeng/api/parts/PartItemStack.java b/src/api/java/appeng/api/parts/PartItemStack.java index 4c8c72dc..49a92ad3 100644 --- a/src/api/java/appeng/api/parts/PartItemStack.java +++ b/src/api/java/appeng/api/parts/PartItemStack.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.parts; public enum PartItemStack diff --git a/src/api/java/appeng/api/parts/SelectedPart.java b/src/api/java/appeng/api/parts/SelectedPart.java index b381e111..b302337d 100644 --- a/src/api/java/appeng/api/parts/SelectedPart.java +++ b/src/api/java/appeng/api/parts/SelectedPart.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.parts; import net.minecraftforge.common.util.ForgeDirection; @@ -24,19 +47,19 @@ public class SelectedPart public final ForgeDirection side; public SelectedPart() { - part = null; - facade = null; - side = ForgeDirection.UNKNOWN; + this.part = null; + this.facade = null; + this.side = ForgeDirection.UNKNOWN; } public SelectedPart(IPart part, ForgeDirection side) { this.part = part; - facade = null; + this.facade = null; this.side = side; } public SelectedPart(IFacadePart facade, ForgeDirection side) { - part = null; + this.part = null; this.facade = facade; this.side = side; } diff --git a/src/api/java/appeng/api/recipes/ICraftHandler.java b/src/api/java/appeng/api/recipes/ICraftHandler.java index df574c7f..bdb9af22 100644 --- a/src/api/java/appeng/api/recipes/ICraftHandler.java +++ b/src/api/java/appeng/api/recipes/ICraftHandler.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.recipes; import appeng.api.exceptions.MissingIngredientError; diff --git a/src/api/java/appeng/api/recipes/IIngredient.java b/src/api/java/appeng/api/recipes/IIngredient.java index 9a8cbb91..7e78e30e 100644 --- a/src/api/java/appeng/api/recipes/IIngredient.java +++ b/src/api/java/appeng/api/recipes/IIngredient.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.recipes; import net.minecraft.item.ItemStack; @@ -55,7 +78,7 @@ public interface IIngredient { public int getQty(); /** - * Bakes the lists in for faster runtime lookups. + * Bakes the lists in for faster runtime look-ups. * @throws MissingIngredientError * @throws RegistrationError */ diff --git a/src/api/java/appeng/api/recipes/IRecipeHandler.java b/src/api/java/appeng/api/recipes/IRecipeHandler.java index 153d1623..63d2756f 100644 --- a/src/api/java/appeng/api/recipes/IRecipeHandler.java +++ b/src/api/java/appeng/api/recipes/IRecipeHandler.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.recipes; /** diff --git a/src/api/java/appeng/api/recipes/IRecipeLoader.java b/src/api/java/appeng/api/recipes/IRecipeLoader.java index a85dbeba..25a189ec 100644 --- a/src/api/java/appeng/api/recipes/IRecipeLoader.java +++ b/src/api/java/appeng/api/recipes/IRecipeLoader.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.recipes; import java.io.BufferedReader; diff --git a/src/api/java/appeng/api/recipes/ISubItemResolver.java b/src/api/java/appeng/api/recipes/ISubItemResolver.java index 49a0bf31..acd5a73c 100644 --- a/src/api/java/appeng/api/recipes/ISubItemResolver.java +++ b/src/api/java/appeng/api/recipes/ISubItemResolver.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.recipes; public interface ISubItemResolver diff --git a/src/api/java/appeng/api/recipes/ResolverResult.java b/src/api/java/appeng/api/recipes/ResolverResult.java index 03e696f0..cf4e6ff2 100644 --- a/src/api/java/appeng/api/recipes/ResolverResult.java +++ b/src/api/java/appeng/api/recipes/ResolverResult.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.recipes; import net.minecraft.nbt.NBTTagCompound; @@ -10,15 +33,15 @@ public class ResolverResult final public NBTTagCompound compound; public ResolverResult(String name, int damage) { - itemName = name; - damageValue = damage; - compound = null; + this.itemName = name; + this.damageValue = damage; + this.compound = null; } public ResolverResult(String name, int damage, NBTTagCompound data) { - itemName = name; - damageValue = damage; - compound = data; + this.itemName = name; + this.damageValue = damage; + this.compound = data; } } diff --git a/src/api/java/appeng/api/recipes/ResolverResultSet.java b/src/api/java/appeng/api/recipes/ResolverResultSet.java index d9e34aa4..9865d700 100644 --- a/src/api/java/appeng/api/recipes/ResolverResultSet.java +++ b/src/api/java/appeng/api/recipes/ResolverResultSet.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.recipes; import java.util.Arrays; @@ -12,8 +35,8 @@ public class ResolverResultSet public final List results; public ResolverResultSet(String myName, ItemStack... set) { - results = Arrays.asList( set ); - name = myName; + this.results = Arrays.asList( set ); + this.name = myName; } } diff --git a/src/api/java/appeng/api/storage/ICellContainer.java b/src/api/java/appeng/api/storage/ICellContainer.java index 8b1f7c21..086c11d1 100644 --- a/src/api/java/appeng/api/storage/ICellContainer.java +++ b/src/api/java/appeng/api/storage/ICellContainer.java @@ -1,9 +1,32 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.storage; import appeng.api.networking.security.IActionHost; /** - * Represents a IGridhost that contributes to storage, such as a ME Chest, or ME Drive. + * Represents an {@link appeng.api.networking.IGridHost} that contributes to storage, such as a ME Chest, or ME Drive. */ public interface ICellContainer extends IActionHost, ICellProvider, ISaveProvider { diff --git a/src/api/java/appeng/api/storage/ICellHandler.java b/src/api/java/appeng/api/storage/ICellHandler.java index 1ddc839a..1b0d0fa0 100644 --- a/src/api/java/appeng/api/storage/ICellHandler.java +++ b/src/api/java/appeng/api/storage/ICellHandler.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.storage; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/api/java/appeng/api/storage/ICellInventory.java b/src/api/java/appeng/api/storage/ICellInventory.java index c48567d4..54098688 100644 --- a/src/api/java/appeng/api/storage/ICellInventory.java +++ b/src/api/java/appeng/api/storage/ICellInventory.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.storage; import net.minecraft.inventory.IInventory; diff --git a/src/api/java/appeng/api/storage/ICellInventoryHandler.java b/src/api/java/appeng/api/storage/ICellInventoryHandler.java index b7e0d610..752e6e65 100644 --- a/src/api/java/appeng/api/storage/ICellInventoryHandler.java +++ b/src/api/java/appeng/api/storage/ICellInventoryHandler.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.storage; import appeng.api.config.IncludeExclude; diff --git a/src/api/java/appeng/api/storage/ICellProvider.java b/src/api/java/appeng/api/storage/ICellProvider.java index 643439d6..33430d7e 100644 --- a/src/api/java/appeng/api/storage/ICellProvider.java +++ b/src/api/java/appeng/api/storage/ICellProvider.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.storage; import java.util.List; diff --git a/src/api/java/appeng/api/storage/ICellRegistry.java b/src/api/java/appeng/api/storage/ICellRegistry.java index 4e983102..12da94a2 100644 --- a/src/api/java/appeng/api/storage/ICellRegistry.java +++ b/src/api/java/appeng/api/storage/ICellRegistry.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.storage; import net.minecraft.item.ItemStack; diff --git a/src/api/java/appeng/api/storage/ICellWorkbenchItem.java b/src/api/java/appeng/api/storage/ICellWorkbenchItem.java index e4fab828..28d73b74 100644 --- a/src/api/java/appeng/api/storage/ICellWorkbenchItem.java +++ b/src/api/java/appeng/api/storage/ICellWorkbenchItem.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.storage; import net.minecraft.inventory.IInventory; diff --git a/src/api/java/appeng/api/storage/IExternalStorageHandler.java b/src/api/java/appeng/api/storage/IExternalStorageHandler.java index a17cdd6f..0d4b5ee6 100644 --- a/src/api/java/appeng/api/storage/IExternalStorageHandler.java +++ b/src/api/java/appeng/api/storage/IExternalStorageHandler.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.storage; import net.minecraft.tileentity.TileEntity; diff --git a/src/api/java/appeng/api/storage/IExternalStorageRegistry.java b/src/api/java/appeng/api/storage/IExternalStorageRegistry.java index 7edbc8b9..af07e0b4 100644 --- a/src/api/java/appeng/api/storage/IExternalStorageRegistry.java +++ b/src/api/java/appeng/api/storage/IExternalStorageRegistry.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.storage; import net.minecraft.tileentity.TileEntity; diff --git a/src/api/java/appeng/api/storage/IMEInventory.java b/src/api/java/appeng/api/storage/IMEInventory.java index d51be9fa..3c2a75c5 100644 --- a/src/api/java/appeng/api/storage/IMEInventory.java +++ b/src/api/java/appeng/api/storage/IMEInventory.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.storage; import appeng.api.config.Actionable; diff --git a/src/api/java/appeng/api/storage/IMEInventoryHandler.java b/src/api/java/appeng/api/storage/IMEInventoryHandler.java index a93d8b86..d05e1a81 100644 --- a/src/api/java/appeng/api/storage/IMEInventoryHandler.java +++ b/src/api/java/appeng/api/storage/IMEInventoryHandler.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.storage; import appeng.api.config.AccessRestriction; diff --git a/src/api/java/appeng/api/storage/IMEMonitor.java b/src/api/java/appeng/api/storage/IMEMonitor.java index 439bb00e..167a6732 100644 --- a/src/api/java/appeng/api/storage/IMEMonitor.java +++ b/src/api/java/appeng/api/storage/IMEMonitor.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.storage; import appeng.api.networking.storage.IBaseMonitor; diff --git a/src/api/java/appeng/api/storage/IMEMonitorHandlerReceiver.java b/src/api/java/appeng/api/storage/IMEMonitorHandlerReceiver.java index f0f50d97..4b322961 100644 --- a/src/api/java/appeng/api/storage/IMEMonitorHandlerReceiver.java +++ b/src/api/java/appeng/api/storage/IMEMonitorHandlerReceiver.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.storage; import appeng.api.networking.security.BaseActionSource; diff --git a/src/api/java/appeng/api/storage/ISaveProvider.java b/src/api/java/appeng/api/storage/ISaveProvider.java index a88bfc5b..2d92859f 100644 --- a/src/api/java/appeng/api/storage/ISaveProvider.java +++ b/src/api/java/appeng/api/storage/ISaveProvider.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.storage; diff --git a/src/api/java/appeng/api/storage/IStorageHelper.java b/src/api/java/appeng/api/storage/IStorageHelper.java index 3f3ceb7e..527dec0c 100644 --- a/src/api/java/appeng/api/storage/IStorageHelper.java +++ b/src/api/java/appeng/api/storage/IStorageHelper.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.storage; import appeng.api.networking.crafting.ICraftingLink; @@ -29,7 +52,7 @@ public interface IStorageHelper * @param is * An ItemStack * - * @return a new instance of {@link IAEItemStack} from a MC {@link ItemStack} + * @return a new INSTANCE of {@link IAEItemStack} from a MC {@link ItemStack} */ IAEItemStack createItemStack(ItemStack is); @@ -37,17 +60,17 @@ public interface IStorageHelper * @param is * A FluidStack * - * @return a new instance of {@link IAEFluidStack} from a Forge {@link FluidStack} + * @return a new INSTANCE of {@link IAEFluidStack} from a Forge {@link FluidStack} */ IAEFluidStack createFluidStack(FluidStack is); /** - * @return a new instance of {@link IItemList} for items + * @return a new INSTANCE of {@link IItemList} for items */ IItemList createItemList(); /** - * @return a new instance of {@link IItemList} for fluids + * @return a new INSTANCE of {@link IItemList} for fluids */ IItemList createFluidList(); diff --git a/src/api/java/appeng/api/storage/IStorageMonitorable.java b/src/api/java/appeng/api/storage/IStorageMonitorable.java index ea7293a8..cf0650c1 100644 --- a/src/api/java/appeng/api/storage/IStorageMonitorable.java +++ b/src/api/java/appeng/api/storage/IStorageMonitorable.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.storage; import appeng.api.implementations.tiles.ITileStorageMonitorable; diff --git a/src/api/java/appeng/api/storage/ITerminalHost.java b/src/api/java/appeng/api/storage/ITerminalHost.java index 70f76bd0..88207826 100644 --- a/src/api/java/appeng/api/storage/ITerminalHost.java +++ b/src/api/java/appeng/api/storage/ITerminalHost.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.storage; import appeng.api.util.IConfigurableObject; diff --git a/src/api/java/appeng/api/storage/MEMonitorHandler.java b/src/api/java/appeng/api/storage/MEMonitorHandler.java index 0af84ecc..425634a5 100644 --- a/src/api/java/appeng/api/storage/MEMonitorHandler.java +++ b/src/api/java/appeng/api/storage/MEMonitorHandler.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.storage; import appeng.api.config.AccessRestriction; @@ -28,23 +51,23 @@ public class MEMonitorHandler implements IMEMonitor< protected IMEInventoryHandler getHandler() { - return internalHandler; + return this.internalHandler; } protected Iterator, Object>> getListeners() { - return listeners.entrySet().iterator(); + return this.listeners.entrySet().iterator(); } protected void postChangesToListeners( Iterable changes, BaseActionSource src) { - notifyListenersOfChange( changes, src ); + this.notifyListenersOfChange( changes, src ); } protected void notifyListenersOfChange(Iterable diff, BaseActionSource src) { - hasChanged = true;// need to update the cache. - Iterator, Object>> i = getListeners(); + this.hasChanged = true;// need to update the cache. + Iterator, Object>> i = this.getListeners(); while (i.hasNext()) { Entry, Object> o = i.next(); @@ -66,108 +89,108 @@ public class MEMonitorHandler implements IMEMonitor< diff.decStackSize( leftOvers.getStackSize() ); if ( diff.getStackSize() != 0 ) - postChangesToListeners( ImmutableList.of( diff ), src ); + this.postChangesToListeners( ImmutableList.of( diff ), src ); return leftOvers; } public MEMonitorHandler(IMEInventoryHandler t) { - internalHandler = t; - cachedList = (IItemList) t.getChannel().createList(); + this.internalHandler = t; + this.cachedList = (IItemList) t.getChannel().createList(); } public MEMonitorHandler(IMEInventoryHandler t, StorageChannel chan) { - internalHandler = t; - cachedList = (IItemList) chan.createList(); + this.internalHandler = t; + this.cachedList = (IItemList) chan.createList(); } @Override public void addListener(IMEMonitorHandlerReceiver l, Object verificationToken) { - listeners.put( l, verificationToken ); + this.listeners.put( l, verificationToken ); } @Override public void removeListener(IMEMonitorHandlerReceiver l) { - listeners.remove( l ); + this.listeners.remove( l ); } @Override public StackType injectItems(StackType input, Actionable mode, BaseActionSource src) { if ( mode == Actionable.SIMULATE ) - return getHandler().injectItems( input, mode, src ); - return monitorDifference(input.copy(), getHandler().injectItems(input, mode, src), false, src); + return this.getHandler().injectItems( input, mode, src ); + return this.monitorDifference(input.copy(), this.getHandler().injectItems(input, mode, src), false, src); } @Override public StackType extractItems(StackType request, Actionable mode, BaseActionSource src) { if ( mode == Actionable.SIMULATE ) - return getHandler().extractItems( request, mode, src ); - return monitorDifference(request.copy(), getHandler().extractItems(request, mode, src), true, src); + return this.getHandler().extractItems( request, mode, src ); + return this.monitorDifference(request.copy(), this.getHandler().extractItems(request, mode, src), true, src); } @Override public IItemList getStorageList() { - if ( hasChanged ) + if ( this.hasChanged ) { - hasChanged = false; - cachedList.resetStatus(); - return getAvailableItems( cachedList ); + this.hasChanged = false; + this.cachedList.resetStatus(); + return this.getAvailableItems( this.cachedList ); } - return cachedList; + return this.cachedList; } @Override public IItemList getAvailableItems(IItemList out) { - return getHandler().getAvailableItems( out ); + return this.getHandler().getAvailableItems( out ); } @Override public StorageChannel getChannel() { - return getHandler().getChannel(); + return this.getHandler().getChannel(); } @Override public AccessRestriction getAccess() { - return getHandler().getAccess(); + return this.getHandler().getAccess(); } @Override public boolean isPrioritized(StackType input) { - return getHandler().isPrioritized( input ); + return this.getHandler().isPrioritized( input ); } @Override public boolean canAccept(StackType input) { - return getHandler().canAccept( input ); + return this.getHandler().canAccept( input ); } @Override public int getPriority() { - return getHandler().getPriority(); + return this.getHandler().getPriority(); } @Override public int getSlot() { - return getHandler().getSlot(); + return this.getHandler().getSlot(); } @Override public boolean validForPass(int i) { - return getHandler().validForPass( i ); + return this.getHandler().validForPass( i ); } } diff --git a/src/api/java/appeng/api/storage/StorageChannel.java b/src/api/java/appeng/api/storage/StorageChannel.java index 1ada1509..bba039b4 100644 --- a/src/api/java/appeng/api/storage/StorageChannel.java +++ b/src/api/java/appeng/api/storage/StorageChannel.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.storage; import appeng.api.AEApi; @@ -21,7 +44,7 @@ public enum StorageChannel public final Class type; private StorageChannel( Class t ) { - type = t; + this.type = t; } public IItemList createList() { diff --git a/src/api/java/appeng/api/storage/data/IAEFluidStack.java b/src/api/java/appeng/api/storage/data/IAEFluidStack.java index 9a1ad283..ea6faefd 100644 --- a/src/api/java/appeng/api/storage/data/IAEFluidStack.java +++ b/src/api/java/appeng/api/storage/data/IAEFluidStack.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.storage.data; import net.minecraftforge.fluids.Fluid; diff --git a/src/api/java/appeng/api/storage/data/IAEItemStack.java b/src/api/java/appeng/api/storage/data/IAEItemStack.java index 26cbbb58..c585da23 100644 --- a/src/api/java/appeng/api/storage/data/IAEItemStack.java +++ b/src/api/java/appeng/api/storage/data/IAEItemStack.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.storage.data; import net.minecraft.item.Item; diff --git a/src/api/java/appeng/api/storage/data/IAEStack.java b/src/api/java/appeng/api/storage/data/IAEStack.java index 64a5963c..aefbe729 100644 --- a/src/api/java/appeng/api/storage/data/IAEStack.java +++ b/src/api/java/appeng/api/storage/data/IAEStack.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.storage.data; import appeng.api.config.FuzzyMode; diff --git a/src/api/java/appeng/api/storage/data/IAETagCompound.java b/src/api/java/appeng/api/storage/data/IAETagCompound.java index ef283978..9b0928e5 100644 --- a/src/api/java/appeng/api/storage/data/IAETagCompound.java +++ b/src/api/java/appeng/api/storage/data/IAETagCompound.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.storage.data; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/api/java/appeng/api/storage/data/IItemContainer.java b/src/api/java/appeng/api/storage/data/IItemContainer.java index fb12493d..9e67bdc1 100644 --- a/src/api/java/appeng/api/storage/data/IItemContainer.java +++ b/src/api/java/appeng/api/storage/data/IItemContainer.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.storage.data; import appeng.api.config.FuzzyMode; diff --git a/src/api/java/appeng/api/storage/data/IItemList.java b/src/api/java/appeng/api/storage/data/IItemList.java index d8f06d11..e339d2b3 100644 --- a/src/api/java/appeng/api/storage/data/IItemList.java +++ b/src/api/java/appeng/api/storage/data/IItemList.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.storage.data; import java.util.Iterator; diff --git a/src/api/java/appeng/api/util/AECableType.java b/src/api/java/appeng/api/util/AECableType.java index c1ee4eed..92e40234 100644 --- a/src/api/java/appeng/api/util/AECableType.java +++ b/src/api/java/appeng/api/util/AECableType.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.util; public enum AECableType diff --git a/src/api/java/appeng/api/util/AEColor.java b/src/api/java/appeng/api/util/AEColor.java index 83a45894..b9675738 100644 --- a/src/api/java/appeng/api/util/AEColor.java +++ b/src/api/java/appeng/api/util/AEColor.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.util; import net.minecraft.util.StatCollector; @@ -66,9 +89,9 @@ public enum AEColor AEColor(String unlocalizedName, int blackHex, int medHex, int whiteHex) { this.unlocalizedName = unlocalizedName; - blackVariant = blackHex; - mediumVariant = medHex; - whiteVariant = whiteHex; + this.blackVariant = blackHex; + this.mediumVariant = medHex; + this.whiteVariant = whiteHex; } /** @@ -76,13 +99,13 @@ public enum AEColor */ public boolean matches(AEColor color) { - return equals(Transparent) || color.equals(Transparent) || equals(color); + return this == Transparent || color == Transparent || this == color; } @Override public String toString() { - return StatCollector.translateToLocal( unlocalizedName ); + return StatCollector.translateToLocal( this.unlocalizedName ); } } diff --git a/src/api/java/appeng/api/util/AEColoredItemDefinition.java b/src/api/java/appeng/api/util/AEColoredItemDefinition.java index 75a56f5e..97a25062 100644 --- a/src/api/java/appeng/api/util/AEColoredItemDefinition.java +++ b/src/api/java/appeng/api/util/AEColoredItemDefinition.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.util; import net.minecraft.block.Block; diff --git a/src/api/java/appeng/api/util/AEItemDefinition.java b/src/api/java/appeng/api/util/AEItemDefinition.java index 9fdd987c..c455097d 100644 --- a/src/api/java/appeng/api/util/AEItemDefinition.java +++ b/src/api/java/appeng/api/util/AEItemDefinition.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.util; import net.minecraft.block.Block; diff --git a/src/api/java/appeng/api/util/DimensionalCoord.java b/src/api/java/appeng/api/util/DimensionalCoord.java index 2f528a0a..7e35bb55 100644 --- a/src/api/java/appeng/api/util/DimensionalCoord.java +++ b/src/api/java/appeng/api/util/DimensionalCoord.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.util; import net.minecraft.tileentity.TileEntity; @@ -14,20 +37,20 @@ public class DimensionalCoord extends WorldCoord public DimensionalCoord(DimensionalCoord s) { super( s.x, s.y, s.z ); - w = s.w; - dimId = s.dimId; + this.w = s.w; + this.dimId = s.dimId; } public DimensionalCoord(TileEntity s) { super( s ); - w = s.getWorldObj(); - dimId = w.provider.dimensionId; + this.w = s.getWorldObj(); + this.dimId = this.w.provider.dimensionId; } public DimensionalCoord(World _w, int _x, int _y, int _z) { super( _x, _y, _z ); - w = _w; - dimId = _w.provider.dimensionId; + this.w = _w; + this.dimId = _w.provider.dimensionId; } @Override @@ -38,34 +61,34 @@ public class DimensionalCoord extends WorldCoord public boolean isEqual(DimensionalCoord c) { - return x == c.x && y == c.y && z == c.z && c.w == this.w; + return this.x == c.x && this.y == c.y && this.z == c.z && c.w == this.w; } @Override public boolean equals(Object obj) { - return obj instanceof DimensionalCoord && isEqual((DimensionalCoord) obj); + return obj instanceof DimensionalCoord && this.isEqual((DimensionalCoord) obj); } @Override public int hashCode() { - return super.hashCode() ^ dimId; + return super.hashCode() ^ this.dimId; } public boolean isInWorld(World world) { - return w == world; + return this.w == world; } @Override public String toString() { - return dimId + "," + super.toString(); + return this.dimId + "," + super.toString(); } public World getWorld() { - return w; + return this.w; } } diff --git a/src/api/java/appeng/api/util/ICommonTile.java b/src/api/java/appeng/api/util/ICommonTile.java index 2f8b3881..2cdb1032 100644 --- a/src/api/java/appeng/api/util/ICommonTile.java +++ b/src/api/java/appeng/api/util/ICommonTile.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.util; import net.minecraft.item.ItemStack; diff --git a/src/api/java/appeng/api/util/IConfigManager.java b/src/api/java/appeng/api/util/IConfigManager.java index d383f981..80b60342 100644 --- a/src/api/java/appeng/api/util/IConfigManager.java +++ b/src/api/java/appeng/api/util/IConfigManager.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.util; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/api/java/appeng/api/util/IConfigurableObject.java b/src/api/java/appeng/api/util/IConfigurableObject.java index 6a3ef669..80c6a0d2 100644 --- a/src/api/java/appeng/api/util/IConfigurableObject.java +++ b/src/api/java/appeng/api/util/IConfigurableObject.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.util; /** diff --git a/src/api/java/appeng/api/util/INetworkToolAgent.java b/src/api/java/appeng/api/util/INetworkToolAgent.java index c2e511be..6ec4605b 100644 --- a/src/api/java/appeng/api/util/INetworkToolAgent.java +++ b/src/api/java/appeng/api/util/INetworkToolAgent.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.util; import net.minecraft.util.MovingObjectPosition; diff --git a/src/api/java/appeng/api/util/IOrientable.java b/src/api/java/appeng/api/util/IOrientable.java index 8574a43a..4654a0b0 100644 --- a/src/api/java/appeng/api/util/IOrientable.java +++ b/src/api/java/appeng/api/util/IOrientable.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.util; import net.minecraftforge.common.util.ForgeDirection; diff --git a/src/api/java/appeng/api/util/IOrientableBlock.java b/src/api/java/appeng/api/util/IOrientableBlock.java index 84be3fc4..eefe2413 100644 --- a/src/api/java/appeng/api/util/IOrientableBlock.java +++ b/src/api/java/appeng/api/util/IOrientableBlock.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.util; import net.minecraft.world.IBlockAccess; diff --git a/src/api/java/appeng/api/util/IReadOnlyCollection.java b/src/api/java/appeng/api/util/IReadOnlyCollection.java index ab087ca7..a6fba46d 100644 --- a/src/api/java/appeng/api/util/IReadOnlyCollection.java +++ b/src/api/java/appeng/api/util/IReadOnlyCollection.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.util; public interface IReadOnlyCollection extends Iterable diff --git a/src/api/java/appeng/api/util/WorldCoord.java b/src/api/java/appeng/api/util/WorldCoord.java index e09f01ce..e495ca4a 100644 --- a/src/api/java/appeng/api/util/WorldCoord.java +++ b/src/api/java/appeng/api/util/WorldCoord.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.util; import net.minecraft.tileentity.TileEntity; @@ -16,56 +39,56 @@ public class WorldCoord public WorldCoord add(ForgeDirection direction, int length) { - x += direction.offsetX * length; - y += direction.offsetY * length; - z += direction.offsetZ * length; + this.x += direction.offsetX * length; + this.y += direction.offsetY * length; + this.z += direction.offsetZ * length; return this; } public WorldCoord subtract(ForgeDirection direction, int length) { - x -= direction.offsetX * length; - y -= direction.offsetY * length; - z -= direction.offsetZ * length; + this.x -= direction.offsetX * length; + this.y -= direction.offsetY * length; + this.z -= direction.offsetZ * length; return this; } public WorldCoord add(int _x, int _y, int _z) { - x += _x; - y += _y; - z += _z; + this.x += _x; + this.y += _y; + this.z += _z; return this; } public WorldCoord subtract(int _x, int _y, int _z) { - x -= _x; - y -= _y; - z -= _z; + this.x -= _x; + this.y -= _y; + this.z -= _z; return this; } public WorldCoord multiple(int _x, int _y, int _z) { - x *= _x; - y *= _y; - z *= _z; + this.x *= _x; + this.y *= _y; + this.z *= _z; return this; } public WorldCoord divide(int _x, int _y, int _z) { - x /= _x; - y /= _y; - z /= _z; + this.x /= _x; + this.y /= _y; + this.z /= _z; return this; } public WorldCoord(int _x, int _y, int _z) { - x = _x; - y = _y; - z = _z; + this.x = _x; + this.y = _y; + this.z = _z; } public WorldCoord(TileEntity s) { @@ -77,9 +100,9 @@ public class WorldCoord */ public ForgeDirection directionTo(WorldCoord loc) { - int ox = x - loc.x; - int oy = y - loc.y; - int oz = z - loc.z; + int ox = this.x - loc.x; + int oy = this.y - loc.y; + int oz = this.z - loc.z; int xlen = Math.abs( ox ); int ylen = Math.abs( oy ); @@ -108,29 +131,29 @@ public class WorldCoord public boolean isEqual(WorldCoord c) { - return x == c.x && y == c.y && z == c.z; + return this.x == c.x && this.y == c.y && this.z == c.z; } public WorldCoord copy() { - return new WorldCoord( x, y, z ); + return new WorldCoord( this.x, this.y, this.z ); } @Override public boolean equals(Object obj) { - return obj instanceof WorldCoord && isEqual((WorldCoord) obj); + return obj instanceof WorldCoord && this.isEqual((WorldCoord) obj); } @Override public String toString() { - return "" + x + "," + y + "," + z; + return "" + this.x + "," + this.y + "," + this.z; } @Override public int hashCode() { - return (y << 24) ^ x ^ z; + return ( this.y << 24) ^ this.x ^ this.z; } } diff --git a/src/api/java/thaumcraft/api/crafting/IInfusionStabiliser.java b/src/api/java/thaumcraft/api/crafting/IInfusionStabiliser.java new file mode 100644 index 00000000..d137ff24 --- /dev/null +++ b/src/api/java/thaumcraft/api/crafting/IInfusionStabiliser.java @@ -0,0 +1,19 @@ +package thaumcraft.api.crafting; + +import net.minecraft.world.World; + +/** + * + * @author Azanor + * + * Blocks that implement this interface act as infusion crafting stabilisers like candles and skulls + * + */ +public interface IInfusionStabiliser { + + /** + * returns true if the block can stabilise things + */ + public boolean canStabaliseInfusion(World world, int x, int y, int z); + +} diff --git a/src/main/java/crazypants/.gitignore b/src/main/java/crazypants/.gitignore new file mode 100644 index 00000000..d6306fb6 --- /dev/null +++ b/src/main/java/crazypants/.gitignore @@ -0,0 +1 @@ +/Crap.java diff --git a/src/main/java/crazypants/Crap.java b/src/main/java/crazypants/Crap.java deleted file mode 100644 index b6e5d3de..00000000 --- a/src/main/java/crazypants/Crap.java +++ /dev/null @@ -1,19 +0,0 @@ -package crazypants; - -import java.io.BufferedReader; -import java.io.FileReader; - -public class Crap { - - public static void main(String[] args) throws Exception { - BufferedReader br = new BufferedReader(new FileReader("C:\\MyData\\Dev\\Minecraft\\Workspace17\\PamsSeeds.txt")); - String line = br.readLine(); - System.out.println("private static final String[] PAMS_SEEDS = new String[] {"); - while(line != null) { - System.out.println("\"" + line.trim() + "\","); - line = br.readLine(); - } - System.out.println("};"); - } - -} diff --git a/src/main/java/crazypants/enderio/BlockEio.java b/src/main/java/crazypants/enderio/BlockEio.java index 32337b31..546f4de2 100644 --- a/src/main/java/crazypants/enderio/BlockEio.java +++ b/src/main/java/crazypants/enderio/BlockEio.java @@ -1,14 +1,24 @@ package crazypants.enderio; +import java.util.ArrayList; + +import javax.annotation.Nullable; + import net.minecraft.block.Block; import net.minecraft.block.material.MapColor; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; +import net.minecraftforge.common.util.ForgeDirection; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import crazypants.enderio.api.tool.ITool; +import crazypants.enderio.machine.AbstractMachineEntity; +import crazypants.enderio.tool.ToolUtil; public abstract class BlockEio extends Block { @@ -60,4 +70,80 @@ public abstract class BlockEio extends Block { blockIcon = iIconRegister.registerIcon("enderio:" + name); } + @Override + public ArrayList getDrops(World world, int x, int y, int z, int metadata, int fortune) { + return doNormalDrops(world, x, y, z) ? super.getDrops(world, x, y, z, metadata, fortune) : new ArrayList(); + } + + /* Subclass Helpers */ + + @Override + public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer entityPlayer, int side, float par7, float par8, float par9) { + + if(shouldWrench(world, x, y, z, entityPlayer, side) && ToolUtil.breakBlockWithTool(this, world, x, y, z, entityPlayer)) { + return true; + } + + ITool tool = ToolUtil.getEquippedTool(entityPlayer); + if(tool != null && !entityPlayer.isSneaking()) { + TileEntity te = world.getTileEntity(x, y, z); + if(te instanceof AbstractMachineEntity) { + ((AbstractMachineEntity) te).toggleIoModeForFace(ForgeDirection.getOrientation(side)); + world.markBlockForUpdate(x, y, z); + return true; + } + } + + if(entityPlayer.isSneaking()) { + return false; + } + + return openGui(world, x, y, z, entityPlayer, side); + } + + protected boolean shouldWrench(World world, int x, int y, int z, EntityPlayer entityPlayer, int side) { + return true; + } + + protected boolean openGui(World world, int x, int y, int z, EntityPlayer entityPlayer, int side) { + return false; + } + + public boolean doNormalDrops(World world, int x, int y, int z) { + return true; + } + + @Override + public boolean removedByPlayer(World world, EntityPlayer player, int x, int y, int z, boolean doHarvest) { + TileEntity te = world.getTileEntity(x, y, z); + if(te instanceof TileEntityEio && ((TileEntityEio) te).shouldDrop()) { + if(!world.isRemote && !player.capabilities.isCreativeMode && !doNormalDrops(world, x, y, z)) { + dropAsItem(world, x, y, z, (TileEntityEio) te); + ((TileEntityEio) te).preventDrops(); + } else if(player.capabilities.isCreativeMode) { + ((TileEntityEio) te).preventDrops(); + } + } + return super.removedByPlayer(world, player, x, y, z, false); + } + + @Override + public void breakBlock(World world, int x, int y, int z, Block block, int meta) { + TileEntity te = world.getTileEntity(x, y, z); + if(te instanceof TileEntityEio && ((TileEntityEio) te).shouldDrop() && !doNormalDrops(world, x, y, z)) { + dropAsItem(world, x, y, z, (TileEntityEio) te); + ((TileEntityEio)te).preventDrops(); + } + super.breakBlock(world, x, y, z, block, meta); + } + + public void dropAsItem(World world, int x, int y, int z, TileEntityEio te) { + int meta = damageDropped(world.getBlockMetadata(x, y, z)); + ItemStack itemStack = new ItemStack(this, 1, meta); + processDrop(world, x, y, z, te, itemStack); + dropBlockAsItem(world, x, y, z, itemStack); + } + + protected void processDrop(World world, int x, int y, int z, @Nullable TileEntityEio te, ItemStack drop) { + } } diff --git a/src/main/java/crazypants/enderio/ClientProxy.java b/src/main/java/crazypants/enderio/ClientProxy.java index 2e1adfc4..af0ae15c 100644 --- a/src/main/java/crazypants/enderio/ClientProxy.java +++ b/src/main/java/crazypants/enderio/ClientProxy.java @@ -383,7 +383,7 @@ public class ClientProxy extends CommonProxy { MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(EnderIO.blockTransceiver), tr); } - new YetaWrenchOverlayRenderer(EnderIO.itemYetaWench); + new YetaWrenchOverlayRenderer(); new ConduitProbeOverlayRenderer(); if(Config.useSneakMouseWheelYetaWrench) { ToolTickHandler th = new ToolTickHandler(); diff --git a/src/main/java/crazypants/enderio/EnderIO.java b/src/main/java/crazypants/enderio/EnderIO.java index 70fa38e2..c824029f 100644 --- a/src/main/java/crazypants/enderio/EnderIO.java +++ b/src/main/java/crazypants/enderio/EnderIO.java @@ -1,12 +1,15 @@ package crazypants.enderio; +import static crazypants.enderio.EnderIO.MODID; +import static crazypants.enderio.EnderIO.MOD_NAME; +import static crazypants.enderio.EnderIO.VERSION; + import java.io.BufferedWriter; import java.io.File; import java.io.FileWriter; import java.lang.reflect.Field; import java.util.List; -import crazypants.enderio.entity.SkeletonHandler; import net.minecraft.block.material.Material; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; @@ -23,11 +26,11 @@ import cpw.mods.fml.common.Mod; import cpw.mods.fml.common.Mod.EventHandler; import cpw.mods.fml.common.Mod.Instance; import cpw.mods.fml.common.SidedProxy; -import cpw.mods.fml.common.event.FMLLoadCompleteEvent; import cpw.mods.fml.common.event.FMLInitializationEvent; import cpw.mods.fml.common.event.FMLInterModComms; import cpw.mods.fml.common.event.FMLInterModComms.IMCEvent; import cpw.mods.fml.common.event.FMLInterModComms.IMCMessage; +import cpw.mods.fml.common.event.FMLLoadCompleteEvent; import cpw.mods.fml.common.event.FMLPostInitializationEvent; import cpw.mods.fml.common.event.FMLPreInitializationEvent; import cpw.mods.fml.common.event.FMLServerStartedEvent; @@ -63,6 +66,7 @@ import crazypants.enderio.enchantment.Enchantments; import crazypants.enderio.enderface.BlockEnderIO; import crazypants.enderio.enderface.EnderfaceRecipes; import crazypants.enderio.enderface.ItemEnderface; +import crazypants.enderio.entity.SkeletonHandler; import crazypants.enderio.fluid.BlockFluidEio; import crazypants.enderio.fluid.FluidFuelRegister; import crazypants.enderio.fluid.Fluids; @@ -150,11 +154,8 @@ import crazypants.enderio.teleport.ItemTravelStaff; import crazypants.enderio.teleport.TeleportRecipes; import crazypants.enderio.teleport.TravelController; import crazypants.util.EntityUtil; -import static crazypants.enderio.EnderIO.MODID; -import static crazypants.enderio.EnderIO.MOD_NAME; -import static crazypants.enderio.EnderIO.VERSION; -@Mod(modid = MODID, name = MOD_NAME, version = VERSION, dependencies = "required-after:Forge@10.13.0.1150,);after:MineFactoryReloaded", guiFactory = "crazypants.enderio.config.ConfigFactoryEIO") +@Mod(modid = MODID, name = MOD_NAME, version = VERSION, dependencies = "required-after:Forge@10.13.0.1150,);after:MineFactoryReloaded;after:Waila@[1.5.8,)", guiFactory = "crazypants.enderio.config.ConfigFactoryEIO") public class EnderIO { public static final String MODID = "EnderIO"; @@ -629,6 +630,7 @@ public class EnderIO { return Config.xpJuiceName; } + @SuppressWarnings("unchecked") private void addModIntegration() { if(Loader.isModLoaded("TConstruct")) { diff --git a/src/main/java/crazypants/enderio/Log.java b/src/main/java/crazypants/enderio/Log.java index 347be541..7fa9bd1d 100644 --- a/src/main/java/crazypants/enderio/Log.java +++ b/src/main/java/crazypants/enderio/Log.java @@ -1,26 +1,27 @@ package crazypants.enderio; -import cpw.mods.fml.common.FMLLog; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; public final class Log { - public static final String CHANNEL = EnderIO.MODID; + public static final Logger LOGGER = LogManager.getLogger(EnderIO.MODID); public static void warn(String msg) { - FMLLog.log(CHANNEL, org.apache.logging.log4j.Level.WARN, msg, (Object[])null); + LOGGER.warn(msg); } public static void error(String msg) { - FMLLog.log(CHANNEL, org.apache.logging.log4j.Level.ERROR, msg); + LOGGER.error(msg); } public static void info(String msg) { - FMLLog.log(CHANNEL, org.apache.logging.log4j.Level.INFO, msg); + LOGGER.info(msg); } public static void debug(String msg) { - FMLLog.log(CHANNEL, org.apache.logging.log4j.Level.DEBUG, msg); + LOGGER.debug(msg); } private Log() { diff --git a/src/main/java/crazypants/enderio/TileEntityEio.java b/src/main/java/crazypants/enderio/TileEntityEio.java index 0475ba6c..dd8e83ff 100644 --- a/src/main/java/crazypants/enderio/TileEntityEio.java +++ b/src/main/java/crazypants/enderio/TileEntityEio.java @@ -11,6 +11,8 @@ import net.minecraft.tileentity.TileEntity; */ public abstract class TileEntityEio extends TileEntity { + private boolean shouldDrop = true; + @Override public final void readFromNBT(NBTTagCompound root) { super.readFromNBT(root); @@ -48,4 +50,12 @@ public abstract class TileEntityEio extends TileEntity { protected boolean isPoweredRedstone() { return worldObj.getStrongestIndirectPower(xCoord, yCoord, zCoord) > 0; } + + public void preventDrops() { + shouldDrop = false; + } + + public boolean shouldDrop() { + return shouldDrop; + } } diff --git a/src/main/java/crazypants/enderio/api/tool/IConduitControl.java b/src/main/java/crazypants/enderio/api/tool/IConduitControl.java new file mode 100644 index 00000000..fbbb8a09 --- /dev/null +++ b/src/main/java/crazypants/enderio/api/tool/IConduitControl.java @@ -0,0 +1,23 @@ +package crazypants.enderio.api.tool; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; + +/** + * Interface for items which support the overlay and conduit view modes + */ +public interface IConduitControl extends IHideFacades { + + /** + * Controls whether the overlay is shown and the player can change the display + * mode. + * + * @param stack + * The itemstack + * @param player + * The player holding the itemstack + * @return True if the overlay should be rendered and the player should be + * able to change modes. False otherwise. + */ + boolean showOverlay(ItemStack stack, EntityPlayer player); +} diff --git a/src/main/java/crazypants/enderio/api/tool/IHideFacades.java b/src/main/java/crazypants/enderio/api/tool/IHideFacades.java new file mode 100644 index 00000000..8641c53d --- /dev/null +++ b/src/main/java/crazypants/enderio/api/tool/IHideFacades.java @@ -0,0 +1,10 @@ +package crazypants.enderio.api.tool; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; + +public interface IHideFacades { + + boolean shouldHideFacades(ItemStack stack, EntityPlayer player); + +} diff --git a/src/main/java/crazypants/enderio/api/tool/ITool.java b/src/main/java/crazypants/enderio/api/tool/ITool.java index 79fe5684..084551c5 100644 --- a/src/main/java/crazypants/enderio/api/tool/ITool.java +++ b/src/main/java/crazypants/enderio/api/tool/ITool.java @@ -4,12 +4,10 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -public interface ITool { +public interface ITool extends IHideFacades { boolean canUse(ItemStack stack, EntityPlayer player, int x, int y, int z); void used(ItemStack stack, EntityPlayer player, int x, int y, int z); - - boolean shouldHideFacades(ItemStack stack, EntityPlayer player); } diff --git a/src/main/java/crazypants/enderio/block/BlockDarkSteelLadder.java b/src/main/java/crazypants/enderio/block/BlockDarkSteelLadder.java index 066e0cd6..e1c3d790 100644 --- a/src/main/java/crazypants/enderio/block/BlockDarkSteelLadder.java +++ b/src/main/java/crazypants/enderio/block/BlockDarkSteelLadder.java @@ -5,8 +5,8 @@ import net.minecraft.block.BlockLadder; import net.minecraft.block.material.Material; import net.minecraft.entity.Entity; import net.minecraft.item.ItemStack; +import net.minecraft.util.MathHelper; import net.minecraft.world.World; -import codechicken.lib.math.MathHelper; import cpw.mods.fml.common.registry.GameRegistry; import crazypants.enderio.EnderIO; import crazypants.enderio.EnderIOTab; diff --git a/src/main/java/crazypants/enderio/block/BlockReinforcedObsidian.java b/src/main/java/crazypants/enderio/block/BlockReinforcedObsidian.java index a6d984d3..5db0d574 100644 --- a/src/main/java/crazypants/enderio/block/BlockReinforcedObsidian.java +++ b/src/main/java/crazypants/enderio/block/BlockReinforcedObsidian.java @@ -57,6 +57,11 @@ public class BlockReinforcedObsidian extends BlockEio implements IResourceToolti public String getUnlocalizedNameForTooltip(ItemStack itemStack) { return getUnlocalizedName(); } + + @Override + protected boolean shouldWrench(World world, int x, int y, int z, EntityPlayer entityPlayer, int side) { + return false; + } @Override public void getWailaInfo(List tooltip, EntityPlayer player, World world, int x, int y, int z) {} diff --git a/src/main/java/crazypants/enderio/conduit/AbstractConduit.java b/src/main/java/crazypants/enderio/conduit/AbstractConduit.java index 4d0ff37a..cd6173e1 100644 --- a/src/main/java/crazypants/enderio/conduit/AbstractConduit.java +++ b/src/main/java/crazypants/enderio/conduit/AbstractConduit.java @@ -4,7 +4,7 @@ import java.util.ArrayList; import java.util.Collection; import java.util.Collections; import java.util.EnumMap; -import java.util.HashSet; +import java.util.EnumSet; import java.util.Iterator; import java.util.List; import java.util.Set; @@ -26,9 +26,9 @@ import crazypants.util.BlockCoord; public abstract class AbstractConduit implements IConduit { - protected final Set conduitConnections = new HashSet(); + protected final Set conduitConnections = EnumSet.noneOf(ForgeDirection.class); - protected final Set externalConnections = new HashSet(); + protected final Set externalConnections = EnumSet.noneOf(ForgeDirection.class); public static final float STUB_WIDTH = 0.2f; @@ -52,8 +52,6 @@ public abstract class AbstractConduit implements IConduit { private boolean dodgyChangeSinceLastCallFlagForBundle = true; - private int lastNumConections = -1; - protected boolean connectionsDirty = true; protected AbstractConduit() { @@ -194,11 +192,7 @@ public abstract class AbstractConduit implements IConduit { if(bundle == null) { return null; } - TileEntity te = bundle.getEntity(); - if(te == null) { - return null; - } - return new BlockCoord(te.xCoord, te.yCoord, te.zCoord); + return bundle.getLocation(); } @Override @@ -225,13 +219,11 @@ public abstract class AbstractConduit implements IConduit { @Override public void conduitConnectionAdded(ForgeDirection fromDirection) { conduitConnections.add(fromDirection); - connectionsChanged(); } @Override public void conduitConnectionRemoved(ForgeDirection fromDirection) { conduitConnections.remove(fromDirection); - connectionsChanged(); } @Override @@ -275,13 +267,11 @@ public abstract class AbstractConduit implements IConduit { @Override public void externalConnectionAdded(ForgeDirection fromDirection) { externalConnections.add(fromDirection); - connectionsChanged(); } @Override public void externalConnectionRemoved(ForgeDirection fromDirection) { externalConnections.remove(fromDirection); - connectionsChanged(); } @Override @@ -428,7 +418,8 @@ public abstract class AbstractConduit implements IConduit { connectionsDirty = false; } - protected void connectionsChanged() { + @Override + public void connectionsChanged() { collidablesDirty = true; clientStateDirty = true; dodgyChangeSinceLastCallFlagForBundle = true; @@ -463,6 +454,7 @@ public abstract class AbstractConduit implements IConduit { if(neighbour != null && neighbour.canConnectToConduit(dir.getOpposite(), this)) { conduitConnections.add(dir); neighbour.conduitConnectionAdded(dir.getOpposite()); + neighbour.connectionsChanged(); } } @@ -485,6 +477,7 @@ public abstract class AbstractConduit implements IConduit { IConduit neighbour = ConduitUtil.getConduit(world, te, dir, getBaseConduitType()); if(neighbour != null) { neighbour.conduitConnectionRemoved(dir.getOpposite()); + neighbour.connectionsChanged(); } } conduitConnections.clear(); @@ -513,7 +506,7 @@ public abstract class AbstractConduit implements IConduit { // Check for changes to external connections, connections to conduits are // handled by the bundle - Set newCons = new HashSet(); + Set newCons = EnumSet.noneOf(ForgeDirection.class); for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { if(!containsConduitConnection(dir) && canConnectToExternal(dir, false)) { newCons.add(dir); @@ -560,8 +553,6 @@ public abstract class AbstractConduit implements IConduit { } List result = new ArrayList(); - CollidableCache cc = CollidableCache.instance; - for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { Collection col = getCollidables(dir); if(col != null) { diff --git a/src/main/java/crazypants/enderio/conduit/AbstractItemConduit.java b/src/main/java/crazypants/enderio/conduit/AbstractItemConduit.java index 186c55ae..e17af5ac 100644 --- a/src/main/java/crazypants/enderio/conduit/AbstractItemConduit.java +++ b/src/main/java/crazypants/enderio/conduit/AbstractItemConduit.java @@ -61,12 +61,10 @@ public abstract class AbstractItemConduit extends Item implements IConduitItem { TileEntity te = world.getTileEntity(placeAt.x, placeAt.y, placeAt.z); if(te instanceof IConduitBundle) { IConduitBundle bundle = (IConduitBundle) te; - if(bundle != null) { - bundle.addConduit(createConduit(stack)); - Block b = EnderIO.blockConduitBundle; - world.playSoundEffect(x + 0.5F, y + 0.5F, z + 0.5F, b.stepSound.getStepResourcePath(), - (b.stepSound.getVolume() + 1.0F) / 2.0F, b.stepSound.getPitch() * 0.8F); - } + bundle.addConduit(createConduit(stack, player)); + Block b = EnderIO.blockConduitBundle; + world.playSoundEffect(x + 0.5F, y + 0.5F, z + 0.5F, b.stepSound.getStepResourcePath(), + (b.stepSound.getVolume() + 1.0F) / 2.0F, b.stepSound.getPitch() * 0.8F); } } } @@ -89,7 +87,7 @@ public abstract class AbstractItemConduit extends Item implements IConduitItem { System.out.println("AbstractItemConduit.onItemUse: Bundle null"); return false; } - IConduit con = createConduit(stack); + IConduit con = createConduit(stack, player); if(con == null) { System.out.println("AbstractItemConduit.onItemUse: Conduit null."); return false; diff --git a/src/main/java/crazypants/enderio/conduit/BlockConduitBundle.java b/src/main/java/crazypants/enderio/conduit/BlockConduitBundle.java index 116c25b3..50e59c50 100644 --- a/src/main/java/crazypants/enderio/conduit/BlockConduitBundle.java +++ b/src/main/java/crazypants/enderio/conduit/BlockConduitBundle.java @@ -36,6 +36,7 @@ import crazypants.enderio.EnderIO; import crazypants.enderio.GuiHandler; import crazypants.enderio.ModObject; import crazypants.enderio.api.tool.ITool; +import crazypants.enderio.conduit.facade.ItemConduitFacade.FacadeType; import crazypants.enderio.conduit.geom.CollidableComponent; import crazypants.enderio.conduit.geom.ConduitConnectorType; import crazypants.enderio.conduit.gui.ExternalConnectionContainer; @@ -64,6 +65,7 @@ import crazypants.util.Util; public class BlockConduitBundle extends BlockEio implements IGuiHandler, IFacade, IRedNetOmniNode { private static final String KEY_CONNECTOR_ICON = "enderIO:conduitConnector"; + private static final String KEY_CONNECTOR_ICON_EXTERNAL = "enderIO:conduitConnectorExternal"; public static BlockConduitBundle create() { @@ -90,7 +92,7 @@ public class BlockConduitBundle extends BlockEio implements IGuiHandler, IFacade public static int rendererId = -1; - private IIcon connectorIcon; + private IIcon connectorIcon, connectorIconExternal; private IIcon lastRemovedComponetIcon = null; @@ -233,14 +235,15 @@ public class BlockConduitBundle extends BlockEio implements IGuiHandler, IFacade return 0; } - public IIcon getConnectorIcon() { - return connectorIcon; + public IIcon getConnectorIcon(Object data) { + return data == ConduitConnectorType.EXTERNAL ? connectorIconExternal : connectorIcon; } @Override @SideOnly(Side.CLIENT) public void registerBlockIcons(IIconRegister IIconRegister) { connectorIcon = IIconRegister.registerIcon(KEY_CONNECTOR_ICON); + connectorIconExternal = IIconRegister.registerIcon(KEY_CONNECTOR_ICON_EXTERNAL); blockIcon = connectorIcon; } @@ -305,11 +308,35 @@ public class BlockConduitBundle extends BlockEio implements IGuiHandler, IFacade } return result; } - + + @Override + public float getBlockHardness(World world, int x, int y, int z) { + IConduitBundle te = (IConduitBundle) world.getTileEntity(x, y, z); + return te != null && te.getFacadeType() == FacadeType.HARDENED ? blockHardness * 10 : blockHardness; + } + + @Override + public float getExplosionResistance(Entity par1Entity, World world, int x, int y, int z, double explosionX, double explosionY, double explosionZ) { + float resist = getExplosionResistance(par1Entity); + IConduitBundle te = (IConduitBundle) world.getTileEntity(x, y, z); + return te != null && te.getFacadeType() == FacadeType.HARDENED ? resist * 10 : resist; + } + @SubscribeEvent public void onBreakSpeed(BreakSpeed event) { - if (event.block == this && event.entityPlayer.getCurrentEquippedItem() == null) { - event.newSpeed *= 3; + if(event.block == this) { + ItemStack held = event.entityPlayer.getCurrentEquippedItem(); + if(held == null || held.getItem().getHarvestLevel(held, "pickaxe") == -1) { + event.newSpeed += 2; + } + IConduitBundle te = (IConduitBundle) event.entity.worldObj.getTileEntity(event.x, event.y, event.z); + if(te != null && te.getFacadeType() == FacadeType.HARDENED) { + if(!ConduitUtil.isSolidFacadeRendered(te, event.entityPlayer)) { + event.newSpeed *= 6; + } else { + event.newSpeed *= 2; + } + } } } @@ -364,11 +391,12 @@ public class BlockConduitBundle extends BlockEio implements IGuiHandler, IFacade List drop = new ArrayList(); if(ConduitUtil.isSolidFacadeRendered(te, player)) { breakBlock = false; - ItemStack fac = new ItemStack(EnderIO.itemConduitFacade, 1, 0); + ItemStack fac = new ItemStack(EnderIO.itemConduitFacade, 1, te.getFacadeType().ordinal()); PainterUtil.setSourceBlock(fac, te.getFacadeId(), te.getFacadeMetadata()); drop.add(fac); te.setFacadeId(null); te.setFacadeMetadata(0); + te.setFacadeType(FacadeType.BASIC); } if(breakBlock) { @@ -591,7 +619,7 @@ public class BlockConduitBundle extends BlockEio implements IGuiHandler, IFacade private boolean handleConduitClick(World world, int x, int y, int z, EntityPlayer player, IConduitBundle bundle, ItemStack stack) { IConduitItem equipped = (IConduitItem) stack.getItem(); if(!bundle.hasType(equipped.getBaseConduitType())) { - bundle.addConduit(equipped.createConduit(stack)); + bundle.addConduit(equipped.createConduit(stack, player)); if(!player.capabilities.isCreativeMode) { world.playSoundEffect(x + 0.5F, y + 0.5F, z + 0.5F, stepSound.getStepResourcePath(), (stepSound.getVolume() + 1.0F) / 2.0F, stepSound.getPitch() * 0.8F); @@ -614,6 +642,7 @@ public class BlockConduitBundle extends BlockEio implements IGuiHandler, IFacade bundle.setFacadeId(PainterUtil.getSourceBlock(player.getCurrentEquippedItem())); bundle.setFacadeMetadata(PainterUtil.getSourceBlockMetadata(player.getCurrentEquippedItem())); + bundle.setFacadeType(FacadeType.values()[player.getCurrentEquippedItem().getItemDamage()]); if(!player.capabilities.isCreativeMode) { stack.stackSize--; } diff --git a/src/main/java/crazypants/enderio/conduit/ConduitDisplayMode.java b/src/main/java/crazypants/enderio/conduit/ConduitDisplayMode.java index d437e3f8..bad968c0 100644 --- a/src/main/java/crazypants/enderio/conduit/ConduitDisplayMode.java +++ b/src/main/java/crazypants/enderio/conduit/ConduitDisplayMode.java @@ -1,8 +1,9 @@ package crazypants.enderio.conduit; import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.MathHelper; -import crazypants.enderio.EnderIO; +import crazypants.enderio.api.tool.IConduitControl; import crazypants.enderio.conduit.gas.GasUtil; import crazypants.enderio.conduit.me.MEUtil; @@ -45,20 +46,31 @@ public enum ConduitDisplayMode { return res; } + private static final String NBT_KEY = "enderio.displaymode"; + public static ConduitDisplayMode getDisplayMode(ItemStack equipped) { - if(equipped == null || equipped.getItem() != EnderIO.itemYetaWench) { + if(equipped == null || !(equipped.getItem() instanceof IConduitControl)) { return ALL; } - int index = equipped.getItemDamage(); + initDisplayModeTag(equipped); + int index = equipped.stackTagCompound.getInteger(NBT_KEY); index = MathHelper.clamp_int(index, 0, ConduitDisplayMode.values().length - 1); return ConduitDisplayMode.values()[index]; } public static void setDisplayMode(ItemStack equipped, ConduitDisplayMode mode) { - if(mode == null || equipped == null) { + if(mode == null || equipped == null || !(equipped.getItem() instanceof IConduitControl)) { return; } - equipped.setItemDamage(mode.ordinal()); + initDisplayModeTag(equipped); + equipped.stackTagCompound.setInteger(NBT_KEY, mode.ordinal()); + } + + private static void initDisplayModeTag(ItemStack stack) { + if (stack.stackTagCompound == null) { + stack.stackTagCompound = new NBTTagCompound(); + stack.stackTagCompound.setInteger(NBT_KEY, ConduitDisplayMode.ALL.ordinal()); + } } public ConduitDisplayMode next() { diff --git a/src/main/java/crazypants/enderio/conduit/ConduitRecipes.java b/src/main/java/crazypants/enderio/conduit/ConduitRecipes.java index e5ec4515..c1fcd73e 100644 --- a/src/main/java/crazypants/enderio/conduit/ConduitRecipes.java +++ b/src/main/java/crazypants/enderio/conduit/ConduitRecipes.java @@ -9,6 +9,7 @@ import appeng.api.AEApi; import cpw.mods.fml.common.Optional.Method; import cpw.mods.fml.common.registry.GameRegistry; import crazypants.enderio.EnderIO; +import crazypants.enderio.conduit.facade.ItemConduitFacade.FacadeType; import crazypants.enderio.conduit.item.filter.ClearFilterRecipe; import crazypants.enderio.conduit.item.filter.CopyFilterRecipe; import crazypants.enderio.conduit.me.MEUtil; @@ -18,7 +19,6 @@ import crazypants.enderio.material.Alloy; import crazypants.enderio.material.BlockFusedQuartz; import crazypants.enderio.material.FrankenSkull; import crazypants.enderio.material.Material; - import static crazypants.enderio.ModObject.*; public class ConduitRecipes { @@ -42,7 +42,8 @@ public class ConduitRecipes { ItemStack zombieController = new ItemStack(EnderIO.itemFrankenSkull, 1, FrankenSkull.ZOMBIE_CONTROLLER.ordinal()); //Recipes - GameRegistry.addShapedRecipe(new ItemStack(EnderIO.itemConduitFacade, 1, 0), "bbb", "b b", "bbb", 'b', conduitBinder); + GameRegistry.addShapedRecipe(new ItemStack(EnderIO.itemConduitFacade, 1, FacadeType.BASIC.ordinal()), "bbb", "b b", "bbb", 'b', conduitBinder); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(EnderIO.itemConduitFacade, 1, FacadeType.HARDENED.ordinal()), " o ", "oFo", " o ", 'F', EnderIO.itemConduitFacade, 'o', "dustObsidian")); int numConduits = Config.numConduitsPerRecipe; GameRegistry.addShapedRecipe(new ItemStack(EnderIO.itemLiquidConduit, numConduits, 0), "bbb", "###", "bbb", 'b', conduitBinder, '#', fusedGlass); @@ -89,7 +90,11 @@ public class ConduitRecipes { ItemStack speedUpgrade = new ItemStack(EnderIO.itemExtractSpeedUpgrade, 1, 0); GameRegistry.addShapedRecipe(speedUpgrade, "iii","epe","ere", 'p', Blocks.piston, 'e', electricalSteel, 'r', Blocks.redstone_torch, 'i', Items.iron_ingot); - + + ItemStack speedDowngrade = new ItemStack(EnderIO.itemExtractSpeedUpgrade, 1, 1); + GameRegistry.addRecipe(new ShapedOreRecipe(speedDowngrade, "iii","ese","ete", 's', "slimeball", 'e', electricalSteel, 't', "stickWood", 'i', Items.iron_ingot)); + GameRegistry.addRecipe(new ShapedOreRecipe(speedDowngrade, "iii","ese","ete", 's', "slimeball", 'e', electricalSteel, 't', "woodStick", 'i', Items.iron_ingot)); + if (MEUtil.isMEEnabled()) { addAeRecipes(); } diff --git a/src/main/java/crazypants/enderio/conduit/ConduitUtil.java b/src/main/java/crazypants/enderio/conduit/ConduitUtil.java index 648f0875..7a9dc356 100644 --- a/src/main/java/crazypants/enderio/conduit/ConduitUtil.java +++ b/src/main/java/crazypants/enderio/conduit/ConduitUtil.java @@ -24,6 +24,8 @@ import cpw.mods.fml.relauncher.SideOnly; import crazypants.enderio.EnderIO; import crazypants.enderio.GuiHandler; import crazypants.enderio.Log; +import crazypants.enderio.api.tool.IConduitControl; +import crazypants.enderio.api.tool.IHideFacades; import crazypants.enderio.conduit.IConduitBundle.FacadeRenderState; import crazypants.enderio.conduit.gas.GasConduitNetwork; import crazypants.enderio.conduit.gas.IGasConduit; @@ -123,6 +125,10 @@ public class ConduitUtil { if(con.getNetwork() != null) { //this should have been destroyed when destroying the neighbours network but lets just make sure con.getNetwork().destroyNetwork(); } + con.connectionsChanged(); + if(neighbour != null) { + neighbour.connectionsChanged(); + } } public static boolean joinConduits(T con, ForgeDirection faceHit) { @@ -137,6 +143,8 @@ public class ConduitUtil { if(neighbour.getNetwork() != null) { neighbour.getNetwork().destroyNetwork(); } + con.connectionsChanged(); + neighbour.connectionsChanged(); return true; } return false; @@ -177,7 +185,7 @@ public class ConduitUtil { } public static boolean isFacadeHidden(IConduitBundle bundle, EntityPlayer player) { - return bundle.getFacadeId() != null && ((ToolUtil.isToolEquipped(player) && (player == null || ToolUtil.getEquippedTool(player).shouldHideFacades(player.getCurrentEquippedItem(), player))) || isConduitEquipped(player) || isProbeEquipped(player)); + return bundle.getFacadeId() != null && shouldHeldItemHideFacades(player); } public static ConduitDisplayMode getDisplayMode(EntityPlayer player) { @@ -190,10 +198,6 @@ public class ConduitUtil { return ConduitDisplayMode.ALL; } - if(equipped.getItem() != EnderIO.itemYetaWench) { - return ConduitDisplayMode.ALL; - } - ConduitDisplayMode result = ConduitDisplayMode.getDisplayMode(equipped); if(result == null) { return ConduitDisplayMode.ALL; @@ -234,6 +238,18 @@ public class ConduitUtil { return true; } + public static boolean shouldHeldItemHideFacades(EntityPlayer player) { + player = player == null ? EnderIO.proxy.getClientPlayer() : player; + if(player == null) { + return false; + } + ItemStack held = player.getCurrentEquippedItem(); + if(held != null && held.getItem() instanceof IHideFacades) { + return ((IHideFacades) held.getItem()).shouldHideFacades(held, player); + } + return ToolUtil.isToolEquipped(player); + } + public static boolean isConduitEquipped(EntityPlayer player) { player = player == null ? EnderIO.proxy.getClientPlayer() : player; if(player == null) { diff --git a/src/main/java/crazypants/enderio/conduit/IConduit.java b/src/main/java/crazypants/enderio/conduit/IConduit.java index 0f24241f..f201de9a 100644 --- a/src/main/java/crazypants/enderio/conduit/IConduit.java +++ b/src/main/java/crazypants/enderio/conduit/IConduit.java @@ -66,6 +66,8 @@ public interface IConduit { void conduitConnectionRemoved(ForgeDirection fromDirection); + void connectionsChanged(); + AbstractConduitNetwork getNetwork(); boolean setNetwork(AbstractConduitNetwork network); diff --git a/src/main/java/crazypants/enderio/conduit/IConduitBundle.java b/src/main/java/crazypants/enderio/conduit/IConduitBundle.java index 755e5ff3..9c77d330 100644 --- a/src/main/java/crazypants/enderio/conduit/IConduitBundle.java +++ b/src/main/java/crazypants/enderio/conduit/IConduitBundle.java @@ -16,6 +16,7 @@ import cofh.api.transport.IItemDuct; import cpw.mods.fml.common.Optional.Interface; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import crazypants.enderio.conduit.facade.ItemConduitFacade.FacadeType; import crazypants.enderio.conduit.geom.CollidableComponent; import crazypants.enderio.conduit.geom.Offset; import crazypants.enderio.power.IInternalPowerHandler; @@ -93,12 +94,16 @@ public interface IConduitBundle extends IInternalPowerHandler, IFluidHandler, II void setFacadeId(Block block, boolean triggerUpdate); - Block getFacadeId(); - void setFacadeMetadata(int meta); + void setFacadeType(FacadeType type); + + Block getFacadeId(); + int getFacadeMetadata(); - + + FacadeType getFacadeType(); + World getWorld(); void setGridNode(Object node); diff --git a/src/main/java/crazypants/enderio/conduit/IConduitItem.java b/src/main/java/crazypants/enderio/conduit/IConduitItem.java index b36514da..b55d50ad 100644 --- a/src/main/java/crazypants/enderio/conduit/IConduitItem.java +++ b/src/main/java/crazypants/enderio/conduit/IConduitItem.java @@ -1,11 +1,13 @@ package crazypants.enderio.conduit; import net.minecraft.item.ItemStack; +import net.minecraft.entity.player.EntityPlayer; +import crazypants.enderio.api.tool.IHideFacades; -public interface IConduitItem { +public interface IConduitItem extends IHideFacades { Class getBaseConduitType(); - IConduit createConduit(ItemStack item); + IConduit createConduit(ItemStack item, EntityPlayer player); } diff --git a/src/main/java/crazypants/enderio/conduit/TileConduitBundle.java b/src/main/java/crazypants/enderio/conduit/TileConduitBundle.java index fc719259..dbdb63e2 100644 --- a/src/main/java/crazypants/enderio/conduit/TileConduitBundle.java +++ b/src/main/java/crazypants/enderio/conduit/TileConduitBundle.java @@ -25,6 +25,7 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import crazypants.enderio.EnderIO; import crazypants.enderio.TileEntityEio; +import crazypants.enderio.conduit.facade.ItemConduitFacade.FacadeType; import crazypants.enderio.conduit.gas.IGasConduit; import crazypants.enderio.conduit.geom.CollidableCache; import crazypants.enderio.conduit.geom.CollidableComponent; @@ -50,6 +51,7 @@ public class TileConduitBundle extends TileEntityEio implements IConduitBundle { private Block facadeId = null; private int facadeMeta = 0; + private FacadeType facadeType = FacadeType.BASIC; private boolean facadeChanged; @@ -100,6 +102,7 @@ public class TileConduitBundle extends TileEntityEio implements IConduitBundle { nbtRoot.setTag("conduits", conduitTags); if(facadeId != null) { nbtRoot.setString("facadeId", Block.blockRegistry.getNameForObject(facadeId)); + nbtRoot.setString("facadeType", facadeType.name()); } else { nbtRoot.setString("facadeId", "null"); } @@ -126,8 +129,12 @@ public class TileConduitBundle extends TileEntityEio implements IConduitBundle { String fs = nbtRoot.getString("facadeId"); if(fs == null || "null".equals(fs)) { facadeId = null; + facadeType = FacadeType.BASIC; } else { facadeId = Block.getBlockFromName(fs); + if(nbtRoot.hasKey("facadeType")) { // backwards compat, never true in freshly placed bundles + facadeType = FacadeType.valueOf(nbtRoot.getString("facadeType")); + } } facadeMeta = nbtRoot.getInteger("facadeMeta"); @@ -164,11 +171,21 @@ public class TileConduitBundle extends TileEntityEio implements IConduitBundle { public void setFacadeMetadata(int meta) { facadeMeta = meta; } + + @Override + public void setFacadeType(FacadeType type) { + facadeType = type; + } @Override public int getFacadeMetadata() { return facadeMeta; } + + @Override + public FacadeType getFacadeType() { + return facadeType; + } @Override @SideOnly(Side.CLIENT) @@ -545,6 +562,24 @@ public class TileConduitBundle extends TileEntityEio implements IConduitBundle { } } } + + // Merge all internal conduit connectors into one box + BoundingBox conBB = null; + for (int i = 0; i < result.size(); i++) { + CollidableComponent cc = result.get(i); + if (cc.conduitType == null && cc.data == ConduitConnectorType.INTERNAL) { + conBB = conBB == null ? cc.bound : conBB.expandBy(cc.bound); + result.remove(i); + i--; + cachedConnectors.remove(cc); + } + } + + if(conBB != null) { + CollidableComponent cc = new CollidableComponent(null, conBB, ForgeDirection.UNKNOWN, ConduitConnectorType.INTERNAL); + result.add(cc); + cachedConnectors.add(cc); + } // External Connectors Set externalDirs = new HashSet(); @@ -566,7 +601,6 @@ public class TileConduitBundle extends TileEntityEio implements IConduitBundle { } connectorsDirty = false; - } private boolean axisOfConnectionsEqual(Set cons) { @@ -875,8 +909,7 @@ public class TileConduitBundle extends TileEntityEio implements IConduitBundle { if (cond == null) { return AECableType.NONE; } else { - ConnectionMode mode = cond.getConnectionMode(dir); - return mode == ConnectionMode.DISABLED ? AECableType.NONE : AECableType.SMART; + return cond.isConnectedTo(dir) ? AECableType.SMART : AECableType.NONE; } } diff --git a/src/main/java/crazypants/enderio/conduit/facade/BlockConduitFacade.java b/src/main/java/crazypants/enderio/conduit/facade/BlockConduitFacade.java index db8c180a..4fc9b819 100644 --- a/src/main/java/crazypants/enderio/conduit/facade/BlockConduitFacade.java +++ b/src/main/java/crazypants/enderio/conduit/facade/BlockConduitFacade.java @@ -8,14 +8,14 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import crazypants.enderio.BlockEio; import crazypants.enderio.ModObject; import crazypants.enderio.conduit.IConduitBundle; import crazypants.enderio.machine.painter.IPaintedBlock; -public class BlockConduitFacade extends Block implements IPaintedBlock{ +public class BlockConduitFacade extends BlockEio implements IPaintedBlock { public static BlockConduitFacade create() { BlockConduitFacade result = new BlockConduitFacade(); @@ -26,18 +26,11 @@ public class BlockConduitFacade extends Block implements IPaintedBlock{ private Block blockOverride; private BlockConduitFacade() { - super(new Material(MapColor.stoneColor)); - setHardness(0.5F); + super(ModObject.blockConduitFacade.unlocalisedName, null, new Material(MapColor.stoneColor)); setStepSound(Block.soundTypeStone); - setHarvestLevel("pickaxe", 0); - setBlockName(ModObject.blockConduitFacade.unlocalisedName); setCreativeTab(null); } - private void init() { - GameRegistry.registerBlock(this, ModObject.blockConduitFacade.unlocalisedName); - } - @Override public void registerBlockIcons(IIconRegister IIconRegister) { blockIcon = IIconRegister.registerIcon("enderio:conduitFacade"); diff --git a/src/main/java/crazypants/enderio/conduit/facade/FacadeRenderer.java b/src/main/java/crazypants/enderio/conduit/facade/FacadeRenderer.java index c2d6a2c9..1f9e7239 100644 --- a/src/main/java/crazypants/enderio/conduit/facade/FacadeRenderer.java +++ b/src/main/java/crazypants/enderio/conduit/facade/FacadeRenderer.java @@ -92,7 +92,7 @@ public class FacadeRenderer implements IItemRenderer { GL11.glDepthFunc(GL11.GL_LEQUAL); } else { - renderBlocks.setOverrideBlockTexture(EnderIO.itemConduitFacade.getIconFromDamage(0)); + renderBlocks.setOverrideBlockTexture(EnderIO.itemConduitFacade.getIconFromDamage(item.getItemDamage())); renderBlocks.renderBlockAsItem(Blocks.stone, 0, 1.0F); renderBlocks.clearOverrideBlockTexture(); } diff --git a/src/main/java/crazypants/enderio/conduit/facade/ItemConduitFacade.java b/src/main/java/crazypants/enderio/conduit/facade/ItemConduitFacade.java index 0205070f..cc5d5bfa 100644 --- a/src/main/java/crazypants/enderio/conduit/facade/ItemConduitFacade.java +++ b/src/main/java/crazypants/enderio/conduit/facade/ItemConduitFacade.java @@ -5,6 +5,7 @@ import java.util.List; import net.minecraft.block.Block; import net.minecraft.block.ITileEntityProvider; import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -20,14 +21,27 @@ import crazypants.enderio.ModObject; import crazypants.enderio.conduit.IConduitBundle; import crazypants.enderio.config.Config; import crazypants.enderio.gui.IAdvancedTooltipProvider; +import crazypants.enderio.gui.IResourceTooltipProvider; import crazypants.enderio.gui.TooltipAddera; import crazypants.enderio.machine.painter.BasicPainterTemplate; import crazypants.enderio.machine.painter.IPaintedBlock; import crazypants.enderio.machine.painter.PaintSourceValidator; import crazypants.enderio.machine.painter.PainterUtil; import crazypants.util.Util; +import crazypants.util.Lang; -public class ItemConduitFacade extends Item implements IAdvancedTooltipProvider { +public class ItemConduitFacade extends Item implements IAdvancedTooltipProvider, IResourceTooltipProvider { + + public static enum FacadeType { + BASIC, + HARDENED; + + public String getUnlocName(Item me) { + return this == BASIC ? me.getUnlocalizedName() : me.getUnlocalizedName() + ".hardened"; + } + } + + private IIcon[] icons; public static ItemConduitFacade create() { ItemConduitFacade result = new ItemConduitFacade(); @@ -39,17 +53,37 @@ public class ItemConduitFacade extends Item implements IAdvancedTooltipProvider protected ItemConduitFacade() { setCreativeTab(EnderIOTab.tabEnderIO); - setUnlocalizedName("enderio." + ModObject.itemConduitFacade.name()); setMaxStackSize(64); + setHasSubtypes(true); } protected void init() { GameRegistry.registerItem(this, ModObject.itemConduitFacade.unlocalisedName); } + @SuppressWarnings({ "unchecked", "rawtypes" }) + @Override + public void getSubItems(Item item, CreativeTabs p_150895_2_, List list) { + for (FacadeType t : FacadeType.values()) { + list.add(new ItemStack(item, 1, t.ordinal())); + } + } + + @Override + public String getUnlocalizedName(ItemStack stack) { + return FacadeType.values()[stack.getItemDamage()].getUnlocName(this); + } + + @Override + public String getUnlocalizedName() { + return "item.enderio." + ModObject.itemConduitFacade.name(); + } + @Override public void registerIcons(IIconRegister IIconRegister) { - itemIcon = IIconRegister.registerIcon("enderio:conduitFacade"); + icons = new IIcon[FacadeType.values().length]; + icons[0] = itemIcon = IIconRegister.registerIcon("enderio:conduitFacade"); + icons[1] = IIconRegister.registerIcon("enderio:conduitFacadeHardened"); overlayIcon = IIconRegister.registerIcon("enderio:conduitFacadeOverlay"); } @@ -57,6 +91,16 @@ public class ItemConduitFacade extends Item implements IAdvancedTooltipProvider return overlayIcon; } + @Override + public IIcon getIconFromDamage(int damage) { + return icons[damage % icons.length]; + } + + @Override + public IIcon getIcon(ItemStack stack, int renderPass, EntityPlayer player, ItemStack usingItem, int useRemaining) { + return getIconFromDamage(stack.getItemDamage()); + } + @Override public boolean onItemUse(ItemStack itemStack, EntityPlayer player, World world, int x, int y, int z, int side, float par8, float par9, float par10) { @@ -77,6 +121,7 @@ public class ItemConduitFacade extends Item implements IAdvancedTooltipProvider IConduitBundle bundle = (IConduitBundle) world.getTileEntity(placeX, placeY, placeZ); bundle.setFacadeId(PainterUtil.getSourceBlock(itemStack)); bundle.setFacadeMetadata(PainterUtil.getSourceBlockMetadata(itemStack)); + bundle.setFacadeType(FacadeType.values()[itemStack.getItemDamage()]); if(!player.capabilities.isCreativeMode) { itemStack.stackSize--; } @@ -91,7 +136,7 @@ public class ItemConduitFacade extends Item implements IAdvancedTooltipProvider public boolean isFull3D() { return true; } - + public ItemStack createItemStackForSourceBlock(Block id, int itemDamage) { if(id == null) { id = EnderIO.blockConduitFacade; @@ -101,34 +146,45 @@ public class ItemConduitFacade extends Item implements IAdvancedTooltipProvider return result; } + @SuppressWarnings("rawtypes") @Override @SideOnly(Side.CLIENT) public void addInformation(ItemStack item, EntityPlayer par2EntityPlayer, List list, boolean par4) { super.addInformation(item, par2EntityPlayer, list, par4); - } + @Override + public String getUnlocalizedNameForTooltip(ItemStack itemStack) { + return getUnlocalizedName(); + } + + @SuppressWarnings("rawtypes") @Override @SideOnly(Side.CLIENT) public void addCommonEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { - } + @SuppressWarnings({ "unchecked", "rawtypes" }) @Override @SideOnly(Side.CLIENT) public void addBasicEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { if(PainterUtil.getSourceBlock(itemstack) == null) { - list.add("Not Painted"); + list.add(Lang.localize("item.itemConduitFacade.tooltip.notpainted")); } else { list.add(PainterUtil.getTooltTipText(itemstack)); } } + @SuppressWarnings({ "unchecked", "rawtypes" }) @Override @SideOnly(Side.CLIENT) public void addDetailedEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { TooltipAddera.addDetailedTooltipFromResources(list, itemstack); + if(itemstack.getItemDamage() == FacadeType.HARDENED.ordinal()) { + list.add(""); + list.add(Lang.localize(getUnlocalizedName(itemstack) + ".tooltip", false)); + } } public final class FacadePainterRecipe extends BasicPainterTemplate { @@ -156,11 +212,11 @@ public class ItemConduitFacade extends Item implements IAdvancedTooltipProvider } return block.getRenderType() == 0 || block.isOpaqueCube() || block.isNormalCube(); } - + @Override public boolean isValidTarget(ItemStack target) { return target != null && target.getItem() == ItemConduitFacade.this; - } + } } - + } diff --git a/src/main/java/crazypants/enderio/conduit/gas/GasConduitRenderer.java b/src/main/java/crazypants/enderio/conduit/gas/GasConduitRenderer.java index 7dfc5d5e..69b2b7df 100644 --- a/src/main/java/crazypants/enderio/conduit/gas/GasConduitRenderer.java +++ b/src/main/java/crazypants/enderio/conduit/gas/GasConduitRenderer.java @@ -115,7 +115,7 @@ public class GasConduitRenderer extends DefaultConduitRenderer { } if(conduit.getConnectionMode(component.dir) == ConnectionMode.DISABLED) { - tex = EnderIO.blockConduitBundle.getConnectorIcon(); + tex = EnderIO.blockConduitBundle.getConnectorIcon(component.data); List corners = component.bound.getCornersWithUvForFace(component.dir, tex.getMinU(), tex.getMaxU(), tex.getMinV(), tex.getMaxV()); Tessellator tessellator = Tessellator.instance; for (Vertex c : corners) { diff --git a/src/main/java/crazypants/enderio/conduit/gas/ItemGasConduit.java b/src/main/java/crazypants/enderio/conduit/gas/ItemGasConduit.java index 07c61986..5a160933 100644 --- a/src/main/java/crazypants/enderio/conduit/gas/ItemGasConduit.java +++ b/src/main/java/crazypants/enderio/conduit/gas/ItemGasConduit.java @@ -40,7 +40,7 @@ public class ItemGasConduit extends AbstractItemConduit implements IAdvancedTool } @Override - public IConduit createConduit(ItemStack stack) { + public IConduit createConduit(ItemStack stack, EntityPlayer player) { return new GasConduit(); } @@ -65,5 +65,10 @@ public class ItemGasConduit extends AbstractItemConduit implements IAdvancedTool list.add(Lang.localize("itemGasConduit.tooltip.maxIo") + " " + maxIo + gpt); TooltipAddera.addDetailedTooltipFromResources(list, "enderio.itemGasConduit"); } + + @Override + public boolean shouldHideFacades(ItemStack stack, EntityPlayer player) { + return true; + } } diff --git a/src/main/java/crazypants/enderio/conduit/gui/BaseSettingsPanel.java b/src/main/java/crazypants/enderio/conduit/gui/BaseSettingsPanel.java index 49aa7089..8fa2c9dd 100644 --- a/src/main/java/crazypants/enderio/conduit/gui/BaseSettingsPanel.java +++ b/src/main/java/crazypants/enderio/conduit/gui/BaseSettingsPanel.java @@ -140,7 +140,7 @@ public class BaseSettingsPanel implements ITabPanel { x += gap + leftArrow.getWidth() + fr.getStringWidth(modeLabel) + gap; GL11.glColor3f(1, 1, 1); - IconEIO icon = new IconEIO(10, 60, 64, 20); + IconEIO icon = new IconEIO(10, 48, 64, 16); icon.renderIcon(x - gap, y - (fr.FONT_HEIGHT / 2) - 1, getLongestModeStringWidth() + gap * 2, leftArrow.getHeight(), 0, true); int move = (getLongestModeStringWidth() - fr.getStringWidth(modeString)) / 2; diff --git a/src/main/java/crazypants/enderio/conduit/gui/ExternalConnectionContainer.java b/src/main/java/crazypants/enderio/conduit/gui/ExternalConnectionContainer.java index d8bb8803..9791f87b 100644 --- a/src/main/java/crazypants/enderio/conduit/gui/ExternalConnectionContainer.java +++ b/src/main/java/crazypants/enderio/conduit/gui/ExternalConnectionContainer.java @@ -11,10 +11,12 @@ import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; import net.minecraftforge.common.util.ForgeDirection; +import crazypants.enderio.EnderIO; import crazypants.enderio.conduit.IConduitBundle; import crazypants.enderio.conduit.gui.item.InventoryFilterUpgrade; import crazypants.enderio.conduit.gui.item.InventorySpeedUpgrades; import crazypants.enderio.conduit.item.IItemConduit; +import crazypants.enderio.conduit.item.SpeedUpgrade; import crazypants.enderio.conduit.item.filter.IItemFilter; public class ExternalConnectionContainer extends Container { @@ -24,6 +26,7 @@ public class ExternalConnectionContainer extends Container { private ForgeDirection dir; private IItemConduit itemConduit; + private int speedUpgradeSlotLimit = 15; private IItemFilter inputFilter; private IItemFilter outputFilter; @@ -86,7 +89,11 @@ public class ExternalConnectionContainer extends Container { public boolean isItemValid(ItemStack par1ItemStack) { return si.isItemValidForSlot(0, par1ItemStack); } - + + @Override + public int getSlotStackLimit() { + return speedUpgradeSlotLimit; + } }); slotLocations.add(new Point(x, y)); @@ -193,6 +200,11 @@ public class ExternalConnectionContainer extends Container { @Override public ItemStack slotClick(int par1, int par2, int par3, EntityPlayer par4EntityPlayer) { + ItemStack st = par4EntityPlayer.inventory.getItemStack(); + if(st != null && st.getItem() == EnderIO.itemExtractSpeedUpgrade) { + SpeedUpgrade speedUpgrade = EnderIO.itemExtractSpeedUpgrade.getSpeedUpgrade(st); + speedUpgradeSlotLimit = speedUpgrade.maxStackSize; + } if(par4EntityPlayer.worldObj != null) { if(par1 >= startFilterSlot && itemConduit != null) { itemConduit.setInputFilter(dir, inputFilter); diff --git a/src/main/java/crazypants/enderio/conduit/gui/GuiExternalConnection.java b/src/main/java/crazypants/enderio/conduit/gui/GuiExternalConnection.java index 441bba53..717666a6 100644 --- a/src/main/java/crazypants/enderio/conduit/gui/GuiExternalConnection.java +++ b/src/main/java/crazypants/enderio/conduit/gui/GuiExternalConnection.java @@ -8,6 +8,7 @@ import java.util.List; import java.util.Map; import net.minecraft.client.gui.GuiButton; +import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.renderer.Tessellator; import net.minecraft.entity.player.InventoryPlayer; import net.minecraftforge.common.util.ForgeDirection; @@ -27,6 +28,8 @@ import crazypants.enderio.gui.IconEIO; import crazypants.gui.GuiContainerBase; import crazypants.render.RenderUtil; +import cpw.mods.fml.common.Optional; + public class GuiExternalConnection extends GuiContainerBase { private static final int TAB_HEIGHT = 24; @@ -69,9 +72,9 @@ public class GuiExternalConnection extends GuiContainerBase { ySize = 166 + 29; xSize = 206; - getContainer().setInputSlotsVisible(false); - getContainer().setOutputSlotsVisible(false); - getContainer().setInventorySlotsVisible(false); + container.setInputSlotsVisible(false); + container.setOutputSlotsVisible(false); + container.setInventorySlotsVisible(false); List cons = new ArrayList(bundle.getConduits()); Collections.sort(cons, new Comparator() { @@ -94,6 +97,7 @@ public class GuiExternalConnection extends GuiContainerBase { for (IConduit con : cons) { if(con.containsExternalConnection(dir) || con.canConnectToExternal(dir, true)) { + @SuppressWarnings("LeakingThisInConstructor") ITabPanel tab = TabFactory.instance.createPanelForConduit(this, con); if(tab != null) { conduits.add(con); @@ -173,7 +177,7 @@ public class GuiExternalConnection extends GuiContainerBase { RenderUtil.bindTexture(IconEIO.TEXTURE); IconEIO.INACTIVE_TAB.renderIcon(tabX, sy + tabYOffset + (i * 24)); IconEIO icon = tabs.get(i).getIcon(); - icon.renderIcon(tabX + 4, sy + tabYOffset + (i * TAB_HEIGHT) + 7, 10, 10, 0, false); + icon.renderIcon(tabX + 4, sy + tabYOffset + (i * TAB_HEIGHT) + 6, 11, 11, 0, false); } } @@ -188,7 +192,7 @@ public class GuiExternalConnection extends GuiContainerBase { if(tabs.size() > 0) { IconEIO icon = tabs.get(activeTab).getIcon(); - icon.renderIcon(tabX + 4, sy + tabYOffset + (activeTab * TAB_HEIGHT) + 7, 10, 10, 0, false); + icon.renderIcon(tabX - 1, sy + tabYOffset + (activeTab * TAB_HEIGHT) + 4); tes.draw(); tabs.get(activeTab).render(par1, par2, par3); } else { @@ -205,4 +209,18 @@ public class GuiExternalConnection extends GuiContainerBase { return container; } + @Override + @Optional.Method(modid = "NotEnoughItems") + public boolean hideItemPanelSlot(GuiContainer gc, int x, int y, int w, int h) { + if(tabs.size() > 0) { + int sx = (width - xSize) / 2; + int sy = (height - ySize) / 2; + int tabX = sx + xSize - 3; + int tabY = sy + tabYOffset; + + return (x+w) >= tabX && x < (tabX + 14) && (y+h) >= tabY && y < (tabY + tabs.size()*TAB_HEIGHT); + } + return false; + } + } diff --git a/src/main/java/crazypants/enderio/conduit/gui/LiquidSettings.java b/src/main/java/crazypants/enderio/conduit/gui/LiquidSettings.java index 773eda83..d2c1a6f7 100644 --- a/src/main/java/crazypants/enderio/conduit/gui/LiquidSettings.java +++ b/src/main/java/crazypants/enderio/conduit/gui/LiquidSettings.java @@ -263,7 +263,7 @@ public class LiquidSettings extends BaseSettingsPanel { if(isEnder && isFilterVisible()) { if(conduit.getConnectionMode(gui.getDir()) == ConnectionMode.IN_OUT) { - String inOutStr = inOutShowIn ? "Extract" : "Insert"; + String inOutStr = inOutShowIn ? Lang.localize("gui.conduit.ioMode.input") : Lang.localize("gui.conduit.ioMode.output"); int x = gui.getGuiLeft() + gui.getXSize() - 20 - 5 - gui.getFontRenderer().getStringWidth(inOutStr); int y = top; gui.getFontRenderer().drawString(inOutStr, x, y, ColorUtil.getRGB(Color.DARK_GRAY)); diff --git a/src/main/java/crazypants/enderio/conduit/gui/item/ExistingItemFilterGui.java b/src/main/java/crazypants/enderio/conduit/gui/item/ExistingItemFilterGui.java index 062abc8c..278ad914 100644 --- a/src/main/java/crazypants/enderio/conduit/gui/item/ExistingItemFilterGui.java +++ b/src/main/java/crazypants/enderio/conduit/gui/item/ExistingItemFilterGui.java @@ -102,10 +102,10 @@ public class ExistingItemFilterGui implements IItemFilterGui { useOreDictB.setUnselectedToolTip(Lang.localize("gui.conduit.item.oreDicDisabled")); useOreDictB.setPaintSelectedBorder(false); - snapshotB = new GuiButton(ID_SNAPSHOT, 0, 0, 60, 20, "Snapshot"); - mergeB = new GuiButton(ID_MERGE, 0, 0, 40, 20, "Merge"); - clearB = new GuiButton(ID_CLEAR, 0, 0, 60, 20, "Clear"); - showB = new GuiButton(ID_SHOW, 0, 0, 40, 20, "Show"); + snapshotB = new GuiButton(ID_SNAPSHOT, 0, 0, 60, 20, Lang.localize("gui.conduit.button.snap")); + mergeB = new GuiButton(ID_MERGE, 0, 0, 40, 20, Lang.localize("gui.conduit.button.merge")); + clearB = new GuiButton(ID_CLEAR, 0, 0, 60, 20, Lang.localize("gui.conduit.button.clear")); + showB = new GuiButton(ID_SHOW, 0, 0, 40, 20, Lang.localize("gui.conduit.button.show")); snapshotOverlay = new SnapshotOverlay(); gui.addOverlay(snapshotOverlay); diff --git a/src/main/java/crazypants/enderio/conduit/gui/item/ItemSettings.java b/src/main/java/crazypants/enderio/conduit/gui/item/ItemSettings.java index ffb90568..67b016b4 100644 --- a/src/main/java/crazypants/enderio/conduit/gui/item/ItemSettings.java +++ b/src/main/java/crazypants/enderio/conduit/gui/item/ItemSettings.java @@ -134,6 +134,8 @@ public class ItemSettings extends BaseSettingsPanel { loopB.setUnselectedToolTip(Lang.localize("gui.conduit.item.selfFeedDisabled")); loopB.setPaintSelectedBorder(false); + priorityTooltip = new GuiToolTip(new Rectangle(priLeft + 9, y, priWidth, 16), Lang.localize("gui.conduit.item.priority")); + x = priLeft + priWidth + 9; priUpB = new IconButtonEIO(gui, ID_PRIORITY_UP, x, y, IconEIO.ADD_BUT); priUpB.setSize(8, 8); @@ -142,8 +144,6 @@ public class ItemSettings extends BaseSettingsPanel { priDownB = new IconButtonEIO(gui, ID_PRIORITY_DOWN, x, y, IconEIO.MINUS_BUT); priDownB.setSize(8, 8); - priorityTooltip = new GuiToolTip(new Rectangle(priLeft + 9, y, priWidth, 20), Lang.localize("gui.conduit.item.priority")); - gui.getContainer().addFilterListener(new FilterChangeListener() { @Override diff --git a/src/main/java/crazypants/enderio/conduit/gui/item/ModItemFilterGui.java b/src/main/java/crazypants/enderio/conduit/gui/item/ModItemFilterGui.java index aac6d0c3..d21e5c7f 100644 --- a/src/main/java/crazypants/enderio/conduit/gui/item/ModItemFilterGui.java +++ b/src/main/java/crazypants/enderio/conduit/gui/item/ModItemFilterGui.java @@ -20,20 +20,23 @@ import crazypants.render.RenderUtil; public class ModItemFilterGui implements IItemFilterGui { - - private IItemConduit itemConduit; - private GuiExternalConnection gui; + private static final int MOD_NAME_COLOR = ColorUtil.getRGB(Color.white); + + private final IItemConduit itemConduit; + private final GuiExternalConnection gui; boolean isInput; - private ModItemFilter filter; + private final ModItemFilter filter; - private Rectangle[] inputBounds; + private final Rectangle[] inputBounds; - private IconButtonEIO[] deleteButs; + private final IconButtonEIO[] deleteButs; - private int inputOffsetX; - private int tfWidth; + private final int inputOffsetX; + private final int tfWidth; + private final int tfTextureX; + private final int tfTextureY; public ModItemFilterGui(GuiExternalConnection gui, IItemConduit itemConduit, boolean isInput) { this.gui = gui; @@ -44,18 +47,22 @@ public class ModItemFilterGui implements IItemFilterGui { if(isInput) { filter = (ModItemFilter) itemConduit.getInputFilter(gui.getDir()); inputOffsetX = 50; - tfWidth = 86; + tfWidth = 96; + tfTextureX = 120; + tfTextureY = 214; } else { filter = (ModItemFilter) itemConduit.getOutputFilter(gui.getDir()); inputOffsetX = 32; - tfWidth = 104; + tfWidth = 114; + tfTextureX = 120; + tfTextureY = 238; } inputBounds = new Rectangle[] { - new Rectangle(inputOffsetX,48,16,16), - new Rectangle(inputOffsetX,69,16,16), - new Rectangle(inputOffsetX,90,16,16) + new Rectangle(inputOffsetX,47,16,16), + new Rectangle(inputOffsetX,68,16,16), + new Rectangle(inputOffsetX,89,16,16) }; deleteButs = new IconButtonEIO[inputBounds.length]; @@ -98,11 +105,9 @@ public class ModItemFilterGui implements IItemFilterGui { RenderUtil.bindTexture("enderio:textures/gui/externalConduitConnection.png"); for(Rectangle r : inputBounds) { //slot - gui.drawTexturedModalRect(gui.getGuiLeft() + r.x - 1, gui.getGuiTop() + r.y - 1, 24, 238, 18, 18); + gui.drawTexturedModalRect(gui.getGuiLeft() + r.x - 1, gui.getGuiTop() + r.y - 1, 24, 214, 18, 18); //text box - gui.drawTexturedModalRect(gui.getGuiLeft() + r.x + 38, gui.getGuiTop() + r.y - 1, 24, 238, 4, 18); - gui.drawTexturedModalRect(gui.getGuiLeft() + r.x + 42, gui.getGuiTop() + r.y - 1, 120, 238, tfWidth, 18); - gui.drawTexturedModalRect(gui.getGuiLeft() + r.x + 42 + tfWidth, gui.getGuiTop() + r.y - 1, 38, 238, 4, 18); + gui.drawTexturedModalRect(gui.getGuiLeft() + r.x + 38, gui.getGuiTop() + r.y - 1, tfTextureX, tfTextureY, tfWidth, 18); } FontRenderer fr = Minecraft.getMinecraft().fontRenderer; @@ -110,17 +115,10 @@ public class ModItemFilterGui implements IItemFilterGui { String mod = filter.getModAt(i); if(mod != null) { Rectangle r = inputBounds[i]; - fr.drawStringWithShadow(mod, gui.getGuiLeft() + r.x + 41, gui.getGuiTop() + r.y + 4 , ColorUtil.getRGB(Color.white)); + mod = fr.trimStringToWidth(mod, tfWidth - 6); + fr.drawStringWithShadow(mod, gui.getGuiLeft() + r.x + 41, gui.getGuiTop() + r.y + 4, MOD_NAME_COLOR); } } - - RenderUtil.bindTexture("enderio:textures/gui/externalConduitConnection.png"); - int edge = inputBounds[0].x + tfWidth + 46; - gui.drawTexturedModalRect(gui.getGuiLeft() + edge, gui.getGuiTop() + inputBounds[0].y, edge, 20, 30, 60); - for(Rectangle r : inputBounds) { - gui.drawTexturedModalRect(gui.getGuiLeft() + edge - 1, gui.getGuiTop() + r.y - 1, 41, 238, 1, 18); - } - } @Override diff --git a/src/main/java/crazypants/enderio/conduit/gui/item/PacketExistingItemFilterSnapshot.java b/src/main/java/crazypants/enderio/conduit/gui/item/PacketExistingItemFilterSnapshot.java index 834eb77d..4020d1a0 100644 --- a/src/main/java/crazypants/enderio/conduit/gui/item/PacketExistingItemFilterSnapshot.java +++ b/src/main/java/crazypants/enderio/conduit/gui/item/PacketExistingItemFilterSnapshot.java @@ -76,6 +76,7 @@ public class PacketExistingItemFilterSnapshot extends AbstractConduitPacket 0 || !canExtract() || !con.isExtractionRedstoneConditionMet(conDir)) { //do nothing } else { @@ -244,8 +243,7 @@ public class NetworkedInventory { return sendPriority; } - private void updateInventory() { - + public final void updateInventory() { TileEntity te = world.getTileEntity(location.x, location.y, location.z); if(te instanceof ISidedInventory) { inv = (ISidedInventory) te; diff --git a/src/main/java/crazypants/enderio/conduit/item/SpeedUpgrade.java b/src/main/java/crazypants/enderio/conduit/item/SpeedUpgrade.java new file mode 100644 index 00000000..844f9eb0 --- /dev/null +++ b/src/main/java/crazypants/enderio/conduit/item/SpeedUpgrade.java @@ -0,0 +1,32 @@ +package crazypants.enderio.conduit.item; + +public enum SpeedUpgrade { + + UPGRADE("enderio:extractSpeedUpgrade", "item.itemExtractSpeedUpgrade", 15) { + @Override + public int getMaximumExtracted(int stackSize) { + return BASE_MAX_EXTRACTED + Math.min(stackSize, maxStackSize) * 4; + } + }, + DOWNGRADE("enderio:extractSpeedDowngrade", "item.itemExtractSpeedDowngrade", 1) { + @Override + public int getMaximumExtracted(int stackSize) { + return 1; + } + }; + + public static final int BASE_MAX_EXTRACTED = 4; + + public final String iconName; + public final String unlocName; + public final int maxStackSize; + + private SpeedUpgrade(String iconName, String unlocName, int maxStackSize) { + this.iconName = iconName; + this.unlocName = unlocName; + this.maxStackSize = maxStackSize; + } + + public abstract int getMaximumExtracted(int stackSize); + +} diff --git a/src/main/java/crazypants/enderio/conduit/item/filter/ItemExistingItemFilter.java b/src/main/java/crazypants/enderio/conduit/item/filter/ItemExistingItemFilter.java index b2bb3e5e..eda825c6 100644 --- a/src/main/java/crazypants/enderio/conduit/item/filter/ItemExistingItemFilter.java +++ b/src/main/java/crazypants/enderio/conduit/item/filter/ItemExistingItemFilter.java @@ -15,6 +15,7 @@ import crazypants.enderio.ModObject; import crazypants.enderio.conduit.item.FilterRegister; import crazypants.enderio.gui.IResourceTooltipProvider; import crazypants.enderio.gui.TooltipAddera; +import crazypants.util.ItemUtil; import crazypants.util.Lang; import net.minecraft.inventory.IInventory; import net.minecraft.tileentity.TileEntity; @@ -59,8 +60,9 @@ public class ItemExistingItemFilter extends Item implements IItemFilterUpgrade, if(player.isSneaking()) { TileEntity te = world.getTileEntity(x, y, z); if(te instanceof IInventory) { + IInventory inv = ItemUtil.getInventory((IInventory)te); ExistingItemFilter filter = (ExistingItemFilter)createFilterFromStack(item); - if(filter.mergeSnapshot((IInventory)te)) { + if(filter.mergeSnapshot(inv)) { player.addChatComponentMessage(new ChatComponentText(Lang.localize("item.itemExistingItemFilter.filterUpdated"))); } else { player.addChatComponentMessage(new ChatComponentText(Lang.localize("item.itemExistingItemFilter.filterNotUpdated"))); diff --git a/src/main/java/crazypants/enderio/conduit/liquid/AdvancedLiquidConduitRenderer.java b/src/main/java/crazypants/enderio/conduit/liquid/AdvancedLiquidConduitRenderer.java index d28d40c1..2c1fa201 100644 --- a/src/main/java/crazypants/enderio/conduit/liquid/AdvancedLiquidConduitRenderer.java +++ b/src/main/java/crazypants/enderio/conduit/liquid/AdvancedLiquidConduitRenderer.java @@ -118,7 +118,7 @@ public class AdvancedLiquidConduitRenderer extends DefaultConduitRenderer { } if(conduit.getConnectionMode(component.dir) == ConnectionMode.DISABLED) { - tex = EnderIO.blockConduitBundle.getConnectorIcon(); + tex = EnderIO.blockConduitBundle.getConnectorIcon(component.data); List corners = component.bound.getCornersWithUvForFace(component.dir, tex.getMinU(), tex.getMaxU(), tex.getMinV(), tex.getMaxV()); Tessellator tessellator = Tessellator.instance; for (Vertex c : corners) { diff --git a/src/main/java/crazypants/enderio/conduit/liquid/ItemLiquidConduit.java b/src/main/java/crazypants/enderio/conduit/liquid/ItemLiquidConduit.java index 305b2075..7260c6df 100644 --- a/src/main/java/crazypants/enderio/conduit/liquid/ItemLiquidConduit.java +++ b/src/main/java/crazypants/enderio/conduit/liquid/ItemLiquidConduit.java @@ -40,7 +40,7 @@ public class ItemLiquidConduit extends AbstractItemConduit implements IAdvancedT } @Override - public IConduit createConduit(ItemStack stack) { + public IConduit createConduit(ItemStack stack, EntityPlayer player) { if(stack.getItemDamage() == 1) { return new AdvancedLiquidConduit(); } else if(stack.getItemDamage() == 2) { @@ -88,6 +88,9 @@ public class ItemLiquidConduit extends AbstractItemConduit implements IAdvancedT } - + @Override + public boolean shouldHideFacades(ItemStack stack, EntityPlayer player) { + return true; + } } diff --git a/src/main/java/crazypants/enderio/conduit/liquid/LiquidConduit.java b/src/main/java/crazypants/enderio/conduit/liquid/LiquidConduit.java index 553d5aad..a19251f8 100644 --- a/src/main/java/crazypants/enderio/conduit/liquid/LiquidConduit.java +++ b/src/main/java/crazypants/enderio/conduit/liquid/LiquidConduit.java @@ -341,7 +341,7 @@ public class LiquidConduit extends AbstractTankConduit { // ----------------------------- @Override - protected void connectionsChanged() { + public void connectionsChanged() { super.connectionsChanged(); updateTank(); } diff --git a/src/main/java/crazypants/enderio/conduit/liquid/LiquidConduitRenderer.java b/src/main/java/crazypants/enderio/conduit/liquid/LiquidConduitRenderer.java index 920be03c..81386107 100644 --- a/src/main/java/crazypants/enderio/conduit/liquid/LiquidConduitRenderer.java +++ b/src/main/java/crazypants/enderio/conduit/liquid/LiquidConduitRenderer.java @@ -66,7 +66,7 @@ public class LiquidConduitRenderer extends DefaultConduitRenderer { } if(conduit.getConnectionMode(component.dir) == ConnectionMode.DISABLED) { - tex = EnderIO.blockConduitBundle.getConnectorIcon(); + tex = EnderIO.blockConduitBundle.getConnectorIcon(component.data); List corners = component.bound.getCornersWithUvForFace(component.dir, tex.getMinU(), tex.getMaxU(), tex.getMinV(), tex.getMaxV()); Tessellator tessellator = Tessellator.instance; for (Vertex c : corners) { diff --git a/src/main/java/crazypants/enderio/conduit/me/ItemMEConduit.java b/src/main/java/crazypants/enderio/conduit/me/ItemMEConduit.java index 7f138de4..0b588c0b 100644 --- a/src/main/java/crazypants/enderio/conduit/me/ItemMEConduit.java +++ b/src/main/java/crazypants/enderio/conduit/me/ItemMEConduit.java @@ -1,5 +1,7 @@ package crazypants.enderio.conduit.me; +import appeng.api.AEApi; +import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import crazypants.enderio.ModObject; import crazypants.enderio.conduit.AbstractItemConduit; @@ -31,7 +33,14 @@ public class ItemMEConduit extends AbstractItemConduit { } @Override - public IConduit createConduit(ItemStack item) { - return new MEConduit(item.getItemDamage()); + public IConduit createConduit(ItemStack item, EntityPlayer player) { + MEConduit con = new MEConduit(item.getItemDamage()); + con.setPlayerID(AEApi.instance().registries().players().getID(player)); + return con; + } + + @Override + public boolean shouldHideFacades(ItemStack stack, EntityPlayer player) { + return true; } } \ No newline at end of file diff --git a/src/main/java/crazypants/enderio/conduit/me/MEConduit.java b/src/main/java/crazypants/enderio/conduit/me/MEConduit.java index d06d879f..7c285765 100644 --- a/src/main/java/crazypants/enderio/conduit/me/MEConduit.java +++ b/src/main/java/crazypants/enderio/conduit/me/MEConduit.java @@ -1,20 +1,15 @@ package crazypants.enderio.conduit.me; -import java.util.Arrays; import java.util.EnumSet; import java.util.List; -import java.util.Set; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.nbt.NBTTagList; -import net.minecraft.nbt.NBTTagString; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; import net.minecraft.world.World; -import net.minecraftforge.common.util.Constants; import net.minecraftforge.common.util.ForgeDirection; import appeng.api.AEApi; import appeng.api.networking.IGridHost; @@ -29,6 +24,7 @@ import crazypants.enderio.conduit.AbstractConduitNetwork; import crazypants.enderio.conduit.ConduitUtil; import crazypants.enderio.conduit.ConnectionMode; import crazypants.enderio.conduit.IConduit; +import crazypants.enderio.conduit.IConduitBundle; import crazypants.enderio.conduit.RaytraceResult; import crazypants.enderio.conduit.TileConduitBundle; import crazypants.enderio.conduit.geom.CollidableComponent; @@ -45,8 +41,7 @@ public class MEConduit extends AbstractConduit implements IMEConduit { public static IIcon[] longTextures; private boolean isDense; - - EnumSet validConnections = EnumSet.copyOf(Arrays.asList(ForgeDirection.VALID_DIRECTIONS)); + private int playerID = -1; public MEConduit() { this(0); @@ -107,39 +102,32 @@ public class MEConduit extends AbstractConduit implements IMEConduit { @Override public void writeToNBT(NBTTagCompound nbtRoot) { super.writeToNBT(nbtRoot); - NBTTagList list = new NBTTagList(); - for (ForgeDirection dir : validConnections) { - NBTTagString name = new NBTTagString(dir.name()); - list.appendTag(name); - } - nbtRoot.setTag("validConnections", list); nbtRoot.setBoolean("isDense", isDense); + nbtRoot.setInteger("playerID", playerID); } @Override public void readFromNBT(NBTTagCompound nbtRoot, short nbtVersion) { super.readFromNBT(nbtRoot, nbtVersion); - if(nbtRoot.hasKey("validConnections")) { - validConnections.clear(); - NBTTagList connections = nbtRoot.getTagList("validConnections", Constants.NBT.TAG_STRING); - for (int i = 0; i < connections.tagCount(); i++) { - validConnections.add(ForgeDirection.valueOf(connections.getStringTagAt(i))); - } - } isDense = nbtRoot.getBoolean("isDense"); + if(nbtRoot.hasKey("playerID")) { + playerID = nbtRoot.getInteger("playerID"); + } else { + playerID = -1; + } + } + + public void setPlayerID(int playerID) { + this.playerID = playerID; } @Override @Method(modid = "appliedenergistics2") - public boolean canConnectToExternal(ForgeDirection dir, boolean ignoreConnectionMode) { + public boolean canConnectToExternal(ForgeDirection dir, boolean ignoreDisabled) { World world = getBundle().getWorld(); BlockCoord pos = getLocation(); TileEntity te = world.getTileEntity(pos.x + dir.offsetX, pos.y + dir.offsetY, pos.z + dir.offsetZ); - if(!ignoreConnectionMode && getConnectionMode(dir) == ConnectionMode.DISABLED) { - return false; - } - if(te instanceof IPartHost) { IPart part = ((IPartHost) te).getPart(dir.getOpposite()); if(part == null) { @@ -178,6 +166,7 @@ public class MEConduit extends AbstractConduit implements IMEConduit { if(getNode() == null && !worldObj.isRemote) { IGridNode node = AEApi.instance().createGridNode(grid); if(node != null) { + node.setPlayerID(playerID); getBundle().setGridNode(node); getNode().updateState(); } @@ -193,58 +182,31 @@ public class MEConduit extends AbstractConduit implements IMEConduit { return mode; } - @Override - public ConnectionMode getConnectionMode(ForgeDirection dir) { - return validConnections.contains(dir) ? ConnectionMode.IN_OUT : ConnectionMode.DISABLED; - } - - @Override - public void setConnectionMode(ForgeDirection dir, ConnectionMode mode) { - super.setConnectionMode(dir, mode); - if(mode == ConnectionMode.DISABLED) { - validConnections.remove(dir); - } else { - validConnections.add(dir); - } - if(hasNode()) { - getNode().updateState(); - getNode().getWorld().markBlockForUpdate(getLocation().x, getLocation().y, getLocation().z); - } - } - @Override public boolean canConnectToConduit(ForgeDirection direction, IConduit conduit) { - if(conduit == null) { + if(!super.canConnectToConduit(direction, conduit)) { return false; } return conduit instanceof IMEConduit; } - @Override - public void conduitConnectionAdded(ForgeDirection fromDirection) { - super.conduitConnectionAdded(fromDirection); - validConnections.add(fromDirection); - } - - @Override - public void conduitConnectionRemoved(ForgeDirection fromDirection) { - super.conduitConnectionRemoved(fromDirection); -// validConnections.remove(fromDirection); // this causes more annoying behavior than wanted behavior. Let's leave it out for now. - } - @Override @Method(modid = "appliedenergistics2") - protected void connectionsChanged() { + public void connectionsChanged() { super.connectionsChanged(); - onNodeChanged(); - if(getNode() != null) { - getNode().updateState(); + BlockCoord loc = getLocation(); + if(loc != null) { + onNodeChanged(loc); + IGridNode node = getNode(); + if(node != null) { + node.updateState(); + node.getWorld().markBlockForUpdate(loc.x, loc.y, loc.z); + } } } @Override public boolean onBlockActivated(EntityPlayer player, RaytraceResult res, List all) { - super.onBlockActivated(player, res, all); if(ToolUtil.isToolEquipped(player)) { if(!getBundle().getEntity().getWorldObj().isRemote) { if(res != null && res.component != null) { @@ -252,20 +214,15 @@ public class MEConduit extends AbstractConduit implements IMEConduit { ForgeDirection faceHit = ForgeDirection.getOrientation(res.movingObjectPosition.sideHit); if(connDir == ForgeDirection.UNKNOWN || connDir == faceHit) { if(getConnectionMode(faceHit) == ConnectionMode.DISABLED) { - setConnectionMode(faceHit, getNextConnectionMode(faceHit)); + setConnectionMode(faceHit, ConnectionMode.IN_OUT); + return true; } - // Attempt to join networks - boolean retVal = ConduitUtil.joinConduits(this, faceHit); - if(retVal) { - onNodeChanged(); - } - return retVal; + return ConduitUtil.joinConduits(this, faceHit); } else if(externalConnections.contains(connDir)) { setConnectionMode(connDir, getNextConnectionMode(connDir)); return true; } else if(containsConduitConnection(connDir)) { ConduitUtil.disconectConduits(this, connDir); - onNodeChanged(); return true; } } @@ -275,14 +232,12 @@ public class MEConduit extends AbstractConduit implements IMEConduit { } @Method(modid = "appliedenergistics2") - public void onNodeChanged() { - boolean foundConnection = false; - + private void onNodeChanged(BlockCoord location) { + World world = getBundle().getWorld(); for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { - TileEntity te = getBundle().getLocation().getLocation(dir).getTileEntity(getBundle().getWorld()); - if(te != null && te instanceof IGridHost) { + TileEntity te = location.getLocation(dir).getTileEntity(world); + if(te != null && te instanceof IGridHost && !(te instanceof IConduitBundle)) { IGridNode node = ((IGridHost) te).getGridNode(ForgeDirection.UNKNOWN); - foundConnection |= validConnections.contains(dir); if(node == null) { node = ((IGridHost) te).getGridNode(dir.getOpposite()); } @@ -291,9 +246,6 @@ public class MEConduit extends AbstractConduit implements IMEConduit { } } } - if(!foundConnection && hasNode()) { - getNode().destroy(); - } } @Override @@ -318,6 +270,16 @@ public class MEConduit extends AbstractConduit implements IMEConduit { getBundle().setGridNode(null); } + @Override + @Method(modid = "appliedenergistics2") + public void onChunkUnload(World worldObj) { + super.onChunkUnload(worldObj); + if(getNode() != null) { + getNode().destroy(); + getBundle().setGridNode(null); + } + } + @Override public MEConduitGrid getGrid() { return grid; @@ -328,21 +290,18 @@ public class MEConduit extends AbstractConduit implements IMEConduit { return getBundle().getGridNode(null); } - private boolean hasNode() { - return getNode() != null; - } - @Override public EnumSet getConnections() { - Set cons = getConduitConnections(); - cons.addAll(getExternalConnections()); - if(cons.isEmpty()) { - return EnumSet.noneOf(ForgeDirection.class); + EnumSet cons = EnumSet.noneOf(ForgeDirection.class); + cons.addAll(getConduitConnections()); + for(ForgeDirection dir : getExternalConnections()) { + if(getConnectionMode(dir) != ConnectionMode.DISABLED) { + cons.add(dir); + } } - return EnumSet.copyOf(cons); - // return validConnections; + return cons; } - + @Override public boolean isDense() { return isDense; diff --git a/src/main/java/crazypants/enderio/conduit/power/ItemPowerConduit.java b/src/main/java/crazypants/enderio/conduit/power/ItemPowerConduit.java index e78ec630..ec4768f8 100644 --- a/src/main/java/crazypants/enderio/conduit/power/ItemPowerConduit.java +++ b/src/main/java/crazypants/enderio/conduit/power/ItemPowerConduit.java @@ -41,7 +41,7 @@ public class ItemPowerConduit extends AbstractItemConduit { } @Override - public IConduit createConduit(ItemStack stack) { + public IConduit createConduit(ItemStack stack, EntityPlayer player) { return new PowerConduit(stack.getItemDamage()); } @@ -56,5 +56,9 @@ public class ItemPowerConduit extends AbstractItemConduit { ICapacitor cap = PowerConduit.getCapacitors()[itemStack.getItemDamage()]; list.add(PREFIX + PowerDisplayUtil.formatPower(cap.getMaxEnergyExtracted()) + POSTFIX); } - + + @Override + public boolean shouldHideFacades(ItemStack stack, EntityPlayer player) { + return true; + } } diff --git a/src/main/java/crazypants/enderio/conduit/redstone/InsulatedRedstoneConduit.java b/src/main/java/crazypants/enderio/conduit/redstone/InsulatedRedstoneConduit.java index f736f9a1..d2bfde5e 100644 --- a/src/main/java/crazypants/enderio/conduit/redstone/InsulatedRedstoneConduit.java +++ b/src/main/java/crazypants/enderio/conduit/redstone/InsulatedRedstoneConduit.java @@ -197,6 +197,8 @@ public class InsulatedRedstoneConduit extends RedstoneConduit implements IInsula } neighbour.conduitConnectionRemoved(connDir.getOpposite()); conduitConnectionRemoved(connDir); + neighbour.connectionsChanged(); + connectionsChanged(); updateNetwork(); neighbour.updateNetwork(); return true; diff --git a/src/main/java/crazypants/enderio/conduit/redstone/ItemRedstoneConduit.java b/src/main/java/crazypants/enderio/conduit/redstone/ItemRedstoneConduit.java index 57ee35aa..0a88deb4 100644 --- a/src/main/java/crazypants/enderio/conduit/redstone/ItemRedstoneConduit.java +++ b/src/main/java/crazypants/enderio/conduit/redstone/ItemRedstoneConduit.java @@ -1,5 +1,6 @@ package crazypants.enderio.conduit.redstone; +import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import crazypants.enderio.ModObject; import crazypants.enderio.conduit.AbstractItemConduit; @@ -31,7 +32,7 @@ public class ItemRedstoneConduit extends AbstractItemConduit { } @Override - public IConduit createConduit(ItemStack stack) { + public IConduit createConduit(ItemStack stack, EntityPlayer player) { if(stack.getItemDamage() == 0) { return new RedstoneConduit(); } @@ -42,4 +43,8 @@ public class ItemRedstoneConduit extends AbstractItemConduit { } } + @Override + public boolean shouldHideFacades(ItemStack stack, EntityPlayer player) { + return true; + } } diff --git a/src/main/java/crazypants/enderio/conduit/redstone/RedstoneSwitchRenderer.java b/src/main/java/crazypants/enderio/conduit/redstone/RedstoneSwitchRenderer.java index 0ef62bb9..ae737713 100644 --- a/src/main/java/crazypants/enderio/conduit/redstone/RedstoneSwitchRenderer.java +++ b/src/main/java/crazypants/enderio/conduit/redstone/RedstoneSwitchRenderer.java @@ -8,6 +8,7 @@ import crazypants.enderio.EnderIO; import crazypants.enderio.conduit.IConduit; import crazypants.enderio.conduit.IConduitBundle; import crazypants.enderio.conduit.geom.CollidableComponent; +import crazypants.enderio.conduit.geom.ConduitConnectorType; import crazypants.enderio.conduit.geom.ConduitGeometryUtil; import crazypants.enderio.conduit.render.ConduitBundleRenderer; import crazypants.enderio.conduit.render.DefaultConduitRenderer; @@ -54,7 +55,7 @@ public class RedstoneSwitchRenderer extends DefaultConduitRenderer { IIcon[] icons = new IIcon[6]; for (int i = 0; i < icons.length; i++) { - icons[i] = EnderIO.blockConduitBundle.getConnectorIcon(); + icons[i] = EnderIO.blockConduitBundle.getConnectorIcon(ConduitConnectorType.INTERNAL); } icons[3] = sw.getSwitchIcon(); diff --git a/src/main/java/crazypants/enderio/conduit/render/ConduitBundleRenderer.java b/src/main/java/crazypants/enderio/conduit/render/ConduitBundleRenderer.java index ec2bb0bd..3dc10aab 100644 --- a/src/main/java/crazypants/enderio/conduit/render/ConduitBundleRenderer.java +++ b/src/main/java/crazypants/enderio/conduit/render/ConduitBundleRenderer.java @@ -39,6 +39,7 @@ import crazypants.enderio.conduit.IConduitBundle.FacadeRenderState; import crazypants.enderio.conduit.TileConduitBundle; import crazypants.enderio.conduit.facade.BlockConduitFacade; import crazypants.enderio.conduit.geom.CollidableComponent; +import crazypants.enderio.conduit.geom.ConduitConnectorType; import crazypants.enderio.conduit.geom.ConduitGeometryUtil; import crazypants.enderio.config.Config; import crazypants.render.BoundingBox; @@ -119,8 +120,8 @@ public class ConduitBundleRenderer extends TileEntitySpecialRenderer implements IConduitBundle bundle = (IConduitBundle) world.getTileEntity(x, y, z); EntityClientPlayerMP player = Minecraft.getMinecraft().thePlayer; - boolean renderedFacade = !renderFacade(x, y, z, rb, bundle, player); - boolean renderConduit = !renderedFacade && (BlockConduitBundle.theRenderPass == 0 || rb.hasOverrideBlockTexture()); + boolean renderedFacade = renderFacade(x, y, z, rb, bundle, player); + boolean renderConduit = !renderedFacade; if(renderConduit) { BlockCoord loc = bundle.getLocation(); @@ -138,31 +139,32 @@ public class ConduitBundleRenderer extends TileEntitySpecialRenderer implements } private boolean renderFacade(int x, int y, int z, RenderBlocks rb, IConduitBundle bundle, EntityClientPlayerMP player) { - boolean res = true; + boolean res = false; if(bundle.hasFacade()) { Block facadeId = bundle.getFacadeId(); if(ConduitUtil.isFacadeHidden(bundle, player)) { + Tessellator.instance.setColorOpaque_F(1, 1, 1); bundle.setFacadeId(null, false); bundle.setFacadeRenderAs(FacadeRenderState.WIRE_FRAME); BlockConduitFacade facb = EnderIO.blockConduitFacade; facb.setBlockOverride(bundle); facb.setBlockBounds(0, 0, 0, 1, 1, 1); - rb.setRenderBoundsFromBlock(facb); - rb.renderStandardBlock(facb, x, y, z); + if(!rb.hasOverrideBlockTexture()) { + rb.setRenderBoundsFromBlock(facb); + rb.renderStandardBlock(facb, x, y, z); + } facb.setBlockOverride(null); bundle.setFacadeId(facadeId, false); - - } else if(facadeId != null) { bundle.setFacadeRenderAs(FacadeRenderState.FULL); boolean isFacadeOpaque = facadeId.isOpaqueCube(); - res = !isFacadeOpaque; + res = isFacadeOpaque; if((isFacadeOpaque && BlockConduitBundle.theRenderPass == 0) || - (!isFacadeOpaque && BlockConduitBundle.theRenderPass == 1)) { + (rb.hasOverrideBlockTexture() || (!isFacadeOpaque && BlockConduitBundle.theRenderPass == 1))) { IBlockAccess origBa = rb.blockAccess; rb.blockAccess = new FacadeAccessWrapper(origBa); try { @@ -178,7 +180,6 @@ public class ConduitBundleRenderer extends TileEntitySpecialRenderer implements } } - } else { bundle.setFacadeRenderAs(FacadeRenderState.NONE); } @@ -190,7 +191,7 @@ public class ConduitBundleRenderer extends TileEntitySpecialRenderer implements Tessellator tessellator = Tessellator.instance; tessellator.setColorOpaque_F(1, 1, 1); tessellator.addTranslation((float) x, (float) y, (float) z); - + // Conduits Set externals = new HashSet(); EntityClientPlayerMP player = Minecraft.getMinecraft().thePlayer; @@ -244,30 +245,27 @@ public class ConduitBundleRenderer extends TileEntitySpecialRenderer implements } } else if(ConduitUtil.getDisplayMode(player) == ConduitDisplayMode.ALL && !rb.hasOverrideBlockTexture()) { - IIcon tex = EnderIO.blockConduitBundle.getConnectorIcon(); + IIcon tex = EnderIO.blockConduitBundle.getConnectorIcon(component.data); CubeRenderer.render(component.bound, tex); } } + //render these after the 'normal' conduits so help with proper blending + for (BoundingBox wireBound : wireBounds) { + Tessellator.instance.setColorRGBA_F(1, 1, 1, 0.25f); + CubeRenderer.render(wireBound, EnderIO.blockConduitFacade.getIcon(0, 0)); + } - if(!rb.hasOverrideBlockTexture()) { - //render these after the 'normal' conduits so help with proper blending - for (BoundingBox wireBound : wireBounds) { - Tessellator.instance.setColorRGBA_F(1, 1, 1, 0.25f); - CubeRenderer.render(wireBound, EnderIO.blockConduitFacade.getIcon(0, 0)); - } - - Tessellator.instance.setColorRGBA_F(1, 1, 1, 1f); - // External connection terminations - for (ForgeDirection dir : externals) { - renderExternalConnection(dir); - } + Tessellator.instance.setColorRGBA_F(1, 1, 1, 1f); + // External connection terminations + for (ForgeDirection dir : externals) { + renderExternalConnection(dir); } tessellator.addTranslation(-(float) x, -(float) y, -(float) z); } private void renderExternalConnection(ForgeDirection dir) { - IIcon tex = EnderIO.blockConduitBundle.getConnectorIcon(); + IIcon tex = EnderIO.blockConduitBundle.getConnectorIcon(ConduitConnectorType.EXTERNAL); BoundingBox[] bbs = ConduitGeometryUtil.instance.getExternalConnectorBoundingBoxes(dir); for (BoundingBox bb : bbs) { CubeRenderer.render(bb, tex, true); diff --git a/src/main/java/crazypants/enderio/conduit/render/DefaultConduitRenderer.java b/src/main/java/crazypants/enderio/conduit/render/DefaultConduitRenderer.java index 9d644b01..587ab042 100644 --- a/src/main/java/crazypants/enderio/conduit/render/DefaultConduitRenderer.java +++ b/src/main/java/crazypants/enderio/conduit/render/DefaultConduitRenderer.java @@ -80,7 +80,7 @@ public class DefaultConduitRenderer implements ConduitRenderer { drawSection(bb, tex.getMinU(), tex.getMaxU(), tex.getMinV(), tex.getMaxV(), component.dir, false); if(conduit.getConnectionMode(component.dir) == ConnectionMode.DISABLED) { - tex = EnderIO.blockConduitBundle.getConnectorIcon(); + tex = EnderIO.blockConduitBundle.getConnectorIcon(component.data); List corners = component.bound.getCornersWithUvForFace(component.dir, tex.getMinU(), tex.getMaxU(), tex.getMinV(), tex.getMaxV()); Tessellator tessellator = Tessellator.instance; for (Vertex c : corners) { diff --git a/src/main/java/crazypants/enderio/config/Config.java b/src/main/java/crazypants/enderio/config/Config.java index 0271f103..a1832193 100644 --- a/src/main/java/crazypants/enderio/config/Config.java +++ b/src/main/java/crazypants/enderio/config/Config.java @@ -269,16 +269,22 @@ public final class Config { public static boolean farmEssenceBerriesEnabled = true; public static boolean farmManaBeansEnabled = false; public static boolean farmHarvestJungleWhenCocoa = false; - public static String[] hoeStrings = new String[] { - "minecraft:wooden_hoe", "minecraft:stone_hoe", "minecraft:iron_hoe", "minecraft:diamond_hoe", "minecraft:golden_hoe", - "MekanismTools:ObsidianHoe", "MekanismTools:LapisLazuliHoe", "MekanismTools:OsmiumHoe", "MekanismTools:BronzeHoe", "MekanismTools:GlowstoneHoe", "MekanismTools:SteelHoe", - "Steamcraft:hoeBrass", "Steamcraft:hoeGildedGold", - "Railcraft:tool.steel.hoe", - "TConstruct:mattock", - "appliedenergistics2:item.ToolCertusQuartzHoe", "appliedenergistics2:item.ToolNetherQuartzHoe", - "ProjRed|Exploration:projectred.exploration.hoeruby", "ProjRed|Exploration:projectred.exploration.hoesapphire", "ProjRed|Exploration:projectred.exploration.hoeperidot", - "magicalcrops:magicalcrops_AccioHoe", "magicalcrops:magicalcrops_CrucioHoe", "magicalcrops:magicalcrops_ImperioHoe", - // disabled as it is currently not unbreaking as advertised "magicalcrops:magicalcrops_ZivicioHoe", + public static String[] hoeStrings = new String[] { + "minecraft:wooden_hoe", "minecraft:stone_hoe", "minecraft:iron_hoe", "minecraft:diamond_hoe", "minecraft:golden_hoe", + "MekanismTools:ObsidianHoe", "MekanismTools:LapisLazuliHoe", "MekanismTools:OsmiumHoe", "MekanismTools:BronzeHoe", "MekanismTools:GlowstoneHoe", + "MekanismTools:SteelHoe", + "Steamcraft:hoeBrass", "Steamcraft:hoeGildedGold", + "Railcraft:tool.steel.hoe", + "TConstruct:mattock", + "appliedenergistics2:item.ToolCertusQuartzHoe", "appliedenergistics2:item.ToolNetherQuartzHoe", + "ProjRed|Exploration:projectred.exploration.hoeruby", "ProjRed|Exploration:projectred.exploration.hoesapphire", + "ProjRed|Exploration:projectred.exploration.hoeperidot", + "magicalcrops:magicalcrops_AccioHoe", "magicalcrops:magicalcrops_CrucioHoe", "magicalcrops:magicalcrops_ImperioHoe", + // disabled as it is currently not unbreaking as advertised "magicalcrops:magicalcrops_ZivicioHoe", + "BiomesOPlenty:hoeAmethyst", "BiomesOPlenty:hoeMud", + "Eln:Eln.Copper Hoe", + "Thaumcraft:ItemHoeThaumium", "Thaumcraft:ItemHoeElemental", "Thaumcraft:ItemHoeVoid", + "ThermalExpansion:tool.hoeInvar" }; public static List farmHoes = new ArrayList(); @@ -567,22 +573,22 @@ public final class Config { "The range of the wireless charger").getInt(wirelessChargerRange); fluidConduitExtractRate = config.get(sectionEfficiency.name, "fluidConduitExtractRate", fluidConduitExtractRate, - "Number of millibuckects per tick extracted by a fluid conduits auto extracting").getInt(fluidConduitExtractRate); + "Number of millibuckets per tick extracted by a fluid conduits auto extracting").getInt(fluidConduitExtractRate); fluidConduitMaxIoRate = config.get(sectionEfficiency.name, "fluidConduitMaxIoRate", fluidConduitMaxIoRate, - "Number of millibuckects per tick that can pass through a single connection to a fluid conduit.").getInt(fluidConduitMaxIoRate); + "Number of millibuckets per tick that can pass through a single connection to a fluid conduit.").getInt(fluidConduitMaxIoRate); advancedFluidConduitExtractRate = config.get(sectionEfficiency.name, "advancedFluidConduitExtractRate", advancedFluidConduitExtractRate, - "Number of millibuckects per tick extracted by pressurised fluid conduits auto extracting").getInt(advancedFluidConduitExtractRate); + "Number of millibuckets per tick extracted by pressurised fluid conduits auto extracting").getInt(advancedFluidConduitExtractRate); advancedFluidConduitMaxIoRate = config.get(sectionEfficiency.name, "advancedFluidConduitMaxIoRate", advancedFluidConduitMaxIoRate, - "Number of millibuckects per tick that can pass through a single connection to an pressurised fluid conduit.").getInt(advancedFluidConduitMaxIoRate); + "Number of millibuckets per tick that can pass through a single connection to an pressurised fluid conduit.").getInt(advancedFluidConduitMaxIoRate); enderFluidConduitExtractRate = config.get(sectionEfficiency.name, "enderFluidConduitExtractRate", enderFluidConduitExtractRate, - "Number of millibuckects per tick extracted by ender fluid conduits auto extracting").getInt(enderFluidConduitExtractRate); + "Number of millibuckets per tick extracted by ender fluid conduits auto extracting").getInt(enderFluidConduitExtractRate); enderFluidConduitMaxIoRate = config.get(sectionEfficiency.name, "enderFluidConduitMaxIoRate", enderFluidConduitMaxIoRate, - "Number of millibuckects per tick that can pass through a single connection to an ender fluid conduit.").getInt(enderFluidConduitMaxIoRate); + "Number of millibuckets per tick that can pass through a single connection to an ender fluid conduit.").getInt(enderFluidConduitMaxIoRate); gasConduitExtractRate = config.get(sectionEfficiency.name, "gasConduitExtractRate", gasConduitExtractRate, "Amount of gas per tick extracted by gas conduits auto extracting").getInt(gasConduitExtractRate); @@ -598,7 +604,7 @@ public final class Config { transceiverUpkeepCostRF = config.get(sectionPower.name, "transceiverUpkeepCostRF", transceiverUpkeepCostRF, "Number of RF/t required to keep a Dimensional Transceiver connection open").getInt(transceiverUpkeepCostRF); transceiverMaxIoRF = config.get(sectionPower.name, "transceiverMaxIoRF", transceiverMaxIoRF, - "Maximum RF/t sent and recieved by a Dimensional Transceiver per tick. Input and output limits are not cumulative").getInt(transceiverMaxIoRF); + "Maximum RF/t sent and received by a Dimensional Transceiver per tick. Input and output limits are not cumulative").getInt(transceiverMaxIoRF); transceiverBucketTransmissionCostRF = config.get(sectionEfficiency.name, "transceiverBucketTransmissionCostRF", transceiverBucketTransmissionCostRF, "The cost in RF of transporting a bucket of fluid via a Dimensional Transceiver.").getInt(transceiverBucketTransmissionCostRF); @@ -684,7 +690,7 @@ public final class Config { enderIoRange = config.get(sectionEfficiency.name, "enderIoRange", enderIoRange, - "Range accessable (in blocks) when using the Ender IO.").getInt(enderIoRange); + "Range accessible (in blocks) when using the Ender IO.").getInt(enderIoRange); enderIoMeAccessEnabled = config.get(sectionPersonal.name, "enderIoMeAccessEnabled", enderIoMeAccessEnabled, "If false: you will not be able to access a ME access or crafting terminal using the Ender IO.").getBoolean(enderIoMeAccessEnabled); @@ -697,7 +703,7 @@ public final class Config { darkSteelPowerDamgeAbsorptionRatios = config .get(sectionDarkSteel.name, "darkSteelPowerDamgeAbsorptionRatios", darkSteelPowerDamgeAbsorptionRatios, - "A list of the amount of durabilty damage absorbed when items are powered. In order of upgrade level. 1=100% so items take no durablity damage when powered.") + "A list of the amount of durability damage absorbed when items are powered. In order of upgrade level. 1=100% so items take no durability damage when powered.") .getDoubleList(); darkSteelPowerStorageBase = config.get(sectionDarkSteel.name, "darkSteelPowerStorageBase", darkSteelPowerStorageBase, "Base amount of power stored by dark steel items.").getInt(darkSteelPowerStorageBase); @@ -755,9 +761,9 @@ public final class Config { darkSteelWalkPowerCost = config.get(sectionDarkSteel.name, "darkSteelWalkPowerCost", darkSteelWalkPowerCost, "Amount of power stored (RF) per block walked when wearing the dark steel boots.").getInt(darkSteelWalkPowerCost); darkSteelSprintPowerCost = config.get(sectionDarkSteel.name, "darkSteelSprintPowerCost", darkSteelWalkPowerCost, - "Amount of power stored (RF) per block walked when wearing the dark stell boots.").getInt(darkSteelSprintPowerCost); + "Amount of power stored (RF) per block walked when wearing the dark steel boots.").getInt(darkSteelSprintPowerCost); darkSteelDrainPowerFromInventory = config.get(sectionDarkSteel.name, "darkSteelDrainPowerFromInventory", darkSteelDrainPowerFromInventory, - "If true, dark steel armor will drain power stored (RF) in power containers in the players invenotry.").getBoolean(darkSteelDrainPowerFromInventory); + "If true, dark steel armor will drain power stored (RF) in power containers in the players inventory.").getBoolean(darkSteelDrainPowerFromInventory); darkSteelBootsJumpPowerCost = config.get(sectionDarkSteel.name, "darkSteelBootsJumpPowerCost", darkSteelBootsJumpPowerCost, "Base amount of power used per jump (RF) dark steel boots. The second jump in a 'double jump' uses 2x this etc").getInt(darkSteelBootsJumpPowerCost); @@ -834,7 +840,7 @@ public final class Config { vanillaSwordSkullLootingModifier); ticCleaverSkullDropChance = (float) config.get(sectionDarkSteel.name, "ticCleaverSkullDropChance", ticCleaverSkullDropChance, - "The base chance that an enderman skull will be dropped when using TiC Cleaver").getDouble( + "The base chance that an Enderman Skull will be dropped when using TiC Cleaver").getDouble( ticCleaverSkullDropChance); ticBeheadingSkullModifier = (float) config.get(sectionPersonal.name, "ticBeheadingSkullModifier", ticBeheadingSkullModifier, "The chance per level of Beheading that a skull will be dropped when using a TiC weapon").getDouble( @@ -863,7 +869,7 @@ public final class Config { darkSteelPickPowerUseObsidian = config.get(sectionDarkSteel.name, "darkSteelPickPowerUseObsidian", darkSteelPickPowerUseObsidian, "The amount of power (RF) used to break an obsidian block.").getInt(darkSteelPickPowerUseObsidian); darkSteelPickEffeciencyObsidian = config.get(sectionDarkSteel.name, "darkSteelPickEffeciencyObsidian", darkSteelPickEffeciencyObsidian, - "The effeciency when breaking obsidian with a powered Dark Pickaxe.").getInt(darkSteelPickEffeciencyObsidian); + "The efficiency when breaking obsidian with a powered Dark Pickaxe.").getInt(darkSteelPickEffeciencyObsidian); darkSteelPickApplyObsidianEffeciencyAtHardess = (float) config.get(sectionDarkSteel.name, "darkSteelPickApplyObsidianEffeciencyAtHardess", darkSteelPickApplyObsidianEffeciencyAtHardess, "If set to a value > 0, the obsidian speed and power use will be used for all blocks with hardness >= to this value.").getDouble( @@ -871,7 +877,7 @@ public final class Config { darkSteelPickPowerUsePerDamagePoint = config.get(sectionDarkSteel.name, "darkSteelPickPowerUsePerDamagePoint", darkSteelPickPowerUsePerDamagePoint, "Power use (RF) per damage/durability point avoided.").getInt(darkSteelPickPowerUsePerDamagePoint); darkSteelPickEffeciencyBoostWhenPowered = (float) config.get(sectionDarkSteel.name, "darkSteelPickEffeciencyBoostWhenPowered", - darkSteelPickEffeciencyBoostWhenPowered, "The increase in effciency when powered.").getDouble(darkSteelPickEffeciencyBoostWhenPowered); + darkSteelPickEffeciencyBoostWhenPowered, "The increase in efficiency when powered.").getDouble(darkSteelPickEffeciencyBoostWhenPowered); darkSteelPickMinesTiCArdite = config.getBoolean("darkSteelPickMinesTiCArdite", sectionDarkSteel.name, darkSteelPickMinesTiCArdite, "When true the dark steel pick will be able to mine TiC Ardite and Cobalt"); @@ -884,7 +890,7 @@ public final class Config { darkSteelAxeSpeedPenaltyMultiHarvest, "How much slower shift-harvesting logs is.").getDouble(darkSteelAxeSpeedPenaltyMultiHarvest); darkSteelAxeEffeciencyBoostWhenPowered = (float) config.get(sectionDarkSteel.name, "darkSteelAxeEffeciencyBoostWhenPowered", - darkSteelAxeEffeciencyBoostWhenPowered, "The increase in effciency when powered.").getDouble(darkSteelAxeEffeciencyBoostWhenPowered); + darkSteelAxeEffeciencyBoostWhenPowered, "The increase in efficiency when powered.").getDouble(darkSteelAxeEffeciencyBoostWhenPowered); darkSteelAnvilDamageChance = (float) config.get(sectionDarkSteel.name, "darkSteelAnvilDamageChance", darkSteelAnvilDamageChance, "Chance that the dark steel anvil will take damage after repairing something.").getDouble(); @@ -1094,7 +1100,7 @@ public final class Config { spawnGuardPowerPerTickLevelThree = config.get(sectionAttractor.name, "spawnGuardPowerPerTickLevelThree", spawnGuardPowerPerTickLevelThree, "The RF/t power use of a levele 3 spawn guard").getInt(spawnGuardPowerPerTickLevelThree); spawnGuardStopAllSlimesDebug = config.getBoolean("spawnGuardStopAllSlimesDebug", sectionAttractor.name, spawnGuardStopAllSlimesDebug, - "When true slimes wont be alowed to spawn at all. Only added to aid testing in super flat worlds."); + "When true slimes wont be allowed to spawn at all. Only added to aid testing in super flat worlds."); spawnGuardStopAllSquidSpawning = config.getBoolean("spawnGuardStopAllSquidSpawning", sectionAttractor.name, spawnGuardStopAllSquidSpawning, "When true no squid will be spawned."); @@ -1114,9 +1120,9 @@ public final class Config { enderRailEnabled = config.getBoolean("enderRailEnabled", sectionRailConfig.name, enderRailEnabled, "Wether Ender Rails are enabled"); enderRailPowerRequireCrossDimensions = config.get(sectionRailConfig.name, "enderRailPowerRequireCrossDimensions", enderRailPowerRequireCrossDimensions, - "The amount of power required to transpoer a cart accross dimensions").getInt(enderRailPowerRequireCrossDimensions); + "The amount of power required to transport a cart across dimensions").getInt(enderRailPowerRequireCrossDimensions); enderRailPowerRequiredPerBlock = config.get(sectionRailConfig.name, "enderRailPowerRequiredPerBlock", enderRailPowerRequiredPerBlock, - "The amout of power required to teleport a cart per block in the same dimension").getInt(enderRailPowerRequiredPerBlock); + "The amount of power required to teleport a cart per block in the same dimension").getInt(enderRailPowerRequiredPerBlock); enderRailCapSameDimensionPowerAtCrossDimensionCost = config.getBoolean("enderRailCapSameDimensionPowerAtCrossDimensionCost", sectionRailConfig.name, enderRailCapSameDimensionPowerAtCrossDimensionCost, "When set to true the RF cost of sending a cart within the same dimension will be capped to the cross dimension cost"); enderRailTicksBeforeForceSpawningLinkedCarts = config.get(sectionRailConfig.name, "enderRailTicksBeforeForceSpawningLinkedCarts", enderRailTicksBeforeForceSpawningLinkedCarts, diff --git a/src/main/java/crazypants/enderio/enderface/BlockEnderIO.java b/src/main/java/crazypants/enderio/enderface/BlockEnderIO.java index 1f78fc3f..6efb8968 100644 --- a/src/main/java/crazypants/enderio/enderface/BlockEnderIO.java +++ b/src/main/java/crazypants/enderio/enderface/BlockEnderIO.java @@ -87,19 +87,14 @@ public class BlockEnderIO extends BlockEio implements IResourceTooltipProvider { } @Override - public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer entityPlayer, int par6, float par7, float par8, float par9) { - if(entityPlayer.isSneaking()) { - return false; - } + public boolean openGui(World world, int x, int y, int z, EntityPlayer entityPlayer, int side) { TileEntity te = world.getTileEntity(x, y, z); if(te instanceof ITravelAccessable) { ITravelAccessable ta = (ITravelAccessable) te; if(ta.canUiBeAccessed(entityPlayer)) { - if(!world.isRemote) { - entityPlayer.openGui(EnderIO.instance, GuiHandler.GUI_ID_TRAVEL_ACCESSABLE, world, x, y, z); - } + entityPlayer.openGui(EnderIO.instance, GuiHandler.GUI_ID_TRAVEL_ACCESSABLE, world, x, y, z); } else { - if(world.isRemote) { + if(world.isRemote && !entityPlayer.isSneaking()) { entityPlayer.addChatComponentMessage(new ChatComponentText(Lang.localize("gui.travelAccessable.privateBlock1") + " " + ta.getPlacedBy() + " " + Lang.localize("gui.travelAccessable.privateBlock2"))); } @@ -146,11 +141,4 @@ public class BlockEnderIO extends BlockEio implements IResourceTooltipProvider { public String getUnlocalizedNameForTooltip(ItemStack stack) { return getUnlocalizedName(); } - - public void breakBlock(World world, int x, int y, int z, Block block, int p_149749_6_) { - super.breakBlock(world, x, y, z, block, p_149749_6_); - world.removeTileEntity(x, y, z); - } - - } diff --git a/src/main/java/crazypants/enderio/entity/EntityWitherSkeleton.java b/src/main/java/crazypants/enderio/entity/EntityWitherSkeleton.java index 6f9a1e57..59bda4e0 100644 --- a/src/main/java/crazypants/enderio/entity/EntityWitherSkeleton.java +++ b/src/main/java/crazypants/enderio/entity/EntityWitherSkeleton.java @@ -1,55 +1,93 @@ package crazypants.enderio.entity; +import java.util.Calendar; + +import net.minecraft.enchantment.EnchantmentHelper; +import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.IEntityLivingData; import net.minecraft.entity.SharedMonsterAttributes; import net.minecraft.entity.ai.attributes.AttributeModifier; import net.minecraft.entity.monster.EntitySkeleton; +import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.init.Items; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.util.DamageSource; import net.minecraft.world.World; +import cpw.mods.fml.common.registry.GameRegistry; +import crazypants.util.EntityUtil; -import java.util.Calendar; +public class EntityWitherSkeleton extends EntitySkeleton { + public EntityWitherSkeleton(World world) { + super(world); + } -public class EntityWitherSkeleton extends EntitySkeleton -{ - public EntityWitherSkeleton(World world) - { - super(world); + public EntityWitherSkeleton(EntitySkeleton entity) { + this(entity.worldObj); + this.copyLocationAndAnglesFrom(entity); + for (int i = 0; i < entity.getLastActiveItems().length; i++) { + this.setCurrentItemOrArmor(i, entity.getEquipmentInSlot(i)); + } + } + + @Override + public void setFire(int p_70015_1_) { + } + + @Override + public IEntityLivingData onSpawnWithEgg(IEntityLivingData entityData) { + this.getEntityAttribute(SharedMonsterAttributes.followRange) + .applyModifier(new AttributeModifier("Random spawn bonus", this.rand.nextGaussian() * 0.05D, 1)); + this.setSkeletonType(1); + this.setCurrentItemOrArmor(0, new ItemStack(Items.stone_sword)); + this.getEntityAttribute(SharedMonsterAttributes.attackDamage).setBaseValue(4.0D); + this.setCombatTask(); + this.setCanPickUpLoot(this.rand.nextFloat() < 0.55F * this.worldObj.func_147462_b(this.posX, this.posY, this.posZ)); + + if(this.getEquipmentInSlot(4) == null) { + Calendar calendar = this.worldObj.getCurrentDate(); + + if(calendar.get(2) + 1 == 10 && calendar.get(5) == 31 && this.rand.nextFloat() < 0.25F) { + this.setCurrentItemOrArmor(4, new ItemStack(this.rand.nextFloat() < 0.1F ? Blocks.lit_pumpkin : Blocks.pumpkin)); + this.equipmentDropChances[4] = 0.0F; + } } - public EntityWitherSkeleton(EntitySkeleton entity) - { - this(entity.worldObj); - this.copyLocationAndAnglesFrom(entity); - } + return entityData; + } - @Override - public void setFire(int p_70015_1_) - { - } + @Override + public int getSkeletonType() { + return 1; + } - @Override - public IEntityLivingData onSpawnWithEgg(IEntityLivingData entityData) - { - this.getEntityAttribute(SharedMonsterAttributes.followRange).applyModifier(new AttributeModifier("Random spawn bonus", this.rand.nextGaussian() * 0.05D, 1)); - this.setSkeletonType(1); - this.setCurrentItemOrArmor(0, new ItemStack(Items.stone_sword)); - this.getEntityAttribute(SharedMonsterAttributes.attackDamage).setBaseValue(4.0D); - this.setCombatTask(); - this.setCanPickUpLoot(this.rand.nextFloat() < 0.55F * this.worldObj.func_147462_b(this.posX, this.posY, this.posZ)); - - if (this.getEquipmentInSlot(4) == null) - { - Calendar calendar = this.worldObj.getCurrentDate(); - - if (calendar.get(2) + 1 == 10 && calendar.get(5) == 31 && this.rand.nextFloat() < 0.25F) - { - this.setCurrentItemOrArmor(4, new ItemStack(this.rand.nextFloat() < 0.1F ? Blocks.lit_pumpkin : Blocks.pumpkin)); - this.equipmentDropChances[4] = 0.0F; - } + @Override + public void onDeath(DamageSource source) { + super.onDeath(source); + if(source.damageType.equals("player")) { + EntityPlayer player = (EntityPlayer) source.getEntity(); + ItemStack stack = player.getCurrentEquippedItem(); + if(stack != null && stack.hasTagCompound()) { + Item cleaver = GameRegistry.findItem("TConstruct", "cleaver"); + int beheading = stack.getTagCompound().getCompoundTag("InfiTool").getInteger("Beheading"); + if(stack.getItem() == cleaver) { + beheading += 2; } - - return entityData; + System.out.println(beheading); + if(beheading > 0 && worldObj.rand.nextInt(100) < beheading * 10) { + EntityUtil.spawnItemInWorldWithRandomMotion(worldObj, new ItemStack(Items.skull, 1, 1), posX, posY, posZ); + } + } } + if(source.getEntity() instanceof EntityLivingBase) { + int lootingLevel = EnchantmentHelper.getLootingModifier((EntityLivingBase) source.getEntity()); + if(worldObj.rand.nextInt(Math.max(1, 1 - lootingLevel)) == 0) { + Item necroticBone = GameRegistry.findItem("TConstruct", "materials"); + if(necroticBone != null) { + EntityUtil.spawnItemInWorldWithRandomMotion(worldObj, new ItemStack(necroticBone, 1, 8), posX, posY, posZ); + } + } + } + } } diff --git a/src/main/java/crazypants/enderio/entity/SkeletonHandler.java b/src/main/java/crazypants/enderio/entity/SkeletonHandler.java index 426593d3..96fcf6a0 100644 --- a/src/main/java/crazypants/enderio/entity/SkeletonHandler.java +++ b/src/main/java/crazypants/enderio/entity/SkeletonHandler.java @@ -1,30 +1,41 @@ package crazypants.enderio.entity; +import net.minecraft.entity.Entity; +import net.minecraft.entity.monster.EntitySkeleton; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.event.entity.EntityJoinWorldEvent; +import net.minecraftforge.event.entity.living.LivingSpawnEvent; import cpw.mods.fml.common.eventhandler.EventPriority; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.registry.EntityRegistry; import crazypants.enderio.EnderIO; -import net.minecraft.entity.monster.EntitySkeleton; -import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.event.entity.EntityJoinWorldEvent; -public class SkeletonHandler -{ - @SubscribeEvent(priority = EventPriority.HIGHEST) - public void skeletonJoinWorld(EntityJoinWorldEvent event) - { - if (event.entity.getClass() == EntitySkeleton.class && ((EntitySkeleton)event.entity).getSkeletonType()==1) - { - event.setCanceled(true); - event.world.spawnEntityInWorld(new EntityWitherSkeleton((EntitySkeleton)event.entity)); - } - } +public class SkeletonHandler { - public static void registerSkeleton(EnderIO mod) - { - int entityID = EntityRegistry.findGlobalUniqueEntityId(); - EntityRegistry.registerGlobalEntityID(EntityWitherSkeleton.class,"witherSkeleton", entityID, 0x00003D, 0x751947); - EntityRegistry.registerModEntity(EntityWitherSkeleton.class,"witherSkeleton",entityID,mod,64,3,true); - MinecraftForge.EVENT_BUS.register(new SkeletonHandler()); + @SubscribeEvent(priority = EventPriority.HIGHEST) + public void skeletonJoinWorld(LivingSpawnEvent event) { + if(isWitherSkele(event.entity)) { + event.entity.setDead(); + event.world.spawnEntityInWorld(new EntityWitherSkeleton((EntitySkeleton) event.entity)); } + } + + @SubscribeEvent(priority = EventPriority.HIGHEST) + public void skeletonJoinWorld(EntityJoinWorldEvent event) { + if(isWitherSkele(event.entity)) { + event.setCanceled(true); + event.world.spawnEntityInWorld(new EntityWitherSkeleton((EntitySkeleton) event.entity)); + } + } + + private boolean isWitherSkele(Entity entity) { + return entity.getClass() == EntitySkeleton.class && ((EntitySkeleton) entity).getSkeletonType() == 1; + } + + public static void registerSkeleton(EnderIO mod) { + int entityID = EntityRegistry.findGlobalUniqueEntityId(); + EntityRegistry.registerGlobalEntityID(EntityWitherSkeleton.class, "witherSkeleton", entityID, 0x00003D, 0x751947); + EntityRegistry.registerModEntity(EntityWitherSkeleton.class, "witherSkeleton", entityID, mod, 64, 3, true); + MinecraftForge.EVENT_BUS.register(new SkeletonHandler()); + } } diff --git a/src/main/java/crazypants/enderio/gui/IconEIO.java b/src/main/java/crazypants/enderio/gui/IconEIO.java index c9bad739..ccddb55d 100644 --- a/src/main/java/crazypants/enderio/gui/IconEIO.java +++ b/src/main/java/crazypants/enderio/gui/IconEIO.java @@ -9,126 +9,121 @@ import crazypants.render.RenderUtil; public final class IconEIO { - public static final IconEIO TICK = new IconEIO(0, 100); - public static final IconEIO MINUS = new IconEIO(16, 100); - public static final IconEIO PUBLIC = new IconEIO(32, 100); - public static final IconEIO PRIVATE = new IconEIO(48, 100); - public static final IconEIO CROSS = new IconEIO(64, 100); - public static final IconEIO PLUS = new IconEIO(80, 100); - public static final IconEIO ARROWS = new IconEIO(178, 100); + public static final IconEIO TICK = new IconEIO(0, 192); + public static final IconEIO MINUS = new IconEIO(16, 192); + public static final IconEIO PUBLIC = new IconEIO(32, 192); + public static final IconEIO PRIVATE = new IconEIO(48, 192); + public static final IconEIO CROSS = new IconEIO(64, 192); + public static final IconEIO PLUS = new IconEIO(80, 192); + public static final IconEIO ARROWS = new IconEIO(176, 192); - public static final IconEIO BUTTON = new IconEIO(0, 116); - public static final IconEIO CHECKED_BUTTON = new IconEIO(0, 132); - public static final IconEIO BUTTON_HIGHLIGHT = new IconEIO(16, 116); - public static final IconEIO BUTTON_DISABLED = new IconEIO(32, 116); - public static final IconEIO BUTTON_DOWN = new IconEIO(48, 116); - public static final IconEIO BUTTON_DOWN_HIGHLIGHT = new IconEIO(64, 116); + public static final IconEIO BUTTON = new IconEIO(0, 208); + public static final IconEIO BUTTON_HIGHLIGHT = new IconEIO(16, 208); + public static final IconEIO BUTTON_DISABLED = new IconEIO(32, 208); + public static final IconEIO BUTTON_DOWN = new IconEIO(48, 208); + public static final IconEIO BUTTON_DOWN_HIGHLIGHT = new IconEIO(64, 208); + public static final IconEIO CHECKED_BUTTON = new IconEIO(112, 208); - public static final IconEIO WRENCH_OVERLAY_POWER = new IconEIO(0, 148, 32, 32); - public static final IconEIO WRENCH_OVERLAY_POWER_OFF = new IconEIO(0 + 96, 148, 32, 32); + public static final IconEIO WRENCH_OVERLAY_POWER = new IconEIO(0, 112); + public static final IconEIO WRENCH_OVERLAY_POWER_OFF = new IconEIO(0 + 48, 112); - public static final IconEIO WRENCH_OVERLAY_REDSTONE = new IconEIO(32, 148, 32, 32); - public static final IconEIO WRENCH_OVERLAY_REDSTONE_OFF = new IconEIO(32 + 96, 148, 32, 32); + public static final IconEIO WRENCH_OVERLAY_REDSTONE = new IconEIO(16, 112); + public static final IconEIO WRENCH_OVERLAY_REDSTONE_OFF = new IconEIO(16 + 48, 112); - public static final IconEIO WRENCH_OVERLAY_FLUID = new IconEIO(0, 180, 32, 32); - public static final IconEIO WRENCH_OVERLAY_FLUID_OFF = new IconEIO(96, 180, 32, 32); + public static final IconEIO WRENCH_OVERLAY_FLUID = new IconEIO(0, 128); + public static final IconEIO WRENCH_OVERLAY_FLUID_OFF = new IconEIO(0 + 48, 128); - public static final IconEIO WRENCH_OVERLAY_ITEM = new IconEIO(32, 180, 32, 32); - public static final IconEIO WRENCH_OVERLAY_ITEM_OFF = new IconEIO(32 + 96, 180, 32, 32); + public static final IconEIO WRENCH_OVERLAY_ITEM = new IconEIO(16, 128); + public static final IconEIO WRENCH_OVERLAY_ITEM_OFF = new IconEIO(16 + 48, 128); - public static final IconEIO WRENCH_OVERLAY_GAS = new IconEIO(64, 148, 32, 32); - public static final IconEIO WRENCH_OVERLAY_GAS_OFF = new IconEIO(64 + 96, 148, 32, 32); + public static final IconEIO WRENCH_OVERLAY_GAS = new IconEIO(32, 112); + public static final IconEIO WRENCH_OVERLAY_GAS_OFF = new IconEIO(32 + 48, 112); - public static final IconEIO WRENCH_OVERLAY_ME = new IconEIO(64, 180, 32, 32); - public static final IconEIO WRENCH_OVERLAY_ME_OFF = new IconEIO(64 + 96, 180, 32, 32); + public static final IconEIO WRENCH_OVERLAY_ME = new IconEIO(32, 128); + public static final IconEIO WRENCH_OVERLAY_ME_OFF = new IconEIO(32 + 48, 128); - public static final IconEIO PROBE_OVERLAY_PROBE = new IconEIO(112, 100, 32, 16); - public static final IconEIO PROBE_OVERLAY_COPY = new IconEIO(144, 100, 32, 16); + public static final IconEIO PROBE_OVERLAY_PROBE = new IconEIO(112, 192, 32, 16); + public static final IconEIO PROBE_OVERLAY_COPY = new IconEIO(144, 192, 32, 16); - public static final IconEIO ACTIVE_TAB = new IconEIO(237, 0, 19, 24); - public static final IconEIO INACTIVE_TAB = new IconEIO(237, 25, 19, 24); + public static final IconEIO ACTIVE_TAB = new IconEIO(205, 0, 19, 24); + public static final IconEIO INACTIVE_TAB = new IconEIO(237, 0, 19, 24); - public static final IconEIO LEFT_ARROW = new IconEIO(217, 0, 16, 32); - public static final IconEIO RIGHT_ARROW = new IconEIO(201, 0, 16, 32); + public static final IconEIO RIGHT_ARROW = new IconEIO(192, 48, 16, 32); + public static final IconEIO LEFT_ARROW = new IconEIO(208, 48, 16, 32); - public static final IconEIO REDSTONE_MODE_ALWAYS = new IconEIO(200, 60, 20, 20); - public static final IconEIO REDSTONE_MODE_WITH_SIGNAL = new IconEIO(220, 60, 20, 20); - public static final IconEIO REDSTONE_MODE_WITHOUT_SIGNAL = new IconEIO(200, 80, 20, 20); - public static final IconEIO REDSTONE_MODE_NEVER = new IconEIO(220, 80, 20, 20); + public static final IconEIO REDSTONE_MODE_WITHOUT_SIGNAL = new IconEIO(64, 224); + public static final IconEIO REDSTONE_MODE_WITH_SIGNAL = new IconEIO(80, 224); + public static final IconEIO REDSTONE_MODE_ALWAYS = new IconEIO(96, 224); + public static final IconEIO REDSTONE_MODE_NEVER = new IconEIO(112, 224); - public static final IconEIO FILTER_META = new IconEIO(0, 212, 22, 22); - public static final IconEIO FILTER_NBT = new IconEIO(22, 212, 22, 22); - public static final IconEIO FILTER_ORE_DICT = new IconEIO(44, 212, 22, 22); - public static final IconEIO FILTER_WHITELIST = new IconEIO(0, 234, 22, 22); - public static final IconEIO FILTER_BLACKLIST = new IconEIO(22, 234, 22, 22); - public static final IconEIO FILTER_STICKY = new IconEIO(44, 234, 22, 22); - public static final IconEIO FILTER_STICKY_OFF = new IconEIO(64, 234, 22, 22); + public static final IconEIO FILTER_META = new IconEIO(160, 224); + public static final IconEIO FILTER_NBT = new IconEIO(176, 224); + public static final IconEIO FILTER_ORE_DICT = new IconEIO(192, 224); + public static final IconEIO FILTER_WHITELIST = new IconEIO(0, 224); + public static final IconEIO FILTER_BLACKLIST = new IconEIO(0, 240); + public static final IconEIO FILTER_STICKY = new IconEIO(16, 240); + public static final IconEIO FILTER_STICKY_OFF = new IconEIO(32, 240); - public static final IconEIO FILTER_META_OFF = new IconEIO(64, 212, 22, 22); - public static final IconEIO FILTER_NBT_OFF = new IconEIO(64 + 22, 212, 22, 22); - public static final IconEIO FILTER_ORE_DICT_OFF = new IconEIO(64 + 44, 212, 22, 22); + public static final IconEIO FILTER_META_OFF = new IconEIO(208, 224); + public static final IconEIO FILTER_NBT_OFF = new IconEIO(224, 224); + public static final IconEIO FILTER_ORE_DICT_OFF = new IconEIO(240, 224); - public static final IconEIO INPUT = new IconEIO(128, 197 + 32, 30, 14); - public static final IconEIO INPUT_SMALL = new IconEIO(159, 220, 16, 8); - public static final IconEIO INPUT_SMALL_INV = new IconEIO(159, 228, 16, 8); - public static final IconEIO DISABLED = new IconEIO(159, 236, 16, 8); + @Deprecated + public static final IconEIO INPUT_OLD = new IconEIO(128, 197 + 32, 30, 14); + @Deprecated + public static final IconEIO OUTPUT_OLD = new IconEIO(128, 180 + 32, 30, 14); - public static final IconEIO OUTPUT = new IconEIO(128, 180 + 32, 30, 14); - public static final IconEIO OUTPUT_SMALL = new IconEIO(177, 220, 16, 8); - public static final IconEIO OUTPUT_SMALL_INV = new IconEIO(177, 228, 16, 8); + public static final IconEIO INPUT = new IconEIO(224, 64, 16, 8); + public static final IconEIO OUTPUT = new IconEIO(240, 64, 16, 8); + public static final IconEIO INPUT_OUTPUT = new IconEIO(224, 48, 32, 16); + public static final IconEIO DISABLED = new IconEIO(48, 240); - public static final IconEIO INPUT_OUTPUT = new IconEIO(159, 212, 30, 8); + public static final IconEIO LOOP = new IconEIO(224, 96); + public static final IconEIO LOOP_OFF = new IconEIO(240, 96); - public static final IconEIO INPUT_OFF = new IconEIO(188, 180 + 32, 30, 14); - public static final IconEIO OUTPUT_OFF = new IconEIO(188, 197 + 32, 30, 14); - public static final IconEIO INPUT_OUTPUT_OFF = new IconEIO(218 + 32, 180, 30, 8); + public static final IconEIO ROUND_ROBIN = new IconEIO(64, 240); + public static final IconEIO ROUND_ROBIN_OFF = new IconEIO(80, 240); - public static final IconEIO LOOP = new IconEIO(217, 236, 20, 20); - public static final IconEIO LOOP_OFF = new IconEIO(236, 236, 20, 20); + public static final IconEIO IO_CONFIG_UP = new IconEIO(16, 224); + public static final IconEIO IO_CONFIG_DOWN = new IconEIO(32, 224); + public static final IconEIO IO_WHATSIT = new IconEIO(128, 208); - public static final IconEIO ROUND_ROBIN = new IconEIO(86, 236, 20, 20); - public static final IconEIO ROUND_ROBIN_OFF = new IconEIO(106, 236, 20, 20); + public static final IconEIO RECIPE = new IconEIO(0, 224); + public static final IconEIO RECIPE_BUTTON = new IconEIO(80, 208); - public static final IconEIO IO_CONFIG_UP = new IconEIO(80, 116, 24, 24); - public static final IconEIO IO_CONFIG_DOWN = new IconEIO(104, 116, 24, 24); + public static final IconEIO ADD_BUT = new IconEIO(208, 32, 8, 8); + public static final IconEIO MINUS_BUT = new IconEIO(208, 40, 8, 8); - public static final IconEIO IO_WHATSIT = new IconEIO(192, 148, 13, 13); + public static final IconEIO SOUND = new IconEIO(176, 208); - public static final IconEIO RECIPE = new IconEIO(16, 132, 16, 16); - public static final IconEIO RECIPE_BUTTON = new IconEIO(128, 116, 24, 24); + public static final IconEIO XP = new IconEIO(128, 224); + public static final IconEIO XP_PLUS = new IconEIO(144, 224); - public static final IconEIO ADD_BUT = new IconEIO(139, 246, 10, 10); - public static final IconEIO MINUS_BUT = new IconEIO(129, 246, 10, 10); + public static final IconEIO SINGLE_PLUS = new IconEIO(240, 192); + public static final IconEIO DOUBLE_PLUS = new IconEIO(224, 192); + public static final IconEIO TRIPLE_PLUS = new IconEIO(208, 192); + public static final IconEIO SINGLE_MINUS = new IconEIO(240, 208); + public static final IconEIO DOUBLE_MINUS = new IconEIO(224, 208); + public static final IconEIO TRIPLE_MINUS = new IconEIO(208, 208); - public static final IconEIO SOUND = new IconEIO(209, 172, 22, 22); + public static final IconEIO ENDER_RAIL = new IconEIO(192, 208); - public static final IconEIO XP = new IconEIO(235, 60, 22, 22); - public static final IconEIO XP_PLUS = new IconEIO(235, 82, 22, 22); + public static final IconEIO FILTER = new IconEIO(192, 192); - public static final IconEIO SINGLE_PLUS = new IconEIO(234, 100); - public static final IconEIO DOUBLE_PLUS = new IconEIO(218, 100); - public static final IconEIO TRIPLE_PLUS = new IconEIO(202, 100); - public static final IconEIO SINGLE_MINUS = new IconEIO(206, 116); - public static final IconEIO DOUBLE_MINUS = new IconEIO(190, 116); - public static final IconEIO TRIPLE_MINUS = new IconEIO(174, 116); - - public static final IconEIO ENDER_RAIL = new IconEIO(235, 175); - - public static final IconEIO FILTER = new IconEIO(203, 31); - - public static final IconEIO ITEM_SINGLE = new IconEIO(220, 32); - public static final IconEIO ITEM_STACK = new IconEIO(220, 48); + public static final IconEIO ITEM_STACK = new IconEIO(144, 208); + public static final IconEIO ITEM_SINGLE = new IconEIO(160, 208); + + public static final IconEIO FARM_UNLOCK = new IconEIO(128, 240); + public static final IconEIO FARM_LOCK = new IconEIO(144, 240); + public static final IconEIO SUN = new IconEIO(160, 240); + public static final IconEIO RAIN = new IconEIO(176, 240); + public static final IconEIO THUNDER = new IconEIO(192, 240); + + // Texture size is actually 512 but everything is aligned to a 256 grid private static final int TEX_SIZE = 256; private static final double PIX_SIZE = 1d / TEX_SIZE; - public static final IconEIO UNLOCKED = new IconEIO(150, 245, 10, 10); - public static final IconEIO LOCKED = new IconEIO(162, 245, 10, 10); - - public static final IconEIO SUN = new IconEIO(32, 132); - public static final IconEIO RAIN = new IconEIO(48, 132); - public static final IconEIO THUNDER = new IconEIO(64, 132); - public final double minU; public final double maxU; public final double minV; @@ -136,7 +131,7 @@ public final class IconEIO { public final double width; public final double height; - public static final ResourceLocation TEXTURE = new ResourceLocation("enderio:textures/gui/widgets.png"); + public static final ResourceLocation TEXTURE = new ResourceLocation("enderio:textures/gui/widgetsv2.png"); public IconEIO(int x, int y) { this(x, y, 16, 16); diff --git a/src/main/java/crazypants/enderio/gui/IoConfigRenderer.java b/src/main/java/crazypants/enderio/gui/IoConfigRenderer.java index e1b7aa8b..3e946620 100644 --- a/src/main/java/crazypants/enderio/gui/IoConfigRenderer.java +++ b/src/main/java/crazypants/enderio/gui/IoConfigRenderer.java @@ -230,6 +230,7 @@ public class IoConfigRenderer { if(!updateCamera(partialTick, vp.x, vp.y, vp.width, vp.height)) { return; } + GL11.glPushAttrib(GL11.GL_ALL_ATTRIB_BITS); applyCamera(partialTick); TravelController.instance.setSelectionEnabled(false); renderScene(); @@ -237,6 +238,7 @@ public class IoConfigRenderer { renderSelection(); renderOverlay(par1, par2); + GL11.glPopAttrib(); } private void renderSelection() { @@ -287,6 +289,7 @@ public class IoConfigRenderer { mx -= vpx; my -= vpy; + if(mx >= x && mx <= x + IconEIO.IO_WHATSIT.width && my >= y && my <= y + IconEIO.IO_WHATSIT.height) { RenderUtil.renderQuad2D(x, y, 0, IconEIO.IO_WHATSIT.width, IconEIO.IO_WHATSIT.height, new Vector4f(0.4f,0.4f,0.4f,0.6f)); @@ -298,15 +301,14 @@ public class IoConfigRenderer { GL11.glColor3f(1, 1, 1); IconEIO.IO_WHATSIT.renderIcon(x, y, true); - if(selection != null) { IconEIO ioIcon = null; // INPUT IoMode mode = selection.config.getIoMode(selection.face); if(mode == IoMode.PULL) { - ioIcon = IconEIO.INPUT_SMALL_INV; + ioIcon = IconEIO.INPUT; } else if(mode == IoMode.PUSH) { - ioIcon = IconEIO.OUTPUT_SMALL_INV; + ioIcon = IconEIO.OUTPUT; } else if(mode == IoMode.PUSH_PULL) { ioIcon = IconEIO.INPUT_OUTPUT; } else if(mode == IoMode.DISABLED) { diff --git a/src/main/java/crazypants/enderio/gui/ToggleButtonEIO.java b/src/main/java/crazypants/enderio/gui/ToggleButtonEIO.java index 097f2fbd..9b37fca7 100644 --- a/src/main/java/crazypants/enderio/gui/ToggleButtonEIO.java +++ b/src/main/java/crazypants/enderio/gui/ToggleButtonEIO.java @@ -6,8 +6,8 @@ import crazypants.gui.IGuiScreen; public class ToggleButtonEIO extends IconButtonEIO { private boolean selected; - private IconEIO unselectedIcon; - private IconEIO selectedIcon; + private final IconEIO unselectedIcon; + private final IconEIO selectedIcon; private String[] selectedTooltip; private String[] unselectedTooltip; @@ -52,12 +52,15 @@ public class ToggleButtonEIO extends IconButtonEIO { @Override public boolean mousePressed(Minecraft par1Minecraft, int par2, int par3) { - boolean result = super.mousePressed(par1Minecraft, par2, par3); - if(result) { - setSelected(!selected); + if(super.mousePressed(par1Minecraft, par2, par3)) { + return toggleSelected(); } - return result; + return false; + } + protected boolean toggleSelected() { + setSelected(!selected); + return true; } public void setSelectedToolTip(String... tt) { diff --git a/src/main/java/crazypants/enderio/gui/TooltipAddera.java b/src/main/java/crazypants/enderio/gui/TooltipAddera.java index 0de80de8..ede5a5a7 100644 --- a/src/main/java/crazypants/enderio/gui/TooltipAddera.java +++ b/src/main/java/crazypants/enderio/gui/TooltipAddera.java @@ -44,10 +44,10 @@ import crazypants.util.Lang; public class TooltipAddera { - public static TooltipAddera instance = new TooltipAddera(); + public static final TooltipAddera instance = new TooltipAddera(); //TODO: Need to decouple this stuff with a callback - private BallTipProvider btp = new BallTipProvider(); + private final BallTipProvider btp = new BallTipProvider(); static { MinecraftForge.EVENT_BUS.register(instance); @@ -62,7 +62,7 @@ public class TooltipAddera { if(!addStirlinGeneratorTooltip(evt)) { int time = TileEntityFurnace.getItemBurnTime(evt.itemStack); if(time > 0) { - evt.toolTip.add("Burn time " + time); + evt.toolTip.add(Lang.localize("tooltip.burntime") + " " + time); } } } @@ -96,11 +96,11 @@ public class TooltipAddera { IGrindingMultiplier gb = CrusherRecipeManager.getInstance().getGrindballFromStack(evt.itemStack); if(gb != null) { btp.ball = gb; - TooltipAddera.instance.addInformation(btp, evt.itemStack, evt.entityPlayer, evt.toolTip, false); + addInformation(btp, evt.itemStack, evt.entityPlayer, evt.toolTip, false); } if(Config.addRegisterdNameTooltip) { - UniqueIdentifier uid = null; + UniqueIdentifier uid; Block block = Block.getBlockFromItem(evt.itemStack.getItem()); if(block != null && block != Blocks.air) { uid = GameRegistry.findUniqueIdentifierFor(block); @@ -108,7 +108,7 @@ public class TooltipAddera { uid = GameRegistry.findUniqueIdentifierFor(evt.itemStack.getItem()); } if(uid != null) { - evt.toolTip.add(EnumChatFormatting.AQUA + "UID: " + uid.toString() + " Meta: " + evt.itemStack.getItemDamage()); + evt.toolTip.add(EnumChatFormatting.AQUA + Lang.localize("tooltip.uid") + " " + uid.toString() + " " + Lang.localize("tooltip.meta") + " " + evt.itemStack.getItemDamage()); } } @@ -116,9 +116,9 @@ public class TooltipAddera { int[] ids = OreDictionary.getOreIDs(evt.itemStack); if(ids != null && ids.length > 0) { if(ids.length == 1) { - evt.toolTip.add(EnumChatFormatting.AQUA + "Ore Dictionary: " + OreDictionary.getOreName(ids[0])); + evt.toolTip.add(EnumChatFormatting.AQUA + Lang.localize("tooltip.oredict") + " " + OreDictionary.getOreName(ids[0])); } else { - evt.toolTip.add(EnumChatFormatting.AQUA + "Ore Dictionary:"); + evt.toolTip.add(EnumChatFormatting.AQUA + Lang.localize("tooltip.oredict")); for (int id : ids) { String name = OreDictionary.getOreName(id); evt.toolTip.add(EnumChatFormatting.AQUA + " " + name); @@ -130,7 +130,7 @@ public class TooltipAddera { } private static boolean addStirlinGeneratorTooltip(ItemTooltipEvent evt) { - if(evt.entityPlayer.openContainer instanceof StirlingGeneratorContainer) { + if(evt.entityPlayer != null && evt.entityPlayer.openContainer instanceof StirlingGeneratorContainer) { AbstractMachineEntity te = ((StirlingGeneratorContainer)evt.entityPlayer.openContainer).getTileEntity(); if(te instanceof TileEntityStirlingGenerator) { TileEntityStirlingGenerator gen = (TileEntityStirlingGenerator) te; @@ -259,19 +259,18 @@ public class TooltipAddera { } public static void addDetailedTooltipFromResources(List list, String unlocalizedName) { - addTooltipFromResources(list, unlocalizedName, ".tooltip.detailed.line"); + addTooltipFromResources(list, unlocalizedName.concat(".tooltip.detailed.line")); } public static void addBasicTooltipFromResources(List list, String unlocalizedName) { - addTooltipFromResources(list, unlocalizedName, ".tooltip.basic.line"); + addTooltipFromResources(list, unlocalizedName.concat(".tooltip.basic.line")); } public static void addCommonTooltipFromResources(List list, String unlocalizedName) { - addTooltipFromResources(list, unlocalizedName, ".tooltip.common.line"); + addTooltipFromResources(list, unlocalizedName.concat(".tooltip.common.line")); } - public static void addTooltipFromResources(List list, String unlocalizedName, String tooltipTag) { - String keyBase = unlocalizedName + tooltipTag; + public static void addTooltipFromResources(List list, String keyBase) { boolean done = false; int line = 1; while (!done) { @@ -290,15 +289,19 @@ public class TooltipAddera { if(itemstack.getItem() == null) { return; } - String unlock = null; + String unloc = null; // Block blk = Block.getBlockFromItem(itemstack.getItem()); // if(blk != null && blk != Blocks.air) { // unlock = blk.getUnlocalizedName(); // } - if(unlock == null) { - unlock = itemstack.getItem().getUnlocalizedName(); + + if (itemstack.getItem() instanceof IResourceTooltipProvider) { + unloc = ((IResourceTooltipProvider)itemstack.getItem()).getUnlocalizedNameForTooltip(itemstack); } - addDetailedTooltipFromResources(list, unlock); + if(unloc == null) { + unloc = itemstack.getItem().getUnlocalizedName(itemstack); + } + addDetailedTooltipFromResources(list, unloc); } private static class BallTipProvider implements IAdvancedTooltipProvider { diff --git a/src/main/java/crazypants/enderio/item/ItemConduitProbe.java b/src/main/java/crazypants/enderio/item/ItemConduitProbe.java index 448c5dd5..d85aba1d 100644 --- a/src/main/java/crazypants/enderio/item/ItemConduitProbe.java +++ b/src/main/java/crazypants/enderio/item/ItemConduitProbe.java @@ -2,12 +2,8 @@ package crazypants.enderio.item; import java.text.NumberFormat; import java.util.Collection; -import java.util.HashSet; -import java.util.Set; -import net.minecraft.block.Block; import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.enchantment.Enchantment; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -19,18 +15,15 @@ import net.minecraftforge.common.util.ForgeDirection; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import crazypants.enderio.EnderIO; import crazypants.enderio.EnderIOTab; -import crazypants.enderio.GuiHandler; import crazypants.enderio.ModObject; -import crazypants.enderio.conduit.ConduitUtil; +import crazypants.enderio.api.tool.IHideFacades; import crazypants.enderio.conduit.IConduit; import crazypants.enderio.conduit.IConduitBundle; -import crazypants.enderio.conduit.redstone.IInsulatedRedstoneConduit; import crazypants.enderio.gui.IResourceTooltipProvider; import crazypants.enderio.network.PacketHandler; -public class ItemConduitProbe extends Item implements IResourceTooltipProvider { +public class ItemConduitProbe extends Item implements IResourceTooltipProvider, IHideFacades { private static final NumberFormat NF = NumberFormat.getIntegerInstance(); @@ -124,5 +117,9 @@ public class ItemConduitProbe extends Item implements IResourceTooltipProvider { public boolean doesSneakBypassUse(World world, int x, int y, int z, EntityPlayer player) { return true; } - + + @Override + public boolean shouldHideFacades(ItemStack stack, EntityPlayer player) { + return true; + } } diff --git a/src/main/java/crazypants/enderio/item/ItemSoulVessel.java b/src/main/java/crazypants/enderio/item/ItemSoulVessel.java index 0c0c702a..e33de3a7 100644 --- a/src/main/java/crazypants/enderio/item/ItemSoulVessel.java +++ b/src/main/java/crazypants/enderio/item/ItemSoulVessel.java @@ -364,7 +364,7 @@ public class ItemSoulVessel extends Item implements IResourceTooltipProvider { if(mobName != null) { par3List.add(EntityUtil.getDisplayNameForEntity(mobName)); } else { - par3List.add("Empty"); + par3List.add(Lang.localize("item.itemSoulVessel.tooltip.empty")); } float health = getHealthFromStack(par1ItemStack); diff --git a/src/main/java/crazypants/enderio/item/ItemYetaWrench.java b/src/main/java/crazypants/enderio/item/ItemYetaWrench.java index 7607065d..918890ff 100644 --- a/src/main/java/crazypants/enderio/item/ItemYetaWrench.java +++ b/src/main/java/crazypants/enderio/item/ItemYetaWrench.java @@ -2,6 +2,7 @@ package crazypants.enderio.item; import java.lang.reflect.InvocationHandler; import java.lang.reflect.Method; +import java.util.ArrayList; import java.util.List; import net.minecraft.block.Block; @@ -17,17 +18,19 @@ import org.lwjgl.input.Keyboard; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import crazypants.enderio.EnderIO; import crazypants.enderio.EnderIOTab; import crazypants.enderio.ModObject; +import crazypants.enderio.api.tool.IConduitControl; import crazypants.enderio.api.tool.ITool; import crazypants.enderio.conduit.ConduitDisplayMode; import crazypants.enderio.config.Config; import crazypants.enderio.gui.IAdvancedTooltipProvider; +import crazypants.enderio.gui.TooltipAddera; import crazypants.enderio.network.PacketHandler; import crazypants.enderio.tool.ToolUtil; -import crazypants.util.Lang; -public class ItemYetaWrench extends Item implements ITool, IAdvancedTooltipProvider, InvocationHandler { +public class ItemYetaWrench extends Item implements ITool, IConduitControl, IAdvancedTooltipProvider, InvocationHandler { public static ItemYetaWrench create() { if(Config.useSneakMouseWheelYetaWrench) { @@ -83,7 +86,13 @@ public class ItemYetaWrench extends Item implements ITool, IAdvancedTooltipProvi ConduitDisplayMode.setDisplayMode(equipped, newMode); return equipped; } - + + @Override + public boolean onBlockStartBreak(ItemStack itemstack, int x, int y, int z, EntityPlayer player) { + Block block = player.worldObj.getBlock(x, y, z); + return block == EnderIO.blockConduitBundle; + } + @Override public boolean isFull3D() { return true; @@ -107,29 +116,33 @@ public class ItemYetaWrench extends Item implements ITool, IAdvancedTooltipProvi public boolean shouldHideFacades(ItemStack stack, EntityPlayer player) { return true; } + + @Override + public boolean showOverlay(ItemStack stack, EntityPlayer player) { + return true; + } /* IAdvancedTooltipProvider */ - @SuppressWarnings({ "rawtypes", "unchecked" }) + @SuppressWarnings("rawtypes") @Override public void addBasicEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { - int line = 1; - String unloc = getUnlocalizedName() + ".tooltip.detailed.line", loc = null; - while (!(loc = Lang.localize(unloc + line, false)).equals(unloc + line++)) { - list.add(String.format(loc, Keyboard.getKeyName(KeyTracker.instance.getYetaWrenchMode().getKeyCode()))); - } } @SuppressWarnings("rawtypes") @Override public void addCommonEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { - ; // none } - @SuppressWarnings("rawtypes") + @SuppressWarnings({ "rawtypes", "unchecked" }) @Override public void addDetailedEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { - ; // none + ArrayList tmp = new ArrayList(); + TooltipAddera.addDetailedTooltipFromResources(tmp, getUnlocalizedName()); + String keyName = Keyboard.getKeyName(KeyTracker.instance.getYetaWrenchMode().getKeyCode()); + for(String line : tmp) { + list.add(String.format(line, keyName)); + } } /* InvocationHandler */ diff --git a/src/main/java/crazypants/enderio/item/KeyTracker.java b/src/main/java/crazypants/enderio/item/KeyTracker.java index 799a32c6..0424f85b 100644 --- a/src/main/java/crazypants/enderio/item/KeyTracker.java +++ b/src/main/java/crazypants/enderio/item/KeyTracker.java @@ -15,6 +15,7 @@ import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.gameevent.InputEvent.KeyInputEvent; import crazypants.enderio.EnderIO; import crazypants.enderio.item.darksteel.DarkSteelItems; +import crazypants.enderio.api.tool.IConduitControl; import crazypants.enderio.conduit.ConduitDisplayMode; import crazypants.enderio.item.darksteel.DarkSteelController; import crazypants.enderio.item.darksteel.GogglesOfRevealingUpgrade; @@ -143,7 +144,7 @@ public class KeyTracker { if(equipped == null) { return; } - if(equipped.getItem() == EnderIO.itemYetaWench) { + if(equipped.getItem() instanceof IConduitControl) { ConduitDisplayMode curMode = ConduitDisplayMode.getDisplayMode(equipped); if(curMode == null) { curMode = ConduitDisplayMode.ALL; diff --git a/src/main/java/crazypants/enderio/item/ToolTickHandler.java b/src/main/java/crazypants/enderio/item/ToolTickHandler.java index 3d71d3b8..4c124cfa 100644 --- a/src/main/java/crazypants/enderio/item/ToolTickHandler.java +++ b/src/main/java/crazypants/enderio/item/ToolTickHandler.java @@ -2,6 +2,7 @@ package crazypants.enderio.item; import net.minecraft.client.Minecraft; import net.minecraft.client.entity.EntityClientPlayerMP; +import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import org.lwjgl.input.Mouse; @@ -12,6 +13,7 @@ import cpw.mods.fml.common.gameevent.TickEvent.Phase; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import crazypants.enderio.EnderIO; +import crazypants.enderio.api.tool.IConduitControl; import crazypants.enderio.conduit.ConduitDisplayMode; import crazypants.enderio.network.PacketHandler; @@ -47,8 +49,8 @@ public class ToolTickHandler { } if(stack.getItem() == EnderIO.itemConduitProbe) { changeConduitProbeMode(stack); - } else if(stack.getItem() ==EnderIO.itemYetaWench) { - changeYetaWrenchMode(stack); + } else if(stack.getItem() instanceof IConduitControl) { + changeDisplayMode(stack, player); } } slotSelected = -1; @@ -57,7 +59,10 @@ public class ToolTickHandler { } } - private void changeYetaWrenchMode(ItemStack stack) { + private void changeDisplayMode(ItemStack stack, EntityPlayer player) { + if (!((IConduitControl)stack.getItem()).showOverlay(stack, player)) { + return; + } ConduitDisplayMode curMode = ConduitDisplayMode.getDisplayMode(stack); if(curMode == null) { curMode = ConduitDisplayMode.ALL; @@ -85,7 +90,7 @@ public class ToolTickHandler { private boolean isToolSelected(EntityClientPlayerMP player) { return player != null && player.getCurrentEquippedItem() != null && - (player.getCurrentEquippedItem().getItem() == EnderIO.itemYetaWench || player.getCurrentEquippedItem().getItem() == EnderIO.itemConduitProbe); + (player.getCurrentEquippedItem().getItem() instanceof IConduitControl || player.getCurrentEquippedItem().getItem() == EnderIO.itemConduitProbe); } } diff --git a/src/main/java/crazypants/enderio/item/YetaWrenchOverlayRenderer.java b/src/main/java/crazypants/enderio/item/YetaWrenchOverlayRenderer.java index f9c8144b..d4edfaac 100644 --- a/src/main/java/crazypants/enderio/item/YetaWrenchOverlayRenderer.java +++ b/src/main/java/crazypants/enderio/item/YetaWrenchOverlayRenderer.java @@ -6,6 +6,7 @@ import java.util.Map; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; +import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraftforge.client.event.RenderGameOverlayEvent; import net.minecraftforge.client.event.RenderGameOverlayEvent.ElementType; @@ -14,6 +15,7 @@ import net.minecraftforge.common.MinecraftForge; import org.lwjgl.opengl.GL11; import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import crazypants.enderio.api.tool.IConduitControl; import crazypants.enderio.conduit.ConduitDisplayMode; import crazypants.enderio.conduit.gas.GasUtil; import crazypants.enderio.conduit.me.MEUtil; @@ -21,15 +23,12 @@ import crazypants.enderio.gui.IconEIO; public class YetaWrenchOverlayRenderer { - private ItemYetaWrench wrench; - private IconEIO[] onIcons; private IconEIO[] offIcons; private Point[] iconOffsets; private Map indices = new EnumMap(ConduitDisplayMode.class); - public YetaWrenchOverlayRenderer(ItemYetaWrench wrench) { - this.wrench = wrench; + public YetaWrenchOverlayRenderer() { MinecraftForge.EVENT_BUS.register(this); } @@ -42,9 +41,10 @@ public class YetaWrenchOverlayRenderer { } private ItemStack getEquippedWrench() { - ItemStack equipped = Minecraft.getMinecraft().thePlayer.getCurrentEquippedItem(); - if(equipped != null && equipped.getItem() == wrench) { - return equipped; + EntityPlayer player = Minecraft.getMinecraft().thePlayer; + ItemStack equipped = player.getCurrentEquippedItem(); + if(equipped != null && equipped.getItem() instanceof IConduitControl) { + return ((IConduitControl) equipped.getItem()).showOverlay(equipped, player) ? equipped : null; } return null; } diff --git a/src/main/java/crazypants/enderio/item/darksteel/DarkSteelRecipeManager.java b/src/main/java/crazypants/enderio/item/darksteel/DarkSteelRecipeManager.java index e71c0a9a..28aa6394 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/DarkSteelRecipeManager.java +++ b/src/main/java/crazypants/enderio/item/darksteel/DarkSteelRecipeManager.java @@ -187,7 +187,7 @@ public class DarkSteelRecipeManager { } } if(!applyableUpgrades.isEmpty()) { - list.add(EnumChatFormatting.YELLOW + "Anvil Upgrades: "); + list.add(EnumChatFormatting.YELLOW + Lang.localize("tooltip.anvilupgrades") + " "); for (IDarkSteelUpgrade up : applyableUpgrades) { list.add(EnumChatFormatting.DARK_AQUA + "" + "" + Lang.localize(up.getUnlocalizedName() + ".name", false) + ": "); list.add(EnumChatFormatting.DARK_AQUA + "" + EnumChatFormatting.ITALIC + " " + up.getUpgradeItemName() + " + " + up.getLevelCost() diff --git a/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelPickaxe.java b/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelPickaxe.java index 271b1fb9..77a65304 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelPickaxe.java +++ b/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelPickaxe.java @@ -5,6 +5,7 @@ import java.util.Set; import net.minecraft.block.Block; import net.minecraft.block.material.Material; +import net.minecraft.client.Minecraft; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; @@ -12,12 +13,10 @@ import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemPickaxe; import net.minecraft.item.ItemStack; -import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.EnumChatFormatting; import net.minecraft.world.World; import net.minecraftforge.common.ForgeHooks; import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.common.util.ForgeDirection; import cofh.api.energy.IEnergyContainerItem; import com.google.common.collect.Sets; @@ -33,8 +32,6 @@ import crazypants.enderio.machine.power.PowerDisplayUtil; import crazypants.enderio.teleport.IItemOfTravel; import crazypants.enderio.teleport.TravelController; import crazypants.enderio.teleport.TravelSource; -import crazypants.render.BoundingBox; -import crazypants.util.BlockCoord; import crazypants.util.ItemUtil; import crazypants.util.Lang; @@ -116,48 +113,43 @@ public class ItemDarkSteelPickaxe extends ItemPickaxe implements IEnergyContaine return true; } - @Override - public boolean onItemUse(ItemStack item, EntityPlayer player, World world, int x, int y, int z, int side, float par8, float par9, float par10) { - if(!isTravelUpgradeActive(player, item)) { - return doRightClickItemPlace(player, world, x, y, z, side, par8, par9, par10); + @Override + public boolean onItemUse(ItemStack item, EntityPlayer player, World world, + int x, int y, int z, int side, float par8, float par9, float par10) { + if (!isTravelUpgradeActive(player, item) && world.isRemote) { + return doRightClickItemPlace(player, world, x, y, z, side, par8, + par9, par10); + } + return false; } - return false; - } - static boolean doRightClickItemPlace(EntityPlayer player, World world, int x, int y, int z, int side, float par8, float par9, float par10) { - int current = player.inventory.currentItem; - int slot = current == 0 && Config.slotZeroPlacesEight ? 8 : current + 1; - if(slot < 9 && player.inventory.mainInventory[slot] != null && !(player.inventory.mainInventory[slot].getItem() instanceof IDarkSteelItem)) { - - if(!canPlaceBlockOnRightClick(player, world, x, y, z, side, slot)) { - return false; - } - boolean ret = player.inventory.mainInventory[slot].getItem().onItemUse(player.inventory.mainInventory[slot], player, world, x, y, z, side, par8, - par9, par10); - if(player.inventory.mainInventory[slot].stackSize <= 0) { - player.inventory.mainInventory[slot] = null; - } - return ret; + @SideOnly(Side.CLIENT) + static boolean doRightClickItemPlace(EntityPlayer player, World world, + int x, int y, int z, int side, float par8, float par9, float par10) { + int current = player.inventory.currentItem; + int slot = current == 0 && Config.slotZeroPlacesEight ? 8 : current + 1; + if (slot < 9 + && player.inventory.mainInventory[slot] != null + && !(player.inventory.mainInventory[slot].getItem() instanceof IDarkSteelItem)) { + /* + * this will not work with buckets unless we don't switch back to + * the current item (the pick); there's probably some client <-> + * server event thing going on with buckets, so our item-switch + * within the same tick would be a problem. + */ + player.inventory.currentItem = slot; + Minecraft mc = Minecraft.getMinecraft(); + boolean result = mc.playerController.onPlayerRightClick( + mc.thePlayer, mc.theWorld, + player.inventory.mainInventory[slot], + mc.objectMouseOver.blockX, mc.objectMouseOver.blockY, + mc.objectMouseOver.blockZ, mc.objectMouseOver.sideHit, + mc.objectMouseOver.hitVec); + player.inventory.currentItem = current; + return (result); + } + return false; } - return false; - } - - static boolean canPlaceBlockOnRightClick(EntityPlayer player, World world, int x, int y, int z, int side, int slot) { - BlockCoord placeCoord = new BlockCoord(x, y, z).getLocation(ForgeDirection.getOrientation(side)); - ItemStack toUse = player.inventory.mainInventory[slot]; - AxisAlignedBB aabb; - Block blk = Block.getBlockFromItem(toUse.getItem()); - if(blk != null) { - aabb = blk.getCollisionBoundingBoxFromPool(world, placeCoord.x, placeCoord.y, placeCoord.z); - } else { - BoundingBox bb = new BoundingBox(placeCoord); - aabb = bb.getAxisAlignedBB(); - } - if(aabb != null && aabb.intersectsWith(player.boundingBox)) { - return false; - } - return true; - } private void applyDamage(EntityLivingBase entity, ItemStack stack, int damage) { diff --git a/src/main/java/crazypants/enderio/item/skull/BlockEndermanSkull.java b/src/main/java/crazypants/enderio/item/skull/BlockEndermanSkull.java index 8fcdaa18..fc987b33 100644 --- a/src/main/java/crazypants/enderio/item/skull/BlockEndermanSkull.java +++ b/src/main/java/crazypants/enderio/item/skull/BlockEndermanSkull.java @@ -1,5 +1,6 @@ package crazypants.enderio.item.skull; +import cpw.mods.fml.common.Optional; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.EntityLivingBase; @@ -13,8 +14,10 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import crazypants.enderio.BlockEio; import crazypants.enderio.ModObject; +import thaumcraft.api.crafting.IInfusionStabiliser; -public class BlockEndermanSkull extends BlockEio { +@Optional.Interface(iface = "thaumcraft.api.crafting.IInfusionStabiliser", modid = "Thaumcraft") +public class BlockEndermanSkull extends BlockEio implements IInfusionStabiliser { public static int renderId = -1; @@ -118,4 +121,10 @@ public class BlockEndermanSkull extends BlockEio { public int damageDropped(int meta) { return meta; } + + @Override + @Optional.Method(modid = "Thaumcraft") + public boolean canStabaliseInfusion(World world, int x, int y, int z) { + return true; + } } diff --git a/src/main/java/crazypants/enderio/machine/AbstractMachineBlock.java b/src/main/java/crazypants/enderio/machine/AbstractMachineBlock.java index 553b7c63..6202d614 100644 --- a/src/main/java/crazypants/enderio/machine/AbstractMachineBlock.java +++ b/src/main/java/crazypants/enderio/machine/AbstractMachineBlock.java @@ -4,12 +4,10 @@ import java.util.List; import java.util.Random; import net.minecraft.block.Block; -import net.minecraft.block.BlockContainer; import net.minecraft.block.material.MapColor; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; @@ -18,22 +16,23 @@ import net.minecraft.util.MathHelper; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; -import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.network.IGuiHandler; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import crazypants.enderio.BlockEio; import crazypants.enderio.ClientProxy; import crazypants.enderio.EnderIO; import crazypants.enderio.EnderIOTab; import crazypants.enderio.ModObject; +import crazypants.enderio.TileEntityEio; import crazypants.enderio.api.tool.ITool; import crazypants.enderio.gui.IResourceTooltipProvider; import crazypants.enderio.network.PacketHandler; import crazypants.enderio.tool.ToolUtil; import crazypants.enderio.waila.IWailaInfoProvider; -public abstract class AbstractMachineBlock extends BlockContainer implements IGuiHandler, IResourceTooltipProvider, +public abstract class AbstractMachineBlock extends BlockEio implements IGuiHandler, IResourceTooltipProvider, IWailaInfoProvider { public static int renderId; @@ -53,8 +52,6 @@ public abstract class AbstractMachineBlock exte protected final ModObject modObject; - protected final Class teClass; - static { PacketHandler.INSTANCE.registerMessage(PacketIoMode.class, PacketIoMode.class, PacketHandler.nextID(), Side.SERVER); PacketHandler.INSTANCE.registerMessage(PacketItemBuffer.class, PacketItemBuffer.class, PacketHandler.nextID(), Side.SERVER); @@ -63,12 +60,10 @@ public abstract class AbstractMachineBlock exte } protected AbstractMachineBlock(ModObject mo, Class teClass, Material mat) { - super(mat); + super(mo.unlocalisedName, teClass, mat); modObject = mo; - this.teClass = teClass; setHardness(2.0F); setStepSound(soundTypeMetal); - setBlockName(mo.unlocalisedName); setCreativeTab(EnderIOTab.tabEnderIO); setHarvestLevel("pickaxe", 0); random = new Random(); @@ -85,46 +80,17 @@ public abstract class AbstractMachineBlock exte } @Override - public TileEntity createNewTileEntity(World var1, int var2) { - try { - return teClass.newInstance(); - } catch (Exception e) { - FMLCommonHandler.instance().raiseException(e, "Could not create tile entity from class " + teClass, true); - return null; - } + public int getRenderType() { + return renderId; } - @Override - public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer entityPlayer, int side, float par7, float par8, float par9) { - - if(ToolUtil.breakBlockWithTool(this, world, x, y, z, entityPlayer)) { - return true; - } - - ITool tool = ToolUtil.getEquippedTool(entityPlayer); - if(tool != null && !entityPlayer.isSneaking()) { - TileEntity te = world.getTileEntity(x, y, z); - if(te instanceof AbstractMachineEntity) { - ((AbstractMachineEntity) te).toggleIoModeForFace(ForgeDirection.getOrientation(side)); - world.markBlockForUpdate(x, y, z); - return true; - } - } - - if(entityPlayer.isSneaking()) { - return false; - } + public boolean openGui(World world, int x, int y, int z, EntityPlayer entityPlayer, int side) { if(!world.isRemote) { entityPlayer.openGui(EnderIO.instance, getGuiId(), world, x, y, z); } return true; } - - @Override - public int getRenderType() { - return renderId; - } - + @Override public boolean canSilkHarvest(World world, EntityPlayer player, int x, int y, int z, int metadata) { return false; @@ -211,35 +177,15 @@ public abstract class AbstractMachineBlock exte } @Override - public int quantityDropped(Random r) { - return 0; - } - - protected boolean shouldDropDefaultItem(World world, EntityPlayer player, int x, int y, int z) { - return true; + public boolean doNormalDrops(World world, int x, int y, int z) { + return false; } @Override - public boolean removedByPlayer(World world, EntityPlayer player, int x, int y, int z, boolean doHarvest) { - if(!world.isRemote && (!player.capabilities.isCreativeMode)) { - TileEntity te = world.getTileEntity(x, y, z); - if(te instanceof AbstractMachineEntity && shouldDropDefaultItem(world, player, x, y, z)) { - AbstractMachineEntity machineEntity = (AbstractMachineEntity) te; - int meta = damageDropped(world.getBlockMetadata(x, y, z)); - ItemStack itemStack = new ItemStack(this, 1, meta); - machineEntity.writeToItemStack(itemStack); - - float f = 0.7F; - double d0 = world.rand.nextFloat() * f + (1.0F - f) * 0.5D; - double d1 = world.rand.nextFloat() * f + (1.0F - f) * 0.5D; - double d2 = world.rand.nextFloat() * f + (1.0F - f) * 0.5D; - EntityItem entityitem = new EntityItem(world, x + d0, y + d1, z + d2, itemStack); - - entityitem.delayBeforeCanPickup = 10; - world.spawnEntityInWorld(entityitem); - } + protected void processDrop(World world, int x, int y, int z, TileEntityEio te, ItemStack stack) { + if(te != null) { + ((AbstractMachineEntity) te).writeToItemStack(stack); } - return super.removedByPlayer(world, player, x, y, z, doHarvest); } @Override diff --git a/src/main/java/crazypants/enderio/machine/AbstractMachineEntity.java b/src/main/java/crazypants/enderio/machine/AbstractMachineEntity.java index 51fa28d7..42f14752 100644 --- a/src/main/java/crazypants/enderio/machine/AbstractMachineEntity.java +++ b/src/main/java/crazypants/enderio/machine/AbstractMachineEntity.java @@ -108,6 +108,16 @@ public abstract class AbstractMachineEntity extends TileEntityEio implements ISi updateBlock(); } + @Override + public void clearAllIoModes() { + if(faceModes != null) { + faceModes = null; + forceClientUpdate = true; + notifyNeighbours = true; + updateBlock(); + } + } + @Override public IoMode getIoMode(ForgeDirection face) { if(faceModes == null) { diff --git a/src/main/java/crazypants/enderio/machine/AbstractPoweredTaskEntity.java b/src/main/java/crazypants/enderio/machine/AbstractPoweredTaskEntity.java index 65137325..15e77872 100644 --- a/src/main/java/crazypants/enderio/machine/AbstractPoweredTaskEntity.java +++ b/src/main/java/crazypants/enderio/machine/AbstractPoweredTaskEntity.java @@ -22,6 +22,7 @@ public abstract class AbstractPoweredTaskEntity extends AbstractPowerConsumerEnt protected boolean startFailed = false; protected int lastProgressScaled = -1; + protected int ticksSinceLastProgressUpdate; public AbstractPoweredTaskEntity(SlotDefinition slotDefinition) { super(slotDefinition); @@ -124,6 +125,7 @@ public abstract class AbstractPoweredTaskEntity extends AbstractPowerConsumerEnt protected void sendTaskProgressPacket() { PacketHandler.sendToAllAround(new PacketCurrentTaskProgress(this), this); + ticksSinceLastProgressUpdate = 0; } protected boolean checkProgress(boolean redstoneChecksPassed) { @@ -140,7 +142,7 @@ public abstract class AbstractPoweredTaskEntity extends AbstractPowerConsumerEnt } int curScaled = getProgressScaled(16); - if(curScaled != lastProgressScaled) { + if(++ticksSinceLastProgressUpdate >= 20 || curScaled != lastProgressScaled) { sendTaskProgressPacket(); lastProgressScaled = curScaled; } diff --git a/src/main/java/crazypants/enderio/machine/IIoConfigurable.java b/src/main/java/crazypants/enderio/machine/IIoConfigurable.java index f520c9bf..f18e8ad9 100644 --- a/src/main/java/crazypants/enderio/machine/IIoConfigurable.java +++ b/src/main/java/crazypants/enderio/machine/IIoConfigurable.java @@ -13,6 +13,8 @@ public interface IIoConfigurable { public IoMode getIoMode(ForgeDirection face) ; + public void clearAllIoModes(); + BlockCoord getLocation(); } diff --git a/src/main/java/crazypants/enderio/machine/MachineRecipes.java b/src/main/java/crazypants/enderio/machine/MachineRecipes.java index 63db616e..0cc966f4 100644 --- a/src/main/java/crazypants/enderio/machine/MachineRecipes.java +++ b/src/main/java/crazypants/enderio/machine/MachineRecipes.java @@ -135,16 +135,19 @@ public class MachineRecipes { //capacitor bank - ItemStack capBank = BlockItemCapBank.createItemStackWithPower(CapBankType.getMetaFromType(CapBankType.SIMPLE), 0); - GameRegistry.addShapedRecipe(capBank, "bcb", "cmc", "bcb", 'b', Items.iron_ingot, 'c', capacitor, 'm', Blocks.redstone_block); - capBank = BlockItemCapBank.createItemStackWithPower(CapBankType.getMetaFromType(CapBankType.ACTIVATED), 0); - GameRegistry.addShapedRecipe(capBank, "bcb", "cmc", "bcb", 'b', electricSteel, 'c', capacitor2, 'm', Blocks.redstone_block); - capBank = BlockItemCapBank.createItemStackWithPower(CapBankType.getMetaFromType(CapBankType.VIBRANT), 0); - GameRegistry.addShapedRecipe(capBank, "bcb", "cmc", "bcb", 'b', electricSteel, 'c', capacitor3, 'm', vibCry); + ItemStack capBank1 = BlockItemCapBank.createItemStackWithPower(CapBankType.getMetaFromType(CapBankType.SIMPLE), 0); + GameRegistry.addShapedRecipe(capBank1, "bcb", "cmc", "bcb", 'b', Items.iron_ingot, 'c', capacitor, 'm', Blocks.redstone_block); + ItemStack capBank2 = BlockItemCapBank.createItemStackWithPower(CapBankType.getMetaFromType(CapBankType.ACTIVATED), 0); + GameRegistry.addShapedRecipe(capBank2, "bcb", "cmc", "bcb", 'b', electricSteel, 'c', capacitor2, 'm', Blocks.redstone_block); + ItemStack capBank3 = BlockItemCapBank.createItemStackWithPower(CapBankType.getMetaFromType(CapBankType.VIBRANT), 0); + GameRegistry.addShapedRecipe(capBank3, "bcb", "cmc", "bcb", 'b', electricSteel, 'c', capacitor3, 'm', vibCry); ConvertOldRecipe convertRecipe = new ConvertOldRecipe(); GameRegistry.addRecipe(convertRecipe); + GameRegistry.addRecipe(new UpgradeCapBankRecipe(capBank2, "eee", "bcb", "eee", 'e', energeticAlloy, 'b', capBank1, 'c', capacitor2)); + GameRegistry.addRecipe(new UpgradeCapBankRecipe(capBank3, "vov", "NcN", "vov", 'v', phasedGold, 'o', capacitor3, 'N', capBank2, 'c', vibCry)); + //painter ItemStack painter = new ItemStack(EnderIO.blockPainter, 1, 0); if(Config.useHardRecipes) { diff --git a/src/main/java/crazypants/enderio/machine/PacketIoMode.java b/src/main/java/crazypants/enderio/machine/PacketIoMode.java index 0744018f..57cb0c2c 100644 --- a/src/main/java/crazypants/enderio/machine/PacketIoMode.java +++ b/src/main/java/crazypants/enderio/machine/PacketIoMode.java @@ -7,6 +7,7 @@ import net.minecraftforge.common.util.ForgeDirection; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; +import crazypants.util.BlockCoord; public class PacketIoMode implements IMessage, IMessageHandler { @@ -19,10 +20,20 @@ public class PacketIoMode implements IMessage, IMessageHandler { - private IconButton vanillaFurnaceButton; + private final IconButton vanillaFurnaceButton; + private final GuiToolTip vanillaFurnaceTooltip; protected static final int SMELT_MODE_BUTTON_ID = 76; public GuiAlloySmelter(InventoryPlayer par1InventoryPlayer, TileAlloySmelter furnaceInventory) { super(furnaceInventory, new ContainerAlloySmelter(par1InventoryPlayer, furnaceInventory)); - addToolTip(new GuiToolTip(new Rectangle(0, 0, 0, 0), "") { + vanillaFurnaceButton = new IconButton(getFontRenderer(), SMELT_MODE_BUTTON_ID, 0, 0, null, RenderUtil.BLOCK_TEX); + vanillaFurnaceButton.setSize(BUTTON_SIZE, BUTTON_SIZE); - @Override - protected void updateText() { - text.clear(); - text.add(Lang.localize("gui.alloy.mode.heading")); - String txt = Lang.localize("gui.alloy.mode.all"); - if(getTileEntity().getMode() == Mode.ALLOY) { - txt = Lang.localize("gui.alloy.mode.alloy"); - } else if(getTileEntity().getMode() == Mode.FURNACE) { - txt = Lang.localize("gui.alloy.mode.furnace"); - } - text.add(txt); - } + vanillaFurnaceTooltip = new GuiToolTip(new Rectangle(xSize - 5 - BUTTON_SIZE, 62, BUTTON_SIZE, BUTTON_SIZE), (String[])null); - @Override - public void onTick(int mouseX, int mouseY) { - bounds.setBounds(xSize - 5 - BUTTON_SIZE, 60, BUTTON_SIZE, BUTTON_SIZE); - super.onTick(mouseX, mouseY); - } - - }); + addProgressTooltip(55, 35, 14, 14); + addProgressTooltip(103, 35, 14, 14); } @SuppressWarnings("unchecked") @@ -56,13 +43,13 @@ public class GuiAlloySmelter extends GuiPoweredMachineBase { public void initGui() { super.initGui(); - int x = guiLeft + xSize - 5 - BUTTON_SIZE; - int y = guiTop + 62; - - vanillaFurnaceButton = new IconButton(getFontRenderer(), SMELT_MODE_BUTTON_ID, x, y, getIconForMode(), RenderUtil.BLOCK_TEX); - vanillaFurnaceButton.setSize(BUTTON_SIZE, BUTTON_SIZE); + vanillaFurnaceButton.xPosition = guiLeft + vanillaFurnaceTooltip.getBounds().x; + vanillaFurnaceButton.yPosition = guiTop + vanillaFurnaceTooltip.getBounds().y; buttonList.add(vanillaFurnaceButton); + addToolTip(vanillaFurnaceTooltip); + + updateVanillaFurnaceButton(); } @Override @@ -78,21 +65,27 @@ public class GuiAlloySmelter extends GuiPoweredMachineBase { protected void actionPerformed(GuiButton par1GuiButton) { if(par1GuiButton.id == SMELT_MODE_BUTTON_ID) { getTileEntity().setMode(getTileEntity().getMode().next()); - vanillaFurnaceButton.setIcon(getIconForMode()); + updateVanillaFurnaceButton(); PacketHandler.INSTANCE.sendToServer(new PacketClientState(getTileEntity())); } else { super.actionPerformed(par1GuiButton); } } - private IIcon getIconForMode() { + private void updateVanillaFurnaceButton() { IIcon icon = EnderIO.blockAlloySmelter.vanillaSmeltingOn; + String unlocText = "gui.alloy.mode.all"; if(getTileEntity().getMode() == Mode.ALLOY) { icon = EnderIO.blockAlloySmelter.vanillaSmeltingOff; + unlocText = "gui.alloy.mode.alloy"; } else if(getTileEntity().getMode() == Mode.FURNACE) { icon = EnderIO.blockAlloySmelter.vanillaSmeltingOnly; + unlocText = "gui.alloy.mode.furnace"; } - return icon; + vanillaFurnaceButton.setIcon(icon); + vanillaFurnaceTooltip.setToolTipText( + Lang.localize("gui.alloy.mode.heading"), + Lang.localize(unlocText)); } /** @@ -103,15 +96,13 @@ public class GuiAlloySmelter extends GuiPoweredMachineBase { protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) { GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); RenderUtil.bindTexture("enderio:textures/gui/alloySmelter.png"); - int sx = (width - xSize) / 2; - int sy = (height - ySize) / 2; + int sx = guiLeft; + int sy = guiTop; drawTexturedModalRect(sx, sy, 0, 0, this.xSize, this.ySize); - int scaled; - - if(getTileEntity().getProgress() < 1 && getTileEntity().getProgress() > 0) { - scaled = getTileEntity().getProgressScaled(14) + 1; + if(shouldRenderProgress()) { + int scaled = getTileEntity().getProgressScaled(14) + 1; drawTexturedModalRect(sx + 55, sy + 49 - scaled, 176, 14 - scaled, 14, scaled); drawTexturedModalRect(sx + 103, sy + 49 - scaled, 176, 14 - scaled, 14, scaled); } diff --git a/src/main/java/crazypants/enderio/machine/buffer/BlockBuffer.java b/src/main/java/crazypants/enderio/machine/buffer/BlockBuffer.java index d6cbaafb..396f8ab7 100644 --- a/src/main/java/crazypants/enderio/machine/buffer/BlockBuffer.java +++ b/src/main/java/crazypants/enderio/machine/buffer/BlockBuffer.java @@ -38,11 +38,11 @@ public class BlockBuffer extends AbstractMachineBlock implements IFa res.init(); return res; } - + private static final String[] textureNames = new String[] { "blockBufferItem", "blockBufferPower", "blockBufferOmni", "blockBufferCreative" }; @SideOnly(Side.CLIENT) private IIcon[] textures; - + private BlockBuffer() { super(ModObject.blockBuffer, TileBuffer.class); } @@ -77,7 +77,7 @@ public class BlockBuffer extends AbstractMachineBlock implements IFa protected int getGuiId() { return GuiHandler.GUI_ID_BUFFER; } - + @Override @SideOnly(Side.CLIENT) public void registerBlockIcons(IIconRegister iIconRegister) { @@ -87,7 +87,7 @@ public class BlockBuffer extends AbstractMachineBlock implements IFa textures[i] = iIconRegister.registerIcon("enderio:" + textureNames[i]); } } - + @Override protected String getMachineFrontIconKey(boolean active) { return getSideIconKey(active); @@ -97,7 +97,7 @@ public class BlockBuffer extends AbstractMachineBlock implements IFa public IIcon getIcon(int blockSide, int blockMeta) { return blockSide > 1 ? textures[blockMeta] : super.getIcon(blockSide, blockMeta); } - + @Override public IIcon getIcon(IBlockAccess world, int x, int y, int z, int blockSide) { TileEntity te = world.getTileEntity(x, y, z); @@ -105,7 +105,7 @@ public class BlockBuffer extends AbstractMachineBlock implements IFa TileBuffer tef = (TileBuffer) te; if(tef.getSourceBlock() != null) { return tef.getSourceBlock().getIcon(blockSide, tef.getSourceBlockMetadata()); - } else if (blockSide > 1){ + } else if(blockSide > 1) { return textures[world.getBlockMetadata(x, y, z)]; } } @@ -127,29 +127,10 @@ public class BlockBuffer extends AbstractMachineBlock implements IFa } @Override - public ArrayList getDrops(World world, int x, int y, int z, int metadata, int fortune) { - return Lists.newArrayList(); + public int damageDropped(int meta) { + return meta; } - @Override - protected boolean shouldDropDefaultItem(World world, EntityPlayer player, int x, int y, int z) { - return false; - } - - @Override - public boolean removedByPlayer(World world, EntityPlayer player, int x, int y, int z, boolean willHarvest) { - if(!world.isRemote) { - TileEntity te = world.getTileEntity(x, y, z); - if(te instanceof TileBuffer) { - TileBuffer cb = (TileBuffer) te; - if(!player.capabilities.isCreativeMode) { - dropBlockAsItem(world, x, y, z, createDrop(cb)); - } - } - } - return super.removedByPlayer(world, player, x, y, z, willHarvest); - } - // TODO refactor machines so all have this functionality @Override public ItemStack getPickBlock(MovingObjectPosition target, World world, int x, int y, int z) { diff --git a/src/main/java/crazypants/enderio/machine/buffer/TileBuffer.java b/src/main/java/crazypants/enderio/machine/buffer/TileBuffer.java index 613659a7..cdb9ef31 100644 --- a/src/main/java/crazypants/enderio/machine/buffer/TileBuffer.java +++ b/src/main/java/crazypants/enderio/machine/buffer/TileBuffer.java @@ -53,7 +53,7 @@ public class TileBuffer extends AbstractPowerConsumerEntity implements IPaintabl @Override protected boolean processTasks(boolean redstoneCheckPassed) { - if(getEnergyStored() <= 0) { + if(getEnergyStored() <= 0 || !redstoneCheckPassed) { return false; } if(dist == null) { @@ -74,6 +74,14 @@ public class TileBuffer extends AbstractPowerConsumerEntity implements IPaintabl } } + @Override + public void clearAllIoModes() { + super.clearAllIoModes(); + if(dist != null) { + dist.neighboursChanged(); + } + } + @Override public boolean canInsertItem(int slot, ItemStack var2, int side) { return hasInventory() && getIoMode(ForgeDirection.VALID_DIRECTIONS[side]).canRecieveInput() && isMachineItemValidForSlot(slot, var2); diff --git a/src/main/java/crazypants/enderio/machine/capbank/BlockCapBank.java b/src/main/java/crazypants/enderio/machine/capbank/BlockCapBank.java index 68de5b30..e1ce8eb8 100644 --- a/src/main/java/crazypants/enderio/machine/capbank/BlockCapBank.java +++ b/src/main/java/crazypants/enderio/machine/capbank/BlockCapBank.java @@ -1,6 +1,5 @@ package crazypants.enderio.machine.capbank; -import java.util.ArrayList; import java.util.Collection; import java.util.List; import java.util.Random; @@ -9,7 +8,6 @@ import net.minecraft.block.Block; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -30,6 +28,7 @@ import crazypants.enderio.BlockEio; import crazypants.enderio.EnderIO; import crazypants.enderio.GuiHandler; import crazypants.enderio.ModObject; +import crazypants.enderio.TileEntityEio; import crazypants.enderio.api.redstone.IRedstoneConnectable; import crazypants.enderio.gui.IAdvancedTooltipProvider; import crazypants.enderio.gui.TooltipAddera; @@ -152,10 +151,6 @@ public class BlockCapBank extends BlockEio implements IGuiHandler, IAdvancedTool return false; } - if(ToolUtil.breakBlockWithTool(this, world, x, y, z, entityPlayer)) { - return true; - } - TileCapBank tcb = (TileCapBank) te; ForgeDirection faceHit = ForgeDirection.getOrientation(side); @@ -170,11 +165,7 @@ public class BlockCapBank extends BlockEio implements IGuiHandler, IAdvancedTool return true; } - if(entityPlayer.isSneaking()) { - return false; - } - - if(ToolUtil.isToolEquipped(entityPlayer)) { + if(!entityPlayer.isSneaking() && ToolUtil.isToolEquipped(entityPlayer)) { IoMode ioMode = tcb.getIoMode(faceHit); if(faceHit.offsetY == 0) { @@ -201,6 +192,16 @@ public class BlockCapBank extends BlockEio implements IGuiHandler, IAdvancedTool return true; } + return super.onBlockActivated(world, x, y, z, entityPlayer, side, par7, par8, par9); + } + + @Override + public boolean doNormalDrops(World world, int x, int y, int z) { + return false; + } + + @Override + protected boolean openGui(World world, int x, int y, int z, EntityPlayer entityPlayer, int side) { if(!world.isRemote) { entityPlayer.openGui(EnderIO.instance, GuiHandler.GUI_ID_CAP_BANK, world, x, y, z); } @@ -420,52 +421,23 @@ public class BlockCapBank extends BlockEio implements IGuiHandler, IAdvancedTool } @Override - public ArrayList getDrops(World world, int x, int y, int z, int metadata, int fortune) { - ArrayList ret = new ArrayList(); - if(!world.isRemote) { - TileEntity te = world.getTileEntity(x, y, z); - if(te instanceof TileCapBank) { - TileCapBank cb = (TileCapBank) te; - ret.add(createItemStack(world, x, y, z, cb)); - } - } - return ret; - } - - @Override - public boolean removedByPlayer(World world, EntityPlayer player, int x, int y, int z) { + public boolean removedByPlayer(World world, EntityPlayer player, int x, int y, int z, boolean doHarvest) { if(!world.isRemote && (!player.capabilities.isCreativeMode)) { TileEntity te = world.getTileEntity(x, y, z); if(te instanceof TileCapBank) { TileCapBank cb = (TileCapBank) te; cb.moveInventoryToNetwork(); - - ItemStack itemStack = createItemStack(world, x, y, z, cb); - - //Clear in the inventory as its now in the item stack - for (int i = 0; i < cb.getInventory().length; i++) { - cb.getInventory()[i] = null; - } - - float f = 0.7F; - double d0 = world.rand.nextFloat() * f + (1.0F - f) * 0.5D; - double d1 = world.rand.nextFloat() * f + (1.0F - f) * 0.5D; - double d2 = world.rand.nextFloat() * f + (1.0F - f) * 0.5D; - EntityItem entityitem = new EntityItem(world, x + d0, y + d1, z + d2, itemStack); - entityitem.delayBeforeCanPickup = 10; - - world.spawnEntityInWorld(entityitem); } } - return super.removedByPlayer(world, player, x, y, z); + return super.removedByPlayer(world, player, x, y, z, doHarvest); } - protected ItemStack createItemStack(World world, int x, int y, int z, TileCapBank cb) { - int meta = damageDropped(world.getBlockMetadata(x, y, z)); - ItemStack itemStack = new ItemStack(this, 1, meta); - itemStack.stackTagCompound = new NBTTagCompound(); - cb.writeCommonNBT(itemStack.stackTagCompound); - return itemStack; + @Override + protected void processDrop(World world, int x, int y, int z, TileEntityEio te, ItemStack drop) { + drop.stackTagCompound = new NBTTagCompound(); + if(te != null) { + ((TileCapBank) te).writeCommonNBT(drop.stackTagCompound); + } } @Override @@ -473,16 +445,12 @@ public class BlockCapBank extends BlockEio implements IGuiHandler, IAdvancedTool if(!world.isRemote) { TileEntity te = world.getTileEntity(x, y, z); if(!(te instanceof TileCapBank)) { - super.breakBlock(world, x, y, z, par5, par6); return; } TileCapBank cb = (TileCapBank) te; cb.onBreakBlock(); - if(world.getGameRules().getGameRuleBooleanValue("doTileDrops")) { - Util.dropItems(world, cb.getInventory(), x, y, z, true); - } } - world.removeTileEntity(x, y, z); + super.breakBlock(world, x, y, z, par5, par6); } @Override @@ -577,7 +545,7 @@ public class BlockCapBank extends BlockEio implements IGuiHandler, IAdvancedTool } /* IRedstoneConnectable */ - + @Override public boolean shouldRedstoneConduitConnect(World world, int x, int y, int z, ForgeDirection from) { return true; diff --git a/src/main/java/crazypants/enderio/machine/capbank/GuiCapBank.java b/src/main/java/crazypants/enderio/machine/capbank/GuiCapBank.java index f323db99..fdf771eb 100644 --- a/src/main/java/crazypants/enderio/machine/capbank/GuiCapBank.java +++ b/src/main/java/crazypants/enderio/machine/capbank/GuiCapBank.java @@ -15,8 +15,6 @@ import net.minecraft.util.EnumChatFormatting; import org.lwjgl.opengl.GL11; import crazypants.enderio.EnderIO; -import crazypants.enderio.gui.IconButtonEIO; -import crazypants.enderio.gui.IconEIO; import crazypants.enderio.gui.RedstoneModeButton; import crazypants.enderio.machine.IRedstoneModeControlable; import crazypants.enderio.machine.IoMode; @@ -25,6 +23,7 @@ import crazypants.enderio.machine.capbank.network.CapBankClientNetwork; import crazypants.enderio.machine.capbank.network.NetworkState; import crazypants.enderio.machine.capbank.packet.PacketGuiChange; import crazypants.enderio.machine.capbank.packet.PacketNetworkStateRequest; +import crazypants.enderio.machine.gui.GuiButtonIoConfig; import crazypants.enderio.machine.gui.GuiOverlayIoConfig; import crazypants.enderio.machine.gui.GuiPoweredMachineBase; import crazypants.enderio.machine.power.PowerDisplayUtil; @@ -69,8 +68,8 @@ public class GuiCapBank extends GuiContainerBase { private GuiTextField maxInputTF; private GuiTextField maxOutputTF; - private GuiOverlayIoConfig configOverlay; - private IconButtonEIO configB; + private final GuiOverlayIoConfig configOverlay; + private final GuiButtonIoConfig configB; private CapBankClientNetwork network; @@ -144,10 +143,6 @@ public class GuiCapBank extends GuiContainerBase { }); outputRsButton.setTooltipKey("enderio.gui.capBank.outputRs"); - y += 20; - configB = new IconButtonEIO(this, CONFIG_ID, x, y, IconEIO.IO_CONFIG_UP); - configB.setToolTip(Lang.localize("gui.machine.ioMode.overlay.tooltip")); - List coords = new ArrayList(); if(network != null && network.getMembers().size() < 200) { for (TileCapBank cb : network.getMembers()) { @@ -160,13 +155,6 @@ public class GuiCapBank extends GuiContainerBase { configOverlay = new GuiOverlayIoConfig(coords) { - - @Override - public void setVisible(boolean visible) { - super.setVisible(visible); - configB.setIcon(visible ? IconEIO.IO_CONFIG_DOWN : IconEIO.IO_CONFIG_UP); - } - @Override protected String getLabelForMode(IoMode mode) { if(mode == IoMode.PUSH) { @@ -176,19 +164,11 @@ public class GuiCapBank extends GuiContainerBase { } return super.getLabelForMode(mode); } - }; addOverlay(configOverlay); - } - - @Override - protected void actionPerformed(GuiButton b) { - super.actionPerformed(b); - if(b.id == CONFIG_ID) { - boolean vis = !configOverlay.isVisible(); - configOverlay.setVisible(vis); - } + y += 20; + configB = new GuiButtonIoConfig(this, CONFIG_ID, x, y, te, configOverlay); } @Override @@ -197,16 +177,13 @@ public class GuiCapBank extends GuiContainerBase { configB.onGuiInit(); - int x = guiLeft + xSize - rightMargin - GuiPoweredMachineBase.BUTTON_SIZE; - int y = guiTop + inputY; - FontRenderer fontRenderer = getFontRenderer(); inputRsButton.onGuiInit(); outputRsButton.onGuiInit(); - x = guiLeft + inputX; - y = guiTop + inputY; + int x = guiLeft + inputX; + int y = guiTop + inputY; maxInputTF = new GuiTextField(fontRenderer, x, y, 68, 16); maxInputTF.setCanLoseFocus(true); maxInputTF.setMaxStringLength(10); diff --git a/src/main/java/crazypants/enderio/machine/capbank/TileCapBank.java b/src/main/java/crazypants/enderio/machine/capbank/TileCapBank.java index a05c5dbd..25a19265 100644 --- a/src/main/java/crazypants/enderio/machine/capbank/TileCapBank.java +++ b/src/main/java/crazypants/enderio/machine/capbank/TileCapBank.java @@ -300,6 +300,23 @@ public class TileCapBank extends TileEntityEio implements IInternalPowerHandler, } } + @Override + public void clearAllIoModes() { + if(network != null) { + for(TileCapBank cb : network.getMembers()) { + cb.doClearAllIoModes(); + } + } else { + doClearAllIoModes(); + } + } + + private void doClearAllIoModes() { + for(ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { + setDefaultIoMode(dir); + } + } + @Override public IoMode getIoMode(ForgeDirection face) { if(faceModes == null) { diff --git a/src/main/java/crazypants/enderio/machine/capbank/network/CapBankClientNetwork.java b/src/main/java/crazypants/enderio/machine/capbank/network/CapBankClientNetwork.java index e8ab9cb5..d92abc0a 100644 --- a/src/main/java/crazypants/enderio/machine/capbank/network/CapBankClientNetwork.java +++ b/src/main/java/crazypants/enderio/machine/capbank/network/CapBankClientNetwork.java @@ -74,7 +74,7 @@ public class CapBankClientNetwork implements ICapBankNetwork { BlockCoord bc = state.getInventoryImplLocation(); if(bc == null) { inventory.setCapBank(null); - } else { + } else if(world != null) { TileEntity te = world.getTileEntity(bc.x, bc.y, bc.z); if(te instanceof TileCapBank) { inventory.setCapBank((TileCapBank) te); diff --git a/src/main/java/crazypants/enderio/machine/crafter/GuiCrafter.java b/src/main/java/crazypants/enderio/machine/crafter/GuiCrafter.java index 37eef4ed..bb501738 100644 --- a/src/main/java/crazypants/enderio/machine/crafter/GuiCrafter.java +++ b/src/main/java/crazypants/enderio/machine/crafter/GuiCrafter.java @@ -16,6 +16,7 @@ import crazypants.enderio.machine.gui.GuiPoweredMachineBase; import crazypants.enderio.machine.power.PowerDisplayUtil; import crazypants.enderio.network.PacketHandler; import crazypants.render.RenderUtil; +import crazypants.util.Lang; public class GuiCrafter extends GuiPoweredMachineBase { @@ -28,8 +29,8 @@ public class GuiCrafter extends GuiPoweredMachineBase { int x = getXSize() - 5 - 16; int y = 43; bufferSizeB = new ToggleButtonEIO(this, 4327, x, y, IconEIO.ITEM_SINGLE, IconEIO.ITEM_STACK); - bufferSizeB.setSelectedToolTip("Buffering item stacks"); - bufferSizeB.setUnselectedToolTip("Buffering single items"); + bufferSizeB.setSelectedToolTip(Lang.localize("gui.machine.bufferingstacks")); + bufferSizeB.setUnselectedToolTip(Lang.localize("gui.machine.bufferingsingle")); bufferSizeB.setSelected(te.isBufferStacks()); } @@ -71,7 +72,7 @@ public class GuiCrafter extends GuiPoweredMachineBase { @Override protected void updatePowerBarTooltip(List text) { text.add(PowerDisplayUtil.formatPower(Config.crafterRfPerCraft) + " " + PowerDisplayUtil.abrevation() - + " Per Craft"); + + " " + Lang.localize("gui.machine.percraft")); super.updatePowerBarTooltip(text); } diff --git a/src/main/java/crazypants/enderio/machine/crusher/CrusherRecipeManager.java b/src/main/java/crazypants/enderio/machine/crusher/CrusherRecipeManager.java index bd2feac8..cb0393fe 100644 --- a/src/main/java/crazypants/enderio/machine/crusher/CrusherRecipeManager.java +++ b/src/main/java/crazypants/enderio/machine/crusher/CrusherRecipeManager.java @@ -130,7 +130,7 @@ public class CrusherRecipeManager { public void addCustomRecipes(String xmlDef) { RecipeConfig config; try { - config = RecipeConfigParser.parse(xmlDef, null); + config = RecipeConfigParser.parse(xmlDef, new GrindingBallTagHandler()); } catch (Exception e) { Log.error("Error parsing custom xml"); return; diff --git a/src/main/java/crazypants/enderio/machine/crusher/GuiCrusher.java b/src/main/java/crazypants/enderio/machine/crusher/GuiCrusher.java index 9dbc14a0..2b91592f 100644 --- a/src/main/java/crazypants/enderio/machine/crusher/GuiCrusher.java +++ b/src/main/java/crazypants/enderio/machine/crusher/GuiCrusher.java @@ -22,6 +22,8 @@ public class GuiCrusher extends GuiPoweredMachineBase { text.add(getTileEntity().getBallDurationScaled(100) + "%"); } }); + + addProgressTooltip(79, 31, 18, 24); } /** @@ -32,15 +34,15 @@ public class GuiCrusher extends GuiPoweredMachineBase { protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) { GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); RenderUtil.bindTexture("enderio:textures/gui/crusher.png"); - int guiLeft = (width - xSize) / 2; - int guiTop = (height - ySize) / 2; drawTexturedModalRect(guiLeft, guiTop, 0, 0, this.xSize, this.ySize); - int barHeight = getTileEntity().getProgressScaled(24); - drawTexturedModalRect(guiLeft + 79, guiTop + 31, 200, 0, 18, barHeight + 1); + if(shouldRenderProgress()) { + int barHeight = getTileEntity().getProgressScaled(24); + drawTexturedModalRect(guiLeft + 79, guiTop + 31, 200, 0, 18, barHeight + 1); + } - barHeight = getTileEntity().getBallDurationScaled(16); + int barHeight = getTileEntity().getBallDurationScaled(16); if(barHeight > 0) { drawTexturedModalRect(guiLeft + 142, guiTop + 23 + (16 - barHeight), 186, 31, 4, barHeight); } diff --git a/src/main/java/crazypants/enderio/machine/enchanter/BlockEnchanter.java b/src/main/java/crazypants/enderio/machine/enchanter/BlockEnchanter.java index 56e0f461..0afe6dd3 100644 --- a/src/main/java/crazypants/enderio/machine/enchanter/BlockEnchanter.java +++ b/src/main/java/crazypants/enderio/machine/enchanter/BlockEnchanter.java @@ -17,6 +17,7 @@ import crazypants.enderio.GuiHandler; import crazypants.enderio.ModObject; import crazypants.enderio.api.tool.ITool; import crazypants.enderio.gui.IResourceTooltipProvider; +import crazypants.enderio.machine.AbstractMachineEntity; import crazypants.enderio.tool.ToolUtil; import crazypants.util.Util; @@ -68,21 +69,9 @@ public class BlockEnchanter extends BlockEio implements IGuiHandler, IResourceTo } world.markBlockForUpdate(x, y, z); } - + @Override - public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer entityPlayer, int side, float par7, float par8, float par9) { - - ITool tool = ToolUtil.getEquippedTool(entityPlayer); - if(tool != null) { - if(entityPlayer.isSneaking() && tool.canUse(entityPlayer.getCurrentEquippedItem(), entityPlayer, x, y, z)) { - removedByPlayer(world, entityPlayer, x, y, z, false); - tool.used(entityPlayer.getCurrentEquippedItem(), entityPlayer, x, y, z); - return true; - } - } - if(entityPlayer.isSneaking()) { - return false; - } + protected boolean openGui(World world, int x, int y, int z, EntityPlayer entityPlayer, int side) { if(!world.isRemote) { entityPlayer.openGui(EnderIO.instance, GuiHandler.GUI_ID_ENCHANTER, world, x, y, z); } @@ -90,31 +79,25 @@ public class BlockEnchanter extends BlockEio implements IGuiHandler, IResourceTo } @Override - public boolean removedByPlayer(World world, EntityPlayer player, int x, int y, int z, boolean harvested) { - if(!world.isRemote) { - TileEntity te = world.getTileEntity(x, y, z); - if(te instanceof TileEnchanter) { - TileEnchanter enchanter = (TileEnchanter) te; - if(!player.capabilities.isCreativeMode) { - ItemStack itemStack = new ItemStack(this); - float f = 0.7F; - double d0 = world.rand.nextFloat() * f + (1.0F - f) * 0.5D; - double d1 = world.rand.nextFloat() * f + (1.0F - f) * 0.5D; - double d2 = world.rand.nextFloat() * f + (1.0F - f) * 0.5D; - EntityItem entityitem = new EntityItem(world, x + d0, y + d1, z + d2, itemStack); - entityitem.delayBeforeCanPickup = 10; - world.spawnEntityInWorld(entityitem); - - if(enchanter.getStackInSlot(0) != null) { - Util.dropItems(world, enchanter.getStackInSlot(0), x, y, z, true); - } - if(enchanter.getStackInSlot(1) != null) { - Util.dropItems(world, enchanter.getStackInSlot(1), x, y, z, true); - } - } - } + public void breakBlock(World world, int x, int y, int z, Block block, int meta) { + TileEntity te = world.getTileEntity(x, y, z); + if(te instanceof TileEnchanter) { + dropItems(world, x, y, z, (TileEnchanter) te); + } + super.breakBlock(world, x, y, z, block, meta); + } + + public boolean doNormalDrops(World world, int x, int y, int z) { + return false; + } + + private void dropItems(World world, int x, int y, int z, TileEnchanter te) { + if(te.getStackInSlot(0) != null) { + Util.dropItems(world, te.getStackInSlot(0), x, y, z, true); + } + if(te.getStackInSlot(1) != null) { + Util.dropItems(world, te.getStackInSlot(1), x, y, z, true); } - return super.removedByPlayer(world, player, x, y, z, harvested); } @Override @@ -154,13 +137,7 @@ public class BlockEnchanter extends BlockEio implements IGuiHandler, IResourceTo } return null; } - - @Override - public void breakBlock(World world, int x, int y, int z, Block block, int p_149749_6_) { - super.breakBlock(world, x, y, z, block, p_149749_6_); - world.removeTileEntity(x, y, z); - } - + @Override public String getUnlocalizedNameForTooltip(ItemStack itemStack) { return getUnlocalizedName(); diff --git a/src/main/java/crazypants/enderio/machine/farm/GuiFarmStation.java b/src/main/java/crazypants/enderio/machine/farm/GuiFarmStation.java index 25f58863..03d84bf0 100644 --- a/src/main/java/crazypants/enderio/machine/farm/GuiFarmStation.java +++ b/src/main/java/crazypants/enderio/machine/farm/GuiFarmStation.java @@ -39,7 +39,7 @@ public class GuiFarmStation extends GuiPoweredMachineBase { private int id = 0; private IconButtonEIO createButton(int x, int y) { - return new ToggleButtonEIO(this, id, x, y, IconEIO.UNLOCKED, IconEIO.LOCKED).setSelected(getTileEntity().lockedSlots.contains(id++ + getTileEntity().minSupSlot)).setIconMargin(3, 3); + return new ToggleButtonEIO(this, id, x, y, IconEIO.FARM_UNLOCK, IconEIO.FARM_LOCK).setSelected(getTileEntity().lockedSlots.contains(id++ + getTileEntity().minSupSlot)); } @Override @@ -68,7 +68,7 @@ public class GuiFarmStation extends GuiPoweredMachineBase { FontRenderer fr = Minecraft.getMinecraft().fontRenderer; - GL11.glEnable(GL11.GL_BLEND); + GL11.glEnable(GL11.GL_BLEND); fr.drawString("SW", sx + 55, sy + 41, ColorUtil.getARGB(1f,1f,0.35f,1f), true); fr.drawString("NW", sx + 55, sy + 59, ColorUtil.getARGB(1f,1f,0.35f,1f), true); fr.drawString("SE", sx + 73, sy + 41, ColorUtil.getARGB(1f,1f,0.35f,1f), true); diff --git a/src/main/java/crazypants/enderio/machine/generator/combustion/GuiCombustionGenerator.java b/src/main/java/crazypants/enderio/machine/generator/combustion/GuiCombustionGenerator.java index 35428f72..fecb14b4 100644 --- a/src/main/java/crazypants/enderio/machine/generator/combustion/GuiCombustionGenerator.java +++ b/src/main/java/crazypants/enderio/machine/generator/combustion/GuiCombustionGenerator.java @@ -102,7 +102,7 @@ public class GuiCombustionGenerator extends GuiPoweredMachineBase { @@ -151,7 +152,7 @@ public class BlockZombieGenerator extends AbstractMachineBlock tooltip, EntityPlayer player, World world, int x, int y, int z) { TileEntity te = world.getTileEntity(x, y, z); if(te != null && te instanceof TileZombieGenerator) { - tooltip.add(((TileZombieGenerator) te).getFluidStored(ForgeDirection.UNKNOWN) + " mB"); + tooltip.add(((TileZombieGenerator) te).getFluidStored(ForgeDirection.UNKNOWN) + " " + Lang.localize("fluid.millibucket.abr")); } } diff --git a/src/main/java/crazypants/enderio/machine/generator/zombie/GuiZombieGenerator.java b/src/main/java/crazypants/enderio/machine/generator/zombie/GuiZombieGenerator.java index d26d2137..1678ca74 100644 --- a/src/main/java/crazypants/enderio/machine/generator/zombie/GuiZombieGenerator.java +++ b/src/main/java/crazypants/enderio/machine/generator/zombie/GuiZombieGenerator.java @@ -81,7 +81,7 @@ public class GuiZombieGenerator extends GuiPoweredMachineBase list = new ArrayList(); + list.add(configTooltip); + TooltipAddera.addTooltipFromResources(list, "enderio.gui.machine.ioMode.overlay.tooltip.visible.line"); + if(list.size() > 1) { + setSelectedToolTip(list.toArray(new String[list.size()])); + } + } + + @Override + protected boolean toggleSelected() { + if(Keyboard.isKeyDown(Keyboard.KEY_LSHIFT) || Keyboard.isKeyDown(Keyboard.KEY_RSHIFT)) { + if(!configOverlay.isVisible()) { + return false; + } + config.clearAllIoModes(); + PacketHandler.INSTANCE.sendToServer(new PacketIoMode(config)); + } else { + boolean vis = !configOverlay.isVisible(); + configOverlay.setVisible(vis); + } + return true; + } +} diff --git a/src/main/java/crazypants/enderio/machine/gui/GuiMachineBase.java b/src/main/java/crazypants/enderio/machine/gui/GuiMachineBase.java index 81396929..0dd43b59 100644 --- a/src/main/java/crazypants/enderio/machine/gui/GuiMachineBase.java +++ b/src/main/java/crazypants/enderio/machine/gui/GuiMachineBase.java @@ -1,5 +1,10 @@ package crazypants.enderio.machine.gui; +import java.awt.Rectangle; +import java.text.MessageFormat; +import java.util.ArrayList; +import java.util.List; + import net.minecraft.client.gui.GuiButton; import net.minecraft.inventory.Container; import net.minecraft.inventory.Slot; @@ -11,11 +16,11 @@ import crazypants.enderio.gui.IconButtonEIO; import crazypants.enderio.gui.IconEIO; import crazypants.enderio.gui.IoConfigRenderer.SelectedFace; import crazypants.enderio.gui.RedstoneModeButton; -import crazypants.enderio.gui.ToggleButtonEIO; import crazypants.enderio.machine.AbstractMachineEntity; import crazypants.enderio.machine.IoMode; import crazypants.enderio.machine.SlotDefinition; import crazypants.gui.GuiContainerBase; +import crazypants.gui.GuiToolTip; import crazypants.render.RenderUtil; import crazypants.util.BlockCoord; import crazypants.util.Lang; @@ -30,57 +35,41 @@ public abstract class GuiMachineBase extends Gu private static final int CONFIG_ID = 8962349; private static final int RECIPE_ID = CONFIG_ID + 1; - private T tileEntity; + private final T tileEntity; protected RedstoneModeButton redstoneButton; - private GuiOverlayIoConfig configOverlay; + private final GuiOverlayIoConfig configOverlay; - protected ToggleButtonEIO configB; + protected final GuiButtonIoConfig configB; protected IconButtonEIO recipeButton; + protected List progressTooltips; + protected int lastProgressTooltipValue = -1; + protected GuiMachineBase(T machine, Container par1Container) { super(par1Container); tileEntity = machine; - + xSize = getXSize(); ySize = getYSize(); int x = getXSize() - 5 - BUTTON_SIZE; int y = 5; redstoneButton = new RedstoneModeButton(this, -1, x, y, tileEntity, new BlockCoord(tileEntity)); - y += 19; - configB = new ToggleButtonEIO(this, CONFIG_ID, x, y, IconEIO.IO_CONFIG_UP, IconEIO.IO_CONFIG_DOWN); - configB.setToolTip(Lang.localize("gui.machine.ioMode.overlay.tooltip")); - - configOverlay = new GuiOverlayIoConfig(machine) { - - @Override - public void setVisible(boolean visible) { - super.setVisible(visible); - configB.setSelected(visible); - } - - }; + configOverlay = new GuiOverlayIoConfig(machine); addOverlay(configOverlay); - + + y += 19; + configB = new GuiButtonIoConfig(this, CONFIG_ID, x, y, machine, configOverlay); + y += 19; - recipeButton = new IconButtonEIO(this, RECIPE_ID, x, y, IconEIO.RECIPE); recipeButton.visible = false; recipeButton.setIconMargin(3, 3); } - @Override - protected void actionPerformed(GuiButton b) { - super.actionPerformed(b); - if(b.id == CONFIG_ID) { - boolean vis = !configOverlay.isVisible(); - configOverlay.setVisible(vis); - } - } - @Override public void initGui() { super.initGui(); @@ -151,4 +140,45 @@ public abstract class GuiMachineBase extends Gu protected T getTileEntity() { return tileEntity; } + + protected void addProgressTooltip(int x, int y, int w, int h) { + if(progressTooltips == null) { + progressTooltips = new ArrayList(); + } + + GuiToolTip tt = new GuiToolTip(new Rectangle(x, y, w, h), (String[])null); + progressTooltips.add(tt); + addToolTip(tt); + } + + private void updateProgressTooltips(int progress) { + if(lastProgressTooltipValue == progress || progressTooltips == null) { + return; + } + lastProgressTooltipValue = progress; + + if(progress < 0) { + for(GuiToolTip tt : progressTooltips) { + tt.setVisible(false); + } + return; + } + + String msg = MessageFormat.format(Lang.localize("gui.progress"), progress); + for(GuiToolTip tt : progressTooltips) { + tt.setToolTipText(msg); + tt.setVisible(true); + } + } + + protected boolean shouldRenderProgress() { + float progress = tileEntity.getProgress(); + if(progress > 0 && progress < 1) { + updateProgressTooltips((int)(progress * 100)); + return true; + } else { + updateProgressTooltips(-1); + return false; + } + } } diff --git a/src/main/java/crazypants/enderio/machine/gui/GuiOverlayIoConfig.java b/src/main/java/crazypants/enderio/machine/gui/GuiOverlayIoConfig.java index 7d26b3c2..a53c8e2e 100644 --- a/src/main/java/crazypants/enderio/machine/gui/GuiOverlayIoConfig.java +++ b/src/main/java/crazypants/enderio/machine/gui/GuiOverlayIoConfig.java @@ -11,6 +11,7 @@ import net.minecraft.client.gui.ScaledResolution; import crazypants.enderio.gui.IGuiOverlay; import crazypants.enderio.gui.IoConfigRenderer; import crazypants.enderio.gui.IoConfigRenderer.SelectedFace; +import crazypants.enderio.gui.ToggleButtonEIO; import crazypants.enderio.machine.IIoConfigurable; import crazypants.enderio.machine.IoMode; import crazypants.gui.IGuiScreen; @@ -21,6 +22,7 @@ import crazypants.util.BlockCoord; public class GuiOverlayIoConfig implements IGuiOverlay { private boolean visible = false; + private ToggleButtonEIO configB; private IGuiScreen screen; @@ -39,6 +41,10 @@ public class GuiOverlayIoConfig implements IGuiOverlay { coords.addAll(bc); } + public void setConfigB(ToggleButtonEIO configB) { + this.configB = configB; + } + @Override public void init(IGuiScreen screen) { this.screen = screen; @@ -98,7 +104,9 @@ public class GuiOverlayIoConfig implements IGuiOverlay { @Override public void setVisible(boolean visible) { this.visible = visible; - + if(configB != null) { + configB.setSelected(visible); + } } @Override diff --git a/src/main/java/crazypants/enderio/machine/gui/GuiPoweredMachineBase.java b/src/main/java/crazypants/enderio/machine/gui/GuiPoweredMachineBase.java index 0620a769..65ffbb90 100644 --- a/src/main/java/crazypants/enderio/machine/gui/GuiPoweredMachineBase.java +++ b/src/main/java/crazypants/enderio/machine/gui/GuiPoweredMachineBase.java @@ -2,6 +2,7 @@ package crazypants.enderio.machine.gui; import java.awt.Rectangle; import java.util.List; +import net.minecraft.util.StatCollector; import net.minecraft.inventory.Container; @@ -37,7 +38,7 @@ public abstract class GuiPoweredMachineBase implements ITileEntityProvider { +public class BlockPowerMonitor extends AbstractMachineBlock { public static BlockPowerMonitor create() { diff --git a/src/main/java/crazypants/enderio/machine/painter/BlockPaintedGlowstone.java b/src/main/java/crazypants/enderio/machine/painter/BlockPaintedGlowstone.java index cc78d715..dbcff41d 100644 --- a/src/main/java/crazypants/enderio/machine/painter/BlockPaintedGlowstone.java +++ b/src/main/java/crazypants/enderio/machine/painter/BlockPaintedGlowstone.java @@ -11,7 +11,6 @@ import net.minecraft.client.particle.EntityDiggingFX; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.item.EntityItem; import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -28,14 +27,16 @@ import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import crazypants.enderio.BlockEio; import crazypants.enderio.EnderIO; import crazypants.enderio.ModObject; +import crazypants.enderio.TileEntityEio; import crazypants.enderio.machine.MachineRecipeInput; import crazypants.enderio.machine.MachineRecipeRegistry; import crazypants.util.IFacade; import crazypants.util.Lang; -public class BlockPaintedGlowstone extends Block implements ITileEntityProvider, IPaintedBlock, IFacade { +public class BlockPaintedGlowstone extends BlockEio implements ITileEntityProvider, IPaintedBlock, IFacade { public static int renderId = -1; @@ -50,15 +51,15 @@ public class BlockPaintedGlowstone extends Block implements ITileEntityProvider, private Random rand = new Random(); protected BlockPaintedGlowstone() { - super(Material.glass); + super(ModObject.blockPaintedGlowstone.unlocalisedName, TileEntityPaintedBlock.class, Material.glass); setCreativeTab(null); - setBlockName(ModObject.blockPaintedGlowstone.unlocalisedName); setStepSound(soundTypeGlass); setHardness(0.7F); setLightLevel(1.0f); } - private void init() { + @Override + protected void init() { GameRegistry.registerBlock(this, BlockItemPaintedGlowstone.class, ModObject.blockPaintedGlowstone.unlocalisedName); GameRegistry.registerTileEntity(TileEntityPaintedBlock.class, ModObject.blockPaintedGlowstone.unlocalisedName + "TileEntity"); MachineRecipeRegistry.instance.registerRecipe(ModObject.blockPainter.unlocalisedName, new PainterTemplate()); @@ -207,34 +208,18 @@ public class BlockPaintedGlowstone extends Block implements ITileEntityProvider, super.onBlockPlacedBy(world, x, y, z, player, stack); } - /** - * Remove the tile entity too. - */ @Override - public void breakBlock(World world, int x, int y, int z, Block par5, int par6) { - if(!world.isRemote && world.getGameRules().getGameRuleBooleanValue("doTileDrops")) { - TileEntity te = world.getTileEntity(x, y, z); - - if(te instanceof TileEntityPaintedBlock) { - TileEntityPaintedBlock tef = (TileEntityPaintedBlock) te; - - ItemStack itemStack = createItemStackForSourceBlock(tef.getSourceBlock(), tef.getSourceBlockMetadata()); - - float f = 0.7F; - double d0 = world.rand.nextFloat() * f + (1.0F - f) * 0.5D; - double d1 = world.rand.nextFloat() * f + (1.0F - f) * 0.5D; - double d2 = world.rand.nextFloat() * f + (1.0F - f) * 0.5D; - EntityItem entityitem = new EntityItem(world, x + d0, y + d1, z + d2, itemStack); - entityitem.delayBeforeCanPickup = 10; - world.spawnEntityInWorld(entityitem); - } + protected void processDrop(World world, int x, int y, int z, TileEntityEio te, ItemStack drop) { + TileEntityPaintedBlock tef = (TileEntityPaintedBlock) te; + if(tef != null) { + ItemStack itemStack = createItemStackForSourceBlock(tef.getSourceBlock(), tef.getSourceBlockMetadata()); + drop.stackTagCompound = (NBTTagCompound) itemStack.stackTagCompound.copy(); } - world.removeTileEntity(x, y, z); } - + @Override - public int quantityDropped(Random par1Random) { - return 0; // need to do custom dropping to maintain source metadata + public boolean doNormalDrops(World world, int x, int y, int z) { + return false; } @Override diff --git a/src/main/java/crazypants/enderio/machine/painter/BlockPaintedSlab.java b/src/main/java/crazypants/enderio/machine/painter/BlockPaintedSlab.java index 1c39c9ac..3c16a9ad 100644 --- a/src/main/java/crazypants/enderio/machine/painter/BlockPaintedSlab.java +++ b/src/main/java/crazypants/enderio/machine/painter/BlockPaintedSlab.java @@ -12,7 +12,7 @@ import net.minecraft.client.particle.EntityDiggingFX; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.item.EntityItem; +import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -205,9 +205,8 @@ public class BlockPaintedSlab extends BlockSlab implements ITileEntityProvider, * Remove the tile entity too. */ @Override - public void breakBlock(World world, int x, int y, int z, Block par5, int par6) { - - if(!world.isRemote && world.getGameRules().getGameRuleBooleanValue("doTileDrops")) { + public boolean removedByPlayer(World world, EntityPlayer player, int x, int y, int z, boolean doHarvest) { + if(!world.isRemote && !player.capabilities.isCreativeMode) { TileEntity te = world.getTileEntity(x, y, z); if(te instanceof TileEntityPaintedSlab && !((TileEntityPaintedSlab) te).isConvertingToFullBlock) { @@ -216,17 +215,11 @@ public class BlockPaintedSlab extends BlockSlab implements ITileEntityProvider, for (int i = 0; i < super.quantityDropped(null); i++) { ItemStack itemStack = createItemStackForSourceBlock(tef.getSourceBlock(), tef.getSourceBlockMetadata()); - float f = 0.7F; - double d0 = world.rand.nextFloat() * f + (1.0F - f) * 0.5D; - double d1 = world.rand.nextFloat() * f + (1.0F - f) * 0.5D; - double d2 = world.rand.nextFloat() * f + (1.0F - f) * 0.5D; - EntityItem entityitem = new EntityItem(world, x + d0, y + d1, z + d2, itemStack); - entityitem.delayBeforeCanPickup = 10; - world.spawnEntityInWorld(entityitem); + dropBlockAsItem(world, x, y, z, itemStack); } } } - world.removeTileEntity(x, y, z); + return super.removedByPlayer(world, player, x, y, z, false); } @Override diff --git a/src/main/java/crazypants/enderio/machine/painter/GuiPainter.java b/src/main/java/crazypants/enderio/machine/painter/GuiPainter.java index cad09957..be39558f 100644 --- a/src/main/java/crazypants/enderio/machine/painter/GuiPainter.java +++ b/src/main/java/crazypants/enderio/machine/painter/GuiPainter.java @@ -6,7 +6,6 @@ import org.lwjgl.opengl.GL11; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import crazypants.enderio.machine.AbstractMachineEntity; import crazypants.enderio.machine.gui.GuiPoweredMachineBase; import crazypants.render.RenderUtil; import crazypants.vecmath.Vector4f; @@ -16,6 +15,8 @@ public class GuiPainter extends GuiPoweredMachineBase { public GuiPainter(InventoryPlayer par1InventoryPlayer, TileEntityPainter te) { super(te, new PainterContainer(par1InventoryPlayer, te)); + + addProgressTooltip(88, 34, 24, 16); } /** @@ -26,14 +27,15 @@ public class GuiPainter extends GuiPoweredMachineBase { protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) { GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); RenderUtil.bindTexture("enderio:textures/gui/painter.png"); - int k = (width - xSize) / 2; - int l = (height - ySize) / 2; + int k = guiLeft; + int l = guiTop; drawTexturedModalRect(k, l, 0, 0, xSize, ySize); - int i1; - i1 = getTileEntity().getProgressScaled(24); - drawTexturedModalRect(k + 88, l + 34, 176, 14, i1 + 1, 16); + if(shouldRenderProgress()) { + int scaled = getTileEntity().getProgressScaled(24); + drawTexturedModalRect(k + 88, l + 34, 176, 14, scaled + 1, 16); + } super.drawGuiContainerBackgroundLayer(par1, par2, par3); } diff --git a/src/main/java/crazypants/enderio/machine/power/BlockCapacitorBank.java b/src/main/java/crazypants/enderio/machine/power/BlockCapacitorBank.java index 5df96ef3..7160e067 100644 --- a/src/main/java/crazypants/enderio/machine/power/BlockCapacitorBank.java +++ b/src/main/java/crazypants/enderio/machine/power/BlockCapacitorBank.java @@ -119,13 +119,6 @@ public class BlockCapacitorBank extends BlockEio implements IGuiHandler, IAdvanc @Override public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer entityPlayer, int side, float par7, float par8, float par9) { - if(ToolUtil.breakBlockWithTool(this, world, x, y, z, entityPlayer)) { - return true; - } - - if(entityPlayer.isSneaking()) { - return false; - } TileEntity te = world.getTileEntity(x, y, z); if(!(te instanceof TileCapacitorBank)) { return false; @@ -145,7 +138,12 @@ public class BlockCapacitorBank extends BlockEio implements IGuiHandler, IAdvanc return true; } - + + return super.onBlockActivated(world, x, y, z, entityPlayer, side, par7, par8, par9); + } + + @Override + protected boolean openGui(World world, int x, int y, int z, EntityPlayer entityPlayer, int side) { if(!world.isRemote) { entityPlayer.openGui(EnderIO.instance, GuiHandler.GUI_ID_CAPACITOR_BANK, world, x, y, z); } @@ -346,7 +344,6 @@ public class BlockCapacitorBank extends BlockEio implements IGuiHandler, IAdvanc TileCapacitorBank cb = (TileCapacitorBank) te; Util.dropItems(world, cb, x, y, z, true); } - world.removeTileEntity(x, y, z); } @Override diff --git a/src/main/java/crazypants/enderio/machine/power/TileCapacitorBank.java b/src/main/java/crazypants/enderio/machine/power/TileCapacitorBank.java index d661d7f1..84e9fdbd 100644 --- a/src/main/java/crazypants/enderio/machine/power/TileCapacitorBank.java +++ b/src/main/java/crazypants/enderio/machine/power/TileCapacitorBank.java @@ -143,6 +143,18 @@ public class TileCapacitorBank extends TileEntityEio implements IInternalPowerHa setIoMode(faceHit, mode, true); } + @Override + public void clearAllIoModes() { + if(faceModes != null) { + faceModes = null; + receptorsDirty = true; + getController().masterReceptorsDirty = true; + notifyNeighbours = true; + render = true; + updateBlock(); + } + } + public void setIoMode(ForgeDirection faceHit, IoMode mode, boolean updateReceptors) { if(mode == IoMode.NONE && faceModes == null) { return; diff --git a/src/main/java/crazypants/enderio/machine/reservoir/BlockReservoir.java b/src/main/java/crazypants/enderio/machine/reservoir/BlockReservoir.java index 8c0599da..445a6087 100644 --- a/src/main/java/crazypants/enderio/machine/reservoir/BlockReservoir.java +++ b/src/main/java/crazypants/enderio/machine/reservoir/BlockReservoir.java @@ -1,7 +1,6 @@ package crazypants.enderio.machine.reservoir; 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.entity.player.EntityPlayer; @@ -16,10 +15,9 @@ import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; -import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import crazypants.enderio.EnderIOTab; +import crazypants.enderio.BlockEio; import crazypants.enderio.ModObject; import crazypants.enderio.gui.IResourceTooltipProvider; import crazypants.enderio.machine.reservoir.TileReservoir.Pos; @@ -29,7 +27,7 @@ import crazypants.util.FluidUtil; import crazypants.util.Util; import crazypants.vecmath.Vector3d; -public class BlockReservoir extends BlockContainer implements IResourceTooltipProvider { +public class BlockReservoir extends BlockEio implements IResourceTooltipProvider { public static BlockReservoir create() { BlockReservoir result = new BlockReservoir(); @@ -59,21 +57,8 @@ public class BlockReservoir extends BlockContainer implements IResourceTooltipPr IIcon switchIcon; private BlockReservoir() { - super(Material.rock); - setHardness(0.5F); + super(ModObject.blockReservoir.unlocalisedName, TileReservoir.class, Material.rock); setStepSound(Block.soundTypeStone); - setBlockName(ModObject.blockReservoir.unlocalisedName); - setCreativeTab(EnderIOTab.tabEnderIO); - } - - @Override - public TileEntity createNewTileEntity(World var1, int var2) { - return new TileReservoir(); - } - - private void init() { - GameRegistry.registerBlock(this, ModObject.blockReservoir.unlocalisedName); - GameRegistry.registerTileEntity(TileReservoir.class, ModObject.blockReservoir.unlocalisedName + "TileEntity"); } @Override @@ -136,8 +121,7 @@ public class BlockReservoir extends BlockContainer implements IResourceTooltipPr } } - return false; - + return super.onBlockActivated(world, x, y, z, entityPlayer, par6, par7, par8, par9); } @Override diff --git a/src/main/java/crazypants/enderio/machine/slicensplice/ContainerSliceAndSplice.java b/src/main/java/crazypants/enderio/machine/slicensplice/ContainerSliceAndSplice.java index fd0c0ccb..0cfbc508 100644 --- a/src/main/java/crazypants/enderio/machine/slicensplice/ContainerSliceAndSplice.java +++ b/src/main/java/crazypants/enderio/machine/slicensplice/ContainerSliceAndSplice.java @@ -21,7 +21,7 @@ public class ContainerSliceAndSplice extends AbstractMachineContainer { new Point(72,16) }; - public static final Point OUTPUT_SLOT = new Point(134, 48); + public static final Point OUTPUT_SLOT = new Point(134, 49); public ContainerSliceAndSplice(InventoryPlayer playerInv, AbstractMachineEntity te) { super(playerInv, te); diff --git a/src/main/java/crazypants/enderio/machine/slicensplice/GuiSliceAndSplice.java b/src/main/java/crazypants/enderio/machine/slicensplice/GuiSliceAndSplice.java index fe9c31cf..4da189bd 100644 --- a/src/main/java/crazypants/enderio/machine/slicensplice/GuiSliceAndSplice.java +++ b/src/main/java/crazypants/enderio/machine/slicensplice/GuiSliceAndSplice.java @@ -11,6 +11,8 @@ public class GuiSliceAndSplice extends GuiPoweredMachineBase public GuiSliceAndSplice(InventoryPlayer par1InventoryPlayer, TileSliceAndSplice te) { super(te, new ContainerSliceAndSplice(par1InventoryPlayer, te)); + + addProgressTooltip(103, 49, 24, 16); } /** @@ -21,14 +23,15 @@ public class GuiSliceAndSplice extends GuiPoweredMachineBase protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) { GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); RenderUtil.bindTexture("enderio:textures/gui/sliceAndSplice.png"); - int k = (width - xSize) / 2; - int l = (height - ySize) / 2; + int k = guiLeft; + int l = guiTop; drawTexturedModalRect(k, l, 0, 0, xSize, ySize); - int i1; - i1 = getTileEntity().getProgressScaled(24); - drawTexturedModalRect(k + 101, l + 46, 176, 14, i1 + 1, 16); + if(shouldRenderProgress()) { + int scaled = getTileEntity().getProgressScaled(24); + drawTexturedModalRect(k + 103, l + 49, 176, 14, scaled + 1, 16); + } super.drawGuiContainerBackgroundLayer(par1, par2, par3); } diff --git a/src/main/java/crazypants/enderio/machine/slicensplice/TileSliceAndSplice.java b/src/main/java/crazypants/enderio/machine/slicensplice/TileSliceAndSplice.java index b98b1c29..c21f20d1 100644 --- a/src/main/java/crazypants/enderio/machine/slicensplice/TileSliceAndSplice.java +++ b/src/main/java/crazypants/enderio/machine/slicensplice/TileSliceAndSplice.java @@ -4,12 +4,10 @@ import java.util.List; import net.minecraft.entity.EntityLivingBase; import net.minecraft.item.ItemAxe; -import net.minecraft.item.ItemHoe; import net.minecraft.item.ItemShears; import net.minecraft.item.ItemStack; import net.minecraft.server.MinecraftServer; import net.minecraftforge.common.util.FakePlayerFactory; -import crazypants.enderio.Log; import crazypants.enderio.ModObject; import crazypants.enderio.config.Config; import crazypants.enderio.machine.AbstractPoweredTaskEntity; @@ -17,7 +15,6 @@ import crazypants.enderio.machine.IMachineRecipe; import crazypants.enderio.machine.MachineRecipeInput; import crazypants.enderio.machine.MachineRecipeRegistry; import crazypants.enderio.machine.SlotDefinition; -import crazypants.enderio.machine.alloy.VanillaSmeltingRecipe; import crazypants.enderio.machine.recipe.ManyToOneMachineRecipe; import crazypants.enderio.power.BasicCapacitor; import crazypants.enderio.power.Capacitors; @@ -40,8 +37,8 @@ public class TileSliceAndSplice extends AbstractPoweredTaskEntity { Capacitors.ENDER_CAPACITOR.capacitor.getMaxEnergyStored(), POWER_PER_TICK_THREE); - private int axeIndex = 6; - private int shearsIndex = 7; + private final int axeIndex = 6; + private final int shearsIndex = 7; private EntityLivingBase fakePlayer; private ICapacitor capacitor; @@ -94,15 +91,6 @@ public class TileSliceAndSplice extends AbstractPoweredTaskEntity { return POWER_PER_TICK_THREE; } - @Override - public int getProgressScaled(int scale) { - int res = super.getProgressScaled(scale); - if(currentTask != null) { - res = Math.max(1, res); - } - return res; - } - @Override protected IMachineRecipe canStartNextTask(float chance) { if(getAxe() == null || getShears() == null) { diff --git a/src/main/java/crazypants/enderio/machine/solar/BlockSolarPanel.java b/src/main/java/crazypants/enderio/machine/solar/BlockSolarPanel.java index 8826afb2..f2321179 100644 --- a/src/main/java/crazypants/enderio/machine/solar/BlockSolarPanel.java +++ b/src/main/java/crazypants/enderio/machine/solar/BlockSolarPanel.java @@ -42,7 +42,7 @@ public class BlockSolarPanel extends BlockEio implements IResourceTooltipProvide IIcon sideIcon; IIcon advancedSideIcon; IIcon advancedIcon; - + IIcon borderIcon; IIcon advancedBorderIcon; @@ -77,22 +77,6 @@ public class BlockSolarPanel extends BlockEio implements IResourceTooltipProvide return false; } - @Override - public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer entityPlayer, int par6, float par7, float par8, float par9) { - ITool tool = ToolUtil.getEquippedTool(entityPlayer); - if(tool != null && entityPlayer.isSneaking() && tool.canUse(entityPlayer.getCurrentEquippedItem(), entityPlayer, x, y, z)) { - if(!world.isRemote && !entityPlayer.capabilities.isCreativeMode) { - int meta = world.getBlockMetadata(x, y, z); - ItemStack is = new ItemStack(this, 1, meta); - Util.dropItems(world, is, x, y, z, true); - } - removedByPlayer(world, entityPlayer, x, y, z, true); - tool.used(entityPlayer.getCurrentEquippedItem(), entityPlayer, x, y, z); - return true; - } - return false; - } - @Override public IIcon getIcon(int side, int meta) { if(side == ForgeDirection.UP.ordinal()) { @@ -104,7 +88,7 @@ public class BlockSolarPanel extends BlockEio implements IResourceTooltipProvide public IIcon getBorderIcon(int i, int meta) { return meta == 0 ? borderIcon : advancedBorderIcon; } - + @Override public int getRenderType() { return renderId; @@ -145,12 +129,6 @@ public class BlockSolarPanel extends BlockEio implements IResourceTooltipProvide super.addCollisionBoxesToList(par1World, par2, par3, par4, par5AxisAlignedBB, par6List, par7Entity); } - @Override - public void breakBlock(World world, int x, int y, int z, Block block, int p_149749_6_) { - super.breakBlock(world, x, y, z, block, p_149749_6_); - world.removeTileEntity(x, y, z); - } - @Override public String getUnlocalizedNameForTooltip(ItemStack itemStack) { return getUnlocalizedName(); @@ -158,13 +136,10 @@ public class BlockSolarPanel extends BlockEio implements IResourceTooltipProvide @Override public void getWailaInfo(List tooltip, EntityPlayer player, World world, int x, int y, int z) { - TileEntity te = world.getTileEntity(x, y, z); + TileEntity te = world.getTileEntity(x, y, z); if(te instanceof TileEntitySolarPanel) { TileEntitySolarPanel solar = (TileEntitySolarPanel) te; float efficiency = solar.calculateLightRatio(); - EnergyStorage storage = new EnergyStorage(Integer.MAX_VALUE); - storage.readFromNBT(WailaCompat.getNBTData()); - tooltip.add(storage.getEnergyStored() + " / " + WailaCompat.getNBTData().getInteger("rfCap") + " RF"); tooltip.add(String.format("%s : %s%.0f%%", EnumChatFormatting.WHITE + Lang.localize("tooltip.efficiency") + EnumChatFormatting.RESET, EnumChatFormatting.WHITE, efficiency * 100)); } diff --git a/src/main/java/crazypants/enderio/machine/soul/GuiSoulBinder.java b/src/main/java/crazypants/enderio/machine/soul/GuiSoulBinder.java index d2db73c0..9789d55c 100644 --- a/src/main/java/crazypants/enderio/machine/soul/GuiSoulBinder.java +++ b/src/main/java/crazypants/enderio/machine/soul/GuiSoulBinder.java @@ -20,13 +20,15 @@ public class GuiSoulBinder extends GuiPoweredMachineBase { private static final int PLAYER_XP_ID = 985162394; - private IconButtonEIO usePlayerXP; + private final IconButtonEIO usePlayerXP; public GuiSoulBinder(InventoryPlayer par1InventoryPlayer, TileSoulBinder te) { super(te, new ContainerSoulBinder(par1InventoryPlayer, te)); usePlayerXP = new IconButtonEIO(this, PLAYER_XP_ID, 125, 57, IconEIO.XP); usePlayerXP.visible = false; usePlayerXP.setToolTip("Use Player XP"); + + addProgressTooltip(80, 34, 24, 16); } @Override @@ -55,18 +57,20 @@ public class GuiSoulBinder extends GuiPoweredMachineBase { protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) { GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); RenderUtil.bindTexture("enderio:textures/gui/soulFuser.png"); - int k = (width - xSize) / 2; - int l = (height - ySize) / 2; + int k = guiLeft; + int l = guiTop; drawTexturedModalRect(k, l, 0, 0, this.xSize, this.ySize); int i1; TileSoulBinder binder = getTileEntity(); - i1 = binder.getProgressScaled(24); - drawTexturedModalRect(k + 80, l + 34, 176, 14, i1 + 1, 16); + if(shouldRenderProgress()) { + i1 = binder.getProgressScaled(24); + drawTexturedModalRect(k + 80, l + 34, 176, 14, i1 + 1, 16); + } - boolean needsXp = getTileEntity().getCurrentlyRequiredLevel() > 0 && binder.getCurrentlyRequiredLevel() > binder.getContainer().getExperienceLevel(); + boolean needsXp = binder.getCurrentlyRequiredLevel() > 0 && binder.getCurrentlyRequiredLevel() > binder.getContainer().getExperienceLevel(); usePlayerXP.visible = needsXp; ExperienceBarRenderer.render(this, getGuiLeft() + 56, getGuiTop() + 68, 65, binder.getContainer(), binder.getCurrentlyRequiredLevel()); diff --git a/src/main/java/crazypants/enderio/machine/soul/TileSoulBinder.java b/src/main/java/crazypants/enderio/machine/soul/TileSoulBinder.java index b1e37579..4ba535da 100644 --- a/src/main/java/crazypants/enderio/machine/soul/TileSoulBinder.java +++ b/src/main/java/crazypants/enderio/machine/soul/TileSoulBinder.java @@ -2,7 +2,6 @@ package crazypants.enderio.machine.soul; import java.util.List; -import scala.xml.persistent.SetStorage; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.common.util.ForgeDirection; @@ -10,7 +9,6 @@ import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.IFluidHandler; -import crazypants.enderio.EnderIO; import crazypants.enderio.ModObject; import crazypants.enderio.config.Config; import crazypants.enderio.machine.AbstractPoweredTaskEntity; @@ -22,7 +20,6 @@ import crazypants.enderio.network.PacketHandler; import crazypants.enderio.power.BasicCapacitor; import crazypants.enderio.power.Capacitors; import crazypants.enderio.power.ICapacitor; -import crazypants.enderio.power.PowerHandlerUtil; import crazypants.enderio.xp.ExperienceContainer; import crazypants.enderio.xp.IHaveExperience; import crazypants.enderio.xp.PacketExperianceContainer; @@ -45,7 +42,7 @@ public class TileSoulBinder extends AbstractPoweredTaskEntity implements IHaveEx private ICapacitor capacitor; - private ExperienceContainer xpCont = new ExperienceContainer(XpUtil.getExperienceForLevel(Config.soulBinderMaxXpLevel)); + private final ExperienceContainer xpCont = new ExperienceContainer(XpUtil.getExperienceForLevel(Config.soulBinderMaxXpLevel)); public TileSoulBinder() { super(new SlotDefinition(2, 2, 1)); @@ -174,15 +171,6 @@ public class TileSoulBinder extends AbstractPoweredTaskEntity implements IHaveEx return POWER_PER_TICK_THREE; } - @Override - public int getProgressScaled(int scale) { - int res = super.getProgressScaled(scale); - if(currentTask != null) { - res = Math.max(1, res); - } - return res; - } - @Override protected boolean doPull(ForgeDirection dir) { boolean res = super.doPull(dir); diff --git a/src/main/java/crazypants/enderio/machine/spawner/GuiPoweredSpawner.java b/src/main/java/crazypants/enderio/machine/spawner/GuiPoweredSpawner.java index 17a3751c..3f8dd86a 100644 --- a/src/main/java/crazypants/enderio/machine/spawner/GuiPoweredSpawner.java +++ b/src/main/java/crazypants/enderio/machine/spawner/GuiPoweredSpawner.java @@ -14,6 +14,7 @@ import crazypants.enderio.machine.gui.GuiPoweredMachineBase; import crazypants.enderio.network.PacketHandler; import crazypants.render.ColorUtil; import crazypants.render.RenderUtil; +import crazypants.util.Lang; public class GuiPoweredSpawner extends GuiPoweredMachineBase { @@ -58,9 +59,9 @@ public class GuiPoweredSpawner extends GuiPoweredMachineBase int left = getGuiLeft(); int top = getGuiTop(); - String txt = "Spawn"; + String txt = Lang.localize("gui.machine.poweredspawner.spawn"); if(!spawner.isSpawnMode()) { - txt = "Capture"; + txt = Lang.localize("gui.machine.poweredspawner.capture"); } FontRenderer fr = getFontRenderer(); int x = left + xSize / 2 - fr.getStringWidth(txt) / 2; diff --git a/src/main/java/crazypants/enderio/machine/tank/BlockTank.java b/src/main/java/crazypants/enderio/machine/tank/BlockTank.java index c8336c63..701d32e9 100644 --- a/src/main/java/crazypants/enderio/machine/tank/BlockTank.java +++ b/src/main/java/crazypants/enderio/machine/tank/BlockTank.java @@ -3,8 +3,10 @@ package crazypants.enderio.machine.tank; import java.util.List; import net.minecraft.block.Block; +import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; @@ -13,7 +15,6 @@ import net.minecraft.util.IIcon; import net.minecraft.util.MathHelper; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidContainerRegistry.FluidContainerData; import net.minecraftforge.fluids.FluidStack; @@ -46,16 +47,14 @@ public class BlockTank extends AbstractMachineBlock implements IAdvanc protected BlockTank() { super(ModObject.blockTank, TileTank.class); setStepSound(Block.soundTypeGlass); + setLightOpacity(0); } - + @Override protected void init() { - GameRegistry.registerBlock(this, BlockItemTank.class, ModObject.blockTank.unlocalisedName); - if(teClass != null) { - GameRegistry.registerTileEntity(teClass, ModObject.blockTank.unlocalisedName + "TileEntity"); - } - EnderIO.guiHandler.registerGuiHandler(GuiHandler.GUI_ID_TANK, this); - setLightOpacity(0); + GameRegistry.registerBlock(this, BlockItemTank.class, modObject.unlocalisedName); + GameRegistry.registerTileEntity(teClass, modObject.unlocalisedName + "TileEntity"); + EnderIO.guiHandler.registerGuiHandler(getGuiId(), this); } @Override @@ -63,6 +62,18 @@ public class BlockTank extends AbstractMachineBlock implements IAdvanc return par1; } + @SuppressWarnings({ "unchecked", "rawtypes" }) + @Override + public void getSubBlocks(Item item, CreativeTabs p_149666_2_, List list) { + list.add(new ItemStack(this, 1, 0)); + list.add(new ItemStack(this, 1, 1)); + } + + @Override + public TileEntity createTileEntity(World world, int metadata) { + return new TileTank(metadata); + } + @Override public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer entityPlayer, int par6, float par7, float par8, float par9) { @@ -134,11 +145,6 @@ public class BlockTank extends AbstractMachineBlock implements IAdvanc return super.onBlockActivated(world, x, y, z, entityPlayer, par6, par7, par8, par9); } - @Override - public TileEntity createNewTileEntity(World var1, int var2) { - return new TileTank(var2); - } - @Override public Object getServerGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { TileEntity te = world.getTileEntity(x, y, z); diff --git a/src/main/java/crazypants/enderio/machine/tank/TileTank.java b/src/main/java/crazypants/enderio/machine/tank/TileTank.java index 1d5c03c9..72fd11d9 100644 --- a/src/main/java/crazypants/enderio/machine/tank/TileTank.java +++ b/src/main/java/crazypants/enderio/machine/tank/TileTank.java @@ -37,7 +37,7 @@ public class TileTank extends AbstractMachineEntity implements IFluidHandler { } public TileTank() { - super(new SlotDefinition(0, 1, 2, 3, -1, -1)); + this(0); } @Override diff --git a/src/main/java/crazypants/enderio/machine/transceiver/BlockTransceiver.java b/src/main/java/crazypants/enderio/machine/transceiver/BlockTransceiver.java index c88be3c8..ab9674d6 100644 --- a/src/main/java/crazypants/enderio/machine/transceiver/BlockTransceiver.java +++ b/src/main/java/crazypants/enderio/machine/transceiver/BlockTransceiver.java @@ -49,14 +49,14 @@ public class BlockTransceiver extends AbstractMachineBlock { } @Override - public boolean removedByPlayer(World world, EntityPlayer player, int x, int y, int z) { + public boolean removedByPlayer(World world, EntityPlayer player, int x, int y, int z, boolean doHarvest) { if(!world.isRemote) { TileEntity te = world.getTileEntity(x, y, z); if(te instanceof TileTransceiver) { ((TileTransceiver)te).getRailController().dropNonSpawnedCarts(); } } - return super.removedByPlayer(world, player, x, y, z); + return super.removedByPlayer(world, player, x, y, z, doHarvest); } @Override @@ -136,7 +136,7 @@ public class BlockTransceiver extends AbstractMachineBlock { tooltip.add(EnumChatFormatting.WHITE + Lang.localize("trans." + type.name().toLowerCase())); if(!isEmpty(recieve)) { - tooltip.add(String.format("%s%s " + Util.TAB + ": %s%s", Util.TAB, Lang.localize("trans.recieving"), Util.TAB + Util.ALIGNRIGHT + tooltip.add(String.format("%s%s " + Util.TAB + ": %s%s", Util.TAB, Lang.localize("trans.receiving"), Util.TAB + Util.ALIGNRIGHT + EnumChatFormatting.WHITE, recieve)); } if(!isEmpty(send)) { diff --git a/src/main/java/crazypants/enderio/machine/transceiver/gui/ChannelTab.java b/src/main/java/crazypants/enderio/machine/transceiver/gui/ChannelTab.java index 80988e6c..9a6e5573 100644 --- a/src/main/java/crazypants/enderio/machine/transceiver/gui/ChannelTab.java +++ b/src/main/java/crazypants/enderio/machine/transceiver/gui/ChannelTab.java @@ -186,13 +186,13 @@ public class ChannelTab implements ITabPanel { int top = parent.getGuiTop(); int x = left + 59; int y = top + 36; - parent.drawCenteredString(parent.getFontRenderer(), "Available", x, y, ColorUtil.getRGB(Color.white)); + parent.drawCenteredString(parent.getFontRenderer(), Lang.localize("gui.available"), x, y, ColorUtil.getRGB(Color.white)); x = left + 199; - parent.drawCenteredString(parent.getFontRenderer(), "Send", x, y, ColorUtil.getRGB(Color.white)); + parent.drawCenteredString(parent.getFontRenderer(), Lang.localize("gui.send"), x, y, ColorUtil.getRGB(Color.white)); y += 56; - parent.drawCenteredString(parent.getFontRenderer(), "Recieve", x, y, ColorUtil.getRGB(Color.white)); + parent.drawCenteredString(parent.getFontRenderer(), Lang.localize("gui.receive"), x, y, ColorUtil.getRGB(Color.white)); } @Override diff --git a/src/main/java/crazypants/enderio/machine/transceiver/gui/FilterTab.java b/src/main/java/crazypants/enderio/machine/transceiver/gui/FilterTab.java index ebe1eafe..4a405306 100644 --- a/src/main/java/crazypants/enderio/machine/transceiver/gui/FilterTab.java +++ b/src/main/java/crazypants/enderio/machine/transceiver/gui/FilterTab.java @@ -19,6 +19,7 @@ import crazypants.enderio.machine.transceiver.TileTransceiver; import crazypants.enderio.network.PacketHandler; import crazypants.render.ColorUtil; import crazypants.render.RenderUtil; +import crazypants.util.Lang; public class FilterTab implements ITabPanel { @@ -98,9 +99,9 @@ public class FilterTab implements ITabPanel { recGui.renderCustomOptions(0, par1, par2, par3); } - String txt = "Send Filter"; + String txt = Lang.localize("gui.machine.sendfilter"); if(!showSend) { - txt = "Receive Filter"; + txt = Lang.localize("gui.machine.receivefilter"); } FontRenderer fr = parent.getFontRenderer(); int x = left + container.getFilterOffset().x; diff --git a/src/main/java/crazypants/enderio/machine/transceiver/gui/GeneralTab.java b/src/main/java/crazypants/enderio/machine/transceiver/gui/GeneralTab.java index 09bd41d5..33fe9e2b 100644 --- a/src/main/java/crazypants/enderio/machine/transceiver/gui/GeneralTab.java +++ b/src/main/java/crazypants/enderio/machine/transceiver/gui/GeneralTab.java @@ -20,6 +20,7 @@ import crazypants.enderio.network.PacketHandler; import crazypants.gui.GuiToolTip; import crazypants.render.ColorUtil; import crazypants.render.RenderUtil; +import crazypants.util.Lang; public class GeneralTab implements ITabPanel { @@ -37,8 +38,8 @@ public class GeneralTab implements ITabPanel { int x = parent.getXSize() - 5 - 16; int y = 43; bufferSizeB = new ToggleButtonEIO(parent, 4327, x, y, IconEIO.ITEM_SINGLE, IconEIO.ITEM_STACK); - bufferSizeB.setSelectedToolTip("Buffering item stacks"); - bufferSizeB.setUnselectedToolTip("Buffering single items"); + bufferSizeB.setSelectedToolTip(Lang.localize("gui.machine.bufferingstacks")); + bufferSizeB.setUnselectedToolTip(Lang.localize("gui.machine.bufferingsingle")); bufferSizeB.setSelected(parent.getTransciever().isBufferStacks()); sendPowerBarTT = new GuiToolTip(new Rectangle(parent.getPowerX() + SEND_BAR_OFFSET, parent.getPowerY(), parent.getPowerWidth(), parent.getPowerHeight()), "") { @@ -89,11 +90,11 @@ public class GeneralTab implements ITabPanel { parent.drawTexturedModalRect(left + invRoot.x - 1 + (18 * 4) + container.getItemBufferSpacing(), top + invRoot.y - 1, 24, 180, 72, 36); FontRenderer fr = parent.getFontRenderer(); - String sendTxt = "Send"; + String sendTxt = Lang.localize("gui.send"); int x = left + invRoot.x + 36 - fr.getStringWidth(sendTxt)/2; int y = top + invRoot.y - fr.FONT_HEIGHT - 3; fr.drawStringWithShadow(sendTxt, x, y, ColorUtil.getRGB(Color.WHITE)); - String recText = "Receive"; + String recText = Lang.localize("gui.receive"); x = left + invRoot.x + 72 + container.getItemBufferSpacing() + 36 - fr.getStringWidth(recText)/2; fr.drawStringWithShadow(recText, x, y, ColorUtil.getRGB(Color.WHITE)); @@ -125,16 +126,16 @@ public class GeneralTab implements ITabPanel { } public void updatePowerBarTooltip(List text) { - text.add("Local Buffer"); - text.add("Upkeep: " + PowerDisplayUtil.formatPowerPerTick(parent.getPowerOutputValue())); + text.add(Lang.localize("gui.machine.localbuffer")); + text.add(Lang.localize("gui.machine.upkeep") + " " + PowerDisplayUtil.formatPowerPerTick(parent.getPowerOutputValue())); int maxEnergy = parent.getTransciever().getCapacitor().getMaxEnergyStored()/2; int energyStored = Math.min(parent.getTransciever().getEnergyStored(), maxEnergy); text.add(PowerDisplayUtil.formatStoredPower(energyStored, maxEnergy)); } private void updateSendPowerBarTooltip(List text) { - text.add("Send/Recieve Buffer"); - text.add("Max IO: " + PowerDisplayUtil.formatPowerPerTick(Config.transceiverMaxIoRF)); + text.add(Lang.localize("gui.machine.sendReceivebuffer")); + text.add(Lang.localize("itemGasConduit.tooltip.maxIo") + " " + PowerDisplayUtil.formatPowerPerTick(Config.transceiverMaxIoRF)); int maxEnergy = parent.getTransciever().getCapacitor().getMaxEnergyStored()/2; int energyStored = Math.max(0, parent.getTransciever().getEnergyStored() - maxEnergy); text.add(PowerDisplayUtil.formatStoredPower(energyStored, maxEnergy)); diff --git a/src/main/java/crazypants/enderio/machine/transceiver/gui/GuiTransceiver.java b/src/main/java/crazypants/enderio/machine/transceiver/gui/GuiTransceiver.java index 6925b247..367699a9 100644 --- a/src/main/java/crazypants/enderio/machine/transceiver/gui/GuiTransceiver.java +++ b/src/main/java/crazypants/enderio/machine/transceiver/gui/GuiTransceiver.java @@ -4,11 +4,14 @@ import java.util.ArrayList; import java.util.List; import net.minecraft.client.gui.GuiButton; +import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.renderer.Tessellator; import net.minecraft.entity.player.InventoryPlayer; import org.lwjgl.opengl.GL11; +import cpw.mods.fml.common.Optional; + import crazypants.enderio.config.Config; import crazypants.enderio.gui.IGuiOverlay; import crazypants.enderio.gui.ITabPanel; @@ -24,7 +27,7 @@ public class GuiTransceiver extends GuiPoweredMachineBase { private int activeTab = 0; private final List tabs = new ArrayList(); - private int tabYOffset = 4; + private final int tabYOffset = 4; GeneralTab generalTab; public GuiTransceiver(InventoryPlayer par1InventoryPlayer, TileTransceiver te) { @@ -201,7 +204,7 @@ public class GuiTransceiver extends GuiPoweredMachineBase { RenderUtil.bindTexture(IconEIO.TEXTURE); IconEIO.INACTIVE_TAB.renderIcon(tabX, sy + tabYOffset + (i * 24)); IconEIO icon = tabs.get(i).getIcon(); - icon.renderIcon(tabX + 4, sy + tabYOffset + (i * TAB_HEIGHT) + 7, 10, 10, 0, false); + icon.renderIcon(tabX + 4, sy + tabYOffset + (i * TAB_HEIGHT) + 6, 11, 11, 0, false); } } @@ -218,7 +221,7 @@ public class GuiTransceiver extends GuiPoweredMachineBase { if(tabs.size() > 0) { IconEIO icon = tabs.get(activeTab).getIcon(); - icon.renderIcon(tabX + 4, sy + tabYOffset + (activeTab * TAB_HEIGHT) + 7, 10, 10, 0, false); + icon.renderIcon(tabX - 1, sy + tabYOffset + (activeTab * TAB_HEIGHT) + 4); tes.draw(); tabs.get(activeTab).render(par1, par2, par3); } else { @@ -233,4 +236,18 @@ public class GuiTransceiver extends GuiPoweredMachineBase { public ContainerTransceiver getContainer() { return (ContainerTransceiver) inventorySlots; } + + @Override + @Optional.Method(modid = "NotEnoughItems") + public boolean hideItemPanelSlot(GuiContainer gc, int x, int y, int w, int h) { + if(tabs.size() > 0) { + int sx = (width - xSize) / 2; + int sy = (height - ySize) / 2; + int tabX = sx + xSize - 3; + int tabY = sy + tabYOffset; + + return (x+w) >= tabX && x < (tabX + 14) && (y+h) >= tabY && y < (tabY + tabs.size()*TAB_HEIGHT); + } + return false; + } } diff --git a/src/main/java/crazypants/enderio/machine/vacuum/BlockVacuumChest.java b/src/main/java/crazypants/enderio/machine/vacuum/BlockVacuumChest.java index 7ce4a782..8f27803c 100644 --- a/src/main/java/crazypants/enderio/machine/vacuum/BlockVacuumChest.java +++ b/src/main/java/crazypants/enderio/machine/vacuum/BlockVacuumChest.java @@ -1,10 +1,6 @@ package crazypants.enderio.machine.vacuum; -import java.util.Random; - -import net.minecraft.block.Block; import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -15,6 +11,7 @@ import crazypants.enderio.BlockEio; import crazypants.enderio.EnderIO; import crazypants.enderio.GuiHandler; import crazypants.enderio.ModObject; +import crazypants.enderio.TileEntityEio; import crazypants.enderio.gui.IResourceTooltipProvider; import crazypants.enderio.tool.ToolUtil; @@ -32,74 +29,46 @@ public class BlockVacuumChest extends BlockEio implements IGuiHandler, IResource super(ModObject.blockVacuumChest.unlocalisedName, TileVacuumChest.class); setBlockTextureName("enderio:blockVacuumChest"); } - + @Override - protected void init() { + protected void init() { super.init(); EnderIO.guiHandler.registerGuiHandler(GuiHandler.GUI_ID_VACUUM_CHEST, this); } @Override - public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer entityPlayer, int side, float par7, float par8, float par9) { - - if(ToolUtil.breakBlockWithTool(this, world, x, y, z, entityPlayer)) { - return true; - } - if(entityPlayer.isSneaking()) { - return false; - } + protected boolean openGui(World world, int x, int y, int z, EntityPlayer entityPlayer, int side) { if(!world.isRemote) { entityPlayer.openGui(EnderIO.instance, GuiHandler.GUI_ID_VACUUM_CHEST, world, x, y, z); - } - return true; - } - - @Override - public boolean removedByPlayer(World world, EntityPlayer player, int x, int y, int z, boolean harvested) { - if(!world.isRemote) { - TileEntity te = world.getTileEntity(x, y, z); - if(te instanceof TileVacuumChest) { - TileVacuumChest cb = (TileVacuumChest) te; - if(!player.capabilities.isCreativeMode || "true".equalsIgnoreCase(System.getProperty("blockCapBankAllwaysDrop"))) { - ItemStack itemStack = createItemStackWithInventory(cb); - float f = 0.7F; - double d0 = world.rand.nextFloat() * f + (1.0F - f) * 0.5D; - double d1 = world.rand.nextFloat() * f + (1.0F - f) * 0.5D; - double d2 = world.rand.nextFloat() * f + (1.0F - f) * 0.5D; - EntityItem entityitem = new EntityItem(world, x + d0, y + d1, z + d2, itemStack); - entityitem.delayBeforeCanPickup = 10; - world.spawnEntityInWorld(entityitem); - } - } - } - return super.removedByPlayer(world, player, x, y, z, harvested); + } return super.openGui(world, x, y, z, entityPlayer, side); } @Override - public int quantityDropped(Random p_149745_1_) { - return 0; + public boolean doNormalDrops(World world, int x, int y, int z) { + return false; } - private ItemStack createItemStackWithInventory(TileVacuumChest cb) { - ItemStack stack = new ItemStack(this); - stack.stackTagCompound = new NBTTagCompound(); - cb.writeContentsToNBT(stack.stackTagCompound); - return stack; + @Override + protected void processDrop(World world, int x, int y, int z, TileEntityEio te, ItemStack drop) { + drop.stackTagCompound = new NBTTagCompound(); + if(te != null) { + ((TileVacuumChest) te).writeContentsToNBT(drop.stackTagCompound); + } } @Override public void onBlockPlacedBy(World world, int x, int y, int z, EntityLivingBase placedBy, ItemStack stack) { if(!world.isRemote) { TileEntity te = world.getTileEntity(x, y, z); - if(stack != null && stack.stackTagCompound != null && te instanceof TileVacuumChest) { - ((TileVacuumChest)te).readContentsFromNBT(stack.stackTagCompound); + if(stack != null && stack.stackTagCompound != null && te instanceof TileVacuumChest) { + ((TileVacuumChest) te).readContentsFromNBT(stack.stackTagCompound); world.markBlockForUpdate(x, y, z); } } } @Override - public int getRenderType() { + public int getRenderType() { return renderId; } @@ -126,12 +95,6 @@ public class BlockVacuumChest extends BlockEio implements IGuiHandler, IResource return null; } - @Override - public void breakBlock(World world, int x, int y, int z, Block block, int p_149749_6_) { - super.breakBlock(world, x, y, z, block, p_149749_6_); - world.removeTileEntity(x, y, z); - } - @Override public String getUnlocalizedNameForTooltip(ItemStack itemStack) { return getUnlocalizedName(); diff --git a/src/main/java/crazypants/enderio/machine/vacuum/TileVacuumChest.java b/src/main/java/crazypants/enderio/machine/vacuum/TileVacuumChest.java index c8ff0216..57a49c9f 100644 --- a/src/main/java/crazypants/enderio/machine/vacuum/TileVacuumChest.java +++ b/src/main/java/crazypants/enderio/machine/vacuum/TileVacuumChest.java @@ -11,17 +11,16 @@ 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 net.minecraft.util.AxisAlignedBB; import crazypants.enderio.ModObject; +import crazypants.enderio.TileEntityEio; import crazypants.enderio.config.Config; import crazypants.render.BoundingBox; import crazypants.util.BlockCoord; import crazypants.util.ItemUtil; -public class TileVacuumChest extends TileEntity implements IEntitySelector, IInventory { +public class TileVacuumChest extends TileEntityEio implements IEntitySelector, IInventory { - private static final double RANGE = Config.vacuumChestRange; private ItemStack[] inv = new ItemStack[27]; @@ -31,7 +30,7 @@ public class TileVacuumChest extends TileEntity implements IEntitySelector, IIn doHoover(); } } - + @Override public boolean isEntityApplicable(Entity entity) { if(entity.isDead) { @@ -46,7 +45,6 @@ public class TileVacuumChest extends TileEntity implements IEntitySelector, IIn } return false; } - private void doHoover() { @@ -65,9 +63,9 @@ public class TileVacuumChest extends TileEntity implements IEntitySelector, IIn hooverEntity(entity); } else { double speed = 0.06; - double distScale = 1.0 - Math.min(0.9, distance / (RANGE*RANGE)); + double distScale = 1.0 - Math.min(0.9, distance / (RANGE * RANGE)); distScale *= distScale; - + entity.motionX += x / distance * distScale * speed; entity.motionY += y / distance * distScale * 0.2; entity.motionZ += z / distance * distScale * speed; @@ -75,7 +73,7 @@ public class TileVacuumChest extends TileEntity implements IEntitySelector, IIn } } - + private void hooverEntity(Entity entity) { if(!worldObj.isRemote) { if(entity instanceof EntityItem && !entity.isDead) { @@ -91,9 +89,9 @@ public class TileVacuumChest extends TileEntity implements IEntitySelector, IIn } } } - + private boolean isFull() { - for(ItemStack stack : inv) { + for (ItemStack stack : inv) { if(stack == null || stack.stackSize < stack.getMaxStackSize()) { return false; } @@ -143,12 +141,12 @@ public class TileVacuumChest extends TileEntity implements IEntitySelector, IIn @Override public void setInventorySlotContents(int slot, ItemStack contents) { - + if(slot < 0 || slot >= inv.length) { System.out.println("TileVacumChest.setInventorySlotContents: " + slot); return; } - + if(contents == null) { inv[slot] = contents; } else { @@ -164,9 +162,9 @@ public class TileVacuumChest extends TileEntity implements IEntitySelector, IIn public ItemStack getStackInSlotOnClosing(int var1) { return null; } - + @Override - public String getInventoryName() { + public String getInventoryName() { return ModObject.blockVacuumChest.unlocalisedName; } @@ -176,16 +174,16 @@ public class TileVacuumChest extends TileEntity implements IEntitySelector, IIn } @Override - public boolean isUseableByPlayer(EntityPlayer var1) { + public boolean isUseableByPlayer(EntityPlayer var1) { return true; } @Override - public void openInventory() { + public void openInventory() { } @Override - public void closeInventory() { + public void closeInventory() { } @Override @@ -194,11 +192,10 @@ public class TileVacuumChest extends TileEntity implements IEntitySelector, IIn } @Override - public void readFromNBT(NBTTagCompound nbtRoot) { - super.readFromNBT(nbtRoot); + public void readCustomNBT(NBTTagCompound nbtRoot) { readContentsFromNBT(nbtRoot); } - + public void readContentsFromNBT(NBTTagCompound nbtRoot) { NBTTagList itemList = (NBTTagList) nbtRoot.getTag("Items"); if(itemList != null) { @@ -213,11 +210,10 @@ public class TileVacuumChest extends TileEntity implements IEntitySelector, IIn } @Override - public void writeToNBT(NBTTagCompound nbtRoot) { - super.writeToNBT(nbtRoot); + public void writeCustomNBT(NBTTagCompound nbtRoot) { writeContentsToNBT(nbtRoot); - } - + } + public void writeContentsToNBT(NBTTagCompound nbtRoot) { NBTTagList itemList = new NBTTagList(); for (int i = 0; i < inv.length; i++) { @@ -230,5 +226,5 @@ public class TileVacuumChest extends TileEntity implements IEntitySelector, IIn } nbtRoot.setTag("Items", itemList); } - + } diff --git a/src/main/java/crazypants/enderio/machine/vat/GuiVat.java b/src/main/java/crazypants/enderio/machine/vat/GuiVat.java index aba584d9..43decedf 100644 --- a/src/main/java/crazypants/enderio/machine/vat/GuiVat.java +++ b/src/main/java/crazypants/enderio/machine/vat/GuiVat.java @@ -26,7 +26,7 @@ public class GuiVat extends GuiPoweredMachineBase { private static final String GUI_TEXTURE = "enderio:textures/gui/vat.png"; - private IconButtonEIO dump1, dump2; + private final IconButtonEIO dump1, dump2; public GuiVat(InventoryPlayer inventory, TileVat te) { super(te, new ContainerVat(inventory, te)); @@ -65,6 +65,8 @@ public class GuiVat extends GuiPoweredMachineBase { dump1.setToolTip(Lang.localize("gui.machine.vat.dump.1")); dump2 = new IconButtonEIO(this, 2, 131, 62, IconEIO.REDSTONE_MODE_NEVER); dump2.setToolTip(Lang.localize("gui.machine.vat.dump.2")); + + addProgressTooltip(81, 63, 14, 14); } @Override @@ -97,12 +99,10 @@ public class GuiVat extends GuiPoweredMachineBase { protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) { GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); RenderUtil.bindTexture(GUI_TEXTURE); - int guiLeft = (width - xSize) / 2; - int guiTop = (height - ySize) / 2; drawTexturedModalRect(guiLeft, guiTop, 0, 0, xSize, ySize); TileVat vat = getTileEntity(); - if(vat.getProgress() < 1 && vat.getProgress() > 0) { + if(shouldRenderProgress()) { int scaled = vat.getProgressScaled(14) + 1; drawTexturedModalRect(guiLeft + 81, guiTop + 77 - scaled, 176, 14 - scaled, 14, scaled); diff --git a/src/main/java/crazypants/enderio/machine/wireless/BlockWirelessCharger.java b/src/main/java/crazypants/enderio/machine/wireless/BlockWirelessCharger.java index e5f7e83e..b6daa47b 100644 --- a/src/main/java/crazypants/enderio/machine/wireless/BlockWirelessCharger.java +++ b/src/main/java/crazypants/enderio/machine/wireless/BlockWirelessCharger.java @@ -1,8 +1,9 @@ package crazypants.enderio.machine.wireless; import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.EntityLivingBase; 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; @@ -11,11 +12,9 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import crazypants.enderio.BlockEio; import crazypants.enderio.ModObject; -import crazypants.enderio.api.tool.ITool; +import crazypants.enderio.TileEntityEio; import crazypants.enderio.gui.IResourceTooltipProvider; import crazypants.enderio.network.PacketHandler; -import crazypants.enderio.tool.ToolUtil; -import crazypants.util.Util; public class BlockWirelessCharger extends BlockEio implements IResourceTooltipProvider /* IGuiHandler */{ @@ -38,21 +37,6 @@ public class BlockWirelessCharger extends BlockEio implements IResourceTooltipPr setLightOpacity(1); } - @Override - public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer entityPlayer, int side, float par7, float par8, float par9) { - ITool tool = ToolUtil.getEquippedTool(entityPlayer); - if(tool != null && entityPlayer.isSneaking() && tool.canUse(entityPlayer.getCurrentEquippedItem(), entityPlayer, x, y, z)) { - if(!world.isRemote) { - Util.dropItems(world, new ItemStack(this), x, y, z, true); - } - breakBlock(world, x, y, z, this, 0); - world.setBlockToAir(x, y, z); - tool.used(entityPlayer.getCurrentEquippedItem(), entityPlayer, x, y, z); - return true; - } - return false; - } - @Override public void registerBlockIcons(IIconRegister iIconRegister) { centerOn = iIconRegister.registerIcon("enderio:blockWirelessChargerOn"); @@ -119,4 +103,29 @@ public class BlockWirelessCharger extends BlockEio implements IResourceTooltipPr return getUnlocalizedName(); } + @Override + public boolean doNormalDrops(World world, int x, int y, int z) { + return false; + } + + @Override + public void onBlockPlacedBy(World world, int x, int y, int z, EntityLivingBase player, ItemStack stack) { + super.onBlockPlacedBy(world, x, y, z, player, stack); + + if(stack.stackTagCompound != null) { + TileEntity te = world.getTileEntity(x, y, z); + if(te instanceof TileWirelessCharger) { + ((TileWirelessCharger) te).readCustomNBT(stack.stackTagCompound); + } + } + } + + @Override + protected void processDrop(World world, int x, int y, int z, TileEntityEio te, ItemStack drop) { + drop.stackTagCompound = new NBTTagCompound(); + if(te instanceof TileWirelessCharger) { + ((TileWirelessCharger) te).writeCustomNBT(drop.stackTagCompound); + } + } + } diff --git a/src/main/java/crazypants/enderio/machine/wireless/IWirelessCharger.java b/src/main/java/crazypants/enderio/machine/wireless/IWirelessCharger.java index d7aeaf60..1b62e106 100644 --- a/src/main/java/crazypants/enderio/machine/wireless/IWirelessCharger.java +++ b/src/main/java/crazypants/enderio/machine/wireless/IWirelessCharger.java @@ -10,7 +10,7 @@ public interface IWirelessCharger { BlockCoord getLocation(); - boolean chargeItems(ItemStack[] armorInventory); + boolean chargeItems(ItemStack[] items); int takeEnergy(int max); diff --git a/src/main/java/crazypants/enderio/machine/wireless/TileWirelessCharger.java b/src/main/java/crazypants/enderio/machine/wireless/TileWirelessCharger.java index 601ca9dd..ef2627e8 100644 --- a/src/main/java/crazypants/enderio/machine/wireless/TileWirelessCharger.java +++ b/src/main/java/crazypants/enderio/machine/wireless/TileWirelessCharger.java @@ -57,12 +57,12 @@ public class TileWirelessCharger extends TileEntityEio implements IInternalPower } @Override - public boolean chargeItems(ItemStack[] items) { + public boolean chargeItems(ItemStack[] items) { boolean chargedItem = false; int available = Math.min(MAX_ENERGY_OUT, storedEnergyRF); - for (ItemStack item : items) { - if(item != null && available > 0) { - int used = 0; + for (int i=0,end=items.length ; i0 ; i++) { + ItemStack item = items[i]; + if(item != null) { if(item.getItem() instanceof IEnergyContainerItem && item.stackSize == 1) { IEnergyContainerItem chargable = (IEnergyContainerItem) item.getItem(); @@ -70,14 +70,14 @@ public class TileWirelessCharger extends TileEntityEio implements IInternalPower int cur = chargable.getEnergyStored(item); int canUse = Math.min(available, max - cur); if(cur < max) { - used = chargable.receiveEnergy(item, canUse, false); + int used = chargable.receiveEnergy(item, canUse, false); + if(used > 0) { + storedEnergyRF = storedEnergyRF - used; + chargedItem = true; + available -= used; + } } } - if(used > 0) { - storedEnergyRF = storedEnergyRF - used; - chargedItem = true; - available -= used; - } } } return chargedItem; diff --git a/src/main/java/crazypants/enderio/machine/wireless/WirelessChargedLocation.java b/src/main/java/crazypants/enderio/machine/wireless/WirelessChargedLocation.java new file mode 100644 index 00000000..ef371b4e --- /dev/null +++ b/src/main/java/crazypants/enderio/machine/wireless/WirelessChargedLocation.java @@ -0,0 +1,43 @@ +package crazypants.enderio.machine.wireless; + +import java.util.ArrayList; +import java.util.List; + +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; + +import crazypants.util.BlockCoord; + +public class WirelessChargedLocation { + + private final TileEntity te; + private int lastChangeCount; + private final List chargers; + + public WirelessChargedLocation(TileEntity te) { + this.te = te; + this.chargers = new ArrayList(); + updateChargers(); + } + + private void updateChargers() { + WirelessChargerController wcc = WirelessChargerController.instance; + chargers.clear(); + lastChangeCount = wcc.getChangeCount(); + wcc.getChargers(te.getWorldObj(), new BlockCoord(te), chargers); + } + + public boolean chargeItems(ItemStack[] items) { + if(lastChangeCount != WirelessChargerController.instance.getChangeCount()) { + updateChargers(); + } + for(IWirelessCharger wc : chargers) { + if(wc.isActive()) { + if(wc.chargeItems(items)) { + return true; + } + } + } + return false; + } +} diff --git a/src/main/java/crazypants/enderio/machine/wireless/WirelessChargerController.java b/src/main/java/crazypants/enderio/machine/wireless/WirelessChargerController.java index 4c78f70b..41137920 100644 --- a/src/main/java/crazypants/enderio/machine/wireless/WirelessChargerController.java +++ b/src/main/java/crazypants/enderio/machine/wireless/WirelessChargerController.java @@ -26,7 +26,8 @@ public class WirelessChargerController { MinecraftForge.EVENT_BUS.register(WirelessChargerController.instance); } - private Map> perWorldChargers = new HashMap>(); + private final Map> perWorldChargers = new HashMap>(); + private int changeCount; private WirelessChargerController() { } @@ -34,9 +35,10 @@ public class WirelessChargerController { public void registerCharger(IWirelessCharger charger) { if(charger == null) { return; - } + } Map chargers = getChargersForWorld(charger.getWorld()); chargers.put(charger.getLocation(), charger); + changeCount++; } public void deregisterCharger(IWirelessCharger capBank) { @@ -45,6 +47,7 @@ public class WirelessChargerController { } Map chargers = getChargersForWorld(capBank.getWorld()); chargers.remove(capBank.getLocation()); + changeCount++; } @SubscribeEvent @@ -55,6 +58,19 @@ public class WirelessChargerController { chargePlayersItems(event.player); } + public int getChangeCount() { + return changeCount; + } + + public void getChargers(World world, BlockCoord bc, Collection res) { + Map chargers = getChargersForWorld(world); + for (IWirelessCharger wc : chargers.values()) { + if(wc.getLocation().distanceSquared(bc) <= RANGE_SQ) { + res.add(wc); + } + } + } + public void chargePlayersItems(EntityPlayer player) { Map chargers = getChargersForWorld(player.worldObj); if(chargers.isEmpty()) { diff --git a/src/main/java/crazypants/enderio/machine/xp/GuiExperianceObelisk.java b/src/main/java/crazypants/enderio/machine/xp/GuiExperianceObelisk.java index a57455e0..67b4b6d8 100644 --- a/src/main/java/crazypants/enderio/machine/xp/GuiExperianceObelisk.java +++ b/src/main/java/crazypants/enderio/machine/xp/GuiExperianceObelisk.java @@ -15,6 +15,7 @@ import crazypants.enderio.xp.ExperienceBarRenderer; import crazypants.enderio.xp.PacketDrainPlayerXP; import crazypants.enderio.xp.PacketGivePlayerXP; import crazypants.render.RenderUtil; +import crazypants.util.Lang; public class GuiExperianceObelisk extends GuiMachineBase { @@ -42,38 +43,38 @@ public class GuiExperianceObelisk extends GuiMachineBase { p = new IconButtonEIO(this, 800, x, y, IconEIO.SINGLE_PLUS); p.setSize(bw, bw); p.setIconMargin(2, 2); - p.setToolTip("Store 1", "level of player XP"); + p.setToolTip(Lang.localize("gui.machine.button.storelevel"), Lang.localize("gui.machine.tooltip.storelevel")); x += spacing + bw; pp = new IconButtonEIO(this, 801, x, y, IconEIO.DOUBLE_PLUS); pp.setSize(bw, bw); pp.setIconMargin(2, 2); - pp.setToolTip("Store 10", "levels of player XP"); + pp.setToolTip(Lang.localize("gui.machine.button.storelevels"), Lang.localize("gui.machine.tooltip.storelevels")); x += spacing + bw; ppp = new IconButtonEIO(this, 802, x, y, IconEIO.TRIPLE_PLUS); ppp.setSize(bw, bw); ppp.setIconMargin(2, 2); - ppp.setToolTip("Store all", "player XP"); + ppp.setToolTip(Lang.localize("gui.machine.button.storeall"), Lang.localize("gui.machine.tooltip.storeall")); x = startX; y = 75; m = new IconButtonEIO(this, 803, x, y, IconEIO.SINGLE_MINUS); m.setSize(bw, bw); m.setIconMargin(2, 2); - m.setToolTip("Retrieve 1", "player XP level"); + m.setToolTip(Lang.localize("gui.machine.button.retrievelevel"), Lang.localize("gui.machine.tooltip.retrievelevel")); x += spacing + bw; mm = new IconButtonEIO(this, 804, x, y, IconEIO.DOUBLE_MINUS); mm.setSize(bw, bw); mm.setIconMargin(2, 2); - mm.setToolTip("Retrieve 10", "player XP levels"); + mm.setToolTip(Lang.localize("gui.machine.button.retrievelevels"), Lang.localize("gui.machine.tooltip.retrievelevels")); x += spacing + bw; mmm = new IconButtonEIO(this, 805, x, y, IconEIO.TRIPLE_MINUS); mmm.setSize(bw, bw); mmm.setIconMargin(2, 2); - mmm.setToolTip("Retrieve all"); + mmm.setToolTip(Lang.localize("gui.machine.button.retrieveall")); } @Override diff --git a/src/main/java/crazypants/enderio/material/BlockFusedQuartz.java b/src/main/java/crazypants/enderio/material/BlockFusedQuartz.java index 0091d5eb..1ba10d08 100644 --- a/src/main/java/crazypants/enderio/material/BlockFusedQuartz.java +++ b/src/main/java/crazypants/enderio/material/BlockFusedQuartz.java @@ -8,6 +8,7 @@ import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.Entity; import net.minecraft.entity.item.EntityItem; +import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; @@ -36,7 +37,8 @@ public class BlockFusedQuartz extends BlockEio { FUSED_QUARTZ("fusedQuartz", "enderio:fusedQuartz", "enderio:fusedQuartzFrame", "enderio:fusedQuartzItem"), GLASS("fusedGlass", "enderio:fusedGlass", Config.clearGlassSameTexture ? "enderio:fusedQuartzFrame" : "enderio:fusedGlassFrame", "enderio:fusedGlassItem"), ENLIGHTENED_FUSED_QUARTZ("enlightenedFusedQuartz", "enderio:fusedQuartz", "enderio:fusedQuartzFrame", "enderio:fusedQuartzItem"), - ENLIGHTENED_GLASS("enlightenedFusedGlass", "enderio:fusedGlass", Config.clearGlassSameTexture ? "enderio:fusedQuartzFrame" : "enderio:fusedGlassFrame", "enderio:fusedGlassItem"); + ENLIGHTENED_GLASS("enlightenedFusedGlass", "enderio:fusedGlass", Config.clearGlassSameTexture ? "enderio:fusedQuartzFrame" : "enderio:fusedGlassFrame", + "enderio:fusedGlassItem"); final String unlocalisedName; final String blockIcon; @@ -49,13 +51,13 @@ public class BlockFusedQuartz extends BlockEio { this.blockIcon = blockIcon; this.itemIcon = itemIcon; } - + public boolean connectTo(int otherMeta) { - if (otherMeta == ordinal() || Config.clearGlassConnectToFusedQuartz) { + if(otherMeta == ordinal() || Config.clearGlassConnectToFusedQuartz) { return true; } - - switch(this) { + + switch (this) { case FUSED_QUARTZ: return otherMeta == ENLIGHTENED_FUSED_QUARTZ.ordinal(); case ENLIGHTENED_FUSED_QUARTZ: @@ -65,7 +67,7 @@ public class BlockFusedQuartz extends BlockEio { case ENLIGHTENED_GLASS: return otherMeta == GLASS.ordinal(); } - + return false; } } @@ -180,13 +182,13 @@ public class BlockFusedQuartz extends BlockEio { } @Override - public boolean isSideSolid(IBlockAccess world, int x, int y, int z, ForgeDirection side) { + public boolean isSideSolid(IBlockAccess world, int x, int y, int z, ForgeDirection side) { if(side == ForgeDirection.UP) { //stop drips - return false; + return false; } - return true; + return true; } - + @Override public boolean canPlaceTorchOnTop(World arg0, int arg1, int arg2, int arg3) { return true; @@ -225,33 +227,9 @@ public class BlockFusedQuartz extends BlockEio { return frameIcons[meta]; } - /** - * Remove the tile entity too. - */ @Override - public void breakBlock(World world, int x, int y, int z, Block par5, int par6) { - - if(!world.isRemote && world.getGameRules().getGameRuleBooleanValue("doTileDrops")) { - TileEntity te = world.getTileEntity(x, y, z); - - if(te instanceof TileEntityPaintedBlock) { - TileEntityPaintedBlock tef = (TileEntityPaintedBlock) te; - - ItemStack itemStack = createItemStackForSourceBlock(world.getBlockMetadata(x, y, z), tef.getSourceBlock(), tef.getSourceBlockMetadata()); - if(itemStack != null) { - float f = 0.7F; - double d0 = world.rand.nextFloat() * f + (1.0F - f) * 0.5D; - double d1 = world.rand.nextFloat() * f + (1.0F - f) * 0.5D; - double d2 = world.rand.nextFloat() * f + (1.0F - f) * 0.5D; - EntityItem entityitem = new EntityItem(world, x + d0, y + d1, z + d2, itemStack); - entityitem.delayBeforeCanPickup = 10; - world.spawnEntityInWorld(entityitem); - } - } - - } - - super.breakBlock(world, x, y, z, par5, par6); + protected boolean shouldWrench(World world, int x, int y, int z, EntityPlayer entityPlayer, int side) { + return false; } private ItemStack createItemStackForSourceBlock(int quartzBlockMeta, Block sourceBlock, int sourceBlockMetadata) { diff --git a/src/main/java/crazypants/enderio/material/BlockIngotStorage.java b/src/main/java/crazypants/enderio/material/BlockIngotStorage.java index 16d24db6..ede7ad1c 100644 --- a/src/main/java/crazypants/enderio/material/BlockIngotStorage.java +++ b/src/main/java/crazypants/enderio/material/BlockIngotStorage.java @@ -80,6 +80,11 @@ public class BlockIngotStorage extends BlockEio implements IAdvancedTooltipProvi public boolean isBeaconBase(IBlockAccess worldObj, int x, int y, int z, int beaconX, int beaconY, int beaconZ) { return true; } + + @Override + protected boolean shouldWrench(World world, int x, int y, int z, EntityPlayer entityPlayer, int side) { + return false; + } @Override public void addCommonEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { diff --git a/src/main/java/crazypants/enderio/material/MaterialRecipes.java b/src/main/java/crazypants/enderio/material/MaterialRecipes.java index 494a151b..63530a82 100644 --- a/src/main/java/crazypants/enderio/material/MaterialRecipes.java +++ b/src/main/java/crazypants/enderio/material/MaterialRecipes.java @@ -44,6 +44,7 @@ public class MaterialRecipes { OreDictionary.registerOre("dustCoal", new ItemStack(EnderIO.itemPowderIngot, 1, PowderIngot.POWDER_COAL.ordinal())); OreDictionary.registerOre("dustIron", new ItemStack(EnderIO.itemPowderIngot, 1, PowderIngot.POWDER_IRON.ordinal())); OreDictionary.registerOre("dustGold", new ItemStack(EnderIO.itemPowderIngot, 1, PowderIngot.POWDER_GOLD.ordinal())); + OreDictionary.registerOre("dustObsidian", new ItemStack(EnderIO.itemPowderIngot, 1, PowderIngot.POWDER_OBSIDIAN.ordinal())); OreDictionary.registerOre("gearStone", new ItemStack(EnderIO.itemMachinePart, 1, MachinePart.BASIC_GEAR.ordinal())); OreDictionary.registerOre("itemSilicon", new ItemStack(EnderIO.itemMaterial, 1, Material.SILICON.ordinal())); diff --git a/src/main/java/crazypants/enderio/material/PowderIngot.java b/src/main/java/crazypants/enderio/material/PowderIngot.java index d4111b43..7af8f439 100644 --- a/src/main/java/crazypants/enderio/material/PowderIngot.java +++ b/src/main/java/crazypants/enderio/material/PowderIngot.java @@ -15,7 +15,8 @@ public enum PowderIngot { POWDER_COPPER("powderCopper", INGOT_COPPER), POWDER_TIN("powderTin", INGOT_TIN), POWDER_ENDER("powderEnder", DUST_ENDERPEARL), - INGOT_ENDERIUM_BASE("ingotEnderiumBase", INGOT_ENDERIUM); + INGOT_ENDERIUM_BASE("ingotEnderiumBase", INGOT_ENDERIUM), + POWDER_OBSIDIAN("powderObsidian", null); // POWDER_LEAD("powderLead", "Lead Powder", "powderLead"), // POWDER_SILVER("powderSilver", "Silver Powder", "powderSilver"), // POWDER_BRONZE("powderBronze", "Bronze Powder", "powderBronze"), diff --git a/src/main/java/crazypants/enderio/teleport/BlockTravelAnchor.java b/src/main/java/crazypants/enderio/teleport/BlockTravelAnchor.java index 58c4ffe6..95bc2559 100644 --- a/src/main/java/crazypants/enderio/teleport/BlockTravelAnchor.java +++ b/src/main/java/crazypants/enderio/teleport/BlockTravelAnchor.java @@ -8,6 +8,7 @@ import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ChatComponentText; import net.minecraft.util.IIcon; @@ -21,6 +22,7 @@ import crazypants.enderio.BlockEio; import crazypants.enderio.EnderIO; import crazypants.enderio.GuiHandler; import crazypants.enderio.ModObject; +import crazypants.enderio.TileEntityEio; import crazypants.enderio.config.Config; import crazypants.enderio.gui.IResourceTooltipProvider; import crazypants.enderio.machine.MachineRecipeInput; @@ -44,7 +46,7 @@ public class BlockTravelAnchor extends BlockEio implements IGuiHandler, ITileEnt public static BlockTravelAnchor create() { PacketHandler.INSTANCE.registerMessage(PacketAccessMode.class, PacketAccessMode.class, PacketHandler.nextID(), Side.SERVER); - PacketHandler.INSTANCE.registerMessage(PacketLabel.class, PacketLabel.class, PacketHandler.nextID(), Side.SERVER); + PacketHandler.INSTANCE.registerMessage(PacketLabel.class, PacketLabel.class, PacketHandler.nextID(), Side.SERVER); PacketHandler.INSTANCE.registerMessage(PacketTravelEvent.class, PacketTravelEvent.class, PacketHandler.nextID(), Side.SERVER); PacketHandler.INSTANCE.registerMessage(PacketDrainStaff.class, PacketDrainStaff.class, PacketHandler.nextID(), Side.SERVER); PacketHandler.INSTANCE.registerMessage(PacketOpenAuthGui.class, PacketOpenAuthGui.class, PacketHandler.nextID(), Side.SERVER); @@ -114,28 +116,22 @@ public class BlockTravelAnchor extends BlockEio implements IGuiHandler, ITileEnt } } } - + @Override - public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer entityPlayer, int par6, float par7, float par8, float par9) { - if(entityPlayer.isSneaking()) { - return false; - } + public boolean openGui(World world, int x, int y, int z, EntityPlayer entityPlayer, int side) { TileEntity te = world.getTileEntity(x, y, z); if(te instanceof ITravelAccessable) { ITravelAccessable ta = (ITravelAccessable) te; if(ta.canUiBeAccessed(entityPlayer)) { - if(!world.isRemote) { - entityPlayer.openGui(EnderIO.instance, GuiHandler.GUI_ID_TRAVEL_ACCESSABLE, world, x, y, z); - } + entityPlayer.openGui(EnderIO.instance, GuiHandler.GUI_ID_TRAVEL_ACCESSABLE, world, x, y, z); } else { - if(world.isRemote) { + if(world.isRemote && !entityPlayer.isSneaking()) { entityPlayer.addChatComponentMessage(new ChatComponentText(Lang.localize("gui.travelAccessable.privateBlock1") + " " + ta.getPlacedBy() + " " + Lang.localize("gui.travelAccessable.privateBlock2"))); } } - return true; } - return false; + return true; } @Override @@ -163,31 +159,26 @@ public class BlockTravelAnchor extends BlockEio implements IGuiHandler, ITileEnt } return null; } - - @Override - public boolean removedByPlayer(World world, EntityPlayer player, int x, int y, int z, boolean doHarvest) { - if(!world.isRemote && (!player.capabilities.isCreativeMode)) { - TileEntity te = world.getTileEntity(x, y, z); - if(te instanceof TileTravelAnchor) { - TileTravelAnchor anchor = (TileTravelAnchor) te; - - ItemStack itemStack; - Block srcBlk = anchor.getSourceBlock(); - if(srcBlk != null) { - itemStack = createItemStackForSourceBlock(anchor.getSourceBlock(), anchor.getSourceBlockMetadata()); - } else { - itemStack = new ItemStack(this); - } - dropBlockAsItem(world, x, y, z, itemStack); - } + @Override + protected void processDrop(World world, int x, int y, int z, TileEntityEio te, ItemStack drop) { + TileTravelAnchor anchor = (TileTravelAnchor) te; + + if(anchor == null) { + return; + } + + ItemStack itemStack = new ItemStack(this); + Block srcBlk = anchor.getSourceBlock(); + if(srcBlk != null) { + itemStack = createItemStackForSourceBlock(anchor.getSourceBlock(), anchor.getSourceBlockMetadata()); + drop.stackTagCompound = (NBTTagCompound) itemStack.stackTagCompound.copy(); } - return super.removedByPlayer(world, player, x, y, z, doHarvest); } @Override - public int quantityDropped(Random par1Random) { - return 0; // need to do custom dropping to maintain source metadata + public boolean doNormalDrops(World world, int x, int y, int z) { + return false; } @Override @@ -246,8 +237,8 @@ public class BlockTravelAnchor extends BlockEio implements IGuiHandler, ITileEnt @Override public int getFacadeMetadata(IBlockAccess world, int x, int y, int z, int side) { TileEntity te = world.getTileEntity(x, y, z); - if (te instanceof TileTravelAnchor) { - return ((TileTravelAnchor)te).getSourceBlockMetadata(); + if(te instanceof TileTravelAnchor) { + return ((TileTravelAnchor) te).getSourceBlockMetadata(); } return 0; } @@ -255,8 +246,8 @@ public class BlockTravelAnchor extends BlockEio implements IGuiHandler, ITileEnt @Override public Block getFacade(IBlockAccess world, int x, int y, int z, int side) { TileEntity te = world.getTileEntity(x, y, z); - if (te instanceof TileTravelAnchor) { - return ((TileTravelAnchor)te).getSourceBlock(); + if(te instanceof TileTravelAnchor) { + return ((TileTravelAnchor) te).getSourceBlock(); } return this; } diff --git a/src/main/java/crazypants/enderio/tool/ToolUtil.java b/src/main/java/crazypants/enderio/tool/ToolUtil.java index fca4871d..ce262cd1 100644 --- a/src/main/java/crazypants/enderio/tool/ToolUtil.java +++ b/src/main/java/crazypants/enderio/tool/ToolUtil.java @@ -13,8 +13,10 @@ import net.minecraft.world.World; import net.sf.cglib.proxy.Enhancer; import net.sf.cglib.proxy.MethodInterceptor; import net.sf.cglib.proxy.MethodProxy; +import crazypants.enderio.BlockEio; import crazypants.enderio.EnderIO; import crazypants.enderio.Log; +import crazypants.enderio.TileEntityEio; import crazypants.enderio.api.tool.ITool; import crazypants.enderio.item.ItemYetaWrench; @@ -35,6 +37,11 @@ public class ToolUtil { public static boolean breakBlockWithTool(Block block, World world, int x, int y, int z, EntityPlayer entityPlayer) { ITool tool = ToolUtil.getEquippedTool(entityPlayer); if(tool != null && entityPlayer.isSneaking() && tool.canUse(entityPlayer.getCurrentEquippedItem(), entityPlayer, x, y, z)) { + if(entityPlayer.capabilities.isCreativeMode && block instanceof BlockEio) { + ((BlockEio) block).dropAsItem(world, x, y, z, (TileEntityEio) world.getTileEntity(x, y, z)); + } else if(!(block instanceof BlockEio) || ((BlockEio) block).doNormalDrops(world, x, y, z)) { + block.dropBlockAsItem(world, x, y, z, world.getBlockMetadata(x, y, z), 0); + } block.removedByPlayer(world, entityPlayer, x, y, z, true); tool.used(entityPlayer.getCurrentEquippedItem(), entityPlayer, x, y, z); return true; diff --git a/src/main/java/crazypants/enderio/waila/WailaCompat.java b/src/main/java/crazypants/enderio/waila/WailaCompat.java index c6dde37c..7ce25435 100644 --- a/src/main/java/crazypants/enderio/waila/WailaCompat.java +++ b/src/main/java/crazypants/enderio/waila/WailaCompat.java @@ -1,15 +1,20 @@ package crazypants.enderio.waila; -import info.jbcs.minecraft.chisel.api.IFacade; +import static crazypants.enderio.waila.IWailaInfoProvider.BIT_BASIC; +import static crazypants.enderio.waila.IWailaInfoProvider.BIT_COMMON; +import static crazypants.enderio.waila.IWailaInfoProvider.BIT_DETAILED; +import static crazypants.enderio.waila.IWailaInfoProvider.fmt; import java.util.List; +import mcp.mobius.waila.api.ITaggedList; import mcp.mobius.waila.api.IWailaConfigHandler; import mcp.mobius.waila.api.IWailaDataAccessor; import mcp.mobius.waila.api.IWailaDataProvider; import mcp.mobius.waila.api.IWailaRegistrar; import mcp.mobius.waila.api.impl.ConfigHandler; import net.minecraft.block.Block; +import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.Item; @@ -20,7 +25,10 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; +import net.minecraft.world.WorldSettings; +import net.minecraft.world.chunk.IChunkProvider; import net.minecraftforge.common.util.ForgeDirection; +import crazypants.enderio.BlockEio; import crazypants.enderio.EnderIO; import crazypants.enderio.TileEntityEio; import crazypants.enderio.block.BlockDarkSteelAnvil; @@ -37,37 +45,79 @@ import crazypants.enderio.gui.TooltipAddera; import crazypants.enderio.machine.IIoConfigurable; import crazypants.enderio.machine.IoMode; import crazypants.enderio.machine.capbank.TileCapBank; -import crazypants.enderio.machine.power.TileCapacitorBank; import crazypants.enderio.power.IInternalPoweredTile; +import crazypants.enderio.power.IPowerContainer; +import crazypants.util.IFacade; import crazypants.util.Lang; -import static crazypants.enderio.waila.IWailaInfoProvider.*; - public class WailaCompat implements IWailaDataProvider { + private class WailaWorldWrapper extends World { + private World wrapped; + + private WailaWorldWrapper(World wrapped) { + super(wrapped.getSaveHandler(), wrapped.getWorldInfo().getWorldName(), wrapped.provider, new WorldSettings(wrapped.getWorldInfo()), wrapped.theProfiler); + this.wrapped = wrapped; + this.isRemote = wrapped.isRemote; + } + + @Override + public Block getBlock(int x, int y, int z) { + Block block = wrapped.getBlock(x, y, z); + if(block instanceof IFacade) { + return ((IFacade) block).getFacade(wrapped, x, y, z, -1); + } + return block; + } + + @Override + public int getBlockMetadata(int x, int y, int z) { + Block block = wrapped.getBlock(x, y, z); + if(block instanceof IFacade) { + return ((IFacade) block).getFacadeMetadata(wrapped, x, y, z, -1); + } + return wrapped.getBlockMetadata(x, y, z); + } + + @Override + public TileEntity getTileEntity(int p_147438_1_, int p_147438_2_, int p_147438_3_) { + return wrapped.getTileEntity(p_147438_1_, p_147438_2_, p_147438_3_); + } + + @Override + protected IChunkProvider createChunkProvider() { + return null; + } + + @Override + protected int func_152379_p() { + return 0; + } + + @Override + public Entity getEntityByID(int p_73045_1_) { + return null; + } + } + public static final WailaCompat INSTANCE = new WailaCompat(); - + private static IWailaDataAccessor _accessor = null; - + public static void load(IWailaRegistrar registrar) { registrar.registerStackProvider(INSTANCE, IFacade.class); registrar.registerStackProvider(INSTANCE, BlockDarkSteelAnvil.class); - registrar.registerHeadProvider(INSTANCE, Block.class); - registrar.registerBodyProvider(INSTANCE, Block.class); - registrar.registerTailProvider(INSTANCE, Block.class); - + registrar.registerBodyProvider(INSTANCE, BlockEio.class); + registrar.registerNBTProvider(INSTANCE, TileEntityEio.class); - registrar.registerSyncedNBTKey("controllerStoredEnergyRF", TileCapacitorBank.class); - - // registrar.registerHeadProvider(INSTANCE, IInternalPowerReceptor.class); - // registrar.registerSyncedNBTKey("*", IInternalPowerReceptor.class); - - ConfigHandler.instance().addConfig(EnderIO.MOD_NAME, "facades.hidden", "Sneaky Facades"); + ConfigHandler.instance().addConfig(EnderIO.MOD_NAME, "facades.hidden", Lang.localize("waila.config.hiddenfacades")); IWailaInfoProvider.fmt.setMaximumFractionDigits(1); } + // IGNORE deprecation, the new method requires forge 1234 which is too new for cauldron! + @SuppressWarnings("deprecation") @Override public ItemStack getWailaStack(IWailaDataAccessor accessor, IWailaConfigHandler config) { MovingObjectPosition pos = accessor.getPosition(); @@ -75,17 +125,15 @@ public class WailaCompat implements IWailaDataProvider { if(accessor.getBlock() instanceof IFacade) { IFacade bundle = (IFacade) accessor.getBlock(); Block facade = bundle.getFacade(accessor.getWorld(), pos.blockX, pos.blockY, pos.blockZ, accessor.getSide().ordinal()); - if (facade != null) { - //accessor.getWorld().setBlockMetadataWithNotify(pos.blockX, pos.blockY, pos.blockZ, bundle.getFacadeMetadata(accessor.getWorld(), pos.blockX, pos.blockY, pos.blockZ, 0), 0); - // TODO metadata is wrong, this gives the wrong output - ItemStack ret = facade.getPickBlock(pos, accessor.getWorld(), pos.blockX, pos.blockY, pos.blockZ); - //accessor.getWorld().setBlockMetadataWithNotify(pos.blockX, pos.blockY, pos.blockZ, 0, 0); + if(facade != null) { + ItemStack ret = facade.getPickBlock(pos, new WailaWorldWrapper(accessor.getWorld()), pos.blockX, pos.blockY, pos.blockZ); return ret; } } } else if(accessor.getBlock() instanceof BlockDarkSteelAnvil) { return accessor.getBlock().getPickBlock(accessor.getPosition(), accessor.getWorld(), accessor.getPosition().blockX, accessor.getPosition().blockY, accessor.getPosition().blockZ); + } return null; } @@ -95,21 +143,24 @@ public class WailaCompat implements IWailaDataProvider { return currenttip; } + @SuppressWarnings("unchecked") @Override public List getWailaBody(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { - + _accessor = accessor; - - Block block = accessor.getBlock(); - TileEntity te = accessor.getTileEntity(); - Item item = Item.getItemFromBlock(block); + EntityPlayer player = accessor.getPlayer(); - World world = player.worldObj; MovingObjectPosition pos = accessor.getPosition(); - int x = pos.blockX, y = pos.blockY, z = pos.blockZ; + World world = new WailaWorldWrapper(player.worldObj); + Block block = world.getBlock(x, y, z); + TileEntity te = world.getTileEntity(x, y, z); + Item item = Item.getItemFromBlock(block); - if(te instanceof IIoConfigurable) { + // let's get rid of WAILA's default RF stuff, once that works + ((ITaggedList) currenttip).removeEntries("RFEnergyStorage"); + + if(te instanceof IIoConfigurable && block == accessor.getBlock()) { IIoConfigurable machine = (IIoConfigurable) te; ForgeDirection side = accessor.getSide(); IoMode mode = machine.getIoMode(side); @@ -163,23 +214,7 @@ public class WailaCompat implements IWailaDataProvider { } } - if(te instanceof IInternalPoweredTile && accessor.getNBTData().hasKey("storedEnergyRF") && !(te instanceof TileCapBank)) { - IInternalPoweredTile power = (IInternalPoweredTile) te; - - if(power.displayPower()) { - - if(currenttip.size() > 4) { - currenttip.add(""); - } - - int stored = accessor.getTileEntity() instanceof TileCapacitorBank ? power.getEnergyStored() : accessor.getNBTData().getInteger("storedEnergyRF"); - int max = power.getMaxEnergyStored(); - - currenttip.add(String.format("%s%s%s / %s%s%s RF", EnumChatFormatting.WHITE, fmt.format(stored), EnumChatFormatting.RESET, EnumChatFormatting.WHITE, - fmt.format(max), - EnumChatFormatting.RESET)); - } - } else if(te instanceof IConduitBundle && itemStack != null && itemStack.getItem() == EnderIO.itemPowerConduit) { + if(te instanceof IConduitBundle && itemStack != null && itemStack.getItem() == EnderIO.itemPowerConduit) { NBTTagCompound nbtRoot = accessor.getNBTData(); short nbtVersion = nbtRoot.getShort("nbtVersion"); NBTTagList conduitTags = (NBTTagList) nbtRoot.getTag("conduits"); @@ -189,7 +224,8 @@ public class WailaCompat implements IWailaDataProvider { NBTTagCompound conduitTag = conduitTags.getCompoundTagAt(i); IConduit conduit = ConduitUtil.readConduitFromNBT(conduitTag, nbtVersion); if(conduit instanceof IPowerConduit) { - currenttip.add(String.format("%s%s%s / %s%s%s RF", EnumChatFormatting.WHITE, fmt.format(((IPowerConduit) conduit).getEnergyStored()), EnumChatFormatting.RESET, + currenttip.add(String.format("%s%s%s / %s%s%s RF", EnumChatFormatting.WHITE, fmt.format(((IPowerConduit) conduit).getEnergyStored()), + EnumChatFormatting.RESET, EnumChatFormatting.WHITE, fmt.format(((IConduitBundle) te).getMaxEnergyStored()), EnumChatFormatting.RESET)); } } @@ -212,18 +248,34 @@ public class WailaCompat implements IWailaDataProvider { int fluidAmount = tank.getFluidAmount(); if(fluidAmount > 0) { currenttip.add(String.format("%s%s%s%s %s%s%s %s", lockedStr, - EnumChatFormatting.WHITE, fluidName, EnumChatFormatting.RESET, - EnumChatFormatting.WHITE, fmt.format(fluidAmount), EnumChatFormatting.RESET, - Fluids.MB())); + EnumChatFormatting.WHITE, fluidName, EnumChatFormatting.RESET, + EnumChatFormatting.WHITE, fmt.format(fluidAmount), EnumChatFormatting.RESET, + Fluids.MB())); } else if(tankConduit.isFluidTypeLocked()) { currenttip.add(String.format("%s%s%s%s", lockedStr, - EnumChatFormatting.WHITE, fluidName, EnumChatFormatting.RESET)); + EnumChatFormatting.WHITE, fluidName, EnumChatFormatting.RESET)); } } break; } } } + } else if(te instanceof IInternalPoweredTile && block == accessor.getBlock() && !(te instanceof TileCapBank)) { + IInternalPoweredTile power = (IInternalPoweredTile) te; + + if(power.displayPower()) { + + if(currenttip.size() > 4) { + currenttip.add(""); + } + + int stored = accessor.getNBTData().getInteger("storedEnergyRF"); + int max = accessor.getNBTData().getInteger("maxStoredRF"); + + currenttip.add(String.format("%s%s%s / %s%s%s RF", EnumChatFormatting.WHITE, fmt.format(stored), EnumChatFormatting.RESET, EnumChatFormatting.WHITE, + fmt.format(max), + EnumChatFormatting.RESET)); + } } return currenttip; @@ -236,16 +288,24 @@ public class WailaCompat implements IWailaDataProvider { @Override public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, int x, int y, int z) { - if (te instanceof IWailaNBTProvider) { + if(te instanceof IWailaNBTProvider) { ((IWailaNBTProvider) te).getData(tag); } + if(te instanceof IInternalPoweredTile) { + tag.setInteger("storedEnergyRF", ((IPowerContainer) te).getEnergyStored()); + tag.setInteger("maxStoredRF", ((IInternalPoweredTile) te).getMaxEnergyStored()); + } + if(te instanceof IConduitBundle) { + te.writeToNBT(tag); + } + tag.setInteger("x", x); tag.setInteger("y", y); tag.setInteger("z", z); return tag; } - + public static NBTTagCompound getNBTData() { - return _accessor.getNBTData(); + return _accessor.getNBTData(); } } diff --git a/src/main/java/crazypants/enderio/xp/ExperienceBarRenderer.java b/src/main/java/crazypants/enderio/xp/ExperienceBarRenderer.java index 010ab5eb..bbdf64f9 100644 --- a/src/main/java/crazypants/enderio/xp/ExperienceBarRenderer.java +++ b/src/main/java/crazypants/enderio/xp/ExperienceBarRenderer.java @@ -6,6 +6,7 @@ import net.minecraft.client.gui.Gui; import org.lwjgl.opengl.GL11; +import crazypants.enderio.gui.IconEIO; import crazypants.render.ColorUtil; import crazypants.render.RenderUtil; @@ -14,37 +15,35 @@ public class ExperienceBarRenderer { public static void render(Gui gui, int x, int y, int length, ExperienceContainer xpCont) { render(gui, x, y, length, xpCont, -1); } - + public static void render(Gui gui, int x, int y, int length, ExperienceContainer xpCont, int required) { - + String text = xpCont.getExperienceLevel() + ""; int color = 8453920; boolean shadow = true; if(required > 0) { text += "/" + required; if(required > xpCont.getExperienceLevel()) { - color = ColorUtil.getRGB(1f,0,0.1f); + color = ColorUtil.getRGB(1f, 0, 0.1f); shadow = false; } } FontRenderer fr = Minecraft.getMinecraft().fontRenderer; - int strX = x + length/2 - fr.getStringWidth(text) / 2; - fr.drawString(text, strX, y-11, color, shadow); - - RenderUtil.bindTexture("enderio:textures/gui/widgets.png"); + int strX = x + length / 2 - fr.getStringWidth(text) / 2; + fr.drawString(text, strX, y - 11, color, shadow); + + RenderUtil.bindTexture(IconEIO.TEXTURE); GL11.glColor3f(1, 1, 1); - int xpScaled = xpCont.getXpBarScaled(length -2); - + int xpScaled = xpCont.getXpBarScaled(length - 2); + // x, y, u, v, width, height //start of 'slot' - gui.drawTexturedModalRect(x,y,80,141,1,5); - gui.drawTexturedModalRect(x + 1,y,81,141,length-2,5); - gui.drawTexturedModalRect(x + length - 1,y,205,141,1,5); - + gui.drawTexturedModalRect(x, y, 0, 91, 1, 5); + gui.drawTexturedModalRect(x + 1, y, 1, 91, length - 2, 5); + gui.drawTexturedModalRect(x + length - 1, y, 125, 91, 1, 5); + RenderUtil.renderQuad2D(x + 1, y + 1, 0, xpScaled, 3, ColorUtil.getRGB(0, 127, 14)); - - - + } - + } diff --git a/src/main/java/crazypants/gui/GuiContainerBase.java b/src/main/java/crazypants/gui/GuiContainerBase.java index 791c90a7..18626994 100644 --- a/src/main/java/crazypants/gui/GuiContainerBase.java +++ b/src/main/java/crazypants/gui/GuiContainerBase.java @@ -1,6 +1,8 @@ package crazypants.gui; +import java.lang.reflect.Field; import java.util.ArrayList; +import java.util.Collections; import java.util.Iterator; import java.util.List; @@ -10,19 +12,34 @@ import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.renderer.RenderHelper; import net.minecraft.inventory.Container; +import net.minecraft.item.ItemStack; +import net.minecraft.util.Timer; import org.lwjgl.input.Mouse; import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; +import cpw.mods.fml.common.Optional; +import cpw.mods.fml.relauncher.ReflectionHelper; + +import codechicken.nei.VisiblityData; +import codechicken.nei.api.INEIGuiHandler; +import codechicken.nei.api.TaggedInventoryArea; + +import crazypants.enderio.Log; import crazypants.enderio.gui.IGuiOverlay; import crazypants.gui.ToolTipManager.ToolTipRenderer; -public abstract class GuiContainerBase extends GuiContainer implements ToolTipRenderer, IGuiScreen { +@Optional.InterfaceList({ + @Optional.Interface(iface = "codechicken.nei.api.INEIGuiHandler", modid = "NotEnoughItems") +}) +public abstract class GuiContainerBase extends GuiContainer implements ToolTipRenderer, IGuiScreen, INEIGuiHandler { protected ToolTipManager ttMan = new ToolTipManager(); protected List overlays = new ArrayList(); + private static Field timerField = null; + protected GuiContainerBase(Container par1Container) { super(par1Container); } @@ -30,14 +47,25 @@ public abstract class GuiContainerBase extends GuiContainer implements ToolTipRe @Override public void initGui() { super.initGui(); - for(IGuiOverlay overlay : overlays) { + for (IGuiOverlay overlay : overlays) { overlay.init(this); } + if(timerField == null) { + try { + if(timerField == null) { + timerField = ReflectionHelper.findField(Minecraft.class, "field_71428_T", "timer", "Q"); + timerField.setAccessible(true); + } + } catch (Exception e) { + Log.error("Failed to initialize timer reflection for IO config."); + e.printStackTrace(); + } + } } @Override protected void keyTyped(char par1, int par2) { - if (par2 == 1 || par2 == this.mc.gameSettings.keyBindInventory.getKeyCode()) { + if(par2 == 1 || par2 == this.mc.gameSettings.keyBindInventory.getKeyCode()) { //this.mc.thePlayer.closeScreen(); if(hideOverlays()) { return; @@ -47,7 +75,7 @@ public abstract class GuiContainerBase extends GuiContainer implements ToolTipRe } public boolean hideOverlays() { - for(IGuiOverlay overlay : overlays) { + for (IGuiOverlay overlay : overlays) { if(overlay.isVisible()) { overlay.setVisible(false); return true; @@ -56,7 +84,6 @@ public abstract class GuiContainerBase extends GuiContainer implements ToolTipRe return false; } - @Override public void addToolTip(GuiToolTip toolTip) { ttMan.addToolTip(toolTip); @@ -67,7 +94,7 @@ public abstract class GuiContainerBase extends GuiContainer implements ToolTipRe int x = Mouse.getEventX() * this.width / this.mc.displayWidth; int y = this.height - Mouse.getEventY() * this.height / this.mc.displayHeight - 1; int b = Mouse.getEventButton(); - for(IGuiOverlay overlay : overlays) { + for (IGuiOverlay overlay : overlays) { if(overlay != null && overlay.isVisible() && overlay.handleMouseInput(x, y, b)) { return; } @@ -76,10 +103,10 @@ public abstract class GuiContainerBase extends GuiContainer implements ToolTipRe } @Override - protected boolean func_146978_c(int p_146978_1_, int p_146978_2_, int p_146978_3_, int p_146978_4_, int p_146978_5_, int p_146978_6_) { + protected boolean func_146978_c(int p_146978_1_, int p_146978_2_, int p_146978_3_, int p_146978_4_, int p_146978_5_, int p_146978_6_) { int x = Mouse.getEventX() * this.width / this.mc.displayWidth; int y = this.height - Mouse.getEventY() * this.height / this.mc.displayHeight - 1; - for(IGuiOverlay overlay : overlays) { + for (IGuiOverlay overlay : overlays) { if(overlay != null && overlay.isVisible() && overlay.isMouseInBounds(x, y)) { return false; } @@ -95,49 +122,78 @@ public abstract class GuiContainerBase extends GuiContainer implements ToolTipRe overlays.remove(overlay); } + private int realMx, realMy; + @Override protected final void drawGuiContainerForegroundLayer(int mouseX, int mouseY) { drawForegroundImpl(mouseX, mouseY); - ttMan.drawTooltips(this, mouseX, mouseY); + + Timer t = null; + try { + t = (Timer) timerField.get(this.mc); + } catch (Exception e) { + e.printStackTrace(); + return; + } + + GL11.glPushMatrix(); + GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + GL11.glDisable(GL11.GL_DEPTH_TEST); + for (IGuiOverlay overlay : overlays) { + if(overlay != null && overlay.isVisible()) { + overlay.draw(realMx, realMy, t.renderPartialTicks); + } + } + GL11.glEnable(GL11.GL_DEPTH_TEST); + GL11.glPopMatrix(); + + ttMan.drawTooltips(this, realMx, realMy); } @Override public void drawScreen(int par1, int par2, float par3) { - int mx = par1; - int my = par2; - for(IGuiOverlay overlay : overlays) { + int mx = realMx = par1; + int my = realMy = par2; + for (IGuiOverlay overlay : overlays) { if(overlay != null && overlay.isVisible() && isMouseInOverlay(par1, par2, overlay)) { mx = -5000; my = -5000; + this.drawItemStack(this.mc.thePlayer.inventory.getItemStack(), par1 - this.guiLeft - 8, par2 - this.guiTop - 8, null); } } super.drawScreen(mx, my, par3); + } - GL11.glPushMatrix(); - GL11.glTranslatef(guiLeft, guiTop, 0.0F); - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - GL11.glDisable(GL11.GL_DEPTH_TEST); - for(IGuiOverlay overlay : overlays) { - if(overlay != null && overlay.isVisible()) { - overlay.draw(par1, par2, par3); - } + // copied from super with hate + private void drawItemStack(ItemStack stack, int mouseX, int mouseY, String str) + { + GL11.glTranslatef(0.0F, 0.0F, 32.0F); + this.zLevel = 200.0F; + itemRender.zLevel = 200.0F; + FontRenderer font = null; + if(stack != null) { + font = stack.getItem().getFontRenderer(stack); } - GL11.glEnable(GL11.GL_DEPTH_TEST); - GL11.glPopMatrix(); + if(font == null) { + font = fontRendererObj; + } + itemRender.renderItemAndEffectIntoGUI(font, this.mc.getTextureManager(), stack, mouseX, mouseY); + itemRender.renderItemOverlayIntoGUI(font, this.mc.getTextureManager(), stack, mouseX, mouseY, str); + this.zLevel = 0.0F; + itemRender.zLevel = 0.0F; } private boolean isMouseInOverlay(int mouseX, int mouseY, IGuiOverlay overlay) { int x = mouseX - getGuiLeft(); int y = mouseY - getGuiTop(); - if(overlay.getBounds().contains(x,y)) { + if(overlay.getBounds().contains(x, y)) { return true; } return false; } - @Override public void removeToolTip(GuiToolTip toolTip) { ttMan.removeToolTip(toolTip); @@ -275,13 +331,42 @@ public abstract class GuiContainerBase extends GuiContainer implements ToolTipRe } @Override - public int getOverlayOffsetX() { + public int getOverlayOffsetX() { return 0; } - + @Override public void doActionPerformed(GuiButton guiButton) { - actionPerformed(guiButton); + actionPerformed(guiButton); } + @Override + @Optional.Method(modid = "NotEnoughItems") + public VisiblityData modifyVisiblity(GuiContainer gc, VisiblityData vd) { + return vd; + } + + @Override + @Optional.Method(modid = "NotEnoughItems") + public Iterable getItemSpawnSlots(GuiContainer gc, ItemStack is) { + return null; + } + + @Override + @Optional.Method(modid = "NotEnoughItems") + public List getInventoryAreas(GuiContainer gc) { + return Collections.emptyList(); + } + + @Override + @Optional.Method(modid = "NotEnoughItems") + public boolean handleDragNDrop(GuiContainer gc, int i, int i1, ItemStack is, int i2) { + return false; + } + + @Override + @Optional.Method(modid = "NotEnoughItems") + public boolean hideItemPanelSlot(GuiContainer gc, int x, int y, int w, int h) { + return false; + } } diff --git a/src/main/java/crazypants/util/EntityUtil.java b/src/main/java/crazypants/util/EntityUtil.java index 024978e2..2a214658 100644 --- a/src/main/java/crazypants/util/EntityUtil.java +++ b/src/main/java/crazypants/util/EntityUtil.java @@ -5,18 +5,18 @@ import java.util.List; import java.util.Map; import java.util.Set; -import crazypants.vecmath.Vector3d; - import net.minecraft.block.Block; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityList; import net.minecraft.entity.EntityLiving; import net.minecraft.entity.boss.IBossDisplayData; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.item.EntityItem; +import net.minecraft.item.ItemStack; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.MathHelper; import net.minecraft.util.StatCollector; import net.minecraft.world.World; +import crazypants.vecmath.Vector3d; public class EntityUtil { @@ -65,5 +65,30 @@ public class EntityUtil { } return collidingBoundingBoxes; } - + + public static void spawnItemInWorldWithRandomMotion(World world, ItemStack item, int x, int y, int z) { + if(item != null) { + spawnItemInWorldWithRandomMotion(world, item, x + 0.5, y + 0.5, z + 0.5); + } + } + + public static void spawnItemInWorldWithRandomMotion(World world, ItemStack item, double x, double y, double z) { + if(item != null) { + spawnItemInWorldWithRandomMotion(new EntityItem(world, x, y, z, item)); + } + } + + public static void spawnItemInWorldWithRandomMotion(EntityItem entity) { + entity.delayBeforeCanPickup = 10; + + float f = (entity.worldObj.rand.nextFloat() * 0.1f) - 0.05f; + float f1 = (entity.worldObj.rand.nextFloat() * 0.1f) - 0.05f; + float f2 = (entity.worldObj.rand.nextFloat() * 0.1f) - 0.05f; + + entity.motionX += f; + entity.motionY += f1; + entity.motionZ += f2; + + entity.worldObj.spawnEntityInWorld(entity); + } } diff --git a/src/main/java/crazypants/util/ItemUtil.java b/src/main/java/crazypants/util/ItemUtil.java index 81451cba..f1840d10 100644 --- a/src/main/java/crazypants/util/ItemUtil.java +++ b/src/main/java/crazypants/util/ItemUtil.java @@ -90,6 +90,7 @@ public class ItemUtil { ItemStack contents = sidedInv.getStackInSlot(slot); ItemStack toInsert = item.copy(); toInsert.stackSize = Math.min(toInsert.stackSize, sidedInv.getInventoryStackLimit()); + toInsert.stackSize = Math.min(toInsert.stackSize, toInsert.getMaxStackSize()); // some inventories like using itemstacks with invalid stack sizes toInsert.stackSize = Math.min(toInsert.stackSize, numToInsert); int inserted = 0; if(contents == null) { @@ -126,6 +127,7 @@ public class ItemUtil { if(!isStackFull(contents)) { ItemStack toInsert = item.copy(); toInsert.stackSize = Math.min(toInsert.stackSize, inv.getInventoryStackLimit()); + toInsert.stackSize = Math.min(toInsert.stackSize, toInsert.getMaxStackSize()); // some inventories like using itemstacks with invalid stack sizes toInsert.stackSize = Math.min(toInsert.stackSize, numToInsert); int inserted = 0; if(contents == null) {