From 18a22800b404b1e8b896833d1845acc9f01e8746 Mon Sep 17 00:00:00 2001 From: LordSheogarad Date: Sun, 21 Feb 2016 08:07:09 +0500 Subject: [PATCH 01/52] Made text more readable, fix some mistakes --- .../resources/assets/mekanism/lang/ru_RU.lang | 210 +++++++++--------- 1 file changed, 105 insertions(+), 105 deletions(-) diff --git a/src/main/resources/assets/mekanism/lang/ru_RU.lang b/src/main/resources/assets/mekanism/lang/ru_RU.lang index a6267135c..70a277d33 100644 --- a/src/main/resources/assets/mekanism/lang/ru_RU.lang +++ b/src/main/resources/assets/mekanism/lang/ru_RU.lang @@ -1,4 +1,4 @@ -//********// +//********// //MEKANISM// //********// @@ -51,7 +51,7 @@ item.BioFuel.name=Биотопливо item.BasicControlCircuit.name=Основная схема управления item.AdvancedControlCircuit.name=Продвинутая схема управления item.EliteControlCircuit.name=Элитная схема управления -item.UltimateControlCircuit.name=Максимальная схема управления +item.UltimateControlCircuit.name=Совершенная схема управления //Gas Tank tile.GasTank.GasTank.name=Газовый баллон @@ -137,13 +137,13 @@ tile.MachineBlock3.SolarNeutronActivator.name=Активатор солнечн tile.MachineBlock3.Oredictionificator.name=Унификатор словаря руд //Plastic -tile.PlasticBlock.name=пластиковый блок -tile.SlickPlasticBlock.name=гладкий пластиковый блок -tile.GlowPlasticBlock.name=пластиковый светящийся блок -tile.ReinforcedPlasticBlock.name=укреплённый пластиковый блок -tile.RoadPlasticBlock.name=пластиковый путь +tile.PlasticBlock.name=Пластиковый блок +tile.SlickPlasticBlock.name=Пладкий пластиковый блок +tile.GlowPlasticBlock.name=Пластиковый светящийся блок +tile.ReinforcedPlasticBlock.name=Укреплённый пластиковый блок +tile.RoadPlasticBlock.name=Пластиковый путь -tile.PlasticFence.name=пластиковый забор +tile.PlasticFence.name=Пластиковый забор //Infuse types infuse.carbon=Углерод @@ -163,30 +163,30 @@ tile.OreBlock.TinOre.name=Оловянная руда item.MultipartTransmitter.BasicPressurizedTube.name=Основная герметичная труба item.MultipartTransmitter.AdvancedPressurizedTube.name=Продвинутая герметичная труба item.MultipartTransmitter.ElitePressurizedTube.name=Элитная герметичная труба -item.MultipartTransmitter.UltimatePressurizedTube.name=Максимальная герметичная труба +item.MultipartTransmitter.UltimatePressurizedTube.name=Совершенная герметичная труба item.MultipartTransmitter.BasicUniversalCable.name=Основной универсальный провод item.MultipartTransmitter.AdvancedUniversalCable.name=Продвинутый универсальный провод item.MultipartTransmitter.EliteUniversalCable.name=Элитный универсальный провод -item.MultipartTransmitter.UltimateUniversalCable.name=Максимальный универсальный провод +item.MultipartTransmitter.UltimateUniversalCable.name=Совершенный универсальный провод item.MultipartTransmitter.BasicMechanicalPipe.name=Основная механическая труба item.MultipartTransmitter.AdvancedMechanicalPipe.name=Продвинутая механическая труба item.MultipartTransmitter.EliteMechanicalPipe.name=Элитная механическая труба -item.MultipartTransmitter.UltimateMechanicalPipe.name=Максимальная механическая труба +item.MultipartTransmitter.UltimateMechanicalPipe.name=Совершенная механическая труба item.MultipartTransmitter.BasicLogisticalTransporter.name=Основной логистический транспортер item.MultipartTransmitter.AdvancedLogisticalTransporter.name=Продвинутый логистический транспортер item.MultipartTransmitter.EliteLogisticalTransporter.name=Элитный логистический транспортер -item.MultipartTransmitter.UltimateLogisticalTransporter.name=Максимальный логистический транспортер +item.MultipartTransmitter.UltimateLogisticalTransporter.name=Совершенный логистический транспортер item.MultipartTransmitter.RestrictiveTransporter.name=Ограничительный транспортер item.MultipartTransmitter.DiversionTransporter.name=Отклоняющий транспортер //Glow Panel -item.GlowPanel.name=светящийся полублок +item.GlowPanel.name=Cветящийся полублок //Energy Cubes tile.EnergyCubeBasic.name=Основной энергетический куб tile.EnergyCubeAdvanced.name=Продвинутый энергетический куб tile.EnergyCubeElite.name=Элитный энергетический куб -tile.EnergyCubeUltimate.name=Максимальный энергетический куб +tile.EnergyCubeUltimate.name=Совершенный энергетический куб tile.EnergyCubeCreative.name=Творческий энергетический куб //Factory Installers @@ -237,13 +237,13 @@ item.silverCrystal.name=Серебряный кристалл item.leadCrystal.name=Свинцовый кристалл //Dirty Dust -item.dirtyIronDust.name=Грязная железная пыль -item.dirtyGoldDust.name=Грязная золотая пыль -item.dirtyOsmiumDust.name=Грязная осмиевая пыль -item.dirtyCopperDust.name=Грязная медная пыль -item.dirtyTinDust.name=Грязная оловянная пыль -item.dirtySilverDust.name=Грязная серебряная пыль -item.dirtyLeadDust.name=Грязная свинцовая пыль +item.dirtyIronDust.name=Загрязненная железная пыль +item.dirtyGoldDust.name=Загрязненная золотая пыль +item.dirtyOsmiumDust.name=Загрязненная осмиевая пыль +item.dirtyCopperDust.name=Загрязненная медная пыль +item.dirtyTinDust.name=Загрязненная оловянная пыль +item.dirtySilverDust.name=Загрязненная серебряная пыль +item.dirtyLeadDust.name=Загрязненная свинцовая пыль //Ingots item.obsidianIngot.name=Обсидиановый слиток @@ -271,7 +271,7 @@ gas.brine=Газообразная рапа gas.deuterium=Дейтерий gas.tritium=Тритий gas.lithium=Литий -gas.fusionFuelDT=Д/т топливо +gas.fusionFuelDT=Дейтерий-тритиевое топливо gas.iron=Расплавленное железо gas.gold=Расплавленное золото @@ -310,7 +310,7 @@ fluid.heavyWater=Тяжёлая вода fluid.lithium=Жидкий литий fluid.deuterium=Жидкий дейтерий fluid.tritium=Жидкий тритий -fluid.fusionFuelDT=Жидкое д/т топливо +fluid.fusionFuelDT=Жидкое дейтерий-тритиевое топливо //OreGas names oregas.iron=Железная руда @@ -340,7 +340,7 @@ transmission.Heat=Нагрев update.consider=Подумайте о обновлении до версии update.newFeatures=Нововведения update.visit=Посетите -update.toDownload=чтобы загрузить +update.toDownload=Чтобы загрузить update.devBuild=Используется сборка разработчиков update.outdated=Используется устаревшая версия одного или нескольких модулей @@ -435,20 +435,20 @@ gui.noDelay=Без задержки gui.fuel=Топливо gui.heat=Нагрев gui.formed=Сформировано -gui.incomplete=Незавершено +gui.incomplete=Незавершенно gui.inductionMatrix=Индукционная матрица gui.matrixStats=Статистика матрицы gui.main=Главное gui.outputting=Выход -gui.dimensions=Dimensions +gui.dimensions=Измерения gui.constituents=Составляющие -gui.cells=ячейки -gui.providers=поставщики +gui.cells=Ячейки +gui.providers=Поставщики gui.structure=Структура gui.dynamicTank=Динам. резервуар -gui.visuals=Visuals +gui.visuals=Визуальные gui.noEject=Невозможно извлечь -gui.undefined=Неопределено +gui.undefined=Неопределенно gui.owner=Владелец gui.public=Общественный gui.private=Частный @@ -456,7 +456,7 @@ gui.add=Добавить gui.set=Установить gui.freq=Частота gui.security=Безопасность -gui.index=Index +gui.index=Индекс gui.producing=Производится gui.maxOutput=Макс. выход gui.storing=Накапливается @@ -466,13 +466,13 @@ gui.needed=Нужно gui.noRecipe=Нет рецепта gui.conflict=Конфликт gui.height=Высота -gui.mult=Mult +gui.mult=Мульти gui.chunk=Чанк gui.vibrating=Вибрации gui.abundancy=Избыток gui.nextItem=След. предмет gui.lastItem=Послед. предмет -gui.oreDictCompat=Compatible OreDict Key +gui.oreDictCompat=Совместимый OreDict ключ gui.toggleCooling=Переключить измерение охлаждения gui.coolingMeasurements=Активное охлаждение gui.redstoneOutputMode=Режим красного камня @@ -491,9 +491,9 @@ gui.upgrades.effect=Эффект gui.chemicalInfuser.short=Хим. зарядник gui.chemicalDissolutionChamber.short=Хим. камера растворения -gui.solarEvaporationController.short=Контроллер солнечного опресн. +gui.solarEvaporationController.short=Контроллер солнечного опреснения -gui.dictionary.noKey=Нет ключа. +gui.dictionary.noKey=Нет ключа gui.configuration=Конфигурация gui.config=Настройка @@ -509,13 +509,13 @@ gui.factory.autoSort=Авто-сортировка //Recipe types gui.factory.Smelting=Плавящая gui.factory.Enriching=Обогащающая -gui.factory.Crushing=Дроблящая +gui.factory.Crushing=Дробящая gui.factory.Compressing=Сжимающая gui.factory.Combining=Объединяющая gui.factory.Purifying=Очищающая gui.factory.Injecting=Впрыскивающая -gui.seismicReader.short=С. считыватель +gui.seismicReader.short=Сейсм. считыватель gui.seismicReader.solids=Твёрдые gui.seismicReader.fluids=Жидкости gui.seismicReader.reading=Считывание @@ -527,7 +527,7 @@ gui.oredictFilter.noKey=Нет введённых ключей gui.oredictFilter.sameKey=Одинаковый ключ gui.modIDFilter=Фильтр по ID мода -gui.modIDFilter.noID=Нет введённых ID +gui.modIDFilter.noID=Не введен ID gui.modIDFilter.sameID=Одинаковый ID gui.oredictionificatorFilter=Фильтр унификатора словаря руд @@ -564,7 +564,7 @@ gui.password.identical=Идентичный gui.password.invalid=Неправильный gui.password=Пароль -gui.logisticalSorter.default=По-умолч. +gui.logisticalSorter.default=По умолчанию gui.logisticalSorter.auto=Авто gui.logisticalSorter.roundRobin=Цикл @@ -576,7 +576,7 @@ gui.teleporter.noFrame=Нет каркаса gui.teleporter.noLink=Нет соединения gui.teleporter.exceeds=Соединений > 2 gui.teleporter.needsEnergy=Требуется энергия -gui.teleporter.noAccess=У Вас нет доступа к этому телепорту. +gui.teleporter.noAccess=У Вас нет доступа к этому телепорту gui.teleporter.noFreq=Нет частоты gui.digitalMinerConfig=Настройки цифрового шахтёра @@ -587,7 +587,7 @@ gui.digitalMiner.reset=Сброс gui.digitalMiner.silkTouch=Шёлковое касание gui.digitalMiner.pull=Собирать gui.digitalMiner.silk=Шёлк -gui.digitalMiner.toMine=To mine +gui.digitalMiner.toMine=Копать gui.digitalMiner.running=Работает gui.digitalMiner.inverse="Обратный" режим gui.digitalMiner.requireReplace=Требуется замена @@ -609,7 +609,7 @@ tooltip.configurator.viewMode=Текущий режим: %s tooltip.configurator.unauth=Этот сундук закрыт tooltip.configurator.noLink=Нет соединения tooltip.configurator.linkMsg=Связан с -tooltip.configurator.dim=измерение +tooltip.configurator.dim=Измерение tooltip.configurator.setLink=Установить соединение на блок tooltip.configurator.plenisherReset=Сбросить расчёт жидкостного снабжателя tooltip.configurator.inductionPortMode=Режим передачи индукционного порта переключен на @@ -625,14 +625,14 @@ tooltip.auth=Проверенный tooltip.locked=Закрытый tooltip.recipeType=Тип рецепта tooltip.hold=Зажмите -tooltip.forDesc=для описания -tooltip.forDetails=для деталей +tooltip.forDesc=Для описания +tooltip.forDetails=Для деталей tooltip.fireMode=Режим огня tooltip.capacity=Ёмкость tooltip.pumpRate=Скорость откачки tooltip.items=Предметы tooltip.blocks=Блоки -tooltip.universal=любые +tooltip.universal=Любые tooltip.fluids=Жидкости tooltip.gasses=Газы tooltip.capableTrans=Подходит для передачи @@ -645,13 +645,13 @@ tooltip.mode=Режим tooltip.efficiency=Эффективность tooltip.modeToggle=Режим изменён на tooltip.flowing=Текущий -tooltip.yes=да -tooltip.no=нет +tooltip.yes=Да +tooltip.no=Нет tooltip.name=Имя tooltip.blockData=Данные блока tooltip.block=Блок tooltip.meta=Метаданные -tooltip.tile=Tile +tooltip.tile=Плитка tooltip.keysFound=Ключ(и) найдены tooltip.noKey=Нет ключа tooltip.hp=Прочность @@ -663,11 +663,11 @@ tooltip.speed=Скорость tooltip.portableTank.bucketMode=Режим ведра -tooltip.disassembler.normal=обычный -tooltip.disassembler.slow=медленный -tooltip.disassembler.fast=быстрый -tooltip.disassembler.vein=жила -tooltip.disassembler.off=откл. +tooltip.disassembler.normal=Обычный +tooltip.disassembler.slow=Медленный +tooltip.disassembler.fast=Быстрый +tooltip.disassembler.vein=Жила +tooltip.disassembler.off=Откл. tooltip.filterCard.got=Получены данные фильтра из %s tooltip.filterCard.set=Введены данные фильтра типа %s @@ -676,7 +676,7 @@ tooltip.filterCard.logisticalSorter=Логистический сортиров tooltip.filterCard.digitalMiner=Цифровой шахтёр tooltip.filterCard.oredictionificator=Унификатор словаря руд -tooltip.balloon=воздушный шар +tooltip.balloon=Воздушный шар tooltip.jetpack.regular=Обычный tooltip.jetpack.hover=Зависание @@ -704,10 +704,10 @@ tooltip.LogisticalSorter=Основанный на фильтре, продви tooltip.RotaryCondensentrator=Механизм, способный конвертировать газы в !nжидкость и наоборот. tooltip.ChemicalInjectionChamber=Элитный механизм, способный перерабатывать руды в !nчетыре осколка, выступающие в качестве начальной !nстадии 400% переработки руды. tooltip.ElectrolyticSeparator=Механизм, который использует процесс !nэлектролиза для разделения газа !nна два других газа. -tooltip.PrecisionSawmill=Этот механизм используется для обработки древесины и других !nдеревянных предметов, а также !nдля получения опилков. -tooltip.ChemicalDissolutionChamber=Максимальный механизм используемый для !nхимического растворения всех примесей !nруды, оставляя необработанный расплав. -tooltip.ChemicalWasher=Максимальный механизм, который очищает необработанные !nрасплавленные руды и подготавливает их для кристаллизации. -tooltip.ChemicalCrystalizer=Максимальный механизм, который используется для кристаллизации !nочищенной расплавленной руды в кристаллы. +tooltip.PrecisionSawmill=Этот механизм используется для обработки древесины и других !nдеревянных предметов, а также !nдля получения опилок. +tooltip.ChemicalDissolutionChamber=Совершенный механизм используемый для !nхимического растворения всех примесей !nруды, оставляя необработанный расплав. +tooltip.ChemicalWasher=Совершенный механизм, который очищает необработанные !nрасплавленные руды и подготавливает их для кристаллизации. +tooltip.ChemicalCrystalizer=Совершенный механизм, который используется для кристаллизации !nочищенной расплавленной руды в кристаллы. tooltip.ChemicalOxidizer=Механизм, который окисляет !nтвёрдые материалы до газа. tooltip.ChemicalInfuser=Механизм, который производит !nновый газ, путём объединения двух других газов. tooltip.SeismicVibrator=Механизм, который использует сейсмические колебания для !nпредоставления информации о различных слоях мира. @@ -727,17 +727,17 @@ tooltip.BioGenerator=Генератор, который сжигает орга tooltip.AdvancedSolarGenerator=Продвинутый генератор, который напрямую !nпоглощает солнечные лучи с небольшой потерей, !nдля производства энергии. tooltip.WindTurbine=Генератор, который использует силу ветра !nдля производства энергии, с большей эффективностью !nна большой высоте. -tooltip.ReactorGlass=Укреплённое стекло, которое используется !nстроительстве термоядерного реактора. +tooltip.ReactorGlass=Укреплённое стекло, которое используется при !nстроительстве термоядерного реактора. tooltip.ReactorLaserFocusMatrix=Панель из реакторного стекла, которая !nспособна поглощать оптическую энергию, !nнагревая термоядерный реактор. tooltip.ReactorController=Блок управления для всего !nтермоядерного реактора. -tooltip.ReactorFrame=Укреплённый каркас, который используется в !nстроительстве термоядерного реактора. +tooltip.ReactorFrame=Укреплённый каркас, который используется при !nстроительстве термоядерного реактора. tooltip.ReactorNeutronCapturePlate=Блок, который используется как !nдля блокирования излучения термоядерного реактора, так и для !nполучения трития. -tooltip.ReactorPort=Блок укреплённого каркаса, который способен !nуправлять и передачей газа и передачей энергии !nтермоядерного реактора. +tooltip.ReactorPort=Блок укреплённого каркаса, который способен !nуправлять передачей газа и энергии !nтермоядерного реактора. tooltip.ReactorLogicAdapter=Блок, который может быть использован для !nмониторинга основных функций реактора, используя красный камень. tooltip.OsmiumOre=Крепкий минерал, который можно найти !nпочти на любой высоте в мире. Он как известно !nимеет множество применений в !nпроизводстве механизмов. -tooltip.CopperOre=Общий проводящий материал, который может быть использован !nв производстве проводов. Имеет способность выдерживать!nвысокие температуры, это делает его необходимым для !nсовременного оборудования. -tooltip.TinOre=Лёгкий, но крепкий проводящий материал, !nкоторый находится немного реже, чем медь. +tooltip.CopperOre=Общий проводящий материал, который может быть использован !nпри производстве проводов. Способность выдерживать!nвысокие температуры, делает его незаменимым в !nсовременном оборудовании. +tooltip.TinOre=Лёгкий, но крепкий проводящий материал, !nкоторый встречается немного реже, чем медь. //Side data sideData.None=Нет @@ -765,54 +765,54 @@ fluidedit.fill=Заполнять fluidedit.empty=Опустошать //Colors -color.black=Чёрный -color.darkBlue=Тёмно-синий -color.darkGreen=Тёмно-зелёный -color.darkAqua=Тёмно-голбуй -color.darkRed=Тёмно-красный +color.black=Черный +color.darkBlue=Темно-Синий +color.darkGreen=Темно-Зеленый +color.darkAqua=Темно-Голубой +color.darkRed=Темно-Красный color.purple=Фиолетовый color.orange=Оранжевый color.grey=Серый -color.darkGrey=Тёмно-серый +color.darkGrey=Темно-Серый color.indigo=Индиго -color.brightGreen=Светло-зелёный +color.brightGreen=Светло-Серый color.aqua=Голубой color.red=Красный color.pink=Розовый -color.yellow=Жёлтый +color.yellow=Желтый color.white=Белый color.brown=Коричневый -color.brightPink=Светло-розовый +color.brightPink=Светло-Розовый //Dyes -dye.black=Чёрный +dye.black=Черный dye.darkBlue=Синий dye.brown=Коричневый -dye.darkGreen=Зелёный -dye.darkAqua=Бирюзовый -dye.darkRed=Тёмно-красный +dye.darkGreen=Зеленый +dye.darkAqua=Темно-Голубой +dye.darkRed=Темно-Красный dye.purple=Фиолетовый dye.orange=Оранжевый -dye.grey=Светло-серый +dye.grey=Светло-Серый dye.darkGrey=Серый -dye.indigo=Светло-синий -dye.brightGreen=Лаймовый +dye.indigo=Светло-Голубой +dye.brightGreen=Светло-Зеленый dye.aqua=Голубой dye.red=Красный dye.brightPink=Розовый -dye.pink=Сиреневый -dye.yellow=Жёлтый +dye.pink=Пурпурный +dye.yellow=Желтый dye.white=Белый //Reactor Logic modes -reactor.disabled=Disabled -reactor.disabled.desc=Will not emit a redstone signal -reactor.ready=Ready for Ignition -reactor.ready.desc=Reactor has reached the required heat level to ignite -reactor.capacity=Heat Capacity Met -reactor.capacity.desc=The reactor's core heat capacity has been met -reactor.depleted=Insufficient Fuel -reactor.depleted.desc=The reactor has insufficient fuel to sustain a reaction +reactor.disabled=Отключен +reactor.disabled.desc=Не излучает редстоун сигнал +reactor.ready=Реактор вот-вот взорвется +reactor.ready.desc=Реактор сильно перегрелся и скоро взорвется +reactor.capacity=Перегрев +reactor.capacity.desc=Ядро реактора перегрелось +reactor.depleted=Недостаточно топлива +reactor.depleted.desc=Реактору не хватает топлива для поддержания реакции //Creative tab itemGroup.tabMekanism=Mekanism @@ -837,13 +837,13 @@ tile.Generator.BioGenerator.name=Биогенератор tile.Generator.AdvancedSolarGenerator.name=Продвинутый солнечный генератор tile.Generator.WindTurbine.name=Ветровая турбина -tile.Reactor.ReactorController.name=Реакторный контроллер -tile.Reactor.ReactorFrame.name=Реакторный каркас +tile.Reactor.ReactorController.name=Панель управления реактором +tile.Reactor.ReactorFrame.name=Каракас реактора tile.Reactor.ReactorNeutronCapturePlate.name=Пластина нейтронного захвата -tile.Reactor.ReactorPort.name=Реакторный порт -tile.Reactor.ReactorLogicAdapter.name=Реакторный логический адаптер +tile.Reactor.ReactorPort.name=Порт реактора +tile.Reactor.ReactorLogicAdapter.name=Логический адаптер реактора -tile.ReactorGlass.ReactorGlass.name=Реакторное стекло +tile.ReactorGlass.ReactorGlass.name=Стекло реактора tile.ReactorGlass.ReactorLaserFocusMatrix.name=Матрица лазерного фокуса //Gui text @@ -867,18 +867,18 @@ gui.steamProduction=Производство пара //*****// //Vanilla Paxels -item.WoodPaxel.name=Деревянный мульти-инмтрумент -item.StonePaxel.name=Каменный мульти-инмтрумент -item.IronPaxel.name=Железный мульти-инмтрумент -item.DiamondPaxel.name=Алмазный мульти-инмтрумент -item.GoldPaxel.name=Золотой мульти-инмтрумент +item.WoodPaxel.name=Деревянный мульти-инcтрумент +item.StonePaxel.name=Каменный мульти-инcтрумент +item.IronPaxel.name=Железный мульти-инcтрумент +item.DiamondPaxel.name=Алмазный мульти-инcтрумент +item.GoldPaxel.name=Золотой мульти-инcтрумент //Obsidian item.ObsidianHelmet.name=Обсидиановый шлем item.ObsidianChestplate.name=Обсидиановая кираса item.ObsidianLeggings.name=Обсидиановые поножи item.ObsidianBoots.name=Обсидиановые ботинки -item.ObsidianPaxel.name=Обсидиановый мульти-инмтрумент +item.ObsidianPaxel.name=Обсидиановый мульти-инcтрумент item.ObsidianPickaxe.name=Обсидиановая кирка item.ObsidianAxe.name=Обсидиановый топор item.ObsidianShovel.name=Обсидиановая лопата @@ -890,7 +890,7 @@ item.LazuliHelmet.name=Лазуритовый шлем item.LazuliChestplate.name=Лазуритовая кираса item.LazuliLeggings.name=Лазуритовые поножи item.LazuliBoots.name=Лазуритовые ботинки -item.LazuliPaxel.name=Лазуритовый мульти-инмтрумент +item.LazuliPaxel.name=Лазуритовый мульти-инcтрумент item.LazuliPickaxe.name=Лазуритовая кирка item.LazuliAxe.name=Лазуритовый топор item.LazuliShovel.name=Лазуритовая лопата @@ -902,7 +902,7 @@ item.OsmiumHelmet.name=Осмиевый шлем item.OsmiumChestplate.name=Осмиевая кираса item.OsmiumLeggings.name=Осмиевые поножи item.OsmiumBoots.name=Осмиевые ботинки -item.OsmiumPaxel.name=Осмиевый мульти-инмтрумент +item.OsmiumPaxel.name=Осмиевый мульти-инcтрумент item.OsmiumPickaxe.name=Осмиевая кирка item.OsmiumAxe.name=Осмиевый топор item.OsmiumShovel.name=Осмиевая лопата @@ -914,7 +914,7 @@ item.BronzeHelmet.name=Бронзовый шлем item.BronzeChestplate.name=Бронзовая кираса item.BronzeLeggings.name=Бронзовые поножи item.BronzeBoots.name=Бронзовые ботинки -item.BronzePaxel.name=Бронзовый мульти-инмтрумент +item.BronzePaxel.name=Бронзовый мульти-инcтрумент item.BronzePickaxe.name=Бронзовая кирка item.BronzeAxe.name=Бронзовый топор item.BronzeShovel.name=Бронзовая лопата @@ -926,7 +926,7 @@ item.GlowstoneHelmet.name=Шлем из светящегося камня item.GlowstoneChestplate.name=Кираса из светящегося камня item.GlowstoneLeggings.name=Поножи из светящегося камня item.GlowstoneBoots.name=Ботинки из светящегося камня -item.GlowstonePaxel.name=Мульти-инмтрумент из светящегося камня +item.GlowstonePaxel.name=Мульти-инcтрумент из светящегося камня item.GlowstonePickaxe.name=Кирка из светящегося камня item.GlowstoneAxe.name=Топор из светящегося камня item.GlowstoneShovel.name=Лопата из светящегося камня @@ -938,7 +938,7 @@ item.SteelHelmet.name=Стальной шлем item.SteelChestplate.name=Стальная кираса item.SteelLeggings.name=Стальные поножи item.SteelBoots.name=Стальные ботинки -item.SteelPaxel.name=Стальной мульти-инмтрумент +item.SteelPaxel.name=Стальной мульти-инcтрумент item.SteelPickaxe.name=Стальная кирка item.SteelAxe.name=Стальной топор item.SteelShovel.name=Стальная лопата From 693e7b5e8b5f53c90229aafaede34bd577434bac Mon Sep 17 00:00:00 2001 From: Lucas Falch Date: Sun, 21 Feb 2016 17:43:26 +0100 Subject: [PATCH 02/52] Add Danish translation Still needs some extra polishing and testing --- .../resources/assets/mekanism/lang/da_DK.lang | 917 ++++++++++++++++++ 1 file changed, 917 insertions(+) create mode 100644 src/main/resources/assets/mekanism/lang/da_DK.lang diff --git a/src/main/resources/assets/mekanism/lang/da_DK.lang b/src/main/resources/assets/mekanism/lang/da_DK.lang new file mode 100644 index 000000000..663817486 --- /dev/null +++ b/src/main/resources/assets/mekanism/lang/da_DK.lang @@ -0,0 +1,917 @@ +//********// +//MEKANISM// +//********// + +//Items +tile.ObsidianTNT.name=Obsidian TNT +item.EnrichedAlloy.name=Beriget Legering +item.ReinforcedAlloy.name=Forstærket Legering +item.AtomicAlloy.name=Kernefysisk Legering +item.EnergyTablet.name=Energi Tablet +item.SpeedUpgrade.name=Hastighedsopgradering +item.EnergyUpgrade.name=Energiopgradering +item.FilterUpgrade.name=Filtreringsopgradering +item.Robit.name=Robit +item.AtomicDisassembler.name=Entomadskiller +item.ElectricBow.name=Elektrisk Bue +item.EnrichedIron.name=Beriget Jern +item.CompressedCarbon.name=Komprimeret Kulstof +item.CompressedRedstone.name=Komprimeret Rødsten +item.CompressedDiamond.name=Komprimeret Diamant +item.CompressedObsidian.name=Komprimeret Obsidian +item.PortableTeleporter.name=Portabel Teleportør +item.TeleportationCore.name=Teleporteringskerne +item.Configurator.name=Konfiguratør +item.NetworkReader.name=Netværkslæser +item.WalkieTalkie.name=Walkie-Talkie +item.Jetpack.name=Jetpack +item.ScubaTank.name=Iltflaske +item.GasMask.name=Gasmaske +item.Dictionary.name=Ordbog +item.ElectrolyticCore.name=Elektrolysekerne +item.Sawdust.name=Savsmuld +item.Salt.name=Salt +item.BrineBucket.name=Saltlagespand +item.LithiumBucket.name=Litiumsspand +item.FreeRunners.name=Fritløbere +item.ArmoredJetpack.name=Panseret Jetpack +item.FilterCard.name=Filterkort +item.SeismicReader.name=Seismisk Aflæser +item.HDPEPellet.name=HDPE-pellets +item.HDPERod.name=HDPE-stav +item.HDPESheet.name=HDPE-plade +item.PlaStick.name=PlaStick +item.Substrate.name=Substrat +item.Flamethrower.name=Flammekaster +item.GaugeDropper.name=Gauge Dropper +item.BioFuel.name=Biobrændsel + +//Control Circuits +item.BasicControlCircuit.name=Basalt Kontrolkredsløb +item.AdvancedControlCircuit.name=Envanceret Kontrolkredsløb +item.EliteControlCircuit.name=Elite Kontrolkredsløb +item.UltimateControlCircuit.name=Ultimativt Kontrolkredsløb + +//Gas Tank +tile.GasTank.GasTank.name=Gasstank + +//Cardboard Box +tile.CardboardBox.name=Papkasse + +//Bounding Block +tile.BoundingBlock.name=Markeringsblok + +//Salt +tile.SaltBlock.name=Saltblok + +//Basic Block +tile.BasicBlock.OsmiumBlock.name=Osmiumblok +tile.BasicBlock.BronzeBlock.name=Bronzeblok +tile.BasicBlock.RefinedObsidian.name=Raffineret Obsidian +tile.BasicBlock.CharcoalBlock.name=Trækulsblok +tile.BasicBlock.RefinedGlowstone.name=Raffineretglødesten +tile.BasicBlock.SteelBlock.name=Stålblok +tile.BasicBlock.Bin.name=Papirkurv +tile.BasicBlock.TeleporterFrame.name=Teleportørramme +tile.BasicBlock.SteelCasing.name=Stål Casing +tile.BasicBlock.DynamicTank.name=Dynamisk Tank +tile.BasicBlock.DynamicGlass.name=Dynamisk Glas +tile.BasicBlock.DynamicValve.name=Dynamisk Ventil +tile.BasicBlock.CopperBlock.name=Kobberblok +tile.BasicBlock.TinBlock.name=Tinblok +tile.BasicBlock.SolarEvaporationController.name=Solfordampningscontroller +tile.BasicBlock.SolarEvaporationValve.name=Solfordampningsventil + +//Basic Block 2 (second ID iteration) +tile.BasicBlock2.SolarEvaporationBlock.name=Solfordampningsblok +tile.BasicBlock2.InductionCasing.name=Induktionskasse +tile.BasicBlock2.InductionPort.name=Induktionsport +tile.BasicBlock2.InductionCellBasic.name=Basal Induktionscelle +tile.BasicBlock2.InductionCellAdvanced.name=Envanceret Induktionscelle +tile.BasicBlock2.InductionCellElite.name=Elite Induktionscelle +tile.BasicBlock2.InductionCellUltimate.name=Ultimativ Induktionscelle +tile.BasicBlock2.InductionProviderBasic.name=Basal Induktionsprovider +tile.BasicBlock2.InductionProviderAdvanced.name=Envanceret Induktionsprovider +tile.BasicBlock2.InductionProviderElite.name=Elite Induktionsprovider +tile.BasicBlock2.InductionProviderUltimate.name=Ultimativ Induktionsprovider + +//Machine Block +tile.MachineBlock.EnrichmentChamber.name=Berigelseskammer +tile.MachineBlock.OsmiumCompressor.name=Osmiumkompressor +tile.MachineBlock.Combiner.name=Kombinerer +tile.MachineBlock.Crusher.name=Knuser +tile.MachineBlock.BasicFactory.name=Basal Fabrik +tile.MachineBlock.AdvancedFactory.name=Envanceret Fabrik +tile.MachineBlock.EliteFactory.name=Elite Fabrik +tile.MachineBlock.MetallurgicInfuser.name=Metallurgic Infuser +tile.MachineBlock.PurificationChamber.name=Rensningskammer +tile.MachineBlock.EnergizedSmelter.name=Energibaseret Smelteværk +tile.MachineBlock.Teleporter.name=Teleporter +tile.MachineBlock.ElectricPump.name=Elektrisk Pumpe +tile.MachineBlock.ElectricChest.name=Elektrisk Kiste +tile.MachineBlock.Chargepad.name=Chargepad +tile.MachineBlock.LogisticalSorter.name=Logistical Sorterer +tile.MachineBlock.DigitalMiner.name=Digital Miner + +//Machine Block 2 (second ID iteration) +tile.MachineBlock2.RotaryCondensentrator.name=Rotary Condensentrator +tile.MachineBlock2.ChemicalOxidizer.name=Kemisk Oxidationsenhed +tile.MachineBlock2.ChemicalInfuser.name=Kemisk Infuser +tile.MachineBlock2.ChemicalCombiner.name=Kemisk Kombinerer +tile.MachineBlock2.ChemicalInjectionChamber.name=Kemisk Injektionskammer +tile.MachineBlock2.ElectrolyticSeparator.name=Electrolyseseparator +tile.MachineBlock2.PrecisionSawmill.name=Precisionssavmølle +tile.MachineBlock2.ChemicalDissolutionChamber.name=Kemisk Opløsningskammer +tile.MachineBlock2.ChemicalWasher.name=Kemisk vasker +tile.MachineBlock2.ChemicalCrystallizer.name=Kemisk Krystalisator +tile.MachineBlock2.SeismicVibrator.name=Seismisk Vibrator +tile.MachineBlock2.PressurizedReactionChamber.name=Pressurized Reaction Chamber +tile.MachineBlock2.PressurizedReactionChamber.short.name=PRC +tile.MachineBlock2.PortableTank.name=Mobil Tank +tile.MachineBlock2.FluidicPlenisher.name=Fluidisk Plenisher +tile.MachineBlock2.Laser.name=Laser +tile.MachineBlock2.LaserAmplifier.name=Laserfortstærker +tile.MachineBlock2.LaserTractorBeam.name=Laser Traktorstråle + +//Machine Block 3 (third ID iteration) +tile.MachineBlock3.SolarNeutronActivator.name=Solar Neutron Activator +tile.MachineBlock3.Oredictionificator.name=Oredictionificator + +//Plastic +tile.PlasticBlock.name=Plastblok +tile.SlickPlasticBlock.name=Slick Plastblok +tile.GlowPlasticBlock.name=Plast Glødeblok +tile.ReinforcedPlasticBlock.name=Forstærket Plastblok +tile.RoadPlasticBlock.name=Plastvej + +tile.PlasticFence.name=Plastbarriere + +//Infuse types +infuse.carbon=Kulstof +infuse.tin=Tin +infuse.diamond=Diamant +infuse.redstone=Rødsten +infuse.fungi=Fungi +infuse.obsidian=Obsidian +infuse.bio=Biomasse + +//Ore Block +tile.OreBlock.OsmiumOre.name=Osmiummalm +tile.OreBlock.CopperOre.name=Kobbermalm +tile.OreBlock.TinOre.name=Tinmalm + +//Transmitters +item.MultipartTransmitter.PressurizedTube.name=Trykrør +item.MultipartTransmitter.BasicUniversalCable.name=Basalt Universalkabel +item.MultipartTransmitter.AdvancedUniversalCable.name=Envanceret Universalkabel +item.MultipartTransmitter.EliteUniversalCable.name=Elite Universalkabel +item.MultipartTransmitter.UltimateUniversalCable.name=Ultimativt Universalkabel +item.MultipartTransmitter.BasicMechanicalPipe.name=Basalt Mekanisk Rør +item.MultipartTransmitter.AdvancedMechanicalPipe.name=Envanceret Mekanisk Rør +item.MultipartTransmitter.EliteMechanicalPipe.name=Elite Mekanisk Rør +item.MultipartTransmitter.UltimateMechanicalPipe.name=Ultimativt Mekanisk Rør +item.MultipartTransmitter.LogisticalTransporter.name=Logistisk Transporter +item.MultipartTransmitter.RestrictiveTransporter.name=Begrænsende Transporter +item.MultipartTransmitter.DiversionTransporter.name=Enfledningstransporter + +//Glow Panel +item.GlowPanel.name=Glødepanel + +//Energy Cubes +tile.EnergyCube.Basic.name=Basal Energikube +tile.EnergyCube.Advanced.name=Envanceret Energikube +tile.EnergyCube.Elite.name=Elite Energikube +tile.EnergyCube.Ultimate.name=Ultimativ Energikube +tile.EnergyCube.Creative.name=Kreativ Energikube + +//Factory Installers +item.basicFactoryInstaller.name=Basal Fabrikinstallerer +item.advancedFactoryInstaller.name=Endvanceret Fabrikinstallerer +item.eliteFactoryInstaller.name=Elite Fabrikinstallerer + +//Dust +item.ironDust.name=Jernstøv +item.goldDust.name=Guldstøv +item.osmiumDust.name=Osmiumstøv +item.obsidianDust.name=Obsidianstøv +item.refinedobsidianDust.name=Raffineret Obsidianstøv +item.diamondDust.name=Diamantstøv +item.steelDust.name=Stålstøv +item.copperDust.name=Kobberstøv +item.tinDust.name=Tinstøv +item.silverDust.name=Sølvstøv +item.leadDust.name=Blystøv +item.sulfurDust.name=Svovlstøv +item.lithiumDust.name=Lithiumstøv + +//Clumps +item.ironClump.name=Jernklump +item.goldClump.name=Guldklump +item.osmiumClump.name=Osmiumklump +item.copperClump.name=Kobberklump +item.tinClump.name=Tinklump +item.silverClump.name=Sølvklump +item.leadClump.name=Blyklump + +//Shards +item.ironShard.name=Jernshard +item.goldShard.name=Guldshard +item.osmiumShard.name=Osmiumshard +item.copperShard.name=Kobbershard +item.tinShard.name=Tinshard +item.silverShard.name=Sølvshard +item.leadShard.name=Blyshard + +//Crystals +item.ironCrystal.name=Jernkrystal +item.goldCrystal.name=Guldkrystal +item.osmiumCrystal.name=Osmiumkrystal +item.copperCrystal.name=Kobberkrystal +item.tinCrystal.name=Tinkrystal +item.silverCrystal.name=Sølvkrystal +item.leadCrystal.name=Blykrystal + +//Dirty Dust +item.dirtyIronDust.name=Beskidt Jernstøv +item.dirtyGoldDust.name=Beskidt Guldstøv +item.dirtyOsmiumDust.name=Beskidt Osmiumstøv +item.dirtyCopperDust.name=Beskidt Kobberstøv +item.dirtyTinDust.name=Beskidt Tinstøv +item.dirtySilverDust.name=Beskidt Sølvstøv +item.dirtyLeadDust.name=Beskidt Blystøv + +//Ingots +item.obsidianIngot.name=Obsidianbarre +item.osmiumIngot.name=Osmiumbarre +item.bronzeIngot.name=Bronzebarre +item.glowstoneIngot.name=Glødestensbarre +item.steelIngot.name=Stålbarre +item.copperIngot.name=Kobberbarre +item.tinIngot.name=Tinbarre + +//Gasses +gas.hydrogen=Brint +gas.oxygen=Ilt +gas.water=Vanddamp +gas.chlorine=Klor +gas.sulfurDioxideGas=Svovldioxid +gas.sulfurTrioxideGas=Svovltrioxid +gas.sulfuricAcid=Svovlsyre +gas.hydrogenChloride=Hydrogenklorid +gas.liquidOsmium=Flydende Osmium +gas.liquidStone=Flydende Sten +gas.ethene=Ethen +gas.sodium=Natrium +gas.brine=Saltlage i Gasform +gas.deuterium=Deuterium +gas.tritium=Tritium +gas.lithium=Lithium +gas.fusionFuelDT=D-T Brændsel + +gas.iron=Jernslurry +gas.gold=Guldslurry +gas.osmium=Osmiumslurry +gas.copper=Kobberslurry +gas.tin=Tinslurry +gas.silver=Sølvslurry +gas.obsidian=Obsidianslurry +gas.lead=Blyslurry + + +gas.cleanIron=Ren Jernslurry +gas.cleanGold=Ren Guldslurry +gas.cleanOsmium=Ren Osmiumslurry +gas.cleanCopper=Ren Kobberslurry +gas.cleanTin=Ren Tinslurry +gas.cleanSilver=Ren Sølvslurry +gas.cleanObsidian=Ren Obsidianslurry +gas.cleanLead=Ren Blyslurry + +//BC Fuel Gases +gas.fuel=Fordampet Brændsel +gas.oil=Fordampet Olie + +//Fluids +fluid.hydrogen=Flydende Brint +fluid.oxygen=Flydende Ilt +fluid.chlorine=Flydende Klor +fluid.sulfurDioxideGas=Flydende Svovldioxid +fluid.sulfurTrioxideGas=Flydende Svovltrioxid +fluid.sulfuricAcid=Flydende Svovlsyre +fluid.hydrogenChloride=Flydende Hydrogenklorid +fluid.brine=Saltlage +fluid.ethene=Flydende Ethen +fluid.sodium=Flydende Natrium +fluid.heavyWater=Tungtvand +fluid.lithium=Flydende Lithium +fluid.deuterium=Flydende Deuterium +fluid.tritium=Flydende Tritium +fluid.fusionFuelDT=Flydende D-T Brændsel + +//OreGas names +oregas.iron=Jernmalm +oregas.gold=Guldmalm +oregas.osmium=Osmiummalm +oregas.copper=Kobbermalm +oregas.tin=Tinmalm +oregas.silver=Sølvmalm +oregas.obsidian=Obsidianmalm +oregas.lead=Blymalm + +//Transmission types +transmission.Energy=Energi +transmission.Fluids=Væsker +transmission.Gases=Gasser +transmission.Items=Ting +transmission.Heat=Varme + +//Update handler text +update.consider=Tænk på at opdatere til version +update.newFeatures=Nye funktioner +update.visit=Besøg +update.toDownload=til at downloade +update.devBuild=Du bruger en udviklerversion +update.outdated=Du bruger en forældet version på et eller flere moduler + +//Upgrades +upgrade.energy=Energi +upgrade.energy.desc=Øger energieffektiviteten !nog kapaciteten på maskinen. +upgrade.speed=Hastighed +upgrade.speed.desc=Øger hastigheden på maskinen. +upgrade.filter=Filter +upgrade.filter.desc=Et filter som sepererer !ntungtvand fra almindelig vand. + +//Key description text +key.mode=Ændr Itemmodus +key.armorMode=Ændr Armormodus +key.voice=Stemme + +//Entities +entity.Robit.name=Robit +entity.BabySkeleton.name=Baby Skelet + +//Config Gui +mekanism.configgui.ctgy.general=Mekanism Generelle Indstillinger +mekanism.configgui.ctgy.machines=Maskinindstillinger +mekanism.configgui.ctgy.tier=Tierindstillinger +mekanism.configgui.ctgy.usage=Brugsindstillinger +mekanism.configgui.ctgy.client=Klientindstillinger + +//Config Tooltips +mekanism.configgui.ctgy.general.tooltip=Generelle indstillinger vedr. Mekanism og alle dets moduler +mekanism.configgui.ctgy.machines.tooltip=Indstillinger vedr. aktivering og deaktivering af specifikke maskiner +mekanism.configgui.ctgy.tier.tooltip=Indstillinger vedr. Mekanism tiers og deres tilsvarende værdier +mekanism.configgui.ctgy.usage.tooltip=Indstillinger vedr. machinery og deres energiforbrug +mekanism.configgui.ctgy.client.tooltip=Klientspecifikke indstillinger vedr. Mekanism og alle dets moduler + +//Gui text +gui.removeSpeedUpgrade=Fjern hastighedsopgradering +gui.removeEnergyUpgrade=Fjern energiopgradering +gui.condensentrating=Condensentrating +gui.decondensentrating=Decondensentrating +gui.power=Strøm +gui.confirm=Bekræft +gui.open=Åbn +gui.allOK=Enlt OK +gui.none=Ingen +gui.new=Ny +gui.edit=Ændr +gui.save=Lagr +gui.output=Udgang +gui.delete=Slet +gui.status=Status +gui.autoEject=Enuto-udstød +gui.itemstack=ItemStack +gui.oredict=OreDict +gui.material=Materiale +gui.out=Ud +gui.noFluid=Ingen væske +gui.empty=Tom +gui.volume=Volume +gui.start=Start +gui.stop=Stop +gui.config=Konfig +gui.teleport=Teleportér +gui.eject=Udstød +gui.input=Input +gui.strictInput=Striks Input +gui.slots=Plads +gui.state=Tilstand +gui.on=Til +gui.off=Fra +gui.filters=Filtere +gui.filter=Filter +gui.idle=Inaktiv +gui.data=Data +gui.newFilter=Nyt Filter +gui.energy=Energi +gui.gas=Gas +gui.dumping=Udsmidning +gui.dumping_excess=Smid overflødigt ud +gui.modID=Mod ID +gui.key=Nøgle +gui.id=ID +gui.finished=Færdig +gui.well=Enlt er vel! +gui.upgrade=Opgradér +gui.infinite=Uendelig +gui.min=Min +gui.max=Maks +gui.delay=Forsinkelse +gui.noDelay=Ingen forsinkelse +gui.fuel=Brændsel +gui.heat=Varme +gui.formed=Formet +gui.incomplete=Ufuldstændig +gui.inductionMatrix=Induktionsatrice +gui.matrixStats=Matricestatistik +gui.main=Hoved +gui.outputting=Outputting +gui.dimensions=dimensioner +gui.constituents=Bestanddele +gui.cells=celler +gui.providers=providers +gui.structure=Struktur +gui.dynamicTank=Dynamisk Tank +gui.visuals=Visuelle +gui.noEject=Kan ikke udstøde +gui.undefined=Udefineret +gui.owner=Ejer +gui.public=Offentlig +gui.private=Privat +gui.add=Tilføj +gui.set=Sæt +gui.freq=Frekvens +gui.security=Sikkerhed +gui.index=Indeks + +gui.reactor.injectionRate=Injektionssats + +gui.upgrades=Opgraderinger +gui.upgrades.supported=Støttet +gui.upgrades.noSelection=Intet valgt +gui.upgrades.amount=Mængde +gui.upgrades.max=Maks +gui.upgrades.effect=Effekt + +gui.chemicalInfuser.short=C. Infuser +gui.chemicalDissolutionChamber.short=C. Opløsningskammer +gui.solarEvaporationController.short=Sol E. Kontrollør + +gui.dictionary.noKey=Ingen nøgle. + +gui.configuration=Konfiguration +gui.config=Konfig +gui.configuration.side=Sidekonfig +gui.configuration.transporter=Transportørskonfig +gui.configuration.strictInput=Striks Input + +gui.rotaryCondensentrator.toggleOperation=Byt operation + +gui.factory.secondaryEnergy=Sekundær energi +gui.factory.smelting=Smeltning +gui.factory.enriching=Berigelse +gui.factory.crushing=Knusning +gui.factory.compressing=Komprimering +gui.factory.combining=Kombinering +gui.factory.purifying=Rensning +gui.factory.injecting=Injicering +gui.factory.autoSort=Enuto-sorterer + +gui.seismicReader.short=S. Aflæser +gui.seismicReader.solids=Faste Stoffer +gui.seismicReader.fluids=Væsker +gui.seismicReader.reading=Læser + +gui.filterSelect.title=Lav Nyt Filter + +gui.oredictFilter=OreDict Filter +gui.oredictFilter.noKey=Ingen nøgle +gui.oredictFilter.sameKey=Samme nøgle + +gui.modIDFilter=Mod ID Filter +gui.modIDFilter.noID=Intet ID +gui.modIDFilter.sameID=Samme ID + +gui.oredictionificatorFilter=Oredictionificator Filter + +gui.itemFilter=Genstandsfilter +gui.itemFilter.noItem=Ingen genstand +gui.itemFilter.details=ItemStack Detaljer +gui.itemFilter.min=Min +gui.itemFilter.max=Maks + +gui.materialFilter=Materialefilter +gui.materialFilter.details=Bruger materiale af + +gui.portableTeleporter=Mobil Teleportør + +gui.robit=Robit +gui.robit.smelting=Robit Smeltning +gui.robit.inventory=Robit Inventar +gui.robit.crafting=Robit Crafting +gui.robit.greeting=Hej, jeg hedder +gui.robit.toggleFollow=Skift 'følge'-modus +gui.robit.rename=Giv nyt navn til denne Robit +gui.robit.teleport=Teleportér hjem +gui.robit.togglePickup=Skift 'saml ting op'-modus +gui.robit.following=Følger +gui.robit.dropPickup=Saml ting op +gui.robit.owner=Ejer + +gui.password.setPassword=Sæt adgangskode +gui.password.enterPassword=Skriv adgangskode +gui.password.fieldsEmpty=Felt(er) tomme +gui.password.notMatching=Matcher ikke +gui.password.identical=Idenstisk +gui.password.invalid=Ugyldig +gui.password=Endgangskode + +gui.logisticalSorter.default=Standard +gui.logisticalSorter.auto=Enuto +gui.logisticalSorter.roundRobin=Round-robin + +gui.electricChest.editPassword=Ændr Adgangskode + +gui.teleporter.notReady=Ikke klar +gui.teleporter.ready=Klar +gui.teleporter.noFrame=Ingen ramme +gui.teleporter.noLink=Ingen tilkobling +gui.teleporter.exceeds=Tilkoblinger > 2 +gui.teleporter.needsEnergy=Mangler energi +gui.teleporter.noAccess=Du har ikke adgang til denne teleportør. +gui.teleporter.noFreq=Ingen frekvens + +gui.digitalMinerConfig=Digital Miner Konfig + +gui.digitalMiner.autoPull=Enuto-træk +gui.digitalMiner.replaceBlock=Erstat blok +gui.digitalMiner.reset=Nulstil +gui.digitalMiner.silkTouch=Silk touch +gui.digitalMiner.pull=Træk +gui.digitalMiner.silk=Silk +gui.digitalMiner.toMine=Ent grave +gui.digitalMiner.running=Kører +gui.digitalMiner.inverse=Inverse modus +gui.digitalMiner.requireReplace=Kræv erstatning +gui.digitalMiner.fuzzyMode=Fuzzy modus +gui.digitalMiner.missingBlock=Manglende blok + +//Recipe names +recipe.mekanismShaped=Formet + +//Item and block tooltip text +tooltip.configurator.configurate=Konfigurér +tooltip.configurator.empty=Tom +tooltip.configurator.rotate=Rotér +tooltip.configurator.wrench=Skruenøgle +tooltip.configurator.pumpReset=Nulstil Elektrisk Pumpe udregning +tooltip.configurator.toggleDiverter=Enfledermodus ændret til +tooltip.configurator.toggleMode=%s opførsel ændret til +tooltip.configurator.viewMode=Nuværende %s opførsel +tooltip.configurator.unauth=Denne kiste er låst +tooltip.configurator.noLink=Ingen forbindelse +tooltip.configurator.linkMsg=Forbundet til +tooltip.configurator.dim=dimension +tooltip.configurator.setLink=Sæt tilkobling til blok +tooltip.configurator.plenisherReset=Nulstil Fluidisk Plenisher udregning +tooltip.configurator.inductionPortMode=Skiftet Indukstionsports overføringsmodus til + +tooltip.upgrade.speed=Hastighed +tooltip.upgrade.energy=Energi + +tooltip.inventory=Inventar +tooltip.storedEnergy=Opbevaret energi +tooltip.auth=Enutentificeret +tooltip.locked=Låst +tooltip.recipeType=Opskriftstype +tooltip.hold=Hold +tooltip.forDesc=for en beskrivelse +tooltip.forDetails=for detaljer +tooltip.fireMode=Enffyringsmodus +tooltip.capacity=Kapacitet +tooltip.pumpRate=Pumpningssats +tooltip.items=Genstande +tooltip.blocks=Blokke +tooltip.universal=universal +tooltip.fluids=Væsker +tooltip.gasses=Gasser +tooltip.capableTrans=I stand til at overføre +tooltip.restrictiveDesc=Kun brugt hvis ingen andre veje er tilgængelige +tooltip.diversionDesc=Kontrollerbar via rødsten +tooltip.noGas=Ingen gas opbevaret +tooltip.stored=Opbevaret +tooltip.channel=Kanal +tooltip.mode=Modus +tooltip.efficiency=Effektivitet +tooltip.modeToggle=Modus skiftet til +tooltip.flowing=Strømmer +tooltip.yes=ja +tooltip.no=nej +tooltip.name=Navn +tooltip.blockData=Blokdata +tooltip.block=Blok +tooltip.meta=Metadata +tooltip.tile=Tile +tooltip.keysFound=Tast(er) fundet +tooltip.noKey=Ingen tast +tooltip.hp=HP +tooltip.configureState=Konfigurér tilstand +tooltip.outputRate=Output Sats +tooltip.insufficientFuel=Utilstrækkelig Brændsel +tooltip.readyForReaction=Klar til Reaktion + +tooltip.portableTank.bucketMode=Spandmodus + +tooltip.disassembler.normal=normal +tooltip.disassembler.slow=langsom +tooltip.disassembler.fast=hurtig +tooltip.disassembler.vein=åre +tooltip.disassembler.off=fra + +tooltip.filterCard.got=Hentet filterdata fra %s +tooltip.filterCard.set=Injicerede filterdata af typen %s +tooltip.filterCard.unequal=Ulige filterdata-formater +tooltip.filterCard.logisticalSorter=Logistisk Sorterer +tooltip.filterCard.digitalMiner=Digital Miner +tooltip.filterCard.oredictionificator=Oredictionificator + +tooltip.balloon=Ballon + +tooltip.flamethrower.combat=Kamp +tooltip.flamethrower.heat=Opvarm +tooltip.flamethrower.inferno=Inferno +tooltip.flamethrower.modeBump=Flammekastermodus skubbet til + +tooltip.seismicReader.needsEnergy=Ikke nok energi til at læse vibration +tooltip.seismicReader.noVibrations=Ikke i stand til at opdage nogen vibrationer + +tooltip.EnrichmentChamber=En simpel maskine brugt til at berige malm om til !nto af deres støvmodparter, såvel som at !nudføre mange andre operationer. +tooltip.OsmiumCompressor=En nogenlunde avanceret maskine brugt til at !nkomprimere osmium om til adskillige støve for !nså at kunne lave deres barremodparter. +tooltip.Combiner=En maskine brugt til at kombinere støv og brosten !nfor at forme deres malmmodparter. +tooltip.Crusher=En maskine brugt til at knuse barrer om til deres støvmodparter, !nså vel som at udføre mange andre operationer. +tooltip.DigitalMiner=En højtavanceret, filterbaseret, auto-miner !nder kan mine hvilken som helst blok du beder den om !inden for en 32-bloks(maks)radius. +tooltip.BasicFactory=Det laveste tier i linjen af Fabrikker, !nder kan bruges til at processere forskellige !nmaskinoperationer ad gangen. +tooltip.AdvancedFactory=Det mellemste tier i linjen af Fabrikker, !nder kan bruges til at processere forskellige !nmaskinoperationer ad gangen. +tooltip.EliteFactory=The højeste tier i linjen af Fabrikker, !nder kan bruges til at processere forskellige !nmaskinoperationer ad gangen. +tooltip.MetallurgicInfuser=En maskine brugt til at infuse adskillige materialer !nom til (generalt) metaller til at lave legeringer !nog andre sammensætninger. +tooltip.PurificationChamber=En avanceret maskine i stand til at processere !nmalm om til the klumper: Bruges som det indledende !nfase i 300%-malmforarbejdning. +tooltip.EnergizedSmelter=En simpel maskine der bruges som en Mekanism-baseret !novn, der kører på energy. +tooltip.Teleporter=En maskine i stand til at teleportere spillere til forskellige !nsteder defineret af en anden teleporter. +tooltip.ElectricPump=En avanceret pumpe i stand til at pumpe !nen hele lavasø op. +tooltip.ElectricChest=En mobil kiste, med 54 pladser, der bruger energi til at låse !nsig selv fra andre vha. adgangskodebeskyttelse. +tooltip.Chargepad=En universal chargepad der kan lade !nenhver energibaseret ting fra enhver mod. +tooltip.LogisticalSorter=En filterbaseret, avanceret sorteringsmaskine, der !nautomatisk kan ustøde specifikke ting ud fra og ind i !ninventarer og Logistiske Transporters ved siden af. +tooltip.RotaryCondensentrator=En maskine i stand til at konvertere gasser om til !nderes flydende form og vice versa. +tooltip.ChemicalInjectionChamber=En elite maskine i stand til at forarbejde !nmalm om til fire shards: Bruges som det indledende !nfase i 400%-malmforarbejdning. +tooltip.ElectrolyticSeparator=En maskine, der bruger electrolyse til at !nsplitte en bestemt gas !nom til to forskellige gasser. +tooltip.PrecisionSawmill=En maskine brugt til at forarbejde logs og andre !ntræbaserede ting mere effektivt, så vel som !nat opnå savsmuld. +tooltip.ChemicalDissolutionChamber=En ultimativ maskine brugt til kemisk at !nopløse alle urenheder af malm, !nder efterlader en uforarbejdet slurry. +tooltip.ChemicalWasher=En ultimativ maskine der rengører uforarbejdet !nslurry og forbereder det krystalisering. +tooltip.ChemicalCrystallizer=En ultimativ maskine brugt til at krystalisere !nrenset malm slurry om til malmkrystaller. +tooltip.ChemicalOxidizer=En maskine i stand til at oxidere !nfast materiale ind til gasform. +tooltip.ChemicalInfuser=En maskine, der producerer en ny !ngas ved infuse til andre. +tooltip.SeismicVibrator=En maskine, der bruger seismiske vibrationer til at !ngive information om forskellige lag !ni verdenen. +tooltip.PressurizedReactionChamber=En avanceret maskine der forarbejder en !nfast, flydende og gasformig blanding og !nlaver både et gasformigt og fast produkt. +tooltip.PortableTank=En handy, mobil tank, der lader dig !nbære 14 spande væske hvorhen du !nønsker. Kan også bruges som spand! +tooltip.FluidicPlenisher=En maskine i stand til at lave hele !nsøer ved at fylde slugter med væske. +tooltip.Laser=En avanceret form for linær!nenergitransfer der udnytter en!nekstremt kollimeret lysstråle. +tooltip.LaserAmplifier=En blok that can be brugt til at merge,!nredirect and amplify laser beams,!nwith fine controls over when to fire. +tooltip.LaserTractorBeam=En blok brugt til at forene og!omdirigere laserstråler. Indsamler!ndrops fra blokke, den ødelægger. +tooltip.SolarNeutronActivator=En maskine der dirigerer neutronstrålingen !nfra solen om til sin interne reserve, hvilket tillader !nen langsom dannelse af forskelige isotoper. +tooltip.Oredictionificator=En maskine brugt til at forene og oversætte mellem forskellige ting !nog blokke vha. Ore Dictionaryen. + +tooltip.HeatGenerator=En generator der bruger lavaens varme eller !nandre brændbare ressourcer til at producere energi. +tooltip.SolarGenerator=En generator der bruger solens !nkraft til producere energi. +tooltip.GasGenerator=En generator der udnytter de molekulært !nvariende gasser til producere energi. +tooltip.BioGenerator=En generator der brænder organisk materiale i !nverdenen til producere energi. +tooltip.AdvancedSolarGenerator=En avanceret generator der direkte !nabsorberer solens stråler med lille tab !ntil at producere energi. +tooltip.WindTurbine=En generator der bruger vindens styrke !ntil at producere energi med større effektivitet !nved højere niveauer. + +tooltip.ReactorGlass=Forstærket glas, der kan bruges i !nFusionsreaktor-multiblokken. +tooltip.ReactorLaserFocusMatrix=Et panel af Reaktorglas i !nstand til at absorbere optisk energi og !nderved opvarme Fusionsreaktoren. +tooltip.ReactorController=Den kotrollerende blok til hele !nFusionsreaktorens struktur. +tooltip.ReactorFrame=Forstærket indramning, der kan bruges i !nFusionsreaktor-multiblokken. +tooltip.ReactorNeutronCapturePlate=En blok, der kan bruges til !nbåde at blokere Fusionsreaktorstråling og assistere !ni produktionen af Tritium. +tooltip.ReactorPort=En blok forstærket indramning i stand til !nat håndtere både gas- og energioverførslen !naf Fusionsreaktoren. +tooltip.ReactorLogicAdapter=En blok der kan bruges til at !ntillade basal overvågning af en reaktor vha. rødsten. + +tooltip.OsmiumOre=Et stærkt mineral der kan findes på !nenhver højde i verdenen. Den er!nkendt for at have mange anvendelser i !nthe konstruktionen af maskineri. +tooltip.CopperOre=Et almindeligt, ledende materiale der !nkan bruges i produktionen af !nledninger. Dets evne til at modstå !nhøj varme gør den også essential !ntil avanceret maskineri. +tooltip.TinOre=Et letvægts, dog stadig robust, ledende !nmateriale, der er en smule mindre !nsjælden end Kobber. + +//Side data +sideData.None=Ingen +sideData.Input=Indgang +sideData.Output=Udgang +sideData.Energy=Energi +sideData.Gas=Gas +sideData.Extra=Ekstra +sideData.Infuse=Infuse +sideData.Fluid=Væske + +//Redstone control +control.disabled=Deaktiveret +control.high=Høj +control.low=Lav +control.pulse=Puls +control.disabled.desc=Altid aktiv +control.high.desc=Aktiv med signal +control.low.desc=Aktiv uden signal +control.pulse.desc=Kun aktiv ved modtagelse af første signal + +//Container edit modes +fluidedit.both=Begge +fluidedit.fill=Fyld +fluidedit.empty=Tom + +//Colors +color.black=Sort +color.darkBlue=Mørkeblå +color.darkGreen=Mørkegrøn +color.darkAqua=Mørkeaqua +color.darkRed=Mørkerød +color.purple=Lilla +color.orange=Orange +color.grey=Grå +color.darkGrey=Mørkegrå +color.indigo=Indigo +color.brightGreen=Lysegrøn +color.aqua=Aqua +color.red=Rød +color.pink=Pink +color.yellow=Gul +color.white=Hvid +color.brown=Brun +color.brightPink=Lyserød + +//Dyes +dye.black=Sort +dye.darkBlu=Blå +dye.brown=Brun +dye.darkGreen=Grøn +dye.darkAqua=Cyan +dye.darkRed=Mørkerød +dye.purple=Lilla +dye.orange=Orange +dye.grey=Lysegrå +dye.darkGrey=Mørkegrå +dye.indigo=Lyseblå +dye.brightGreen=Lime +dye.aqua=Aqua +dye.red=Rød +dye.brightPink=Pink +dye.pink=Magenta +dye.yellow=Gul +dye.white=Hvid + +//Reactor Logic modes +reactor.disabled=Deaktiveret +reactor.disabled.desc=Vil ikke udgive et rødstenssignal +reactor.ready=Klar til at tænde +reactor.ready.desc=Reaktoren er nået det nødvendige varmeniveau til at tænde +reactor.capacity=Varmekapacitet mødt +reactor.capacity.desc=Reaktorens kernevarmekapacitet er blevet mødt +reactor.depleted=Utilstrækkelig Brændstof +reactor.depleted.desc=Reaktoren har utilstrækkelig brændstof til at vedligeholde en reaktion + +//Creative tab +itemGroup.tabMekanism=Mekanism + +//NEI stuff +nei.chemicalInjectionChamber=C. Injektionskammer +nei.rotaryCondensentrator=R. Condensentrator + +//**********// +//GENERATORS// +//**********// + +//Items +item.SolarPanel.name=Solpanel +item.Hohlraum.name=Hohlraum + +//Generators +tile.Generator.HeatGenerator.name=Varmegenerator +tile.Generator.SolarGenerator.name=Solgenerator +tile.Generator.GasGenerator.name=Gasbrændende Generator +tile.Generator.BioGenerator.name=Bio-generator +tile.Generator.AdvancedSolarGenerator.name=Avanceret Solgenerator +tile.Generator.WindTurbine.name=Vindturbine + +tile.Reactor.ReactorController.name=Reaktor-controller +tile.Reactor.ReactorFrame.name=Reaktorramme +tile.Reactor.ReactorNeutronCapturePlate.name=Neutronfanger-plade +tile.Reactor.ReactorInOutPort.name=Reaktor-port +tile.Reactor.ReactorLogicAdapter.name=Reaktorlogiks-adapter + +tile.ReactorGlass.ReactorGlass.name=Reaktorglas +tile.ReactorGlass.ReactorLaserFocusMatrix.name=Laserfokus-matrice + +//Gui text +gui.heatGenerator.fuel=Brændstof +gui.solarGenerator.sun=Sol +gui.bioGenerator.bioFuel=Bio-brændsel +gui.electrolyticSeparator.dump=Udstød + +gui.passive=Luftkølet +gui.active=Vandkølet + +gui.minInject=Min. injektionssats +gui.ignition=Tændingstemp. +gui.maxPlasma=Maks. Plasma-temp. +gui.maxCasing=Maks. Casing-temp. +gui.passiveGeneration=Passiv Generering +gui.steamProduction=Dampproduktion + +//*****// +//TOOLS// +//*****// + +//Vanilla Paxels +item.WoodPaxel.name=Træ-paxel +item.StonePaxel.name=Sten-paxel +item.IronPaxel.name=Jern-paxel +item.DiamondPaxel.name=Diamant-paxel +item.GoldPaxel.name=Guld-paxel + +//Obsidian +item.ObsidianHelmet.name=Obsidianhjelm +item.ObsidianChestplate.name=Obsidianbrystplade +item.ObsidianLeggings.name=Obsidianbukser +item.ObsidianBoots.name=Obsidianstøvler +item.ObsidianPaxel.name=Obsidian-paxel +item.ObsidianPickaxe.name=Obsidianhakke +item.ObsidianAxe.name=Obsidianøkse +item.ObsidianShovel.name=Obsidianspade +item.ObsidianHoe.name=Obsidianlugejern +item.ObsidianSword.name=Obsidiansværd + +//Lapis Lazuli +item.LazuliHelmet.name=Lapis Lazuli-hjelm +item.LazuliChestplate.name=Lapis Lazuli-brystplate +item.LazuliLeggings.name=Lapis Lazuli-bukser +item.LazuliBoots.name=Lapis Lazuli-støvler +item.LazuliPaxel.name=Lapis Lazuli-paxel +item.LazuliPickaxe.name=Lapis Lazuli-hakke +item.LazuliAxe.name=Lapis Lazuli-økse +item.LazuliShovel.name=Lapis Lazuli-spade +item.LazuliHoe.name=Lapis Lazuli-lugejern +item.LazuliSword.name=Lapis Lazuli-sværd + +//Osmium +item.OsmiumHelmet.name=Osmiumhjelm +item.OsmiumChestplate.name=Osmiumbrystplade +item.OsmiumLeggings.name=Osmiumbukser +item.OsmiumBoots.name=Osmiumstøvler +item.OsmiumPaxel.name=Osmium-paxel +item.OsmiumPickaxe.name=Osmiumhakke +item.OsmiumAxe.name=Osmiumøkse +item.OsmiumShovel.name=Osmiumspade +item.OsmiumHoe.name=Osmiumlugejern +item.OsmiumSword.name=Osmiumsværd + +//Bronze +item.BronzeHelmet.name=Bronzehjelm +item.BronzeChestplate.name=Bronzebrystplade +item.BronzeLeggings.name=Bronzebukser +item.BronzeBoots.name=Bronzestøvler +item.BronzePaxel.name=Bronze-paxel +item.BronzePickaxe.name=Bronzehakke +item.BronzeAxe.name=Bronzeøkse +item.BronzeShovel.name=Bronzespade +item.BronzeHoe.name=Bronzelugejern +item.BronzeSword.name=Bronzesværd + +//Glow +item.GlowstoneHelmet.name=Glødestenshjelm +item.GlowstoneChestplate.name=Glødestensbrystplade +item.GlowstoneLeggings.name=Glødestensbukser +item.GlowstoneBoots.name=Glødestensstøvler +item.GlowstonePaxel.name=Glødestens-paxel +item.GlowstonePickaxe.name=Glødestenshakke +item.GlowstoneAxe.name=Glødestensøkse +item.GlowstoneShovel.name=Glødestensspade +item.GlowstoneHoe.name=Glødestenslugejern +item.GlowstoneSword.name=Glødestenssværd + +//Steel +item.SteelHelmet.name=Stålhjelm +item.SteelChestplate.name=Stålbrystplade +item.SteelLeggings.name=Stålbukser +item.SteelBoots.name=Stålstøvler +item.SteelPaxel.name=Stål-paxel +item.SteelPickaxe.name=Stålhakke +item.SteelAxe.name=Ståløkse +item.SteelShovel.name=Stålspade +item.SteelHoe.name=Stållugejern +item.SteelSword.name=Stålsværd + +//Config Gui +mekanism.configgui.ctgy.tools.general=Generelt +mekanism.configgui.ctgy.tools.armor=Rustningsbalance +mekanism.configgui.ctgy.tools.tools=Værktøjsbalance + +//Config Tooltips +mekanism.configgui.ctgy.tools.general.tooltip=Indstillinger vedr. MekanismTools' generelle konfiguration. +mekanism.configgui.ctgy.tools.armor.tooltip=Indstillinger vedr. beskyttelsesværdier og balance for MekanismTools rustninger. +mekanism.configgui.ctgy.tools.tools.tooltip=Indstillinger vedr. effektivitetsværdier og balance for MekanismTools værktøj. From 3fe65bdb3a491bb9c1c468816c96f3c8a655b2fa Mon Sep 17 00:00:00 2001 From: Lucas Falch Date: Sun, 21 Feb 2016 23:07:18 +0100 Subject: [PATCH 03/52] Update Danish locale Correct mistakes and add missing translations --- .../resources/assets/mekanism/lang/da_DK.lang | 183 +++++++++++------- 1 file changed, 115 insertions(+), 68 deletions(-) diff --git a/src/main/resources/assets/mekanism/lang/da_DK.lang b/src/main/resources/assets/mekanism/lang/da_DK.lang index 663817486..1ef32add0 100644 --- a/src/main/resources/assets/mekanism/lang/da_DK.lang +++ b/src/main/resources/assets/mekanism/lang/da_DK.lang @@ -6,13 +6,14 @@ tile.ObsidianTNT.name=Obsidian TNT item.EnrichedAlloy.name=Beriget Legering item.ReinforcedAlloy.name=Forstærket Legering -item.AtomicAlloy.name=Kernefysisk Legering -item.EnergyTablet.name=Energi Tablet +item.AtomicAlloy.name=Atomar Legering +item.EnergyTablet.name=Energi-tablet item.SpeedUpgrade.name=Hastighedsopgradering item.EnergyUpgrade.name=Energiopgradering item.FilterUpgrade.name=Filtreringsopgradering +item.GasUpgrade.name=Gasopgradering item.Robit.name=Robit -item.AtomicDisassembler.name=Entomadskiller +item.AtomicDisassembler.name=Atomadskiller item.ElectricBow.name=Elektrisk Bue item.EnrichedIron.name=Beriget Jern item.CompressedCarbon.name=Komprimeret Kulstof @@ -32,12 +33,13 @@ item.ElectrolyticCore.name=Elektrolysekerne item.Sawdust.name=Savsmuld item.Salt.name=Salt item.BrineBucket.name=Saltlagespand -item.LithiumBucket.name=Litiumsspand +item.LithiumBucket.name=Lithiumsspand +item.HeavyWaterBucket.name=Tungtvandsspand item.FreeRunners.name=Fritløbere item.ArmoredJetpack.name=Panseret Jetpack item.FilterCard.name=Filterkort item.SeismicReader.name=Seismisk Aflæser -item.HDPEPellet.name=HDPE-pellets +item.HDPEPellet.name=HDPE-pellet item.HDPERod.name=HDPE-stav item.HDPESheet.name=HDPE-plade item.PlaStick.name=PlaStick @@ -48,7 +50,7 @@ item.BioFuel.name=Biobrændsel //Control Circuits item.BasicControlCircuit.name=Basalt Kontrolkredsløb -item.AdvancedControlCircuit.name=Envanceret Kontrolkredsløb +item.AdvancedControlCircuit.name=Avanceret Kontrolkredsløb item.EliteControlCircuit.name=Elite Kontrolkredsløb item.UltimateControlCircuit.name=Ultimativt Kontrolkredsløb @@ -69,11 +71,11 @@ tile.BasicBlock.OsmiumBlock.name=Osmiumblok tile.BasicBlock.BronzeBlock.name=Bronzeblok tile.BasicBlock.RefinedObsidian.name=Raffineret Obsidian tile.BasicBlock.CharcoalBlock.name=Trækulsblok -tile.BasicBlock.RefinedGlowstone.name=Raffineretglødesten +tile.BasicBlock.RefinedGlowstone.name=Raffineret Glødesten tile.BasicBlock.SteelBlock.name=Stålblok tile.BasicBlock.Bin.name=Papirkurv -tile.BasicBlock.TeleporterFrame.name=Teleportørramme -tile.BasicBlock.SteelCasing.name=Stål Casing +tile.BasicBlock.TeleporterFrame.name=Teleportørindramning +tile.BasicBlock.SteelCasing.name=Stål-casing tile.BasicBlock.DynamicTank.name=Dynamisk Tank tile.BasicBlock.DynamicGlass.name=Dynamisk Glas tile.BasicBlock.DynamicValve.name=Dynamisk Ventil @@ -84,14 +86,14 @@ tile.BasicBlock.SolarEvaporationValve.name=Solfordampningsventil //Basic Block 2 (second ID iteration) tile.BasicBlock2.SolarEvaporationBlock.name=Solfordampningsblok -tile.BasicBlock2.InductionCasing.name=Induktionskasse +tile.BasicBlock2.InductionCasing.name=Induktions-casing tile.BasicBlock2.InductionPort.name=Induktionsport tile.BasicBlock2.InductionCellBasic.name=Basal Induktionscelle -tile.BasicBlock2.InductionCellAdvanced.name=Envanceret Induktionscelle +tile.BasicBlock2.InductionCellAdvanced.name=Avanceret Induktionscelle tile.BasicBlock2.InductionCellElite.name=Elite Induktionscelle tile.BasicBlock2.InductionCellUltimate.name=Ultimativ Induktionscelle tile.BasicBlock2.InductionProviderBasic.name=Basal Induktionsprovider -tile.BasicBlock2.InductionProviderAdvanced.name=Envanceret Induktionsprovider +tile.BasicBlock2.InductionProviderAdvanced.name=Avanceret Induktionsprovider tile.BasicBlock2.InductionProviderElite.name=Elite Induktionsprovider tile.BasicBlock2.InductionProviderUltimate.name=Ultimativ Induktionsprovider @@ -100,9 +102,7 @@ tile.MachineBlock.EnrichmentChamber.name=Berigelseskammer tile.MachineBlock.OsmiumCompressor.name=Osmiumkompressor tile.MachineBlock.Combiner.name=Kombinerer tile.MachineBlock.Crusher.name=Knuser -tile.MachineBlock.BasicFactory.name=Basal Fabrik -tile.MachineBlock.AdvancedFactory.name=Envanceret Fabrik -tile.MachineBlock.EliteFactory.name=Elite Fabrik +tile.MachineBlock.Factory.name=Fabrik tile.MachineBlock.MetallurgicInfuser.name=Metallurgic Infuser tile.MachineBlock.PurificationChamber.name=Rensningskammer tile.MachineBlock.EnergizedSmelter.name=Energibaseret Smelteværk @@ -119,7 +119,7 @@ tile.MachineBlock2.ChemicalOxidizer.name=Kemisk Oxidationsenhed tile.MachineBlock2.ChemicalInfuser.name=Kemisk Infuser tile.MachineBlock2.ChemicalCombiner.name=Kemisk Kombinerer tile.MachineBlock2.ChemicalInjectionChamber.name=Kemisk Injektionskammer -tile.MachineBlock2.ElectrolyticSeparator.name=Electrolyseseparator +tile.MachineBlock2.ElectrolyticSeparator.name=Elektrolytisk Separator tile.MachineBlock2.PrecisionSawmill.name=Precisionssavmølle tile.MachineBlock2.ChemicalDissolutionChamber.name=Kemisk Opløsningskammer tile.MachineBlock2.ChemicalWasher.name=Kemisk vasker @@ -161,32 +161,38 @@ tile.OreBlock.CopperOre.name=Kobbermalm tile.OreBlock.TinOre.name=Tinmalm //Transmitters -item.MultipartTransmitter.PressurizedTube.name=Trykrør +item.MultipartTransmitter.BasicPressurizedTube.name=Basal Tryk-tube +item.MultipartTransmitter.AdvancedPressurizedTube.name=Avanceret Tryk-tube +item.MultipartTransmitter.ElitePressurizedTube.name=Elite Tryk-tube +item.MultipartTransmitter.UltimatePressurizedTube.name=Ultimativ Tryk-tube item.MultipartTransmitter.BasicUniversalCable.name=Basalt Universalkabel -item.MultipartTransmitter.AdvancedUniversalCable.name=Envanceret Universalkabel +item.MultipartTransmitter.AdvancedUniversalCable.name=Avanceret Universalkabel item.MultipartTransmitter.EliteUniversalCable.name=Elite Universalkabel item.MultipartTransmitter.UltimateUniversalCable.name=Ultimativt Universalkabel item.MultipartTransmitter.BasicMechanicalPipe.name=Basalt Mekanisk Rør -item.MultipartTransmitter.AdvancedMechanicalPipe.name=Envanceret Mekanisk Rør +item.MultipartTransmitter.AdvancedMechanicalPipe.name=Avanceret Mekanisk Rør item.MultipartTransmitter.EliteMechanicalPipe.name=Elite Mekanisk Rør item.MultipartTransmitter.UltimateMechanicalPipe.name=Ultimativt Mekanisk Rør -item.MultipartTransmitter.LogisticalTransporter.name=Logistisk Transporter +item.MultipartTransmitter.BasicLogisticalTransporter.name=Basal Logistisk Transportør +item.MultipartTransmitter.AdvancedLogisticalTransporter.name=Avanceret Logistisk Transportør +item.MultipartTransmitter.EliteLogisticalTransporter.name=Elite Logistisk Transportør +item.MultipartTransmitter.UltimateLogisticalTransporter.name=Ultimativ Logistisk Transportør item.MultipartTransmitter.RestrictiveTransporter.name=Begrænsende Transporter -item.MultipartTransmitter.DiversionTransporter.name=Enfledningstransporter +item.MultipartTransmitter.DiversionTransporter.name=Afledningstransporter //Glow Panel item.GlowPanel.name=Glødepanel //Energy Cubes -tile.EnergyCube.Basic.name=Basal Energikube -tile.EnergyCube.Advanced.name=Envanceret Energikube -tile.EnergyCube.Elite.name=Elite Energikube -tile.EnergyCube.Ultimate.name=Ultimativ Energikube -tile.EnergyCube.Creative.name=Kreativ Energikube +tile.EnergyCubeBasic.name=Basal Energikube +tile.EnergyCubeAdvanced.name=Avanceret Energikube +tile.EnergyCubeElite.name=Elite Energikube +tile.EnergyCubeUltimate.name=Ultimativ Energikube +tile.EnergyCubeCreative.name=Kreativ Energikube //Factory Installers item.basicFactoryInstaller.name=Basal Fabrikinstallerer -item.advancedFactoryInstaller.name=Endvanceret Fabrikinstallerer +item.advancedFactoryInstaller.name=Avanceret Fabrikinstallerer item.eliteFactoryInstaller.name=Elite Fabrikinstallerer //Dust @@ -277,7 +283,6 @@ gas.silver=Sølvslurry gas.obsidian=Obsidianslurry gas.lead=Blyslurry - gas.cleanIron=Ren Jernslurry gas.cleanGold=Ren Guldslurry gas.cleanOsmium=Ren Osmiumslurry @@ -318,6 +323,13 @@ oregas.silver=Sølvmalm oregas.obsidian=Obsidianmalm oregas.lead=Blymalm +//Tier names +tier.Basic=Basal +tier.Advanced=Avanceret +tier.Elite=Elite +tier.Ultimate=Ultimativ +tier.Creative=Kreativ + //Transmission types transmission.Energy=Energi transmission.Fluids=Væsker @@ -340,6 +352,8 @@ upgrade.speed=Hastighed upgrade.speed.desc=Øger hastigheden på maskinen. upgrade.filter=Filter upgrade.filter.desc=Et filter som sepererer !ntungtvand fra almindelig vand. +upgrade.gas=Gas +upgrade.gas.desc=Øger effektiviteten !naf gasforbrugende maskineri. //Key description text key.mode=Ændr Itemmodus @@ -372,15 +386,15 @@ gui.decondensentrating=Decondensentrating gui.power=Strøm gui.confirm=Bekræft gui.open=Åbn -gui.allOK=Enlt OK +gui.allOK=Alt OK gui.none=Ingen -gui.new=Ny +gui.new=Nyt gui.edit=Ændr gui.save=Lagr gui.output=Udgang gui.delete=Slet gui.status=Status -gui.autoEject=Enuto-udstød +gui.autoEject=Auto-udstød gui.itemstack=ItemStack gui.oredict=OreDict gui.material=Materiale @@ -412,22 +426,23 @@ gui.modID=Mod ID gui.key=Nøgle gui.id=ID gui.finished=Færdig -gui.well=Enlt er vel! +gui.well=Alt er vel! gui.upgrade=Opgradér gui.infinite=Uendelig gui.min=Min gui.max=Maks gui.delay=Forsinkelse gui.noDelay=Ingen forsinkelse -gui.fuel=Brændsel +gui.fuel=Brændstof gui.heat=Varme gui.formed=Formet gui.incomplete=Ufuldstændig -gui.inductionMatrix=Induktionsatrice -gui.matrixStats=Matricestatistik +gui.inductionMatrix=Induktionsmatrice +gui.matrixStats=Matrice-statistik gui.main=Hoved gui.outputting=Outputting -gui.dimensions=dimensioner +gui.receiving=Modtager +gui.dimensions=Dimensioner gui.constituents=Bestanddele gui.cells=celler gui.providers=providers @@ -441,9 +456,31 @@ gui.public=Offentlig gui.private=Privat gui.add=Tilføj gui.set=Sæt -gui.freq=Frekvens +gui.freq=Frek. gui.security=Sikkerhed gui.index=Indeks +gui.producing=Producing +gui.maxOutput=Max Output +gui.storing=Storing +gui.skyBlocked=Sky blocked +gui.using=Using +gui.needed=Needed +gui.noRecipe=No recipe +gui.conflict=Conflict +gui.height=Height +gui.mult=Mult +gui.chunk=Chunk +gui.vibrating=Vibrating +gui.abundancy=Abundancy +gui.nextItem=Next Item +gui.lastItem=Last Item +gui.oreDictCompat=Compatible OreDict Key +gui.toggleCooling=Toggle Cooling Measurements +gui.coolingMeasurements=Active cooling +gui.redstoneOutputMode=Redstone mode +gui.entityDetection=Entity Detection +gui.moveUp=Move Up +gui.moveDown=Move Down gui.reactor.injectionRate=Injektionssats @@ -454,8 +491,8 @@ gui.upgrades.amount=Mængde gui.upgrades.max=Maks gui.upgrades.effect=Effekt -gui.chemicalInfuser.short=C. Infuser -gui.chemicalDissolutionChamber.short=C. Opløsningskammer +gui.chemicalInfuser.short=K. Infuser +gui.chemicalDissolutionChamber.short=K. Opløsningskammer gui.solarEvaporationController.short=Sol E. Kontrollør gui.dictionary.noKey=Ingen nøgle. @@ -463,25 +500,27 @@ gui.dictionary.noKey=Ingen nøgle. gui.configuration=Konfiguration gui.config=Konfig gui.configuration.side=Sidekonfig -gui.configuration.transporter=Transportørskonfig +gui.configuration.transporter=Transporter-konfig gui.configuration.strictInput=Striks Input -gui.rotaryCondensentrator.toggleOperation=Byt operation +gui.rotaryCondensentrator.toggleOperation=Skift operation gui.factory.secondaryEnergy=Sekundær energi -gui.factory.smelting=Smeltning -gui.factory.enriching=Berigelse -gui.factory.crushing=Knusning -gui.factory.compressing=Komprimering -gui.factory.combining=Kombinering -gui.factory.purifying=Rensning -gui.factory.injecting=Injicering -gui.factory.autoSort=Enuto-sorterer +gui.factory.autoSort=Auto-sortér + +//Recipe types +gui.factory.Smelting=Smeltnings +gui.factory.Enriching=Berigelses +gui.factory.Crushing=Knusnings +gui.factory.Compressing=Komprimerings +gui.factory.Combining=Kombinerings +gui.factory.Purifying=Rensnings +gui.factory.Injecting=Injicerings gui.seismicReader.short=S. Aflæser gui.seismicReader.solids=Faste Stoffer gui.seismicReader.fluids=Væsker -gui.seismicReader.reading=Læser +gui.seismicReader.reading=Aflæser gui.filterSelect.title=Lav Nyt Filter @@ -525,18 +564,18 @@ gui.password.fieldsEmpty=Felt(er) tomme gui.password.notMatching=Matcher ikke gui.password.identical=Idenstisk gui.password.invalid=Ugyldig -gui.password=Endgangskode +gui.password=Adgangskode gui.logisticalSorter.default=Standard -gui.logisticalSorter.auto=Enuto +gui.logisticalSorter.auto=Auto gui.logisticalSorter.roundRobin=Round-robin -gui.electricChest.editPassword=Ændr Adgangskode +gui.electricChest.editPassword=Ændr Kode gui.teleporter.notReady=Ikke klar gui.teleporter.ready=Klar -gui.teleporter.noFrame=Ingen ramme -gui.teleporter.noLink=Ingen tilkobling +gui.teleporter.noFrame=Ingen indramning +gui.teleporter.noLink=Ingen tilkoblinge gui.teleporter.exceeds=Tilkoblinger > 2 gui.teleporter.needsEnergy=Mangler energi gui.teleporter.noAccess=Du har ikke adgang til denne teleportør. @@ -544,13 +583,13 @@ gui.teleporter.noFreq=Ingen frekvens gui.digitalMinerConfig=Digital Miner Konfig -gui.digitalMiner.autoPull=Enuto-træk +gui.digitalMiner.autoPull=Auto-træk gui.digitalMiner.replaceBlock=Erstat blok gui.digitalMiner.reset=Nulstil gui.digitalMiner.silkTouch=Silk touch gui.digitalMiner.pull=Træk gui.digitalMiner.silk=Silk -gui.digitalMiner.toMine=Ent grave +gui.digitalMiner.toMine=At grave gui.digitalMiner.running=Kører gui.digitalMiner.inverse=Inverse modus gui.digitalMiner.requireReplace=Kræv erstatning @@ -566,7 +605,7 @@ tooltip.configurator.empty=Tom tooltip.configurator.rotate=Rotér tooltip.configurator.wrench=Skruenøgle tooltip.configurator.pumpReset=Nulstil Elektrisk Pumpe udregning -tooltip.configurator.toggleDiverter=Enfledermodus ændret til +tooltip.configurator.toggleDiverter=Afledermodus ændret til tooltip.configurator.toggleMode=%s opførsel ændret til tooltip.configurator.viewMode=Nuværende %s opførsel tooltip.configurator.unauth=Denne kiste er låst @@ -576,6 +615,8 @@ tooltip.configurator.dim=dimension tooltip.configurator.setLink=Sæt tilkobling til blok tooltip.configurator.plenisherReset=Nulstil Fluidisk Plenisher udregning tooltip.configurator.inductionPortMode=Skiftet Indukstionsports overføringsmodus til +tooltip.configurator.toggleColor=Farve skiftet til +tooltip.configurator.viewColor=Nuværende farve tooltip.upgrade.speed=Hastighed tooltip.upgrade.energy=Energi @@ -620,8 +661,10 @@ tooltip.configureState=Konfigurér tilstand tooltip.outputRate=Output Sats tooltip.insufficientFuel=Utilstrækkelig Brændsel tooltip.readyForReaction=Klar til Reaktion +tooltip.speed=Fart +tooltip.and=og -tooltip.portableTank.bucketMode=Spandmodus +tooltip.portableTank.bucketMode=Spand-modus tooltip.disassembler.normal=normal tooltip.disassembler.slow=langsom @@ -638,6 +681,10 @@ tooltip.filterCard.oredictionificator=Oredictionificator tooltip.balloon=Ballon +tooltip.jetpack.regular=Almindelig +tooltip.jetpack.hover=Svæv +tooltip.jetpack.disabled=Deaktiveret + tooltip.flamethrower.combat=Kamp tooltip.flamethrower.heat=Opvarm tooltip.flamethrower.inferno=Inferno @@ -650,11 +697,11 @@ tooltip.EnrichmentChamber=En simpel maskine brugt til at berige malm om til !nto tooltip.OsmiumCompressor=En nogenlunde avanceret maskine brugt til at !nkomprimere osmium om til adskillige støve for !nså at kunne lave deres barremodparter. tooltip.Combiner=En maskine brugt til at kombinere støv og brosten !nfor at forme deres malmmodparter. tooltip.Crusher=En maskine brugt til at knuse barrer om til deres støvmodparter, !nså vel som at udføre mange andre operationer. -tooltip.DigitalMiner=En højtavanceret, filterbaseret, auto-miner !nder kan mine hvilken som helst blok du beder den om !inden for en 32-bloks(maks)radius. +tooltip.DigitalMiner=En højtavanceret, filterbaseret, auto-miner !nder kan mine hvilken som helst blok du beder den om !ninden for en 32-bloks(maks)radius. tooltip.BasicFactory=Det laveste tier i linjen af Fabrikker, !nder kan bruges til at processere forskellige !nmaskinoperationer ad gangen. tooltip.AdvancedFactory=Det mellemste tier i linjen af Fabrikker, !nder kan bruges til at processere forskellige !nmaskinoperationer ad gangen. tooltip.EliteFactory=The højeste tier i linjen af Fabrikker, !nder kan bruges til at processere forskellige !nmaskinoperationer ad gangen. -tooltip.MetallurgicInfuser=En maskine brugt til at infuse adskillige materialer !nom til (generalt) metaller til at lave legeringer !nog andre sammensætninger. +tooltip.MetallurgicInfuser=En maskine brugt til at infuse adskillige materialer !nom til (generelt) metaller til at lave legeringer !nog andre sammensætninger. tooltip.PurificationChamber=En avanceret maskine i stand til at processere !nmalm om til the klumper: Bruges som det indledende !nfase i 300%-malmforarbejdning. tooltip.EnergizedSmelter=En simpel maskine der bruges som en Mekanism-baseret !novn, der kører på energy. tooltip.Teleporter=En maskine i stand til at teleportere spillere til forskellige !nsteder defineret af en anden teleporter. @@ -674,12 +721,12 @@ tooltip.ChemicalInfuser=En maskine, der producerer en ny !ngas ved infuse til an tooltip.SeismicVibrator=En maskine, der bruger seismiske vibrationer til at !ngive information om forskellige lag !ni verdenen. tooltip.PressurizedReactionChamber=En avanceret maskine der forarbejder en !nfast, flydende og gasformig blanding og !nlaver både et gasformigt og fast produkt. tooltip.PortableTank=En handy, mobil tank, der lader dig !nbære 14 spande væske hvorhen du !nønsker. Kan også bruges som spand! -tooltip.FluidicPlenisher=En maskine i stand til at lave hele !nsøer ved at fylde slugter med væske. +tooltip.FluidicPlenisher=En maskine i stand til at lave hele !nsøer ved at fylde slugter op med væske. tooltip.Laser=En avanceret form for linær!nenergitransfer der udnytter en!nekstremt kollimeret lysstråle. -tooltip.LaserAmplifier=En blok that can be brugt til at merge,!nredirect and amplify laser beams,!nwith fine controls over when to fire. -tooltip.LaserTractorBeam=En blok brugt til at forene og!omdirigere laserstråler. Indsamler!ndrops fra blokke, den ødelægger. +tooltip.LaserAmplifier=En blok that can be brugt til at merge,!nomdirigere og forstærke laserstråler,!nmed finkontrollering over hvornår der skydes. +tooltip.LaserTractorBeam=En blok brugt til at forene og!nomdirigere laserstråler. Indsamler!ndrops fra blokke, den ødelægger. tooltip.SolarNeutronActivator=En maskine der dirigerer neutronstrålingen !nfra solen om til sin interne reserve, hvilket tillader !nen langsom dannelse af forskelige isotoper. -tooltip.Oredictionificator=En maskine brugt til at forene og oversætte mellem forskellige ting !nog blokke vha. Ore Dictionaryen. +tooltip.Oredictionificator=En maskine brugt til at forene og !noversætte mellem forskellige ting !nog blokke vha. Ore Dictionaryen. tooltip.HeatGenerator=En generator der bruger lavaens varme eller !nandre brændbare ressourcer til at producere energi. tooltip.SolarGenerator=En generator der bruger solens !nkraft til producere energi. @@ -696,7 +743,7 @@ tooltip.ReactorNeutronCapturePlate=En blok, der kan bruges til !nbåde at bloker tooltip.ReactorPort=En blok forstærket indramning i stand til !nat håndtere både gas- og energioverførslen !naf Fusionsreaktoren. tooltip.ReactorLogicAdapter=En blok der kan bruges til at !ntillade basal overvågning af en reaktor vha. rødsten. -tooltip.OsmiumOre=Et stærkt mineral der kan findes på !nenhver højde i verdenen. Den er!nkendt for at have mange anvendelser i !nthe konstruktionen af maskineri. +tooltip.OsmiumOre=Et stærkt mineral der kan findes på !nenhver højde i verdenen. Den er!nkendt for at have mange anvendelser i !nkonstruktionen af maskineri. tooltip.CopperOre=Et almindeligt, ledende materiale der !nkan bruges i produktionen af !nledninger. Dets evne til at modstå !nhøj varme gør den også essential !ntil avanceret maskineri. tooltip.TinOre=Et letvægts, dog stadig robust, ledende !nmateriale, der er en smule mindre !nsjælden end Kobber. @@ -779,7 +826,7 @@ reactor.depleted.desc=Reaktoren har utilstrækkelig brændstof til at vedligehol itemGroup.tabMekanism=Mekanism //NEI stuff -nei.chemicalInjectionChamber=C. Injektionskammer +nei.chemicalInjectionChamber=K. Injektionskammer nei.rotaryCondensentrator=R. Condensentrator //**********// @@ -799,7 +846,7 @@ tile.Generator.AdvancedSolarGenerator.name=Avanceret Solgenerator tile.Generator.WindTurbine.name=Vindturbine tile.Reactor.ReactorController.name=Reaktor-controller -tile.Reactor.ReactorFrame.name=Reaktorramme +tile.Reactor.ReactorFrame.name=Reaktorindramning tile.Reactor.ReactorNeutronCapturePlate.name=Neutronfanger-plade tile.Reactor.ReactorInOutPort.name=Reaktor-port tile.Reactor.ReactorLogicAdapter.name=Reaktorlogiks-adapter From 3c1496740cdf3ddbc32a6a58ce4020f2ab3bcd8c Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Wed, 24 Feb 2016 17:01:43 -0500 Subject: [PATCH 04/52] Tiered Gas Tanks and tiered Fluid Tanks! --- .../java/mekanism/client/ClientProxy.java | 10 +- .../mekanism/client/MekanismKeyHandler.java | 2 +- ...GuiPortableTank.java => GuiFluidTank.java} | 8 +- .../java/mekanism/client/gui/GuiGasTank.java | 4 +- ...lPortableTank.java => ModelFluidTank.java} | 9 +- ...ChemicalInjectionChamberRecipeHandler.java | 20 ++- .../nei/PurificationChamberRecipeHandler.java | 8 +- .../client/render/MekanismRenderer.java | 4 +- .../render/item/ItemRenderingHandler.java | 23 ++-- ...PortableTank.java => RenderFluidTank.java} | 27 ++-- .../render/tileentity/RenderGasTank.java | 7 +- .../java/mekanism/common/CommonProxy.java | 10 +- src/main/java/mekanism/common/Mekanism.java | 58 ++++++--- src/main/java/mekanism/common/Tier.java | 121 ++++++++++++++++++ .../java/mekanism/common/base/ITierItem.java | 11 ++ .../mekanism/common/block/BlockBasic.java | 10 +- .../common/block/BlockEnergyCube.java | 1 + .../mekanism/common/block/BlockGasTank.java | 8 ++ .../mekanism/common/block/BlockMachine.java | 40 ++++-- .../container/ContainerPortableTank.java | 6 +- .../mekanism/common/item/ItemBlockBasic.java | 25 ++-- .../common/item/ItemBlockEnergyCube.java | 1 + .../common/item/ItemBlockGasTank.java | 71 +++++++--- .../common/item/ItemBlockMachine.java | 67 +++++++--- .../common/item/ItemGaugeDropper.java | 6 +- ...ableTank.java => TileEntityFluidTank.java} | 35 +++-- .../common/tile/TileEntityGasTank.java | 33 +++-- .../mekanism/common/util/MekanismUtils.java | 21 ++- .../mekanism/common/util/RecipeUtils.java | 6 +- .../generators/common/MekanismGenerators.java | 3 +- .../resources/assets/mekanism/lang/en_US.lang | 14 +- .../assets/mekanism/render/FluidTank.png | Bin 0 -> 2578 bytes .../assets/mekanism/render/FluidTankOn.png | Bin 0 -> 2638 bytes .../assets/mekanism/render/GasTank.png | Bin 3253 -> 0 bytes .../mekanism/render/GasTankAdvanced.png | Bin 0 -> 3245 bytes .../assets/mekanism/render/GasTankBasic.png | Bin 0 -> 3241 bytes .../assets/mekanism/render/GasTankElite.png | Bin 0 -> 3231 bytes .../mekanism/render/GasTankUltimate.png | Bin 0 -> 3238 bytes .../assets/mekanism/render/PortableTank.png | Bin 1775 -> 0 bytes .../assets/mekanism/render/PortableTankOn.png | Bin 1284 -> 0 bytes 40 files changed, 498 insertions(+), 171 deletions(-) rename src/main/java/mekanism/client/gui/{GuiPortableTank.java => GuiFluidTank.java} (91%) rename src/main/java/mekanism/client/model/{ModelPortableTank.java => ModelFluidTank.java} (93%) rename src/main/java/mekanism/client/render/tileentity/{RenderPortableTank.java => RenderFluidTank.java} (84%) create mode 100644 src/main/java/mekanism/common/base/ITierItem.java rename src/main/java/mekanism/common/tile/{TileEntityPortableTank.java => TileEntityFluidTank.java} (92%) create mode 100755 src/main/resources/assets/mekanism/render/FluidTank.png create mode 100644 src/main/resources/assets/mekanism/render/FluidTankOn.png delete mode 100644 src/main/resources/assets/mekanism/render/GasTank.png create mode 100644 src/main/resources/assets/mekanism/render/GasTankAdvanced.png create mode 100644 src/main/resources/assets/mekanism/render/GasTankBasic.png create mode 100644 src/main/resources/assets/mekanism/render/GasTankElite.png create mode 100644 src/main/resources/assets/mekanism/render/GasTankUltimate.png delete mode 100755 src/main/resources/assets/mekanism/render/PortableTank.png delete mode 100644 src/main/resources/assets/mekanism/render/PortableTankOn.png diff --git a/src/main/java/mekanism/client/ClientProxy.java b/src/main/java/mekanism/client/ClientProxy.java index df433814c..06e6f1fde 100644 --- a/src/main/java/mekanism/client/ClientProxy.java +++ b/src/main/java/mekanism/client/ClientProxy.java @@ -41,7 +41,7 @@ import mekanism.client.gui.GuiOsmiumCompressor; import mekanism.client.gui.GuiPRC; import mekanism.client.gui.GuiPasswordEnter; import mekanism.client.gui.GuiPasswordModify; -import mekanism.client.gui.GuiPortableTank; +import mekanism.client.gui.GuiFluidTank; import mekanism.client.gui.GuiPrecisionSawmill; import mekanism.client.gui.GuiPurificationChamber; import mekanism.client.gui.GuiRobitCrafting; @@ -93,7 +93,7 @@ import mekanism.client.render.tileentity.RenderLaserTractorBeam; import mekanism.client.render.tileentity.RenderLogisticalSorter; import mekanism.client.render.tileentity.RenderMetallurgicInfuser; import mekanism.client.render.tileentity.RenderObsidianTNT; -import mekanism.client.render.tileentity.RenderPortableTank; +import mekanism.client.render.tileentity.RenderFluidTank; import mekanism.client.render.tileentity.RenderPressurizedReactionChamber; import mekanism.client.render.tileentity.RenderRotaryCondensentrator; import mekanism.client.render.tileentity.RenderThermalEvaporationController; @@ -160,7 +160,7 @@ import mekanism.common.tile.TileEntityObsidianTNT; import mekanism.common.tile.TileEntityOredictionificator; import mekanism.common.tile.TileEntityOsmiumCompressor; import mekanism.common.tile.TileEntityPRC; -import mekanism.common.tile.TileEntityPortableTank; +import mekanism.common.tile.TileEntityFluidTank; import mekanism.common.tile.TileEntityPrecisionSawmill; import mekanism.common.tile.TileEntityPurificationChamber; import mekanism.common.tile.TileEntityRotaryCondensentrator; @@ -320,7 +320,7 @@ public class ClientProxy extends CommonProxy ClientRegistry.registerTileEntity(TileEntityChemicalCrystallizer.class, "ChemicalCrystallizer", new RenderChemicalCrystallizer()); ClientRegistry.registerTileEntity(TileEntitySeismicVibrator.class, "SeismicVibrator", new RenderSeismicVibrator()); ClientRegistry.registerTileEntity(TileEntityPRC.class, "PressurizedReactionChamber", new RenderPressurizedReactionChamber()); - ClientRegistry.registerTileEntity(TileEntityPortableTank.class, "PortableTank", new RenderPortableTank()); + ClientRegistry.registerTileEntity(TileEntityFluidTank.class, "PortableTank", new RenderFluidTank()); //TODO rename ClientRegistry.registerTileEntity(TileEntityFluidicPlenisher.class, "FluidicPlenisher", new RenderFluidicPlenisher()); ClientRegistry.registerTileEntity(TileEntityLaser.class, "Laser", new RenderLaser()); ClientRegistry.registerTileEntity(TileEntityLaserAmplifier.class, "LaserAmplifier", new RenderLaserAmplifier()); @@ -490,7 +490,7 @@ public class ClientProxy extends CommonProxy case 40: return new GuiPRC(player.inventory, (TileEntityPRC)tileEntity); case 41: - return new GuiPortableTank(player.inventory, (TileEntityPortableTank)tileEntity); + return new GuiFluidTank(player.inventory, (TileEntityFluidTank)tileEntity); case 42: return new GuiFluidicPlenisher(player.inventory, (TileEntityFluidicPlenisher)tileEntity); case 43: diff --git a/src/main/java/mekanism/client/MekanismKeyHandler.java b/src/main/java/mekanism/client/MekanismKeyHandler.java index 5b8a0cf9f..42d9a1dd8 100644 --- a/src/main/java/mekanism/client/MekanismKeyHandler.java +++ b/src/main/java/mekanism/client/MekanismKeyHandler.java @@ -91,7 +91,7 @@ public class MekanismKeyHandler extends MekKeyHandler { ItemBlockMachine machine = (ItemBlockMachine)item; - if(MachineType.get(toolStack) == MachineType.PORTABLE_TANK) + if(MachineType.get(toolStack) == MachineType.FLUID_TANK) { machine.setBucketMode(toolStack, !machine.getBucketMode(toolStack)); Mekanism.packetHandler.sendToServer(new PortableTankStateMessage(machine.getBucketMode(toolStack))); diff --git a/src/main/java/mekanism/client/gui/GuiPortableTank.java b/src/main/java/mekanism/client/gui/GuiFluidTank.java similarity index 91% rename from src/main/java/mekanism/client/gui/GuiPortableTank.java rename to src/main/java/mekanism/client/gui/GuiFluidTank.java index 4412516a7..f60d72a5e 100644 --- a/src/main/java/mekanism/client/gui/GuiPortableTank.java +++ b/src/main/java/mekanism/client/gui/GuiFluidTank.java @@ -7,7 +7,7 @@ import mekanism.client.gui.element.GuiFluidGauge.IFluidInfoHandler; import mekanism.client.gui.element.GuiSlot.SlotOverlay; import mekanism.client.gui.element.GuiSlot.SlotType; import mekanism.common.inventory.container.ContainerPortableTank; -import mekanism.common.tile.TileEntityPortableTank; +import mekanism.common.tile.TileEntityFluidTank; import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; @@ -19,11 +19,11 @@ import cpw.mods.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; @SideOnly(Side.CLIENT) -public class GuiPortableTank extends GuiMekanism +public class GuiFluidTank extends GuiMekanism { - public TileEntityPortableTank tileEntity; + public TileEntityFluidTank tileEntity; - public GuiPortableTank(InventoryPlayer inventory, TileEntityPortableTank tentity) + public GuiFluidTank(InventoryPlayer inventory, TileEntityFluidTank tentity) { super(tentity, new ContainerPortableTank(inventory, tentity)); tileEntity = tentity; diff --git a/src/main/java/mekanism/client/gui/GuiGasTank.java b/src/main/java/mekanism/client/gui/GuiGasTank.java index 737d80b25..3bec4dfcf 100644 --- a/src/main/java/mekanism/client/gui/GuiGasTank.java +++ b/src/main/java/mekanism/client/gui/GuiGasTank.java @@ -46,7 +46,7 @@ public class GuiGasTank extends GuiMekanism int xAxis = (mouseX - (width - xSize) / 2); int yAxis = (mouseY - (height - ySize) / 2); - String capacityInfo = tileEntity.gasTank.getStored() + "/" + tileEntity.MAX_GAS; + String capacityInfo = tileEntity.gasTank.getStored() + "/" + tileEntity.tier.storage; fontRendererObj.drawString(tileEntity.getInventoryName(), (xSize / 2) - (fontRendererObj.getStringWidth(tileEntity.getInventoryName()) / 2), 6, 0x404040); fontRendererObj.drawString(capacityInfo, 45, 40, 0x404040); @@ -74,7 +74,7 @@ public class GuiGasTank extends GuiMekanism if(tileEntity.gasTank.getGas() != null) { - int scale = (int)(((double)tileEntity.gasTank.getStored() / tileEntity.MAX_GAS) * 72); + int scale = (int)(((double)tileEntity.gasTank.getStored() / tileEntity.tier.storage) * 72); drawTexturedModalRect(guiWidth + 65, guiHeight + 17, 176, 0, scale, 10); } diff --git a/src/main/java/mekanism/client/model/ModelPortableTank.java b/src/main/java/mekanism/client/model/ModelFluidTank.java similarity index 93% rename from src/main/java/mekanism/client/model/ModelPortableTank.java rename to src/main/java/mekanism/client/model/ModelFluidTank.java index 297e199fc..ffc7d375d 100644 --- a/src/main/java/mekanism/client/model/ModelPortableTank.java +++ b/src/main/java/mekanism/client/model/ModelFluidTank.java @@ -1,14 +1,14 @@ package mekanism.client.model; import mekanism.client.render.MekanismRenderer; - +import mekanism.common.Tier.FluidTankTier; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) -public class ModelPortableTank extends ModelBase +public class ModelFluidTank extends ModelBase { ModelRenderer Base; ModelRenderer PoleFL; @@ -21,7 +21,7 @@ public class ModelPortableTank extends ModelBase ModelRenderer RightGlass; ModelRenderer LeftGlass; - public ModelPortableTank() + public ModelFluidTank() { textureWidth = 128; textureHeight = 128; @@ -88,7 +88,7 @@ public class ModelPortableTank extends ModelBase setRotation(LeftGlass, 0F, 0F, 0F); } - public void render(float size) + public void render(float size, FluidTankTier tier) { Base.render(size); PoleFL.render(size); @@ -98,6 +98,7 @@ public class ModelPortableTank extends ModelBase Top.render(size); MekanismRenderer.blendOn(); + MekanismRenderer.color(tier.getBaseTier().getColor()); FrontGlass.render(size); BackGlass.render(size); RightGlass.render(size); diff --git a/src/main/java/mekanism/client/nei/ChemicalInjectionChamberRecipeHandler.java b/src/main/java/mekanism/client/nei/ChemicalInjectionChamberRecipeHandler.java index 7bd17aeb0..e94cb15cf 100644 --- a/src/main/java/mekanism/client/nei/ChemicalInjectionChamberRecipeHandler.java +++ b/src/main/java/mekanism/client/nei/ChemicalInjectionChamberRecipeHandler.java @@ -9,6 +9,7 @@ import mekanism.api.gas.GasRegistry; import mekanism.api.util.ListUtils; import mekanism.client.gui.GuiChemicalInjectionChamber; import mekanism.client.gui.element.GuiProgress.ProgressBar; +import mekanism.common.Tier.GasTankTier; import mekanism.common.recipe.RecipeHandler.Recipe; import mekanism.common.recipe.machines.InjectionRecipe; import mekanism.common.util.LangUtils; @@ -49,18 +50,31 @@ public class ChemicalInjectionChamberRecipeHandler extends AdvancedMachineRecipe { List fuels = new ArrayList(); fuels.addAll(OreDictionary.getOres("dustSulfur")); - fuels.add(MekanismUtils.getFullGasTank(GasRegistry.getGas("sulfuricAcid"))); + + for(GasTankTier tier : GasTankTier.values()) + { + fuels.add(MekanismUtils.getFullGasTank(tier, GasRegistry.getGas("sulfuricAcid"))); + } + return fuels; } else if(gasType == GasRegistry.getGas("water")) { - return ListUtils.asList(MekanismUtils.getFullGasTank(GasRegistry.getGas("water"))); + for(GasTankTier tier : GasTankTier.values()) + { + return ListUtils.asList(MekanismUtils.getFullGasTank(tier, GasRegistry.getGas("water"))); + } } else if(gasType == GasRegistry.getGas("hydrogenChloride")) { List fuels = new ArrayList(); fuels.addAll(OreDictionary.getOres("dustSalt")); - fuels.add(MekanismUtils.getFullGasTank(GasRegistry.getGas("hydrogenChloride"))); + + for(GasTankTier tier : GasTankTier.values()) + { + fuels.add(MekanismUtils.getFullGasTank(tier, GasRegistry.getGas("hydrogenChloride"))); + } + return fuels; } diff --git a/src/main/java/mekanism/client/nei/PurificationChamberRecipeHandler.java b/src/main/java/mekanism/client/nei/PurificationChamberRecipeHandler.java index 0643f41dd..db1e61bca 100644 --- a/src/main/java/mekanism/client/nei/PurificationChamberRecipeHandler.java +++ b/src/main/java/mekanism/client/nei/PurificationChamberRecipeHandler.java @@ -7,8 +7,9 @@ import java.util.List; import mekanism.api.gas.Gas; import mekanism.api.gas.GasRegistry; import mekanism.api.util.ListUtils; -import mekanism.client.gui.element.GuiProgress.ProgressBar; import mekanism.client.gui.GuiPurificationChamber; +import mekanism.client.gui.element.GuiProgress.ProgressBar; +import mekanism.common.Tier.GasTankTier; import mekanism.common.recipe.RecipeHandler.Recipe; import mekanism.common.recipe.machines.PurificationRecipe; import mekanism.common.util.LangUtils; @@ -53,7 +54,10 @@ public class PurificationChamberRecipeHandler extends AdvancedMachineRecipeHandl { if(gasType == GasRegistry.getGas("oxygen")) { - return ListUtils.asList(new ItemStack(Items.flint), MekanismUtils.getFullGasTank(GasRegistry.getGas("oxygen"))); + for(GasTankTier tier : GasTankTier.values()) + { + return ListUtils.asList(new ItemStack(Items.flint), MekanismUtils.getFullGasTank(tier, GasRegistry.getGas("oxygen"))); + } } return new ArrayList(); diff --git a/src/main/java/mekanism/client/render/MekanismRenderer.java b/src/main/java/mekanism/client/render/MekanismRenderer.java index 8e0465d7c..cf2165b7a 100644 --- a/src/main/java/mekanism/client/render/MekanismRenderer.java +++ b/src/main/java/mekanism/client/render/MekanismRenderer.java @@ -15,7 +15,7 @@ import mekanism.api.infuse.InfuseType; import mekanism.api.transmitters.TransmissionType; import mekanism.client.render.tileentity.RenderConfigurableMachine; import mekanism.client.render.tileentity.RenderDynamicTank; -import mekanism.client.render.tileentity.RenderPortableTank; +import mekanism.client.render.tileentity.RenderFluidTank; import mekanism.client.render.tileentity.RenderThermalEvaporationController; import mekanism.common.ObfuscatedNames; import mekanism.common.base.ISpecialBounds; @@ -142,7 +142,7 @@ public class MekanismRenderer RenderDynamicTank.resetDisplayInts(); RenderThermalEvaporationController.resetDisplayInts(); - RenderPortableTank.resetDisplayInts(); + RenderFluidTank.resetDisplayInts(); } } diff --git a/src/main/java/mekanism/client/render/item/ItemRenderingHandler.java b/src/main/java/mekanism/client/render/item/ItemRenderingHandler.java index f25da80c0..075a5a830 100644 --- a/src/main/java/mekanism/client/render/item/ItemRenderingHandler.java +++ b/src/main/java/mekanism/client/render/item/ItemRenderingHandler.java @@ -9,12 +9,12 @@ import mekanism.client.model.ModelAtomicDisassembler; import mekanism.client.model.ModelEnergyCube; import mekanism.client.model.ModelEnergyCube.ModelEnergyCore; import mekanism.client.model.ModelFlamethrower; +import mekanism.client.model.ModelFluidTank; import mekanism.client.model.ModelFreeRunners; import mekanism.client.model.ModelGasMask; import mekanism.client.model.ModelGasTank; import mekanism.client.model.ModelJetpack; import mekanism.client.model.ModelObsidianTNT; -import mekanism.client.model.ModelPortableTank; import mekanism.client.model.ModelRobit; import mekanism.client.model.ModelScubaTank; import mekanism.client.render.MekanismRenderer; @@ -22,16 +22,19 @@ import mekanism.client.render.RenderGlowPanel; import mekanism.client.render.RenderPartTransmitter; import mekanism.client.render.entity.RenderBalloon; import mekanism.client.render.tileentity.RenderBin; -import mekanism.client.render.tileentity.RenderPortableTank; +import mekanism.client.render.tileentity.RenderFluidTank; import mekanism.common.MekanismBlocks; import mekanism.common.MekanismItems; +import mekanism.common.Tier.BaseTier; import mekanism.common.Tier.EnergyCubeTier; +import mekanism.common.Tier.FluidTankTier; import mekanism.common.base.IEnergyCube; import mekanism.common.block.BlockMachine.MachineType; import mekanism.common.inventory.InventoryBin; import mekanism.common.item.ItemAtomicDisassembler; import mekanism.common.item.ItemBalloon; import mekanism.common.item.ItemBlockBasic; +import mekanism.common.item.ItemBlockGasTank; import mekanism.common.item.ItemBlockMachine; import mekanism.common.item.ItemFlamethrower; import mekanism.common.item.ItemFreeRunners; @@ -43,7 +46,7 @@ import mekanism.common.multipart.ItemGlowPanel; import mekanism.common.multipart.ItemPartTransmitter; import mekanism.common.multipart.TransmitterType; import mekanism.common.tile.TileEntityBin; -import mekanism.common.tile.TileEntityPortableTank; +import mekanism.common.tile.TileEntityFluidTank; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.block.Block; @@ -84,12 +87,12 @@ public class ItemRenderingHandler implements IItemRenderer public ModelScubaTank scubaTank = new ModelScubaTank(); public ModelFreeRunners freeRunners = new ModelFreeRunners(); public ModelAtomicDisassembler atomicDisassembler = new ModelAtomicDisassembler(); - public ModelPortableTank portableTank = new ModelPortableTank(); + public ModelFluidTank portableTank = new ModelFluidTank(); public ModelFlamethrower flamethrower = new ModelFlamethrower(); private final RenderBalloon balloonRenderer = new RenderBalloon(); private final RenderBin binRenderer = (RenderBin)TileEntityRendererDispatcher.instance.mapSpecialRenderers.get(TileEntityBin.class); - private final RenderPortableTank portableTankRenderer = (RenderPortableTank)TileEntityRendererDispatcher.instance.mapSpecialRenderers.get(TileEntityPortableTank.class); + private final RenderFluidTank portableTankRenderer = (RenderFluidTank)TileEntityRendererDispatcher.instance.mapSpecialRenderers.get(TileEntityFluidTank.class); private final RenderItem renderItem = (RenderItem)RenderManager.instance.getEntityClassRenderObject(EntityItem.class); @Override @@ -293,7 +296,8 @@ public class ItemRenderingHandler implements IItemRenderer else if(Block.getBlockFromItem(item.getItem()) == MekanismBlocks.GasTank) { GL11.glPushMatrix(); - Minecraft.getMinecraft().renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "GasTank.png")); + BaseTier tier = ((ItemBlockGasTank)item.getItem()).getBaseTier(item); + Minecraft.getMinecraft().renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "GasTank" + tier.getName() + ".png")); GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); GL11.glRotatef(270F, 0.0F, -1.0F, 0.0F); GL11.glTranslatef(0.0F, -1.0F, 0.0F); @@ -506,15 +510,16 @@ public class ItemRenderingHandler implements IItemRenderer flamethrower.render(0.0625F); GL11.glPopMatrix(); } - else if(MachineType.get(item) == MachineType.PORTABLE_TANK) + else if(MachineType.get(item) == MachineType.FLUID_TANK) { GL11.glPushMatrix(); GL11.glRotatef(270F, 0.0F, -1.0F, 0.0F); - Minecraft.getMinecraft().renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "PortableTank.png")); + Minecraft.getMinecraft().renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "FluidTank.png")); ItemBlockMachine itemMachine = (ItemBlockMachine)item.getItem(); + FluidTankTier tier = FluidTankTier.values()[itemMachine.getBaseTier(item).ordinal()]; Fluid fluid = itemMachine.getFluidStack(item) != null ? itemMachine.getFluidStack(item).getFluid() : null; - portableTankRenderer.render(fluid, itemMachine.getPrevScale(item), false, null, -0.5, -0.5, -0.5); + portableTankRenderer.render(tier, fluid, itemMachine.getPrevScale(item), false, null, -0.5, -0.5, -0.5); GL11.glPopMatrix(); } else { diff --git a/src/main/java/mekanism/client/render/tileentity/RenderPortableTank.java b/src/main/java/mekanism/client/render/tileentity/RenderFluidTank.java similarity index 84% rename from src/main/java/mekanism/client/render/tileentity/RenderPortableTank.java rename to src/main/java/mekanism/client/render/tileentity/RenderFluidTank.java index 1179a1367..b081e9eab 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderPortableTank.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderFluidTank.java @@ -3,46 +3,47 @@ package mekanism.client.render.tileentity; import java.util.HashMap; import java.util.Map; -import mekanism.client.model.ModelPortableTank; +import mekanism.client.model.ModelFluidTank; import mekanism.client.render.MekanismRenderer; import mekanism.client.render.MekanismRenderer.DisplayInteger; import mekanism.client.render.MekanismRenderer.Model3D; -import mekanism.common.tile.TileEntityPortableTank; +import mekanism.common.Tier.FluidTankTier; +import mekanism.common.tile.TileEntityFluidTank; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; - import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.init.Blocks; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.fluids.Fluid; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + @SideOnly(Side.CLIENT) -public class RenderPortableTank extends TileEntitySpecialRenderer +public class RenderFluidTank extends TileEntitySpecialRenderer { private static Map cachedCenterFluids = new HashMap(); private static Map cachedValveFluids = new HashMap(); private static int stages = 1400; - private ModelPortableTank model = new ModelPortableTank(); + private ModelFluidTank model = new ModelFluidTank(); @Override public void renderTileEntityAt(TileEntity tileEntity, double x, double y, double z, float partialTick) { - renderAModelAt((TileEntityPortableTank)tileEntity, x, y, z, partialTick); + renderAModelAt((TileEntityFluidTank)tileEntity, x, y, z, partialTick); } - private void renderAModelAt(TileEntityPortableTank tileEntity, double x, double y, double z, float partialTick) + private void renderAModelAt(TileEntityFluidTank tileEntity, double x, double y, double z, float partialTick) { Fluid fluid = tileEntity.fluidTank.getFluid() != null ? tileEntity.fluidTank.getFluid().getFluid() : null; - render(fluid, tileEntity.prevScale, tileEntity.isActive, tileEntity.valve > 0 ? tileEntity.valveFluid : null, x, y, z); + render(tileEntity.tier, fluid, tileEntity.prevScale, tileEntity.isActive, tileEntity.valve > 0 ? tileEntity.valveFluid : null, x, y, z); } - public void render(Fluid fluid, float fluidScale, boolean active, Fluid valveFluid, double x, double y, double z) + public void render(FluidTankTier tier, Fluid fluid, float fluidScale, boolean active, Fluid valveFluid, double x, double y, double z) { if(fluid != null && fluidScale > 0) { @@ -93,10 +94,10 @@ public class RenderPortableTank extends TileEntitySpecialRenderer GL11.glPushMatrix(); GL11.glTranslatef((float)x + 0.5F, (float)y + 1.5F, (float)z + 0.5F); - bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "PortableTank" + (active ? "On" : "") + ".png")); + bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "FluidTank" + (active ? "On" : "") + ".png")); GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); - model.render(0.0625F); + model.render(0.0625F, tier); GL11.glPopMatrix(); } diff --git a/src/main/java/mekanism/client/render/tileentity/RenderGasTank.java b/src/main/java/mekanism/client/render/tileentity/RenderGasTank.java index 2e9ffea99..af4af146d 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderGasTank.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderGasTank.java @@ -7,11 +7,12 @@ import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + @SideOnly(Side.CLIENT) public class RenderGasTank extends TileEntitySpecialRenderer { @@ -27,7 +28,7 @@ public class RenderGasTank extends TileEntitySpecialRenderer { GL11.glPushMatrix(); GL11.glTranslatef((float)x + 0.5F, (float)y + 1.5F, (float)z + 0.5F); - bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "GasTank.png")); + bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "GasTank" + tileEntity.tier.getBaseTier().getName() + ".png")); switch(tileEntity.facing) { diff --git a/src/main/java/mekanism/common/CommonProxy.java b/src/main/java/mekanism/common/CommonProxy.java index 9d3efa86e..29b71547b 100644 --- a/src/main/java/mekanism/common/CommonProxy.java +++ b/src/main/java/mekanism/common/CommonProxy.java @@ -49,9 +49,9 @@ import mekanism.common.inventory.container.ContainerRobitRepair; import mekanism.common.inventory.container.ContainerRobitSmelting; import mekanism.common.inventory.container.ContainerRotaryCondensentrator; import mekanism.common.inventory.container.ContainerSeismicVibrator; -import mekanism.common.inventory.container.ContainerThermalEvaporationController; import mekanism.common.inventory.container.ContainerSolarNeutronActivator; import mekanism.common.inventory.container.ContainerTeleporter; +import mekanism.common.inventory.container.ContainerThermalEvaporationController; import mekanism.common.inventory.container.ContainerUpgradeManagement; import mekanism.common.item.ItemPortableTeleporter; import mekanism.common.network.PacketPortableTeleporter.PortableTeleporterMessage; @@ -82,6 +82,7 @@ import mekanism.common.tile.TileEntityEnergizedSmelter; import mekanism.common.tile.TileEntityEnergyCube; import mekanism.common.tile.TileEntityEnrichmentChamber; import mekanism.common.tile.TileEntityFactory; +import mekanism.common.tile.TileEntityFluidTank; import mekanism.common.tile.TileEntityFluidicPlenisher; import mekanism.common.tile.TileEntityGasTank; import mekanism.common.tile.TileEntityInductionCasing; @@ -98,15 +99,14 @@ import mekanism.common.tile.TileEntityObsidianTNT; import mekanism.common.tile.TileEntityOredictionificator; import mekanism.common.tile.TileEntityOsmiumCompressor; import mekanism.common.tile.TileEntityPRC; -import mekanism.common.tile.TileEntityPortableTank; import mekanism.common.tile.TileEntityPrecisionSawmill; import mekanism.common.tile.TileEntityPurificationChamber; import mekanism.common.tile.TileEntityRotaryCondensentrator; import mekanism.common.tile.TileEntitySeismicVibrator; -import mekanism.common.tile.TileEntityThermalEvaporationController; import mekanism.common.tile.TileEntitySolarNeutronActivator; import mekanism.common.tile.TileEntityStructuralGlass; import mekanism.common.tile.TileEntityTeleporter; +import mekanism.common.tile.TileEntityThermalEvaporationController; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; @@ -180,7 +180,7 @@ public class CommonProxy implements IGuiProvider GameRegistry.registerTileEntity(TileEntityChemicalCrystallizer.class, "ChemicalCrystallizer"); GameRegistry.registerTileEntity(TileEntitySeismicVibrator.class, "SeismicVibrator"); GameRegistry.registerTileEntity(TileEntityPRC.class, "PressurizedReactionChamber"); - GameRegistry.registerTileEntity(TileEntityPortableTank.class, "PortableTank"); + GameRegistry.registerTileEntity(TileEntityFluidTank.class, "PortableTank"); //TODO rename GameRegistry.registerTileEntity(TileEntityFluidicPlenisher.class, "FluidicPlenisher"); GameRegistry.registerTileEntity(TileEntityLaser.class, "Laser"); GameRegistry.registerTileEntity(TileEntityLaserAmplifier.class, "LaserAmplifier"); @@ -508,7 +508,7 @@ public class CommonProxy implements IGuiProvider case 40: return new ContainerPRC(player.inventory, (TileEntityPRC)tileEntity); case 41: - return new ContainerPortableTank(player.inventory, (TileEntityPortableTank)tileEntity); + return new ContainerPortableTank(player.inventory, (TileEntityFluidTank)tileEntity); case 42: return new ContainerFluidicPlenisher(player.inventory, (TileEntityFluidicPlenisher)tileEntity); case 43: diff --git a/src/main/java/mekanism/common/Mekanism.java b/src/main/java/mekanism/common/Mekanism.java index bf008715b..58ab386a4 100644 --- a/src/main/java/mekanism/common/Mekanism.java +++ b/src/main/java/mekanism/common/Mekanism.java @@ -34,6 +34,8 @@ import mekanism.common.FluidNetwork.FluidTransferEvent; import mekanism.common.Tier.BaseTier; import mekanism.common.Tier.EnergyCubeTier; import mekanism.common.Tier.FactoryTier; +import mekanism.common.Tier.FluidTankTier; +import mekanism.common.Tier.GasTankTier; import mekanism.common.Tier.InductionCellTier; import mekanism.common.Tier.InductionProviderTier; import mekanism.common.base.IChunkLoadHandler; @@ -78,9 +80,9 @@ import mekanism.common.tile.TileEntityCardboardBox; import mekanism.common.tile.TileEntityElectricBlock; import mekanism.common.tile.TileEntityEntangledBlock; import mekanism.common.tile.TileEntityPressureDisperser; +import mekanism.common.tile.TileEntitySuperheatingElement; import mekanism.common.tile.TileEntityThermalEvaporationBlock; import mekanism.common.tile.TileEntityThermalEvaporationValve; -import mekanism.common.tile.TileEntitySuperheatingElement; import mekanism.common.util.MekanismUtils; import mekanism.common.voice.VoiceServerManager; import mekanism.common.world.GenHandler; @@ -314,9 +316,6 @@ public class Mekanism CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(MekanismItems.AtomicDisassembler.getUnchargedItem(), new Object[] { "AEA", "ACA", " O ", Character.valueOf('A'), MekanismItems.EnrichedAlloy, Character.valueOf('E'), MekanismItems.EnergyTablet.getUnchargedItem(), Character.valueOf('C'), MekanismItems.AtomicAlloy, Character.valueOf('O'), "ingotRefinedObsidian" })); - CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(MekanismUtils.getEmptyGasTank(), new Object[] { - "PPP", "PDP", "PPP", Character.valueOf('P'), "ingotOsmium", Character.valueOf('D'), "dustIron" - })); MachineType.METALLURGIC_INFUSER.addRecipe(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.MachineBlock, 1, 8), new Object[] { "IFI", "ROR", "IFI", Character.valueOf('I'), "ingotIron", Character.valueOf('F'), Blocks.furnace, Character.valueOf('R'), "dustRedstone", Character.valueOf('O'), "ingotOsmium" })); @@ -382,11 +381,11 @@ public class Mekanism Character.valueOf('I'), new ItemStack(MekanismBlocks.BasicBlock, 1, 8), Character.valueOf('T'), MekanismItems.TeleportationCore })); MachineType.ROTARY_CONDENSENTRATOR.addRecipe(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.MachineBlock2, 1, 0), new Object[] { - "GCG", "tEI", "GCG", Character.valueOf('G'), "blockGlass", Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.BASIC), Character.valueOf('t'), MekanismUtils.getEmptyGasTank(), Character.valueOf('E'), MekanismItems.EnergyTablet.getUnchargedItem(), - Character.valueOf('T'), new ItemStack(MekanismBlocks.BasicBlock, 1, 9), Character.valueOf('I'), new ItemStack(MekanismBlocks.MachineBlock2, 1, 11) + "GCG", "tEI", "GCG", Character.valueOf('G'), "blockGlass", Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.BASIC), Character.valueOf('t'), MekanismUtils.getEmptyGasTank(GasTankTier.BASIC), Character.valueOf('E'), MekanismItems.EnergyTablet.getUnchargedItem(), + Character.valueOf('T'), new ItemStack(MekanismBlocks.BasicBlock, 1, 9), Character.valueOf('I'), MekanismUtils.getEmptyFluidTank(FluidTankTier.BASIC) })); CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(MekanismItems.Jetpack.getEmptyItem(), new Object[] { - "SCS", "TGT", " T ", Character.valueOf('S'), "ingotSteel", Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.BASIC), Character.valueOf('T'), "ingotTin", Character.valueOf('G'), MekanismUtils.getEmptyGasTank() + "SCS", "TGT", " T ", Character.valueOf('S'), "ingotSteel", Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.BASIC), Character.valueOf('T'), "ingotTin", Character.valueOf('G'), MekanismUtils.getEmptyGasTank(GasTankTier.BASIC) })); CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismItems.Dictionary), new Object[] { "C", "B", Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.BASIC), Character.valueOf('B'), Items.book @@ -398,10 +397,10 @@ public class Mekanism " C ", "ATA", "SSS", Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.BASIC), Character.valueOf('A'), MekanismItems.EnrichedAlloy, Character.valueOf('S'), "ingotSteel" })); MachineType.CHEMICAL_OXIDIZER.addRecipe(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.MachineBlock2, 1, 1), new Object[] { - "ACA", "ERG", "ACA", Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.BASIC), Character.valueOf('R'), new ItemStack(MekanismBlocks.BasicBlock, 1, 9), Character.valueOf('G'), MekanismUtils.getEmptyGasTank(), Character.valueOf('E'), new ItemStack(MekanismBlocks.MachineBlock, 1, 13), Character.valueOf('A'), MekanismItems.EnrichedAlloy + "ACA", "ERG", "ACA", Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.BASIC), Character.valueOf('R'), new ItemStack(MekanismBlocks.BasicBlock, 1, 9), Character.valueOf('G'), MekanismUtils.getEmptyGasTank(GasTankTier.BASIC), Character.valueOf('E'), new ItemStack(MekanismBlocks.MachineBlock, 1, 13), Character.valueOf('A'), MekanismItems.EnrichedAlloy })); MachineType.CHEMICAL_INFUSER.addRecipe(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.MachineBlock2, 1, 2), new Object[] { - "ACA", "GRG", "ACA", Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.BASIC), Character.valueOf('R'), new ItemStack(MekanismBlocks.BasicBlock, 1, 9), Character.valueOf('G'), MekanismUtils.getEmptyGasTank(), Character.valueOf('A'), MekanismItems.EnrichedAlloy + "ACA", "GRG", "ACA", Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.BASIC), Character.valueOf('R'), new ItemStack(MekanismBlocks.BasicBlock, 1, 9), Character.valueOf('G'), MekanismUtils.getEmptyGasTank(GasTankTier.BASIC), Character.valueOf('A'), MekanismItems.EnrichedAlloy })); MachineType.CHEMICAL_INJECTION_CHAMBER.addRecipe(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.MachineBlock2, 1, 3), new Object[] { "RCR", "GPG", "RCR", Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.ELITE), Character.valueOf('R'), "alloyElite", Character.valueOf('G'), "ingotGold", Character.valueOf('P'), new ItemStack(MekanismBlocks.MachineBlock, 1, 9) @@ -431,13 +430,13 @@ public class Mekanism " S ", "SCS", " S ", Character.valueOf('C'), "ingotCopper", Character.valueOf('S'), "ingotSteel" })); MachineType.CHEMICAL_DISSOLUTION_CHAMBER.addRecipe(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.MachineBlock2, 1, 6), new Object[] { - "CGC", "EAE", "CGC", Character.valueOf('G'), MekanismUtils.getEmptyGasTank(), Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.BASIC), Character.valueOf('A'), MekanismItems.AtomicAlloy, Character.valueOf('E'), MekanismItems.EnrichedAlloy + "CGC", "EAE", "CGC", Character.valueOf('G'), MekanismUtils.getEmptyGasTank(GasTankTier.BASIC), Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.BASIC), Character.valueOf('A'), MekanismItems.AtomicAlloy, Character.valueOf('E'), MekanismItems.EnrichedAlloy })); MachineType.CHEMICAL_WASHER.addRecipe(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.MachineBlock2, 1, 7), new Object[] { - "CWC", "EIE", "CGC", Character.valueOf('W'), Items.bucket, Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.BASIC), Character.valueOf('E'), MekanismItems.EnrichedAlloy, Character.valueOf('G'), MekanismUtils.getEmptyGasTank(), Character.valueOf('I'), new ItemStack(MekanismBlocks.BasicBlock, 1, 8) + "CWC", "EIE", "CGC", Character.valueOf('W'), Items.bucket, Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.BASIC), Character.valueOf('E'), MekanismItems.EnrichedAlloy, Character.valueOf('G'), MekanismUtils.getEmptyGasTank(GasTankTier.BASIC), Character.valueOf('I'), new ItemStack(MekanismBlocks.BasicBlock, 1, 8) })); MachineType.CHEMICAL_CRYSTALLIZER.addRecipe(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.MachineBlock2, 1, 8), new Object[] { - "CGC", "ASA", "CGC", Character.valueOf('G'), MekanismUtils.getEmptyGasTank(), Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.BASIC), Character.valueOf('A'), MekanismItems.AtomicAlloy, Character.valueOf('S'), new ItemStack(MekanismBlocks.BasicBlock, 1, 8) + "CGC", "ASA", "CGC", Character.valueOf('G'), MekanismUtils.getEmptyGasTank(GasTankTier.BASIC), Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.BASIC), Character.valueOf('A'), MekanismItems.AtomicAlloy, Character.valueOf('S'), new ItemStack(MekanismBlocks.BasicBlock, 1, 8) })); CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(MekanismItems.FreeRunners.getUnchargedItem(), new Object[] { "C C", "A A", "T T", Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.BASIC), Character.valueOf('A'), MekanismItems.EnrichedAlloy, Character.valueOf('T'), MekanismItems.EnergyTablet.getUnchargedItem() @@ -455,12 +454,9 @@ public class Mekanism "TLT", "CIC", "TTT", Character.valueOf('T'), "ingotTin", Character.valueOf('L'), new ItemStack(Items.dye, 1, 4), Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.BASIC), Character.valueOf('I'), new ItemStack(MekanismBlocks.BasicBlock, 1, 8) })); MachineType.PRESSURIZED_REACTION_CHAMBER.addRecipe(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.MachineBlock2, 1, 10), new Object[] { - "TET", "CIC", "GFG", Character.valueOf('S'), "ingotSteel", Character.valueOf('E'), MekanismItems.EnrichedAlloy, Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.BASIC), Character.valueOf('G'), MekanismUtils.getEmptyGasTank(), + "TET", "CIC", "GFG", Character.valueOf('S'), "ingotSteel", Character.valueOf('E'), MekanismItems.EnrichedAlloy, Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.BASIC), Character.valueOf('G'), MekanismUtils.getEmptyGasTank(GasTankTier.BASIC), Character.valueOf('I'), new ItemStack(MekanismBlocks.MachineBlock, 1, 0), Character.valueOf('F'), new ItemStack(MekanismBlocks.BasicBlock, 1, 9) })); - MachineType.PORTABLE_TANK.addRecipe(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.MachineBlock2, 1, 11), new Object[] { - "III", "GCG", "III", Character.valueOf('I'), "ingotIron", Character.valueOf('G'), "blockGlass", Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.BASIC) - })); MachineType.FLUIDIC_PLENISHER.addRecipe(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.MachineBlock2, 1, 12), new Object[] { "TTT", "CPC", "TTT", Character.valueOf('P'), new ItemStack(MekanismBlocks.MachineBlock, 1, 12), Character.valueOf('T'), "ingotTin", Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.BASIC) })); @@ -468,7 +464,7 @@ public class Mekanism "O O", "OSO", "O O", Character.valueOf('O'), "ingotOsmium", Character.valueOf('S'), "stickWood" })); CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(MekanismItems.Flamethrower.getEmptyItem(), new Object[] { - "TTT", "TGS", "BCB", Character.valueOf('T'), "ingotTin", Character.valueOf('G'), MekanismUtils.getEmptyGasTank(), Character.valueOf('S'), Items.flint_and_steel, Character.valueOf('B'), "ingotBronze", Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.ADVANCED) + "TTT", "TGS", "BCB", Character.valueOf('T'), "ingotTin", Character.valueOf('G'), MekanismUtils.getEmptyGasTank(GasTankTier.BASIC), Character.valueOf('S'), Items.flint_and_steel, Character.valueOf('B'), "ingotBronze", Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.ADVANCED) })); CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(MekanismItems.GaugeDropper.getEmptyItem(), new Object[] { " O ", "G G", "GGG", Character.valueOf('O'), "ingotOsmium", Character.valueOf('G'), "paneGlass" @@ -530,6 +526,34 @@ public class Mekanism "ATA", "dEd", "ATA", Character.valueOf('A'), "alloyUltimate", Character.valueOf('d'), "gemDiamond", Character.valueOf('T'), MekanismItems.EnergyTablet.getUnchargedItem(), Character.valueOf('E'), MekanismUtils.getEnergyCube(EnergyCubeTier.ELITE) })); + //Gas Tank Recipes + CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(MekanismUtils.getEmptyGasTank(GasTankTier.BASIC), new Object[] { + "APA", "P P", "APA", Character.valueOf('P'), "ingotOsmium", Character.valueOf('A'), "alloyBasic" + })); + CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(MekanismUtils.getEmptyGasTank(GasTankTier.ADVANCED), new Object[] { + "APA", "PTP", "APA", Character.valueOf('P'), "ingotOsmium", Character.valueOf('A'), "alloyAdvanced", Character.valueOf('T'), MekanismUtils.getEmptyGasTank(GasTankTier.BASIC) + })); + CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(MekanismUtils.getEmptyGasTank(GasTankTier.ELITE), new Object[] { + "APA", "PTP", "APA", Character.valueOf('P'), "ingotOsmium", Character.valueOf('A'), "alloyElite", Character.valueOf('T'), MekanismUtils.getEmptyGasTank(GasTankTier.ADVANCED) + })); + CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(MekanismUtils.getEmptyGasTank(GasTankTier.ULTIMATE), new Object[] { + "APA", "PTP", "APA", Character.valueOf('P'), "ingotOsmium", Character.valueOf('A'), "alloyUltimate", Character.valueOf('T'), MekanismUtils.getEmptyGasTank(GasTankTier.ELITE) + })); + + //Fluid Tank Recipes + MachineType.FLUID_TANK.addRecipe(new ShapedMekanismRecipe(MekanismUtils.getEmptyFluidTank(FluidTankTier.BASIC), new Object[] { + "AIA", "I I", "AIA", Character.valueOf('I'), "ingotIron", Character.valueOf('A'), "alloyBasic" + })); + MachineType.FLUID_TANK.addRecipe(new ShapedMekanismRecipe(MekanismUtils.getEmptyFluidTank(FluidTankTier.ADVANCED), new Object[] { + "AIA", "ITI", "AIA", Character.valueOf('I'), "ingotIron", Character.valueOf('A'), "alloyAdvanced", Character.valueOf('T'), MekanismUtils.getEmptyFluidTank(FluidTankTier.BASIC) + })); + MachineType.FLUID_TANK.addRecipe(new ShapedMekanismRecipe(MekanismUtils.getEmptyFluidTank(FluidTankTier.ELITE), new Object[] { + "AIA", "ITI", "AIA", Character.valueOf('I'), "ingotIron", Character.valueOf('A'), "alloyElite", Character.valueOf('T'), MekanismUtils.getEmptyFluidTank(FluidTankTier.ADVANCED) + })); + MachineType.FLUID_TANK.addRecipe(new ShapedMekanismRecipe(MekanismUtils.getEmptyFluidTank(FluidTankTier.ULTIMATE), new Object[] { + "AIA", "ITI", "AIA", Character.valueOf('I'), "ingotIron", Character.valueOf('A'), "alloyUltimate", Character.valueOf('T'), MekanismUtils.getEmptyFluidTank(FluidTankTier.ELITE) + })); + //Induction Cell recipes CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(MekanismUtils.getInductionCell(InductionCellTier.BASIC), new Object[] { "LTL", "TET", "LTL", Character.valueOf('T'), MekanismItems.EnergyTablet.getUnchargedItem(), Character.valueOf('E'), MekanismUtils.getEnergyCube(EnergyCubeTier.BASIC), Character.valueOf('L'), "dustLithium" diff --git a/src/main/java/mekanism/common/Tier.java b/src/main/java/mekanism/common/Tier.java index 9ccad9cb2..8d86122f3 100644 --- a/src/main/java/mekanism/common/Tier.java +++ b/src/main/java/mekanism/common/Tier.java @@ -553,6 +553,97 @@ public final class Tier } } + public static enum FluidTankTier + { + BASIC(14000, 400), + ADVANCED(28000, 800), + ELITE(56000, 1600), + ULTIMATE(112000, 3200); + + public BaseTier getBaseTier() + { + return BaseTier.values()[ordinal()]; + } + + public int storage; + private int baseStorage; + + public int output; + private int baseOutput; + + private FluidTankTier(int s, int o) + { + baseStorage = storage = s; + baseOutput = output = o; + } + + protected void loadConfig() + { + storage = Mekanism.configuration.get("tier", getBaseTier().getName() + "FluidTankStorage", baseStorage).getInt(); + output = Mekanism.configuration.get("tier", getBaseTier().getName() + "FluidTankOutput", baseOutput).getInt(); + } + + protected void readConfig(ByteBuf dataStream) + { + storage = dataStream.readInt(); + output = dataStream.readInt(); + } + + protected void writeConfig(ByteBuf dataStream) + { + dataStream.writeInt(storage); + dataStream.writeInt(output); + } + } + + /** + * The tiers used by Logistical Transporters and their corresponding values. + * @author AidanBrady + * + */ + public static enum GasTankTier + { + BASIC(64000, 256), + ADVANCED(128000, 512), + ELITE(256000, 1028), + ULTIMATE(512000, 2056); + + public BaseTier getBaseTier() + { + return BaseTier.values()[ordinal()]; + } + + public int storage; + private int baseStorage; + + public int output; + private int baseOutput; + + private GasTankTier(int s, int o) + { + baseStorage = storage = s; + baseOutput = output = o; + } + + protected void loadConfig() + { + storage = Mekanism.configuration.get("tier", getBaseTier().getName() + "GasTankStorage", baseStorage).getInt(); + output = Mekanism.configuration.get("tier", getBaseTier().getName() + "GasTankOutput", baseOutput).getInt(); + } + + protected void readConfig(ByteBuf dataStream) + { + storage = dataStream.readInt(); + output = dataStream.readInt(); + } + + protected void writeConfig(ByteBuf dataStream) + { + dataStream.writeInt(storage); + dataStream.writeInt(output); + } + } + public static void loadConfig() { for(CableTier tier : CableTier.values()) @@ -594,6 +685,16 @@ public final class Tier { tier.loadConfig(); } + + for(FluidTankTier tier : FluidTankTier.values()) + { + tier.loadConfig(); + } + + for(GasTankTier tier : GasTankTier.values()) + { + tier.loadConfig(); + } } public static void readConfig(ByteBuf dataStream) @@ -637,6 +738,16 @@ public final class Tier { tier.readConfig(dataStream); } + + for(FluidTankTier tier : FluidTankTier.values()) + { + tier.readConfig(dataStream); + } + + for(GasTankTier tier : GasTankTier.values()) + { + tier.readConfig(dataStream); + } } public static void writeConfig(ByteBuf dataStream) @@ -680,5 +791,15 @@ public final class Tier { tier.writeConfig(dataStream); } + + for(FluidTankTier tier : FluidTankTier.values()) + { + tier.writeConfig(dataStream); + } + + for(GasTankTier tier : GasTankTier.values()) + { + tier.writeConfig(dataStream); + } } } diff --git a/src/main/java/mekanism/common/base/ITierItem.java b/src/main/java/mekanism/common/base/ITierItem.java new file mode 100644 index 000000000..31912c6d8 --- /dev/null +++ b/src/main/java/mekanism/common/base/ITierItem.java @@ -0,0 +1,11 @@ +package mekanism.common.base; + +import mekanism.common.Tier.BaseTier; +import net.minecraft.item.ItemStack; + +public interface ITierItem +{ + public BaseTier getBaseTier(ItemStack stack); + + public void setBaseTier(ItemStack stack, BaseTier tier); +} diff --git a/src/main/java/mekanism/common/block/BlockBasic.java b/src/main/java/mekanism/common/block/BlockBasic.java index b5f046276..79fa0e1ce 100644 --- a/src/main/java/mekanism/common/block/BlockBasic.java +++ b/src/main/java/mekanism/common/block/BlockBasic.java @@ -119,11 +119,11 @@ public class BlockBasic extends Block implements IBlockCTM, ICustomBlockIcon { if(getBlockFromItem(stack.getItem()) == MekanismBlocks.BasicBlock2 && stack.getItemDamage() == 3) { - return icons[3][((ItemBlockBasic)stack.getItem()).getTier(stack).ordinal()]; + return icons[3][((ItemBlockBasic)stack.getItem()).getBaseTier(stack).ordinal()]; } else if(getBlockFromItem(stack.getItem()) == MekanismBlocks.BasicBlock2 && stack.getItemDamage() == 4) { - return icons[4][((ItemBlockBasic)stack.getItem()).getTier(stack).ordinal()]; + return icons[4][((ItemBlockBasic)stack.getItem()).getBaseTier(stack).ordinal()]; } return getIcon(side, stack.getItemDamage()); @@ -331,7 +331,7 @@ public class BlockBasic extends Block implements IBlockCTM, ICustomBlockIcon if(tier.isObtainable()) { ItemStack stack = new ItemStack(item, 1, type.meta); - ((ItemBlockBasic)stack.getItem()).setTier(stack, tier); + ((ItemBlockBasic)stack.getItem()).setBaseTier(stack, tier); list.add(stack); } } @@ -830,12 +830,12 @@ public class BlockBasic extends Block implements IBlockCTM, ICustomBlockIcon else if(type == BasicType.INDUCTION_CELL) { TileEntityInductionCell tileEntity = (TileEntityInductionCell)world.getTileEntity(x, y, z); - ((ItemBlockBasic)ret.getItem()).setTier(ret, tileEntity.tier.getBaseTier()); + ((ItemBlockBasic)ret.getItem()).setBaseTier(ret, tileEntity.tier.getBaseTier()); } else if(type == BasicType.INDUCTION_PROVIDER) { TileEntityInductionProvider tileEntity = (TileEntityInductionProvider)world.getTileEntity(x, y, z); - ((ItemBlockBasic)ret.getItem()).setTier(ret, tileEntity.tier.getBaseTier()); + ((ItemBlockBasic)ret.getItem()).setBaseTier(ret, tileEntity.tier.getBaseTier()); } TileEntity tileEntity = world.getTileEntity(x, y, z); diff --git a/src/main/java/mekanism/common/block/BlockEnergyCube.java b/src/main/java/mekanism/common/block/BlockEnergyCube.java index a5c461df1..8e01d8974 100644 --- a/src/main/java/mekanism/common/block/BlockEnergyCube.java +++ b/src/main/java/mekanism/common/block/BlockEnergyCube.java @@ -164,6 +164,7 @@ public class BlockEnergyCube extends BlockContainer tileEntity.setFacing((short)change); world.notifyBlocksOfNeighborChange(x, y, z, this); + return true; } } diff --git a/src/main/java/mekanism/common/block/BlockGasTank.java b/src/main/java/mekanism/common/block/BlockGasTank.java index e4e4b34d4..710c985df 100644 --- a/src/main/java/mekanism/common/block/BlockGasTank.java +++ b/src/main/java/mekanism/common/block/BlockGasTank.java @@ -6,6 +6,7 @@ import mekanism.api.gas.IGasItem; import mekanism.common.Mekanism; import mekanism.common.MekanismBlocks; import mekanism.common.base.ISustainedInventory; +import mekanism.common.base.ITierItem; import mekanism.common.tile.TileEntityBasicBlock; import mekanism.common.tile.TileEntityGasTank; import mekanism.common.util.MekanismUtils; @@ -102,12 +103,15 @@ public class BlockGasTank extends BlockContainer } if(MekanismUtils.isBCWrench(tool)) + { ((IToolWrench)tool).wrenchUsed(entityplayer, x, y, z); + } int change = ForgeDirection.ROTATION_MATRIX[ForgeDirection.UP.ordinal()][tileEntity.facing]; tileEntity.setFacing((short)change); world.notifyBlocksOfNeighborChange(x, y, z, this); + return true; } } @@ -120,6 +124,7 @@ public class BlockGasTank extends BlockContainer return true; } } + return false; } @@ -203,6 +208,9 @@ public class BlockGasTank extends BlockContainer { TileEntityGasTank tileEntity = (TileEntityGasTank)world.getTileEntity(x, y, z); ItemStack itemStack = new ItemStack(MekanismBlocks.GasTank); + + ITierItem tierItem = (ITierItem)itemStack.getItem(); + tierItem.setBaseTier(itemStack, tileEntity.tier.getBaseTier()); IGasItem storageTank = (IGasItem)itemStack.getItem(); storageTank.setGas(itemStack, tileEntity.gasTank.getGas()); diff --git a/src/main/java/mekanism/common/block/BlockMachine.java b/src/main/java/mekanism/common/block/BlockMachine.java index 02a75bace..7cfe78d1b 100644 --- a/src/main/java/mekanism/common/block/BlockMachine.java +++ b/src/main/java/mekanism/common/block/BlockMachine.java @@ -22,6 +22,7 @@ import mekanism.common.CTMData; import mekanism.common.Mekanism; import mekanism.common.MekanismBlocks; import mekanism.common.Tier.BaseTier; +import mekanism.common.Tier.FluidTankTier; import mekanism.common.base.IActiveState; import mekanism.common.base.IBlockCTM; import mekanism.common.base.IBoundingBlock; @@ -34,6 +35,7 @@ import mekanism.common.base.ISpecialBounds; import mekanism.common.base.ISustainedData; import mekanism.common.base.ISustainedInventory; import mekanism.common.base.ISustainedTank; +import mekanism.common.base.ITierItem; import mekanism.common.base.IUpgradeTile; import mekanism.common.item.ItemBlockMachine; import mekanism.common.network.PacketElectricChest.ElectricChestMessage; @@ -63,6 +65,7 @@ import mekanism.common.tile.TileEntityEnergizedSmelter; import mekanism.common.tile.TileEntityEnrichmentChamber; import mekanism.common.tile.TileEntityEntangledBlock; import mekanism.common.tile.TileEntityFactory; +import mekanism.common.tile.TileEntityFluidTank; import mekanism.common.tile.TileEntityFluidicPlenisher; import mekanism.common.tile.TileEntityLaser; import mekanism.common.tile.TileEntityLaserAmplifier; @@ -72,7 +75,6 @@ import mekanism.common.tile.TileEntityMetallurgicInfuser; import mekanism.common.tile.TileEntityOredictionificator; import mekanism.common.tile.TileEntityOsmiumCompressor; import mekanism.common.tile.TileEntityPRC; -import mekanism.common.tile.TileEntityPortableTank; import mekanism.common.tile.TileEntityPrecisionSawmill; import mekanism.common.tile.TileEntityPurificationChamber; import mekanism.common.tile.TileEntityRotaryCondensentrator; @@ -141,7 +143,7 @@ import cpw.mods.fml.relauncher.SideOnly; * 1:8: Chemical Crystallizer * 1:9: Seismic Vibrator * 1:10: Pressurized Reaction Chamber - * 1:11: Portable Tank + * 1:11: Fluid Tank * 1:12: Fluidic Plenisher * 1:13: Laser * 1:14: Laser Amplifier @@ -515,17 +517,23 @@ public class BlockMachine extends BlockContainer implements ISpecialBounds, IBlo } break; - case PORTABLE_TANK: - list.add(new ItemStack(item, 1, type.meta)); + case FLUID_TANK: + ItemBlockMachine itemMachine = (ItemBlockMachine)item; + + for(FluidTankTier tier : FluidTankTier.values()) + { + ItemStack stack = new ItemStack(item, 1, type.meta); + itemMachine.setBaseTier(stack, tier.getBaseTier()); + list.add(stack); + } if(general.prefilledPortableTanks) { - ItemBlockMachine itemMachine = (ItemBlockMachine)item; - for(Fluid f : FluidRegistry.getRegisteredFluids().values()) { try { //Prevent bad IDs ItemStack filled = new ItemStack(item, 1, type.meta); + itemMachine.setBaseTier(filled, BaseTier.ULTIMATE); itemMachine.setFluidStack(new FluidStack(f, itemMachine.getCapacity(filled)), filled); itemMachine.setPrevScale(filled, 1); list.add(filled); @@ -620,10 +628,10 @@ public class BlockMachine extends BlockContainer implements ISpecialBounds, IBlo return true; } break; - case PORTABLE_TANK: + case FLUID_TANK: if(entityplayer.getCurrentEquippedItem() != null && FluidContainerRegistry.isContainer(entityplayer.getCurrentEquippedItem())) { - if(manageInventory(entityplayer, (TileEntityPortableTank)tileEntity)) + if(manageInventory(entityplayer, (TileEntityFluidTank)tileEntity)) { entityplayer.inventory.markDirty(); return true; @@ -758,7 +766,7 @@ public class BlockMachine extends BlockContainer implements ISpecialBounds, IBlo return world.setBlockToAir(x, y, z); } - private boolean manageInventory(EntityPlayer player, TileEntityPortableTank tileEntity) + private boolean manageInventory(EntityPlayer player, TileEntityFluidTank tileEntity) { ItemStack itemStack = player.getCurrentEquippedItem(); @@ -911,6 +919,12 @@ public class BlockMachine extends BlockContainer implements ISpecialBounds, IBlo { itemStack.setTagCompound(new NBTTagCompound()); } + + if(tileEntity instanceof TileEntityFluidTank) + { + ITierItem tierItem = (ITierItem)itemStack.getItem(); + tierItem.setBaseTier(itemStack, ((TileEntityFluidTank)tileEntity).tier.getBaseTier()); + } if(tileEntity instanceof IUpgradeTile) { @@ -1034,7 +1048,7 @@ public class BlockMachine extends BlockContainer implements ISpecialBounds, IBlo case CHARGEPAD: setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 0.06F, 1.0F); break; - case PORTABLE_TANK: + case FLUID_TANK: setBlockBounds(0.125F, 0.0F, 0.125F, 0.875F, 1.0F, 0.875F); break; default: @@ -1064,7 +1078,7 @@ public class BlockMachine extends BlockContainer implements ISpecialBounds, IBlo case CHARGEPAD: case ELECTRIC_CHEST: return false; - case PORTABLE_TANK: + case FLUID_TANK: return side == ForgeDirection.UP || side == ForgeDirection.DOWN; default: return true; @@ -1122,7 +1136,7 @@ public class BlockMachine extends BlockContainer implements ISpecialBounds, IBlo CHEMICAL_CRYSTALLIZER(MachineBlock.MACHINE_BLOCK_2, 8, "ChemicalCrystallizer", 37, TileEntityChemicalCrystallizer.class, true, true, true), SEISMIC_VIBRATOR(MachineBlock.MACHINE_BLOCK_2, 9, "SeismicVibrator", 39, TileEntitySeismicVibrator.class, true, true, false), PRESSURIZED_REACTION_CHAMBER(MachineBlock.MACHINE_BLOCK_2, 10, "PressurizedReactionChamber", 40, TileEntityPRC.class, true, true, false), - PORTABLE_TANK(MachineBlock.MACHINE_BLOCK_2, 11, "PortableTank", 41, TileEntityPortableTank.class, false, true, false), + FLUID_TANK(MachineBlock.MACHINE_BLOCK_2, 11, "FluidTank", 41, TileEntityFluidTank.class, false, true, false), FLUIDIC_PLENISHER(MachineBlock.MACHINE_BLOCK_2, 12, "FluidicPlenisher", 42, TileEntityFluidicPlenisher.class, true, true, false), LASER(MachineBlock.MACHINE_BLOCK_2, 13, "Laser", -1, TileEntityLaser.class, true, true, false), LASER_AMPLIFIER(MachineBlock.MACHINE_BLOCK_2, 14, "LaserAmplifier", 44, TileEntityLaserAmplifier.class, false, true, false), @@ -1283,7 +1297,7 @@ public class BlockMachine extends BlockContainer implements ISpecialBounds, IBlo return usage.seismicVibratorUsage; case PRESSURIZED_REACTION_CHAMBER: return usage.pressurizedReactionBaseUsage; - case PORTABLE_TANK: + case FLUID_TANK: return 0; case FLUIDIC_PLENISHER: return usage.fluidicPlenisherUsage; diff --git a/src/main/java/mekanism/common/inventory/container/ContainerPortableTank.java b/src/main/java/mekanism/common/inventory/container/ContainerPortableTank.java index f30ffc361..986978c37 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerPortableTank.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerPortableTank.java @@ -1,7 +1,7 @@ package mekanism.common.inventory.container; import mekanism.common.inventory.slot.SlotOutput; -import mekanism.common.tile.TileEntityPortableTank; +import mekanism.common.tile.TileEntityFluidTank; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; @@ -12,9 +12,9 @@ import net.minecraftforge.fluids.FluidContainerRegistry; public class ContainerPortableTank extends Container { - private TileEntityPortableTank tileEntity; + private TileEntityFluidTank tileEntity; - public ContainerPortableTank(InventoryPlayer inventory, TileEntityPortableTank tentity) + public ContainerPortableTank(InventoryPlayer inventory, TileEntityFluidTank tentity) { tileEntity = tentity; addSlotToContainer(new Slot(tentity, 0, 146, 19)); diff --git a/src/main/java/mekanism/common/item/ItemBlockBasic.java b/src/main/java/mekanism/common/item/ItemBlockBasic.java index 041c7702b..82e2ca70b 100644 --- a/src/main/java/mekanism/common/item/ItemBlockBasic.java +++ b/src/main/java/mekanism/common/item/ItemBlockBasic.java @@ -15,6 +15,7 @@ import mekanism.common.MekanismBlocks; import mekanism.common.Tier.BaseTier; import mekanism.common.Tier.InductionCellTier; import mekanism.common.Tier.InductionProviderTier; +import mekanism.common.base.ITierItem; import mekanism.common.block.BlockBasic.BasicType; import mekanism.common.inventory.InventoryBin; import mekanism.common.network.PacketTileEntity.TileEntityMessage; @@ -66,7 +67,7 @@ import cpw.mods.fml.relauncher.SideOnly; * @author AidanBrady * */ -public class ItemBlockBasic extends ItemBlock implements IEnergizedItem +public class ItemBlockBasic extends ItemBlock implements IEnergizedItem, ITierItem { public Block metaBlock; @@ -91,7 +92,7 @@ public class ItemBlockBasic extends ItemBlock implements IEnergizedItem public ItemStack getUnchargedCell(InductionCellTier tier) { ItemStack stack = new ItemStack(MekanismBlocks.BasicBlock2, 1, 3); - setTier(stack, tier.getBaseTier()); + setBaseTier(stack, tier.getBaseTier()); return stack; } @@ -99,12 +100,13 @@ public class ItemBlockBasic extends ItemBlock implements IEnergizedItem public ItemStack getUnchargedProvider(InductionProviderTier tier) { ItemStack stack = new ItemStack(MekanismBlocks.BasicBlock2, 1, 4); - setTier(stack, tier.getBaseTier()); + setBaseTier(stack, tier.getBaseTier()); return stack; } - public BaseTier getTier(ItemStack itemstack) + @Override + public BaseTier getBaseTier(ItemStack itemstack) { if(itemstack.stackTagCompound == null) { @@ -114,7 +116,8 @@ public class ItemBlockBasic extends ItemBlock implements IEnergizedItem return BaseTier.values()[itemstack.stackTagCompound.getInteger("tier")]; } - public void setTier(ItemStack itemstack, BaseTier tier) + @Override + public void setBaseTier(ItemStack itemstack, BaseTier tier) { if(itemstack.stackTagCompound == null) { @@ -161,13 +164,13 @@ public class ItemBlockBasic extends ItemBlock implements IEnergizedItem } else if(type == BasicType.INDUCTION_CELL) { - InductionCellTier tier = InductionCellTier.values()[getTier(itemstack).ordinal()]; + InductionCellTier tier = InductionCellTier.values()[getBaseTier(itemstack).ordinal()]; list.add(tier.getBaseTier().getColor() + LangUtils.localize("tooltip.capacity") + ": " + EnumColor.GREY + MekanismUtils.getEnergyDisplay(tier.maxEnergy)); } else if(type == BasicType.INDUCTION_PROVIDER) { - InductionProviderTier tier = InductionProviderTier.values()[getTier(itemstack).ordinal()]; + InductionProviderTier tier = InductionProviderTier.values()[getBaseTier(itemstack).ordinal()]; list.add(tier.getBaseTier().getColor() + LangUtils.localize("tooltip.outputRate") + ": " + EnumColor.GREY + MekanismUtils.getEnergyDisplay(tier.output)); } @@ -250,7 +253,7 @@ public class ItemBlockBasic extends ItemBlock implements IEnergizedItem else if(type == BasicType.INDUCTION_CELL) { TileEntityInductionCell tileEntity = (TileEntityInductionCell)world.getTileEntity(x, y, z); - tileEntity.tier = InductionCellTier.values()[getTier(stack).ordinal()]; + tileEntity.tier = InductionCellTier.values()[getBaseTier(stack).ordinal()]; if(!world.isRemote) { @@ -260,7 +263,7 @@ public class ItemBlockBasic extends ItemBlock implements IEnergizedItem else if(type == BasicType.INDUCTION_PROVIDER) { TileEntityInductionProvider tileEntity = (TileEntityInductionProvider)world.getTileEntity(x, y, z); - tileEntity.tier = InductionProviderTier.values()[getTier(stack).ordinal()]; + tileEntity.tier = InductionProviderTier.values()[getBaseTier(stack).ordinal()]; if(!world.isRemote) { @@ -290,7 +293,7 @@ public class ItemBlockBasic extends ItemBlock implements IEnergizedItem if(type == BasicType.INDUCTION_CELL || type == BasicType.INDUCTION_PROVIDER) { - name += getTier(itemstack).getName(); + name += getBaseTier(itemstack).getName(); } return name; @@ -334,7 +337,7 @@ public class ItemBlockBasic extends ItemBlock implements IEnergizedItem { if(BasicType.get(itemStack) == BasicType.INDUCTION_CELL) { - return InductionCellTier.values()[getTier(itemStack).ordinal()].maxEnergy; + return InductionCellTier.values()[getBaseTier(itemStack).ordinal()].maxEnergy; } return 0; diff --git a/src/main/java/mekanism/common/item/ItemBlockEnergyCube.java b/src/main/java/mekanism/common/item/ItemBlockEnergyCube.java index 23f7ca534..b0712eaa2 100644 --- a/src/main/java/mekanism/common/item/ItemBlockEnergyCube.java +++ b/src/main/java/mekanism/common/item/ItemBlockEnergyCube.java @@ -76,6 +76,7 @@ public class ItemBlockEnergyCube extends ItemBlock implements IEnergizedItem, IE ItemStack stack = new ItemStack(this); setEnergyCubeTier(stack, tier); stack.setItemDamage(100); + return stack; } diff --git a/src/main/java/mekanism/common/item/ItemBlockGasTank.java b/src/main/java/mekanism/common/item/ItemBlockGasTank.java index e7b8629c2..d67b42e12 100644 --- a/src/main/java/mekanism/common/item/ItemBlockGasTank.java +++ b/src/main/java/mekanism/common/item/ItemBlockGasTank.java @@ -1,8 +1,11 @@ package mekanism.common.item; +import java.util.ArrayList; import java.util.List; +import mekanism.api.Coord4D; import mekanism.api.EnumColor; +import mekanism.api.Range4D; import mekanism.api.gas.Gas; import mekanism.api.gas.GasRegistry; import mekanism.api.gas.GasStack; @@ -10,7 +13,11 @@ import mekanism.api.gas.IGasItem; import mekanism.client.MekKeyHandler; import mekanism.client.MekanismKeyHandler; import mekanism.common.Mekanism; +import mekanism.common.Tier.BaseTier; +import mekanism.common.Tier.GasTankTier; import mekanism.common.base.ISustainedInventory; +import mekanism.common.base.ITierItem; +import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.tile.TileEntityGasTank; import mekanism.common.util.LangUtils; import net.minecraft.block.Block; @@ -26,7 +33,7 @@ import net.minecraft.util.IIcon; import net.minecraft.world.World; import net.minecraftforge.common.util.Constants.NBT; -public class ItemBlockGasTank extends ItemBlock implements IGasItem, ISustainedInventory +public class ItemBlockGasTank extends ItemBlock implements IGasItem, ISustainedInventory, ITierItem { public Block metaBlock; @@ -58,11 +65,11 @@ public class ItemBlockGasTank extends ItemBlock implements IGasItem, ISustainedI { return metaBlock.getIcon(2, i); } - + @Override - public String getUnlocalizedName(ItemStack itemstack) + public String getItemStackDisplayName(ItemStack itemstack) { - return getUnlocalizedName() + "." + "GasTank"; + return LangUtils.localize("tile.GasTank" + getBaseTier(itemstack).getName() + ".name"); } @Override @@ -73,9 +80,16 @@ public class ItemBlockGasTank extends ItemBlock implements IGasItem, ISustainedI if(place) { TileEntityGasTank tileEntity = (TileEntityGasTank)world.getTileEntity(x, y, z); + tileEntity.tier = GasTankTier.values()[getBaseTier(stack).ordinal()]; + tileEntity.gasTank.setMaxGas(tileEntity.tier.storage); tileEntity.gasTank.setGas(getGas(stack)); ((ISustainedInventory)tileEntity).setInventory(getInventory(stack)); + + if(!world.isRemote) + { + Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(tileEntity), tileEntity.getNetworkedData(new ArrayList())), new Range4D(Coord4D.get(tileEntity))); + } } return place; @@ -103,12 +117,6 @@ public class ItemBlockGasTank extends ItemBlock implements IGasItem, ISustainedI } } - @Override - public void onCreated(ItemStack itemstack, World world, EntityPlayer entityplayer) - { - itemstack = getEmptyItem(); - } - @Override public GasStack getGas(ItemStack itemstack) { @@ -152,43 +160,72 @@ public class ItemBlockGasTank extends ItemBlock implements IGasItem, ISustainedI } } - public ItemStack getEmptyItem() + public ItemStack getEmptyItem(GasTankTier tier) { ItemStack empty = new ItemStack(this); + setBaseTier(empty, tier.getBaseTier()); setGas(empty, null); empty.setItemDamage(100); + return empty; } @Override public void getSubItems(Item item, CreativeTabs tabs, List list) { - ItemStack empty = new ItemStack(this); - setGas(empty, null); - empty.setItemDamage(100); - list.add(empty); + for(GasTankTier tier : GasTankTier.values()) + { + ItemStack empty = new ItemStack(this); + setBaseTier(empty, tier.getBaseTier()); + setGas(empty, null); + empty.setItemDamage(100); + list.add(empty); + } for(Gas type : GasRegistry.getRegisteredGasses()) { if(type.isVisible()) { ItemStack filled = new ItemStack(this); + setBaseTier(filled, BaseTier.ULTIMATE); setGas(filled, new GasStack(type, ((IGasItem)filled.getItem()).getMaxGas(filled))); list.add(filled); } } } + + @Override + public BaseTier getBaseTier(ItemStack itemstack) + { + if(itemstack.stackTagCompound == null) + { + return BaseTier.BASIC; + } + + return BaseTier.values()[itemstack.stackTagCompound.getInteger("tier")]; + } + + @Override + public void setBaseTier(ItemStack itemstack, BaseTier tier) + { + if(itemstack.stackTagCompound == null) + { + itemstack.setTagCompound(new NBTTagCompound()); + } + + itemstack.stackTagCompound.setInteger("tier", tier.ordinal()); + } @Override public int getMaxGas(ItemStack itemstack) { - return MAX_GAS; + return GasTankTier.values()[getBaseTier(itemstack).ordinal()].storage; } @Override public int getRate(ItemStack itemstack) { - return TRANSFER_RATE; + return GasTankTier.values()[getBaseTier(itemstack).ordinal()].output; } @Override diff --git a/src/main/java/mekanism/common/item/ItemBlockMachine.java b/src/main/java/mekanism/common/item/ItemBlockMachine.java index 40f9c1f94..3b864ed49 100644 --- a/src/main/java/mekanism/common/item/ItemBlockMachine.java +++ b/src/main/java/mekanism/common/item/ItemBlockMachine.java @@ -17,6 +17,7 @@ import mekanism.client.MekKeyHandler; import mekanism.client.MekanismKeyHandler; import mekanism.common.Mekanism; import mekanism.common.Tier.BaseTier; +import mekanism.common.Tier.FluidTankTier; import mekanism.common.Upgrade; import mekanism.common.base.IElectricChest; import mekanism.common.base.IFactory; @@ -26,6 +27,7 @@ import mekanism.common.base.ISideConfiguration; import mekanism.common.base.ISustainedData; import mekanism.common.base.ISustainedInventory; import mekanism.common.base.ISustainedTank; +import mekanism.common.base.ITierItem; import mekanism.common.base.IUpgradeTile; import mekanism.common.block.BlockMachine.MachineType; import mekanism.common.integration.IC2ItemManager; @@ -36,7 +38,7 @@ import mekanism.common.tile.TileEntityBasicBlock; import mekanism.common.tile.TileEntityElectricBlock; import mekanism.common.tile.TileEntityElectricChest; import mekanism.common.tile.TileEntityFactory; -import mekanism.common.tile.TileEntityPortableTank; +import mekanism.common.tile.TileEntityFluidTank; import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import net.minecraft.block.Block; @@ -113,7 +115,7 @@ import cpw.mods.fml.relauncher.SideOnly; @Interface(iface = "cofh.api.energy.IEnergyContainerItem", modid = "CoFHCore"), @Interface(iface = "ic2.api.item.ISpecialElectricItem", modid = "IC2") }) -public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpecialElectricItem, IFactory, ISustainedInventory, ISustainedTank, IElectricChest, IEnergyContainerItem, IFluidContainerItem +public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpecialElectricItem, IFactory, ISustainedInventory, ISustainedTank, IElectricChest, IEnergyContainerItem, IFluidContainerItem, ITierItem { public Block metaBlock; @@ -159,6 +161,10 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec return tier.getLocalizedName() + " " + RecipeType.values()[getRecipeType(itemstack)].getLocalizedName() + " " + super.getItemStackDisplayName(itemstack); } + else if(type == MachineType.FLUID_TANK) + { + return LangUtils.localize("tile.FluidTank" + getBaseTier(itemstack).getName() + ".name"); + } return super.getItemStackDisplayName(itemstack); } @@ -171,7 +177,7 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec if(!MekKeyHandler.getIsKeyPressed(MekanismKeyHandler.sneakKey)) { - if(type == MachineType.PORTABLE_TANK) + if(type == MachineType.FLUID_TANK) { FluidStack fluidStack = getFluidStack(itemstack); @@ -197,7 +203,7 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec list.add(EnumColor.INDIGO + LangUtils.localize("tooltip.locked") + ": " + EnumColor.GREY + LangUtils.transYesNo(getLocked(itemstack))); } - if(type == MachineType.PORTABLE_TANK) + if(type == MachineType.FLUID_TANK) { list.add(EnumColor.INDIGO + LangUtils.localize("tooltip.portableTank.bucketMode") + ": " + EnumColor.GREY + LangUtils.transYesNo(getBucketMode(itemstack))); } @@ -207,7 +213,7 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec list.add(EnumColor.BRIGHT_GREEN + LangUtils.localize("tooltip.storedEnergy") + ": " + EnumColor.GREY + MekanismUtils.getEnergyDisplay(getEnergy(itemstack))); } - if(hasTank(itemstack) && type != MachineType.PORTABLE_TANK) + if(hasTank(itemstack) && type != MachineType.FLUID_TANK) { FluidStack fluidStack = getFluidStack(itemstack); @@ -242,7 +248,7 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec { MachineType type = MachineType.get(stack); - if(type == MachineType.PORTABLE_TANK && getBucketMode(stack)) + if(type == MachineType.FLUID_TANK && getBucketMode(stack)) { return false; } @@ -287,6 +293,13 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec { TileEntityBasicBlock tileEntity = (TileEntityBasicBlock)world.getTileEntity(x, y, z); + if(tileEntity instanceof TileEntityFluidTank) + { + TileEntityFluidTank tile = (TileEntityFluidTank)tileEntity; + tile.tier = FluidTankTier.values()[getBaseTier(stack).ordinal()]; + tile.fluidTank.setCapacity(tile.tier.storage); + } + if(tileEntity instanceof IUpgradeTile) { if(stack.stackTagCompound != null && stack.stackTagCompound.hasKey("upgrades")) @@ -442,11 +455,11 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec } } } - else if(type == MachineType.PORTABLE_TANK) + else if(type == MachineType.FLUID_TANK) { if(world != null && !world.isRemote) { - float targetScale = (float)(getFluidStack(itemstack) != null ? getFluidStack(itemstack).amount : 0)/TileEntityPortableTank.MAX_FLUID; + float targetScale = (float)(getFluidStack(itemstack) != null ? getFluidStack(itemstack).amount : 0)/getCapacity(itemstack); if(Math.abs(getPrevScale(itemstack) - targetScale) > 0.01) { @@ -525,7 +538,7 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec } } } - else if(type == MachineType.PORTABLE_TANK && getBucketMode(itemstack)) + else if(type == MachineType.FLUID_TANK && getBucketMode(itemstack)) { MovingObjectPosition pos = getMovingObjectPositionFromPlayer(world, entityplayer, !entityplayer.isSneaking()); @@ -554,7 +567,7 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec if(fluid != null && (getFluidStack(itemstack) == null || getFluidStack(itemstack).isFluidEqual(fluid))) { - int needed = TileEntityPortableTank.MAX_FLUID-(getFluidStack(itemstack) != null ? getFluidStack(itemstack).amount : 0); + int needed = getCapacity(itemstack)-(getFluidStack(itemstack) != null ? getFluidStack(itemstack).amount : 0); if(fluid.amount > needed) { @@ -715,7 +728,7 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec MachineType type = MachineType.get((ItemStack)data[0]); - return type == MachineType.ELECTRIC_PUMP || type == MachineType.PORTABLE_TANK || type == MachineType.FLUIDIC_PLENISHER; + return type == MachineType.ELECTRIC_PUMP || type == MachineType.FLUID_TANK || type == MachineType.FLUIDIC_PLENISHER; } @Override @@ -984,13 +997,13 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec @Override public int getCapacity(ItemStack container) { - return TileEntityPortableTank.MAX_FLUID; + return FluidTankTier.values()[getBaseTier(container).ordinal()].storage; } @Override public int fill(ItemStack container, FluidStack resource, boolean doFill) { - if(MachineType.get(container) == MachineType.PORTABLE_TANK && resource != null) + if(MachineType.get(container) == MachineType.FLUID_TANK && resource != null) { FluidStack stored = getFluidStack(container); int toFill; @@ -1002,10 +1015,10 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec if(stored == null) { - toFill = Math.min(resource.amount, TileEntityPortableTank.MAX_FLUID); + toFill = Math.min(resource.amount, getCapacity(container)); } else { - toFill = Math.min(resource.amount, TileEntityPortableTank.MAX_FLUID-stored.amount); + toFill = Math.min(resource.amount, getCapacity(container)-stored.amount); } if(doFill) @@ -1023,7 +1036,7 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec @Override public FluidStack drain(ItemStack container, int maxDrain, boolean doDrain) { - if(MachineType.get(container) == MachineType.PORTABLE_TANK) + if(MachineType.get(container) == MachineType.FLUID_TANK) { FluidStack stored = getFluidStack(container); @@ -1043,4 +1056,26 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec return null; } + + @Override + public BaseTier getBaseTier(ItemStack itemstack) + { + if(itemstack.stackTagCompound == null) + { + return BaseTier.BASIC; + } + + return BaseTier.values()[itemstack.stackTagCompound.getInteger("tier")]; + } + + @Override + public void setBaseTier(ItemStack itemstack, BaseTier tier) + { + if(itemstack.stackTagCompound == null) + { + itemstack.setTagCompound(new NBTTagCompound()); + } + + itemstack.stackTagCompound.setInteger("tier", tier.ordinal()); + } } diff --git a/src/main/java/mekanism/common/item/ItemGaugeDropper.java b/src/main/java/mekanism/common/item/ItemGaugeDropper.java index 7a1a8be6c..0c21269eb 100644 --- a/src/main/java/mekanism/common/item/ItemGaugeDropper.java +++ b/src/main/java/mekanism/common/item/ItemGaugeDropper.java @@ -6,7 +6,7 @@ import mekanism.api.gas.Gas; import mekanism.api.gas.GasStack; import mekanism.api.gas.IGasItem; import mekanism.common.Mekanism; -import mekanism.common.tile.TileEntityPortableTank; +import mekanism.common.tile.TileEntityFluidTank; import mekanism.common.util.LangUtils; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; @@ -160,10 +160,10 @@ public class ItemGaugeDropper extends ItemMekanism implements IGasItem, IFluidCo if(stored == null) { - toFill = Math.min(resource.amount, TileEntityPortableTank.MAX_FLUID); + toFill = Math.min(resource.amount, CAPACITY); } else { - toFill = Math.min(resource.amount, TileEntityPortableTank.MAX_FLUID-stored.amount); + toFill = Math.min(resource.amount, CAPACITY-stored.amount); } if(doFill) diff --git a/src/main/java/mekanism/common/tile/TileEntityPortableTank.java b/src/main/java/mekanism/common/tile/TileEntityFluidTank.java similarity index 92% rename from src/main/java/mekanism/common/tile/TileEntityPortableTank.java rename to src/main/java/mekanism/common/tile/TileEntityFluidTank.java index b6a246546..f45fcde94 100644 --- a/src/main/java/mekanism/common/tile/TileEntityPortableTank.java +++ b/src/main/java/mekanism/common/tile/TileEntityFluidTank.java @@ -9,6 +9,7 @@ import mekanism.api.IConfigurable; import mekanism.api.MekanismConfig.general; import mekanism.api.Range4D; import mekanism.common.Mekanism; +import mekanism.common.Tier.FluidTankTier; import mekanism.common.base.IActiveState; import mekanism.common.base.IFluidContainerManager; import mekanism.common.base.ISustainedTank; @@ -17,6 +18,7 @@ import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.util.FluidContainerUtils; import mekanism.common.util.FluidContainerUtils.ContainerEditMode; import mekanism.common.util.InventoryUtils; +import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -32,18 +34,18 @@ import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.IFluidContainerItem; import net.minecraftforge.fluids.IFluidHandler; -public class TileEntityPortableTank extends TileEntityContainerBlock implements IActiveState, IConfigurable, IFluidHandler, ISustainedTank, IFluidContainerManager, ITankManager +public class TileEntityFluidTank extends TileEntityContainerBlock implements IActiveState, IConfigurable, IFluidHandler, ISustainedTank, IFluidContainerManager, ITankManager { public boolean isActive; public boolean clientActive; - public static final int MAX_FLUID = 14000; - - public FluidTank fluidTank = new FluidTank(MAX_FLUID); + public FluidTank fluidTank; public ContainerEditMode editMode = ContainerEditMode.BOTH; + public FluidTankTier tier = FluidTankTier.BASIC; + public int updateDelay; public int prevAmount; @@ -55,10 +57,11 @@ public class TileEntityPortableTank extends TileEntityContainerBlock implements public boolean needsPacket; - public TileEntityPortableTank() + public TileEntityFluidTank() { - super("PortableTank"); + super("FluidTank"); + fluidTank = new FluidTank(tier.storage); inventory = new ItemStack[2]; } @@ -140,6 +143,12 @@ public class TileEntityPortableTank extends TileEntityContainerBlock implements } } + @Override + public String getInventoryName() + { + return LangUtils.localize("tile.FluidTank" + tier.getBaseTier().getName() + ".name"); + } + private void activeEmit() { if(fluidTank.getFluid() != null) @@ -148,7 +157,7 @@ public class TileEntityPortableTank extends TileEntityContainerBlock implements if(tileEntity instanceof IFluidHandler) { - FluidStack toDrain = new FluidStack(fluidTank.getFluid(), Math.min(100, fluidTank.getFluidAmount())); + FluidStack toDrain = new FluidStack(fluidTank.getFluid(), Math.min(tier.output, fluidTank.getFluidAmount())); fluidTank.drain(((IFluidHandler)tileEntity).fill(ForgeDirection.UP, toDrain, true), true); } } @@ -287,7 +296,7 @@ public class TileEntityPortableTank extends TileEntityContainerBlock implements { Coord4D up = Coord4D.get(this).getFromSide(ForgeDirection.UP); - if(up.getTileEntity(worldObj) instanceof TileEntityPortableTank) + if(up.getTileEntity(worldObj) instanceof TileEntityFluidTank) { IFluidHandler handler = (IFluidHandler)up.getTileEntity(worldObj); @@ -353,6 +362,7 @@ public class TileEntityPortableTank extends TileEntityContainerBlock implements { super.writeToNBT(nbtTags); + nbtTags.setInteger("tier", tier.ordinal()); nbtTags.setBoolean("isActive", isActive); nbtTags.setInteger("editMode", editMode.ordinal()); @@ -367,6 +377,7 @@ public class TileEntityPortableTank extends TileEntityContainerBlock implements { super.readFromNBT(nbtTags); + tier = FluidTankTier.values()[nbtTags.getInteger("tier")]; clientActive = isActive = nbtTags.getBoolean("isActive"); editMode = ContainerEditMode.values()[nbtTags.getInteger("editMode")]; @@ -381,6 +392,7 @@ public class TileEntityPortableTank extends TileEntityContainerBlock implements { super.handlePacketData(dataStream); + tier = FluidTankTier.values()[dataStream.readInt()]; clientActive = dataStream.readBoolean(); valve = dataStream.readInt(); editMode = ContainerEditMode.values()[dataStream.readInt()]; @@ -415,9 +427,9 @@ public class TileEntityPortableTank extends TileEntityContainerBlock implements Coord4D top = Coord4D.get(this).getFromSide(ForgeDirection.UP); - if(top.getTileEntity(worldObj) instanceof TileEntityPortableTank) + if(top.getTileEntity(worldObj) instanceof TileEntityFluidTank) { - needed += ((TileEntityPortableTank)top.getTileEntity(worldObj)).getCurrentNeeded(); + needed += ((TileEntityFluidTank)top.getTileEntity(worldObj)).getCurrentNeeded(); } return needed; @@ -428,6 +440,7 @@ public class TileEntityPortableTank extends TileEntityContainerBlock implements { super.getNetworkedData(data); + data.add(tier.ordinal()); data.add(isActive); data.add(valve); data.add(editMode.ordinal()); @@ -558,7 +571,7 @@ public class TileEntityPortableTank extends TileEntityContainerBlock implements { TileEntity tile = Coord4D.get(this).getFromSide(ForgeDirection.DOWN).getTileEntity(worldObj); - if(isActive && !(tile instanceof TileEntityPortableTank)) + if(isActive && !(tile instanceof TileEntityFluidTank)) { return false; } diff --git a/src/main/java/mekanism/common/tile/TileEntityGasTank.java b/src/main/java/mekanism/common/tile/TileEntityGasTank.java index cff2b66f1..ead765dbc 100644 --- a/src/main/java/mekanism/common/tile/TileEntityGasTank.java +++ b/src/main/java/mekanism/common/tile/TileEntityGasTank.java @@ -17,6 +17,7 @@ import mekanism.api.gas.ITubeConnection; import mekanism.api.transmitters.TransmissionType; import mekanism.common.Mekanism; import mekanism.common.SideData; +import mekanism.common.Tier.GasTankTier; import mekanism.common.base.IEjector; import mekanism.common.base.IRedstoneControl; import mekanism.common.base.ISideConfiguration; @@ -24,6 +25,7 @@ import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.tile.component.TileComponentConfig; import mekanism.common.tile.component.TileComponentEjector; import mekanism.common.util.InventoryUtils; +import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; @@ -42,12 +44,9 @@ public class TileEntityGasTank extends TileEntityContainerBlock implements IGasH } /** The type of gas stored in this tank. */ - public GasTank gasTank = new GasTank(MAX_GAS); - - public static final int MAX_GAS = 96000; - - /** How fast this tank can output gas. */ - public int output = 256; + public GasTank gasTank; + + public GasTankTier tier = GasTankTier.BASIC; public GasMode dumping; @@ -74,6 +73,7 @@ public class TileEntityGasTank extends TileEntityContainerBlock implements IGasH configComponent.setIOConfig(TransmissionType.GAS); configComponent.setEjecting(TransmissionType.GAS, true); + gasTank = new GasTank(tier.storage); inventory = new ItemStack[2]; dumping = GasMode.IDLE; controlType = RedstoneControl.DISABLED; @@ -100,19 +100,19 @@ public class TileEntityGasTank extends TileEntityContainerBlock implements IGasH { if(configComponent.isEjecting(TransmissionType.GAS)) { - GasStack toSend = new GasStack(gasTank.getGas().getGas(), Math.min(gasTank.getStored(), output)); + GasStack toSend = new GasStack(gasTank.getGas().getGas(), Math.min(gasTank.getStored(), tier.output)); gasTank.draw(GasTransmission.emit(toSend, this, configComponent.getSidesForData(TransmissionType.GAS, facing, 2)), true); } } if(dumping == GasMode.DUMPING) { - gasTank.draw(8, true); + gasTank.draw(tier.storage/400, true); } - if(dumping == GasMode.DUMPING_EXCESS && gasTank.getNeeded() < output) + if(dumping == GasMode.DUMPING_EXCESS && gasTank.getNeeded() < tier.output) { - gasTank.draw(output-gasTank.getNeeded(), true); + gasTank.draw(tier.output-gasTank.getNeeded(), true); } int newGasAmount = gasTank.getStored(); @@ -125,6 +125,12 @@ public class TileEntityGasTank extends TileEntityContainerBlock implements IGasH currentGasAmount = newGasAmount; } } + + @Override + public String getInventoryName() + { + return LangUtils.localize("tile.GasTank" + tier.getBaseTier().getName() + ".name"); + } @Override public boolean canExtractItem(int slotID, ItemStack itemstack, int side) @@ -226,6 +232,9 @@ public class TileEntityGasTank extends TileEntityContainerBlock implements IGasH } super.handlePacketData(dataStream); + + tier = GasTankTier.values()[dataStream.readInt()]; + gasTank.setMaxGas(tier.storage); if(dataStream.readBoolean()) { @@ -246,6 +255,7 @@ public class TileEntityGasTank extends TileEntityContainerBlock implements IGasH { super.readFromNBT(nbtTags); + tier = GasTankTier.values()[nbtTags.getInteger("tier")]; gasTank.read(nbtTags.getCompoundTag("gasTank")); dumping = GasMode.values()[nbtTags.getInteger("dumping")]; @@ -257,6 +267,7 @@ public class TileEntityGasTank extends TileEntityContainerBlock implements IGasH { super.writeToNBT(nbtTags); + nbtTags.setInteger("tier", tier.ordinal()); nbtTags.setTag("gasTank", gasTank.write(new NBTTagCompound())); nbtTags.setInteger("dumping", dumping.ordinal()); nbtTags.setInteger("controlType", controlType.ordinal()); @@ -266,6 +277,8 @@ public class TileEntityGasTank extends TileEntityContainerBlock implements IGasH public ArrayList getNetworkedData(ArrayList data) { super.getNetworkedData(data); + + data.add(tier.ordinal()); if(gasTank.getGas() != null) { diff --git a/src/main/java/mekanism/common/util/MekanismUtils.java b/src/main/java/mekanism/common/util/MekanismUtils.java index d6a9eee0f..528d642c1 100644 --- a/src/main/java/mekanism/common/util/MekanismUtils.java +++ b/src/main/java/mekanism/common/util/MekanismUtils.java @@ -34,6 +34,8 @@ import mekanism.common.OreDictCache; import mekanism.common.Tier.BaseTier; import mekanism.common.Tier.EnergyCubeTier; import mekanism.common.Tier.FactoryTier; +import mekanism.common.Tier.FluidTankTier; +import mekanism.common.Tier.GasTankTier; import mekanism.common.Tier.InductionCellTier; import mekanism.common.Tier.InductionProviderTier; import mekanism.common.Upgrade; @@ -49,6 +51,7 @@ import mekanism.common.inventory.container.ContainerElectricChest; import mekanism.common.item.ItemBlockBasic; import mekanism.common.item.ItemBlockEnergyCube; import mekanism.common.item.ItemBlockGasTank; +import mekanism.common.item.ItemBlockMachine; import mekanism.common.network.PacketElectricChest.ElectricChestMessage; import mekanism.common.network.PacketElectricChest.ElectricChestPacketType; import mekanism.common.tile.TileEntityAdvancedBoundingBlock; @@ -368,10 +371,18 @@ public final class MekanismUtils * Retrieves an empty Gas Tank. * @return empty gas tank */ - public static ItemStack getEmptyGasTank() + public static ItemStack getEmptyGasTank(GasTankTier tier) { - ItemStack itemstack = ((ItemBlockGasTank)new ItemStack(MekanismBlocks.GasTank).getItem()).getEmptyItem(); - return itemstack; + return ((ItemBlockGasTank)new ItemStack(MekanismBlocks.GasTank).getItem()).getEmptyItem(tier); + } + + public static ItemStack getEmptyFluidTank(FluidTankTier tier) + { + ItemStack stack = new ItemStack(MekanismBlocks.MachineBlock2, 1, 11); + ItemBlockMachine itemMachine = (ItemBlockMachine)stack.getItem(); + itemMachine.setBaseTier(stack, tier.getBaseTier()); + + return stack; } /** @@ -1336,9 +1347,9 @@ public final class MekanismUtils * @param gas - gas to fill the tank with * @return filled gas tank */ - public static ItemStack getFullGasTank(Gas gas) + public static ItemStack getFullGasTank(GasTankTier tier, Gas gas) { - ItemStack tank = getEmptyGasTank(); + ItemStack tank = getEmptyGasTank(tier); ItemBlockGasTank item = (ItemBlockGasTank)tank.getItem(); item.setGas(tank, new GasStack(gas, item.MAX_GAS)); diff --git a/src/main/java/mekanism/common/util/RecipeUtils.java b/src/main/java/mekanism/common/util/RecipeUtils.java index 482a0e8eb..caf953c41 100644 --- a/src/main/java/mekanism/common/util/RecipeUtils.java +++ b/src/main/java/mekanism/common/util/RecipeUtils.java @@ -11,8 +11,8 @@ import mekanism.api.gas.IGasItem; import mekanism.common.Upgrade; import mekanism.common.base.IEnergyCube; import mekanism.common.base.IFactory; +import mekanism.common.base.ITierItem; import mekanism.common.block.BlockMachine.MachineType; -import mekanism.common.item.ItemBlockBasic; import mekanism.common.recipe.ShapedMekanismRecipe; import mekanism.common.recipe.ShapelessMekanismRecipe; import net.minecraft.block.Block; @@ -79,9 +79,9 @@ public class RecipeUtils return false; } } - else if(target.getItem() instanceof ItemBlockBasic && input.getItem() instanceof ItemBlockBasic) + else if(target.getItem() instanceof ITierItem && input.getItem() instanceof ITierItem) { - if(((ItemBlockBasic)target.getItem()).getTier(target) != ((ItemBlockBasic)input.getItem()).getTier(input)) + if(((ITierItem)target.getItem()).getBaseTier(target) != ((ITierItem)input.getItem()).getBaseTier(input)) { return false; } diff --git a/src/main/java/mekanism/generators/common/MekanismGenerators.java b/src/main/java/mekanism/generators/common/MekanismGenerators.java index 447a367d5..9b00244c8 100644 --- a/src/main/java/mekanism/generators/common/MekanismGenerators.java +++ b/src/main/java/mekanism/generators/common/MekanismGenerators.java @@ -14,6 +14,7 @@ import mekanism.common.Mekanism; import mekanism.common.MekanismBlocks; import mekanism.common.MekanismItems; import mekanism.common.Tier.BaseTier; +import mekanism.common.Tier.GasTankTier; import mekanism.common.Version; import mekanism.common.base.IModule; import mekanism.common.multiblock.MultiblockManager; @@ -166,7 +167,7 @@ public class MekanismGenerators implements IModule " I ", "IGI", " I ", Character.valueOf('I'), new ItemStack(GeneratorsBlocks.Reactor, 1, 1), Character.valueOf('G'), "blockGlass" })); CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(GeneratorsBlocks.Reactor, 1, 0), new Object[] { - "CGC", "ITI", "III", Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.ULTIMATE), Character.valueOf('G'), "paneGlass", Character.valueOf('I'), new ItemStack(GeneratorsBlocks.Reactor, 1, 1), Character.valueOf('T'), MekanismUtils.getEmptyGasTank() + "CGC", "ITI", "III", Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.ULTIMATE), Character.valueOf('G'), "paneGlass", Character.valueOf('I'), new ItemStack(GeneratorsBlocks.Reactor, 1, 1), Character.valueOf('T'), MekanismUtils.getEmptyGasTank(GasTankTier.BASIC) })); CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(GeneratorsBlocks.ReactorGlass, 2, 1), new Object[] { " I ", "ILI", " I ", Character.valueOf('I'), new ItemStack(GeneratorsBlocks.ReactorGlass, 1, 0), Character.valueOf('L'), "blockRedstone" diff --git a/src/main/resources/assets/mekanism/lang/en_US.lang b/src/main/resources/assets/mekanism/lang/en_US.lang index ef79904d5..1ad23d3ab 100644 --- a/src/main/resources/assets/mekanism/lang/en_US.lang +++ b/src/main/resources/assets/mekanism/lang/en_US.lang @@ -56,7 +56,16 @@ item.EliteControlCircuit.name=Elite Control Circuit item.UltimateControlCircuit.name=Ultimate Control Circuit //Gas Tank -tile.GasTank.GasTank.name=Gas Tank +tile.GasTankBasic.name=Basic Gas Tank +tile.GasTankAdvanced.name=Advanced Gas Tank +tile.GasTankElite.name=Elite Gas Tank +tile.GasTankUltimate.name=Ultimate Gas Tank + +//Fluid Tank (part of MachineBlock2, naming handled differently) +tile.FluidTankBasic.name=Basic Fluid Tank +tile.FluidTankAdvanced.name=Advanced Fluid Tank +tile.FluidTankElite.name=Elite Fluid Tank +tile.FluidTankUltimate.name=Ultimate Fluid Tank //Cardboard Box tile.CardboardBox.name=Cardboard Box @@ -132,7 +141,6 @@ tile.MachineBlock2.ChemicalCrystallizer.name=Chemical Crystallizer tile.MachineBlock2.SeismicVibrator.name=Seismic Vibrator tile.MachineBlock2.PressurizedReactionChamber.name=Pressurized Reaction Chamber tile.MachineBlock2.PressurizedReactionChamber.short.name=PRC -tile.MachineBlock2.PortableTank.name=Portable Tank tile.MachineBlock2.FluidicPlenisher.name=Fluidic Plenisher tile.MachineBlock2.Laser.name=Laser tile.MachineBlock2.LaserAmplifier.name=Laser Amplifier @@ -766,7 +774,7 @@ tooltip.ChemicalOxidizer=A machine capable of oxidizing solid materials into gas tooltip.ChemicalInfuser=A machine that produces a new gas by infusing two others. tooltip.SeismicVibrator=A machine that uses seismic vibrations to provide information on differing layers of the world. tooltip.PressurizedReactionChamber=An advanced machine that processes a solid, liquid and gaseous mixture and creates both a gaseous and solid product. -tooltip.PortableTank=A handy, sturdy, portable tank that lets you carry 14 buckets of fluid wherever you please. Also doubles as a bucket! +tooltip.FluidTank=A handy, sturdy, portable tank that lets you carry multiple buckets of fluid wherever you please. Also doubles as a bucket! tooltip.FluidicPlenisher=A machine that is capable of creating entire lakes by filling ravines with fluids. tooltip.Laser=An advanced form of linear energy transfer that utilizes an extremely collimated beam of light. tooltip.LaserAmplifier=A block that can be used to merge, redirect and amplify laser beams, with fine controls over when to fire. diff --git a/src/main/resources/assets/mekanism/render/FluidTank.png b/src/main/resources/assets/mekanism/render/FluidTank.png new file mode 100755 index 0000000000000000000000000000000000000000..b1dc430e97c0010f4c8483e3d1b4cd2929e88440 GIT binary patch literal 2578 zcmd6pS5y-S7KW1;5EPKE)C390DB{pUZw8Q1gP|xz>Zl+cq)dP$f+irn7a=ezNFOi| ziXa^k34)*uRbmMckP?kR0xUao&YpeS*L}F<;r{nO=X<#4CZTMv@Sl)80RRB_krt*` zk1Fop!NYx&`wYEC001z*9|D0wA`nniSny51fZqTB?bK99_uJBrqJ|yex8z||bb!YF zh-XIp3jEnl8s+46?EE}DC=UsrIlJu3`bI4nrfREq?3de_p<-26i$(iiQgBeEAE#yw z$(M3ZD9lVkl?=%{38>|V6^ueX^+Lb)#)aR$#WG7aN-^KsZf$Taw^d)u%M=BQ7u8=p ztwswcq!SG;WF!*GPIH$#+sj;Vud)Wg?M_BDyDlPnF&=+S%^#5JDCRO^&`^l?^RLfN z64Qa3m5w8kz~A>WAx5h%vMldqimGw{rQchZd_MGr8^)*l-TbUfdq?DQMEeu-1=HUQ z?3nYhRsVeNQD)=Ms9yf^hj;Pa`Lf244X*=IV9)LQ%)q|Nu|kqz;)a(S`+}wdeaXJx zsyd5g&f%fm35;uz{y3XgoGE0)oiVpi)KDR`Vd_>pd%U`f^rWsiSuUQQ2xltOE)vJI z=&#W|(>2xE1CM$l`ze|(+uM5J?xc3tqOGAYb|AWRoBm~0vuFepW6Ifk5o5uM3nS^Q zuf#4h6Z0+}=RD2NNf7H#AY#kSO;~i=LF1gI;4uk*$uCH(O4efm*Gr$=11pxttoTlA zO+u{18GHDvWrwEEABN!?u5;Jer=;4=Tx?rq?Ai}dPsfsC@55{G*e?F(yj)5JzY;o6 z*jzg%i&T;MFUSgxyvu`MfW| z@Sb>+Bqyy_{M~O`HTT_oM2zBVm462@+*Az7KBYQVEG$@(^|Z0RNu-;KR# z%K)<*`daVzU!`0lQMJy=D+yf&X}&wtlR!Zy{k_Itv20$I89T%6MWVCQJu>$uT4YFv*y zC{u5w0x zpI66Vi<2&u8psIvK)zP8-MUnqfJy8|(07{yM@NU1kepv+oPuq%yG%qN4@!nFp_|({7^)Gl4ErTpJ7D)4vz1b(|7$Rk`wr&DY&!w6(@op{0=l zdD1xikbKaYvDe2JxU`vxGflHSGMN^!CqGX9Tw}f5Q;Uw@pIn*i53i+P#5HT_mAqWs zh^@NAHRGPj9*g zWC%jHjuVZ12s=Dr`BE;?$q={gXSeK|MpK|2j6?@ZUHP?$QYoRx$O{fLJv}`{xrT-Y zugFNazJbC0Ac~YM1k%^rdpR0|Iay+Rjy$`*$>B&ZEG{A%K0Lmk@M^Qo(=s|r9= z-%#4yC2ehOUHYe{$H&KscOR9OI;GdeP)TQI>*K1NYJQ}5^Av(hNu=~%7JFYw<#IOQ z@wn297ccq~jUxt`eX_E$f25zudH}0#-rwIBV)_sW1XZ0o^n$NDw(BFuFhM~ok4U5| zp+ct+A+Zr$)!3*gEyZpc&AT>;hRlN*=8hGx+3bQ}_4M@cM>`k{#-CkXvfK$hmBPAATS*S_uTFwqiKhr@vZGiyMiUCHM!y9%7S z1Bq-o1vI~J)`QRhIV&qGO+@NG6xGRvYIF$p??64Fc@P?w*5j0wb8YiIPa3a9a7RnU zuN^k@O@BiI22~$K3xEEgV>RU^J!Mzv73d;^Uj<*gem&`)+>IuBPxu;`jP183AWWA+ z2Cw52&d!%l$&!FXd6Q*X8251tnt$rux%v44Q~4FLE@;ZtSa<7Pq)=w^w=ve^Zn9Uv zrUr2;4ug@}K(7!)(XA&#-R^Wd-wzjn;O(ka#XBaTGSle~ds-5{CP(u$sPHITRF)Cm4pnim;u#zHr9gLRsC;?Q}4UKhDcb*G8 zAjf6l*f5ZH24B?$)E2Q{4AT3w5Bk$0XKZcB>Y>#V>l-{$JjxGkDnJ!RJz>Ct-(mONb z(%RmhjLeX=0iotsuska~JR?ztC3qG5Qv{@u7U=p6r(KZKM#MEn%&y;E&*_!Zss-aTqQF;-69-8xfO;74a2FI!+X>wmN{6VX1!bPkUWG}tPH+`KwvcB_kyk$I z)DlA9469cK4L0`C%vZt#VZQGTHn&aiYyLm zB8@>$!IrF_Sp^exiE}_+jU?ls^s(LI?<)0A<-lRcY^K&{%?ck0VkYL@-||YLF|s$O z-&&|?1LK(3tyt%|RItynPBVK}GZ%sjM z28Q%tnqHeCuSHpo@$kV7Vf3EP`M* i^k1I;_iaU5_u?0PLHwF5HSFlu10c<8P3tdv-uo9iHOg&`+LV$us2H{N)>hQ0*i~wmHuNG9F12+~B&GJc#E8-B zl9sjOvX{ zxck;|BntTWI9tkS!&&m^-g>JVl%V>!ZP9zOKf*8}GvNM;($Yj4lcRlLT0Rfz?*XbQ z2VL#`SC4Y5z|ETVAFu8eJ^Wr?A4>K*EkpGBKcyi0-x3ST3{%NouJkKf@@tE>1dAF> znJI&H=>a0XMSNih#5UQS6ElcOEz}J&9KyTm%Vw{{QP3VTBuCTF0yH;T}z<-EVI5AI3ta4Fmy3a2CNOZV4)Y-kmZ#Kssij{l4?JBkl4)7vJ+ zty5C-lvx-R`MD_qgp{z4)|O7|XU%zj5eXFi0Z&xHyykLIU3NoMt`jXdgmgYj zSqN?(C)<^u88`kOo>X_28Ec!7X+5pnzOhNO9T*deD~o%ojZIGM=4@nRQhae0*~M=4 z+b_I6icscx!72ah6fS0U{&)N$&plq=7ZO|RG1$M>R504x-IsehJnWG|Ya462?1MCX zBG@3x$ifLu`0in!x_a{&B`E2Dj4p{tL%yXD-PPeo*MZv>)3|KuYCnln;%a#&JMt@?$*qeq=uz)VQqr+)SrRGf zxHCrcplveLkFGER-z+4q+}UdlA9DV?v%#`|E9kd~M~6azWvZpuCAhq$R^QTHyH%Wk>GXQgfz_#_qXQ{4_g4w05G&p88+;jZFrSQEZHJ$2 zcPKAq{;>XG7rnuFxBW7!Sr5%IVD52o&9Bp zFY^pj{JnV^(sYucf~KfkosWDgoT>bg_|eE?tZlldLG5LQ?CDZ+Pg{lI+ZrtXtk_;F zT-9NEXD7HH-PzgszO7BTwzjq}RF@+^Ki|vOS3bk^^;KbxoA`Nd9UUDn14$%}Mx$yh z@6ON9Biq~Cg^?)X)mYlTZ}iU{H&mNwEd2=4e{Bw*=yAPeRnNma2!B-ZxNGip4{HI~ z-Q7K_Pen<|IE=Rt>|c0kc5ZGk6&g86=~Yotd4&?jJd>+w)(M%@{2R5sy*;pkEAh@- zW@%RC-m0jm2#t;w9xyTB=-vAyP<48~e*wT^vGpD43U@J72Se{MBGJ1q2!UY2RDI1t zq53x`>-rB55B=nAwkh2$)D19n*P%Lb=Zv?olMOTXzAJ0Sdd9x{3s+Zn>yrrV zaEQ9e^O%y;_F8_Vy^v?p(;sGz*z|K5Pd8Ly8?nm8-0tW60(OiZl4 zCV*ngaH5`$8#Cry>AOx-k-EnGTzCQwPo?;9QBOorb+-Yju&L3}(cO(N*wDyG zeiLhPIAA*b_`<~!kQc3#m|(T!$@qc>OXqP%j2%i%!wPW=g%}h;lZ`zop2w~P5I698 zT90GAfmevinv71%ppp)VdP!V8@!+AfWxsn=r|blLXIYSt6mBmEj|mla$wBs5zdEjp zc;DDK5&GPe$M_~kD*TCzE=Wf6w23KHo{hSEVIh6Fze`BfouJ!cQe#<@fX(?as!@tF`ML zSU^E;a_E`mh*OpBoClaBusK`q7Fk}cf~avD1X+h9&q|h29+BK!e+SFiSd{xDs-{=R z*X}{kP$AZpBWf}J0(n97U&w#){x3$)RaOS)f@8FAy()9)`JV`Yo7^_8z3KVnA9GRY Aod5s; literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/mekanism/render/GasTank.png b/src/main/resources/assets/mekanism/render/GasTank.png deleted file mode 100644 index 355a92aa326ab35af6522e85f925de186dd09752..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3253 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 diff --git a/src/main/resources/assets/mekanism/render/GasTankAdvanced.png b/src/main/resources/assets/mekanism/render/GasTankAdvanced.png new file mode 100644 index 0000000000000000000000000000000000000000..98c797b73239374f5559d03e5cb6446b5981b6d5 GIT binary patch literal 3245 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 Yu`uk=z3|lub0=Y-b4MHdw{z^j0O;;kv;Y7A literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/mekanism/render/GasTankBasic.png b/src/main/resources/assets/mekanism/render/GasTankBasic.png new file mode 100644 index 0000000000000000000000000000000000000000..7d7dd42ddeee24a98474bea8663a0b673e32adc9 GIT binary patch literal 3241 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 Mo~2>qUAM&l0IuL#8UO$Q literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/mekanism/render/GasTankUltimate.png b/src/main/resources/assets/mekanism/render/GasTankUltimate.png new file mode 100644 index 0000000000000000000000000000000000000000..3b7ad2ab2b3b8b46907644de010f87d55fc80eaa GIT binary patch literal 3238 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 PbC5nyS3j3^P6 Date: Wed, 24 Feb 2016 17:42:12 -0500 Subject: [PATCH 05/52] Work on boilers --- .../content/boiler/BoilerSteamTank.java | 9 +- .../common/content/boiler/BoilerTank.java | 27 +- .../content/boiler/BoilerWaterTank.java | 9 +- .../boiler/SynchronizedBoilerData.java | 42 ++- .../common/tile/TileEntityBoilerCasing.java | 357 ++++++------------ .../common/tile/TileEntityBoilerValve.java | 4 +- .../common/tile/TileEntityDynamicTank.java | 4 +- .../resources/assets/mekanism/lang/en_US.lang | 1 + 8 files changed, 175 insertions(+), 278 deletions(-) diff --git a/src/main/java/mekanism/common/content/boiler/BoilerSteamTank.java b/src/main/java/mekanism/common/content/boiler/BoilerSteamTank.java index 3e99ab2a0..32086fd6f 100644 --- a/src/main/java/mekanism/common/content/boiler/BoilerSteamTank.java +++ b/src/main/java/mekanism/common/content/boiler/BoilerSteamTank.java @@ -1,7 +1,6 @@ package mekanism.common.content.boiler; import mekanism.common.tile.TileEntityBoilerCasing; - import net.minecraftforge.fluids.FluidStack; public class BoilerSteamTank extends BoilerTank @@ -17,9 +16,15 @@ public class BoilerSteamTank extends BoilerTank return steamBoiler.structure != null ? steamBoiler.structure.steamStored : null; } + @Override public void setFluid(FluidStack stack) { steamBoiler.structure.steamStored = stack; } - + + @Override + public int getCapacity() + { + return steamBoiler.structure != null ? steamBoiler.structure.steamVolume*BoilerUpdateProtocol.STEAM_PER_TANK : 0; + } } diff --git a/src/main/java/mekanism/common/content/boiler/BoilerTank.java b/src/main/java/mekanism/common/content/boiler/BoilerTank.java index 33a7cdc5d..d313536cc 100644 --- a/src/main/java/mekanism/common/content/boiler/BoilerTank.java +++ b/src/main/java/mekanism/common/content/boiler/BoilerTank.java @@ -4,7 +4,6 @@ import mekanism.api.Coord4D; import mekanism.common.content.boiler.SynchronizedBoilerData.ValveData; import mekanism.common.tile.TileEntityBoilerCasing; import mekanism.common.util.MekanismUtils; - import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.IFluidTank; @@ -20,12 +19,6 @@ public abstract class BoilerTank implements IFluidTank public abstract void setFluid(FluidStack stack); - @Override - public int getCapacity() - { - return steamBoiler.structure != null ? steamBoiler.structure.volume * BoilerUpdateProtocol.WATER_PER_TANK : 0; - } - @Override public int fill(FluidStack resource, boolean doFill) { @@ -48,9 +41,7 @@ public abstract class BoilerTank implements IFluidTank if(resource.amount > 0 && doFill) { MekanismUtils.saveChunk(steamBoiler); - updateValveData(true); - steamBoiler.sendPacketToRenderer(); - updateValveData(false); + updateValveData(); } return resource.amount; @@ -65,9 +56,7 @@ public abstract class BoilerTank implements IFluidTank if(getCapacity() > 0 && doFill) { MekanismUtils.saveChunk(steamBoiler); - updateValveData(true); - steamBoiler.sendPacketToRenderer(); - updateValveData(false); + updateValveData(); } return getCapacity(); @@ -91,9 +80,7 @@ public abstract class BoilerTank implements IFluidTank if(resource.amount > 0 && doFill) { MekanismUtils.saveChunk(steamBoiler); - updateValveData(true); - steamBoiler.sendPacketToRenderer(); - updateValveData(false); + updateValveData(); } return resource.amount; @@ -107,9 +94,7 @@ public abstract class BoilerTank implements IFluidTank if(space > 0 && doFill) { MekanismUtils.saveChunk(steamBoiler); - updateValveData(true); - steamBoiler.sendPacketToRenderer(); - updateValveData(false); + updateValveData(); } return space; @@ -119,7 +104,7 @@ public abstract class BoilerTank implements IFluidTank return 0; } - public void updateValveData(boolean value) + public void updateValveData() { if(steamBoiler.structure != null) { @@ -127,7 +112,7 @@ public abstract class BoilerTank implements IFluidTank { if(data.location.equals(Coord4D.get(steamBoiler))) { - data.serverFluid = value; + data.onTransfer(); } } } diff --git a/src/main/java/mekanism/common/content/boiler/BoilerWaterTank.java b/src/main/java/mekanism/common/content/boiler/BoilerWaterTank.java index 78f8757da..ec1aab932 100644 --- a/src/main/java/mekanism/common/content/boiler/BoilerWaterTank.java +++ b/src/main/java/mekanism/common/content/boiler/BoilerWaterTank.java @@ -1,7 +1,6 @@ package mekanism.common.content.boiler; import mekanism.common.tile.TileEntityBoilerCasing; - import net.minecraftforge.fluids.FluidStack; public class BoilerWaterTank extends BoilerTank @@ -17,9 +16,15 @@ public class BoilerWaterTank extends BoilerTank return steamBoiler.structure != null ? steamBoiler.structure.waterStored : null; } + @Override public void setFluid(FluidStack stack) { steamBoiler.structure.waterStored = stack; } - + + @Override + public int getCapacity() + { + return steamBoiler.structure != null ? steamBoiler.structure.waterVolume*BoilerUpdateProtocol.WATER_PER_TANK : 0; + } } diff --git a/src/main/java/mekanism/common/content/boiler/SynchronizedBoilerData.java b/src/main/java/mekanism/common/content/boiler/SynchronizedBoilerData.java index 74ee6d8e9..f44ffc3a2 100644 --- a/src/main/java/mekanism/common/content/boiler/SynchronizedBoilerData.java +++ b/src/main/java/mekanism/common/content/boiler/SynchronizedBoilerData.java @@ -15,8 +15,10 @@ import net.minecraftforge.fluids.FluidStack; public class SynchronizedBoilerData extends SynchronizedData implements IHeatTransfer { public FluidStack waterStored; + public FluidStack prevWater; public FluidStack steamStored; + public FluidStack prevSteam; public double temperature; @@ -37,6 +39,37 @@ public class SynchronizedBoilerData extends SynchronizedData valves = new HashSet(); + + public boolean needsRenderUpdate() + { + if((waterStored == null && prevWater != null) || (waterStored != null && prevWater == null)) + { + return true; + } + + if(waterStored != null && prevWater != null) + { + if((waterStored.getFluid() != prevWater.getFluid()) || (waterStored.amount != prevWater.amount)) + { + return true; + } + } + + if((steamStored == null && prevSteam != null) || (steamStored != null && prevSteam == null)) + { + return true; + } + + if(steamStored != null && prevSteam != null) + { + if((steamStored.getFluid() != prevSteam.getFluid()) || (steamStored.amount != prevSteam.amount)) + { + return true; + } + } + + return false; + } @Override public ItemStack[] getInventory() @@ -124,7 +157,14 @@ public class SynchronizedBoilerData extends SynchronizedData implements IFluidContainerManager, IHeatTransfer { - /** A client-sided and server-sided map of valves on this tank's structure, used on the client for rendering fluids. */ - public Map valveViewing = new HashMap(); + /** A client-sided set of valves on this tank's structure that are currently active, used on the client for rendering fluids. */ + public Set valveViewing = new HashSet(); /** The capacity this tank has on the client-side. */ public int clientWaterCapacity; public int clientSteamCapacity; public float prevWaterScale; - public float prevSteamScale; public ForgeDirection innerSide; @@ -65,34 +61,19 @@ public class TileEntityBoilerCasing extends TileEntityMultiblock 0) - { - valveViewing.put(data, valveViewing.get(data)-1); - } - } - float targetScale = (float)(structure.waterStored != null ? structure.waterStored.amount : 0)/clientWaterCapacity; if(Math.abs(prevWaterScale - targetScale) > 0.01) { prevWaterScale = (9*prevWaterScale + targetScale)/10; } - - targetScale = (float)(structure.steamStored != null ? structure.steamStored.amount : 0)/clientSteamCapacity; - - if(Math.abs(prevSteamScale - targetScale) > 0.01) - { - prevSteamScale = (9*prevSteamScale+ targetScale)/10; - } } if(!clientHasStructure || !isRendering) { - for(ValveData data : valveViewing.keySet()) + for(ValveData data : valveViewing) { - TileEntityDynamicTank tileEntity = (TileEntityDynamicTank)data.location.getTileEntity(worldObj); + TileEntityBoilerCasing tileEntity = (TileEntityBoilerCasing)data.location.getTileEntity(worldObj); if(tileEntity != null) { @@ -108,166 +89,44 @@ public class TileEntityBoilerCasing extends TileEntityMultiblock= FluidContainerRegistry.BUCKET_VOLUME) + + if(isRendering) { - ItemStack filled = FluidContainerRegistry.fillFluidContainer(structure.waterStored, structure.inventory[0]); - - if(filled != null) + boolean needsValveUpdate = false; + + for(ValveData data : structure.valves) { - if(structure.inventory[1] == null || (structure.inventory[1].isItemEqual(filled) && structure.inventory[1].stackSize+1 <= filled.getMaxStackSize())) + if(data.activeTicks > 0) { - structure.inventory[0].stackSize--; - - if(structure.inventory[0].stackSize <= 0) - { - structure.inventory[0] = null; - } - - if(structure.inventory[1] == null) - { - structure.inventory[1] = filled; - } - else { - structure.inventory[1].stackSize++; - } - - markDirty(); - - structure.waterStored.amount -= FluidContainerRegistry.getFluidForFilledItem(filled).amount; - - if(structure.waterStored.amount == 0) - { - structure.waterStored = null; - } - - Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new ArrayList())), new Range4D(Coord4D.get(this))); + data.activeTicks--; } + + if(data.activeTicks > 0 != data.prevActive) + { + needsValveUpdate = true; + } + + data.prevActive = data.activeTicks > 0; } - } - } - else if(FluidContainerRegistry.isFilledContainer(structure.inventory[0]) && (structure.editMode == ContainerEditMode.BOTH || structure.editMode == ContainerEditMode.EMPTY)) - { - FluidStack itemFluid = FluidContainerRegistry.getFluidForFilledItem(structure.inventory[0]); - - if((structure.waterStored == null && itemFluid.amount <= max) || structure.waterStored.amount+itemFluid.amount <= max) - { - if(structure.waterStored != null && !structure.waterStored.isFluidEqual(itemFluid)) + + if(needsValveUpdate || structure.needsRenderUpdate()) { - return; + sendPacketToRenderer(); } - - ItemStack containerItem = structure.inventory[0].getItem().getContainerItem(structure.inventory[0]); - - boolean filled = false; - - if(containerItem != null) - { - if(structure.inventory[1] == null || (structure.inventory[1].isItemEqual(containerItem) && structure.inventory[1].stackSize+1 <= containerItem.getMaxStackSize())) - { - structure.inventory[0] = null; - - if(structure.inventory[1] == null) - { - structure.inventory[1] = containerItem; - } - else { - structure.inventory[1].stackSize++; - } - - filled = true; - } - } - else { - structure.inventory[0].stackSize--; - - if(structure.inventory[0].stackSize == 0) - { - structure.inventory[0] = null; - } - - filled = true; - } - - if(filled) - { - if(structure.waterStored == null) - { - structure.waterStored = itemFluid.copy(); - } - else { - structure.waterStored.amount += itemFluid.amount; - } - - markDirty(); - } - - Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new ArrayList())), new Range4D(Coord4D.get(this))); + + structure.prevWater = structure.waterStored; + structure.prevSteam = structure.steamStored; } } } @@ -307,38 +166,46 @@ public class TileEntityBoilerCasing extends TileEntityMultiblock toSend = new HashSet(); + + for(ValveData valveData : structure.valves) + { + if(valveData.activeTicks > 0) + { + toSend.add(valveData); + } + } + + data.add(toSend.size()); + + for(ValveData valveData : toSend) + { + valveData.location.write(data); + data.add(valveData.side.ordinal()); + } } } @@ -355,56 +222,44 @@ public class TileEntityBoilerCasing extends TileEntityMultiblock 0) + TileEntityBoilerCasing tileEntity = (TileEntityBoilerCasing)data.location.getTileEntity(worldObj); + + if(tileEntity != null) { - continue; + tileEntity.clientHasStructure = true; } } - - valveViewing.put(data, viewingTicks); - - TileEntityBoilerCasing tileEntity = (TileEntityBoilerCasing)data.location.getTileEntity(worldObj); - - if(tileEntity != null) - { - tileEntity.clientHasStructure = true; - } } } } @@ -515,6 +370,12 @@ public class TileEntityBoilerCasing extends TileEntityMultiblock Date: Wed, 24 Feb 2016 20:29:50 -0500 Subject: [PATCH 06/52] Thermodynamic Conductors function properly, added Thermal Evaporation Plant integration with heat system --- .../java/mekanism/common/HeatNetwork.java | 15 +++-- src/main/java/mekanism/common/Tier.java | 8 +-- .../mekanism/common/block/BlockMachine.java | 6 +- .../multipart/PartThermodynamicConductor.java | 8 ++- .../common/tile/TileEntityBoilerCasing.java | 27 ++------ .../tile/TileEntityResistiveHeater.java | 62 ++++++++++++++++++ .../TileEntityThermalEvaporationValve.java | 56 +++++++++++++++- .../java/mekanism/common/util/HeatUtils.java | 6 +- .../tile/reactor/TileEntityReactorPort.java | 1 + .../textures/blocks/GlowPlasticBlock.png | Bin 1307 -> 1752 bytes .../mekanism/textures/blocks/PlasticBlock.png | Bin 1332 -> 1719 bytes .../mekanism/textures/blocks/PlasticFence.png | Bin 1332 -> 1478 bytes .../blocks/ReinforcedPlasticBlock.png | Bin 1330 -> 1419 bytes .../textures/blocks/RoadPlasticBlock.png | Bin 1383 -> 1356 bytes .../textures/blocks/SlickPlasticBlock.png | Bin 1332 -> 1478 bytes 15 files changed, 149 insertions(+), 40 deletions(-) create mode 100644 src/main/java/mekanism/common/tile/TileEntityResistiveHeater.java mode change 100644 => 100755 src/main/resources/assets/mekanism/textures/blocks/GlowPlasticBlock.png mode change 100644 => 100755 src/main/resources/assets/mekanism/textures/blocks/PlasticBlock.png mode change 100644 => 100755 src/main/resources/assets/mekanism/textures/blocks/PlasticFence.png mode change 100644 => 100755 src/main/resources/assets/mekanism/textures/blocks/ReinforcedPlasticBlock.png mode change 100644 => 100755 src/main/resources/assets/mekanism/textures/blocks/RoadPlasticBlock.png mode change 100644 => 100755 src/main/resources/assets/mekanism/textures/blocks/SlickPlasticBlock.png diff --git a/src/main/java/mekanism/common/HeatNetwork.java b/src/main/java/mekanism/common/HeatNetwork.java index 939178463..0e96fa2d4 100644 --- a/src/main/java/mekanism/common/HeatNetwork.java +++ b/src/main/java/mekanism/common/HeatNetwork.java @@ -6,6 +6,9 @@ import java.util.Set; import mekanism.api.IHeatTransfer; import mekanism.api.transmitters.DynamicNetwork; import mekanism.api.transmitters.IGridTransmitter; +import mekanism.api.util.UnitDisplayUtils.TemperatureUnit; +import mekanism.common.multipart.MultipartTransmitter; +import mekanism.common.util.MekanismUtils; import cpw.mods.fml.common.FMLCommonHandler; public class HeatNetwork extends DynamicNetwork @@ -40,13 +43,13 @@ public class HeatNetwork extends DynamicNetwork @Override public String getStoredInfo() { - return meanTemp + "K above ambient"; + return MekanismUtils.getTemperatureDisplay(meanTemp, TemperatureUnit.KELVIN) + " above ambient"; } @Override public String getFlowInfo() { - return heatTransferred + " transferred to acceptors, " + heatLost + " lost to environment, " + (heatTransferred + heatLost == 0 ? "" : heatTransferred / (heatTransferred + heatLost) * 100 + "% efficiency"); + return MekanismUtils.getTemperatureDisplay(heatTransferred, TemperatureUnit.KELVIN) + " transferred to acceptors, " + MekanismUtils.getTemperatureDisplay(heatLost, TemperatureUnit.KELVIN) + " lost to environment, " + (heatTransferred + heatLost == 0 ? "" : heatTransferred / (heatTransferred + heatLost) * 100 + "% efficiency"); } @Override @@ -74,9 +77,9 @@ public class HeatNetwork extends DynamicNetwork { for(IGridTransmitter transmitter : transmitters) { - if(transmitter instanceof IHeatTransfer) + if(transmitter instanceof MultipartTransmitter && ((MultipartTransmitter)transmitter).getPart() instanceof IHeatTransfer) { - IHeatTransfer heatTransmitter = (IHeatTransfer)transmitter; + IHeatTransfer heatTransmitter = (IHeatTransfer)((MultipartTransmitter)transmitter).getPart(); double[] d = heatTransmitter.simulateHeat(); newHeatTransferred += d[0]; newHeatLost += d[1]; @@ -85,9 +88,9 @@ public class HeatNetwork extends DynamicNetwork for(IGridTransmitter transmitter : transmitters) { - if(transmitter instanceof IHeatTransfer) + if(transmitter instanceof MultipartTransmitter && ((MultipartTransmitter)transmitter).getPart() instanceof IHeatTransfer) { - IHeatTransfer heatTransmitter = (IHeatTransfer)transmitter; + IHeatTransfer heatTransmitter = (IHeatTransfer)((MultipartTransmitter)transmitter).getPart(); newSumTemp += heatTransmitter.applyTemperatureChange(); } } diff --git a/src/main/java/mekanism/common/Tier.java b/src/main/java/mekanism/common/Tier.java index 8d86122f3..e697be2be 100644 --- a/src/main/java/mekanism/common/Tier.java +++ b/src/main/java/mekanism/common/Tier.java @@ -484,10 +484,10 @@ public final class Tier public static enum ConductorTier { - BASIC(5, 1, 0, new ColourRGBA(0.2, 0.2, 0.2, 1), TransmitterType.THERMODYNAMIC_CONDUCTOR_BASIC), - ADVANCED(5, 1, 0, new ColourRGBA(0.2, 0.2, 0.2, 1), TransmitterType.THERMODYNAMIC_CONDUCTOR_ADVANCED), - ELITE(5, 1, 0, new ColourRGBA(0.2, 0.2, 0.2, 1), TransmitterType.THERMODYNAMIC_CONDUCTOR_ELITE), - ULTIMATE(5, 1, 0, new ColourRGBA(0.2, 0.2, 0.2, 1), TransmitterType.THERMODYNAMIC_CONDUCTOR_ULTIMATE); + BASIC(5, 1, 10, new ColourRGBA(0.2, 0.2, 0.2, 1), TransmitterType.THERMODYNAMIC_CONDUCTOR_BASIC), + ADVANCED(5, 1, 400, new ColourRGBA(0.2, 0.2, 0.2, 1), TransmitterType.THERMODYNAMIC_CONDUCTOR_ADVANCED), + ELITE(5, 1, 8000, new ColourRGBA(0.2, 0.2, 0.2, 1), TransmitterType.THERMODYNAMIC_CONDUCTOR_ELITE), + ULTIMATE(5, 1, 100000, new ColourRGBA(0.2, 0.2, 0.2, 1), TransmitterType.THERMODYNAMIC_CONDUCTOR_ULTIMATE); public BaseTier getBaseTier() { diff --git a/src/main/java/mekanism/common/block/BlockMachine.java b/src/main/java/mekanism/common/block/BlockMachine.java index 7cfe78d1b..269629ddf 100644 --- a/src/main/java/mekanism/common/block/BlockMachine.java +++ b/src/main/java/mekanism/common/block/BlockMachine.java @@ -77,6 +77,7 @@ import mekanism.common.tile.TileEntityOsmiumCompressor; import mekanism.common.tile.TileEntityPRC; import mekanism.common.tile.TileEntityPrecisionSawmill; import mekanism.common.tile.TileEntityPurificationChamber; +import mekanism.common.tile.TileEntityResistiveHeater; import mekanism.common.tile.TileEntityRotaryCondensentrator; import mekanism.common.tile.TileEntitySeismicVibrator; import mekanism.common.tile.TileEntitySolarNeutronActivator; @@ -1144,7 +1145,8 @@ public class BlockMachine extends BlockContainer implements ISpecialBounds, IBlo ENTANGLED_BLOCK(MachineBlock.MACHINE_BLOCK_3, 0, "EntangledBlock", 46, TileEntityEntangledBlock.class, true, false, false), SOLAR_NEUTRON_ACTIVATOR(MachineBlock.MACHINE_BLOCK_3, 1, "SolarNeutronActivator", 47, TileEntitySolarNeutronActivator.class, false, true, false), AMBIENT_ACCUMULATOR(MachineBlock.MACHINE_BLOCK_3, 2, "AmbientAccumulator", 48, TileEntityAmbientAccumulator.class, true, false, false), - OREDICTIONIFICATOR(MachineBlock.MACHINE_BLOCK_3, 3, "Oredictionificator", 52, TileEntityOredictionificator.class, false, false, false); + OREDICTIONIFICATOR(MachineBlock.MACHINE_BLOCK_3, 3, "Oredictionificator", 52, TileEntityOredictionificator.class, false, false, false), + RESISTIVE_HEATER(MachineBlock.MACHINE_BLOCK_3, 4, "ResistiveHeater", 53, TileEntityResistiveHeater.class, true, true, false); public MachineBlock typeBlock; public int meta; @@ -1195,7 +1197,7 @@ public class BlockMachine extends BlockContainer implements ISpecialBounds, IBlo for(MachineType type : MachineType.values()) { - if(type != ENTANGLED_BLOCK && type != AMBIENT_ACCUMULATOR) + if(type != ENTANGLED_BLOCK && type != AMBIENT_ACCUMULATOR && type != RESISTIVE_HEATER) { ret.add(type); } diff --git a/src/main/java/mekanism/common/multipart/PartThermodynamicConductor.java b/src/main/java/mekanism/common/multipart/PartThermodynamicConductor.java index bba2e1d22..3a812fab7 100644 --- a/src/main/java/mekanism/common/multipart/PartThermodynamicConductor.java +++ b/src/main/java/mekanism/common/multipart/PartThermodynamicConductor.java @@ -121,9 +121,13 @@ public class PartThermodynamicConductor extends PartTransmitterQnSVl*BQ+*Yph6}I)>&MOv)2k+*;|*XiJy^v4sKD0NmX?;*RvKtp zYg-$XU|JE4*4EZWhYEs0XEGQ}CS)rCMkbTRVzo2dnXGnJI|RF()6V9w*&GgJD*;9h zhs))5a634VLGU{G9UXk&d_IrI=RpC)=XZ8?3itwkrvRitAOv&?y95GY-NG(FH=qY9 zKyR-|+$#cz#o|8Def@xe{sE`~gM*R*i3GSrIt10wie&QFG6=b1SfNl14-b!wj6fQN z7#kfM836`(15mzEjzOkWs#GfFxKcH)QjL#KOaKE+s3+Cx$w{?FJvF6)YFeY2o|>Kk zXlJz3GqYO2taf&8er^tEVSZ7kThJ{oEb72R{Li;@1K1`+E;x-*dPr<03}#{hX%*~N zr43kILquZ&*No^JS(Hc@S=X1Q ziN5WVQ~J(0AU!*$tfVkfgsKeHyOdOPozo2xadjB!X<^|i{rg5m8Mr4%jd$^_Y@Tw- z;O3EV=DM#Y3EX_u&S}0pODaV6Y;`1-;0V5PFc<9iNopw{Kh`5eiZR{Gj()_*8O&ZDkwe8 zcSE#oanpCk`t)CAWRc58+*Ii%dl4V`;p0AbKPxBS4CF?Sy`p2(;GNwHCSAN0idU7Q{dN+3RYoP1!$-kZ65@{(7* z^zHk`5`=U%nc!A8T9k#P=ji0)|4e9g>4ZBFkSB)o- Rk3v5ObYK|j@!n%+{{vXT>;3=$ delta 1260 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 delta 1282 zcmV+d1^xPq3$hB38Gi-<0047(dh`GQ1N3P_Lr_UWLm*IcZ)Rz1WdHzp+KrUYZxm%1 z$3MIC&a4SI2U7uy!HGYBkV3X#kOo0_yUVsv%VyhR+nAW`?AzV3)7kNz+43VjanT#7 ze}IY{JeYVg!Cw(Bz(E5EK|^dvOgNPIBSaD|hSbAMcL!+2_kZ-v^M0T2_xn8WlYz|V zRo{2h7R-8~s+989_{5}@xj~v|SVK2!s&?S#%H<(|s_(lza_;?13gFuImGA%atf|Ss zhSU>4vliI1kU9psYx^n$;})>zXy}KKc^2qW;}esR$pT&VC@uh9Q&Bt)bg9uwKV)3M zv>VkLWafdMseeSio`@q40Cbh4CzWGcl~Ud+tLC)h%7op=T>sBA>$aBlHUVpcnUO=l zR!ALdsDVlxe_~gQBfyK0y6lJf3a}Ycf3#-Ca=bm z=R~7_IO5UNJJo|_pc}OJRkLz9@~oYaZmAOSYZv{n9DC3fJ$HC0;uNL~iX+SUurWFi z)r#Gr8jWkkWh};At*T-v;t_vKZ!G52H`JI*=cAMv2T1YG^93g+YyS25W zcT&CW*jG;7d7!%ah-bO%CpiHEX4=T@$^I|Re}A{3!*N}ld+XZTOY};n7Us9#EY2PIq^1>?^14 z$oGct4Rf-mlg<8;{WE(#`)T%U_V9}@3pVBZ?qq=wDZ~p?Fa3m_NDf1 z;(x7H-;eg&lS_0f@m8F*#5MEgM)L);U_NKQWDa%s%=KokIbd!v3+Bf5yCwCKy*NzZ zwx_zXR)ibF!{I0rML-o7kK+&Re_Sm#iC!`I(AMq|dqvx&Q8Wrh4$IhP^clUzK_l1k zXKXPFMxU|8C_b=t_9`971S;9*cBYU7%zvP8m_ywPGJ$pxwRdroUIrT;uSV{&`&B@vh#wRAN=ofvrLJCN&yVA*pZ@|94K)c$>O}5~R z0M@_U$!+b1r$2^syX}^mi~sql)K3sh@7fuCt<8geb7|@BX2^U9_di%#`sd8j(jxuO zKwE(G?!Q?8ad_2KDscb+00v@9M??Vs0RI60puMM)ks&L8zez+vR9M5^mrD|ZAPhhy z(@St*PRy|4*F}c~sgY1ECT1mO9Ok_Q5aXPy+eDO7cHaZQVcr{Qn?T-@vc6$HY`#u7Q7%pH*vj@#?@$l&;S4c07*qoM6N<$f-NYK&;S4c diff --git a/src/main/resources/assets/mekanism/textures/blocks/RoadPlasticBlock.png b/src/main/resources/assets/mekanism/textures/blocks/RoadPlasticBlock.png old mode 100644 new mode 100755 index a39951d85b1b037e78ff5a7497b0db44dd457a6e..3e2207a71a15751fd6542cfc4cf723f58ae30dbc GIT binary patch delta 1310 zcmV+(1>ySV3d{KKrdh34%awA?s@3at%eI@%X6L0-E|-4| z)A+~d3kHMHXfzxS#p1DKG8qbm0)c@4!5@xiM?2R^ywRW=pTN;;KPPBoa}g-K8(*^SP#f z9O+w4pC0Kv;dd^V`|hOsJxxDz5@T2mUMbP?MR&D3D`&IaX!;ELQs_JxkH^Jg@#j9- zmfdK&PFA3s(D`2cF^*}9r)JI6^r@yh8|Yg5=RwmkP3YV0h7ZpdbJS6<>1BUSw;Ry4 z_Lq*PW17&L%?9+R(VQpc5$Zja_R!z z7tIE*p!@tjB`ZDi-F4x?f+9%TqHV%J=gXh#U_4bclH9YOjdc$sa+NE-d!$I#VS?MqI)t56u z=ShFi&*gJR?U!`Rb4KVGLyv~SA>Bn(Z+06xRd!Xh%dQH2HfM)c%a7$~G@^^NQcmA- zS4F#a=18wp*&z!$M^eeVvyQx^PeeO=v~3ZV^h*=~U&e)F8#^9|XeXGa4<+9mAvA_;vAX5Okj%&$xGLrZFfscXU52@!A z|Dk8{g@Sm3_DnYOAD`*CbSB;H z^)OAJ{Ebd{8t+@e>yCHN6ZQ0%f*uNoVYwOkfB8;|;SAcBZm!&%A3F6cOUZ1yNZ>2^ z&J%tQ1_RN4bAAXx5vokSd-9zpYzZ!3(67%ANe;#Q>F7r|CJJrXw$XzdAptCpi>X4)*z;e8)yk z#{1hl^n2z9^|+$sKJyFxN51nUo6B;Ve)i0-^MiVFNp}(Vi+l2&Y7RVIq?O(=KO|F? zdwYqWb>!82x9e7=QW=hhp6|Ej2lcI1OUXUb)sFaM0)KyL|H^kVk}^CI`px+vnW{Kt z+#^rEYxk delta 1336 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 Date: Fri, 26 Feb 2016 09:28:19 -0500 Subject: [PATCH 07/52] A bit of work on resistive heaters --- .../tile/TileEntityResistiveHeater.java | 40 ++++++++++++++++--- 1 file changed, 35 insertions(+), 5 deletions(-) diff --git a/src/main/java/mekanism/common/tile/TileEntityResistiveHeater.java b/src/main/java/mekanism/common/tile/TileEntityResistiveHeater.java index 0a83c3b2d..4d46a51c5 100644 --- a/src/main/java/mekanism/common/tile/TileEntityResistiveHeater.java +++ b/src/main/java/mekanism/common/tile/TileEntityResistiveHeater.java @@ -3,19 +3,46 @@ package mekanism.common.tile; import mekanism.api.IHeatTransfer; import mekanism.common.block.BlockMachine.MachineType; import mekanism.common.util.HeatUtils; +import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.common.util.ForgeDirection; public class TileEntityResistiveHeater extends TileEntityElectricBlock implements IHeatTransfer { + public double temperature; + public double heatToAbsorb = 0; + public TileEntityResistiveHeater() { super("ResistiveHeater", MachineType.RESISTIVE_HEATER.baseEnergy); } + + @Override + public void onUpdate() + { + simulateHeat(); + applyTemperatureChange(); + } + + @Override + public void readFromNBT(NBTTagCompound nbtTags) + { + super.readFromNBT(nbtTags); + + temperature = nbtTags.getDouble("temperature"); + } + + @Override + public void writeToNBT(NBTTagCompound nbtTags) + { + super.writeToNBT(nbtTags); + + nbtTags.setDouble("temperature", temperature); + } @Override public double getTemp() { - return 0; + return temperature; } @Override @@ -27,13 +54,13 @@ public class TileEntityResistiveHeater extends TileEntityElectricBlock implement @Override public double getInsulationCoefficient(ForgeDirection side) { - return 0; + return 1000; } @Override - public void transferHeatTo(double heat) + public void transferHeatTo(double heat) { - + heatToAbsorb += heat; } @Override @@ -45,7 +72,10 @@ public class TileEntityResistiveHeater extends TileEntityElectricBlock implement @Override public double applyTemperatureChange() { - return 0; + temperature += heatToAbsorb; + heatToAbsorb = 0; + + return temperature; } @Override From baf3ae6f59412b36c767d5f723ad2c9487e3c344 Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Fri, 26 Feb 2016 14:30:49 -0500 Subject: [PATCH 08/52] Update build number --- build.properties | 2 +- src/main/java/mekanism/common/Mekanism.java | 4 +- .../generators/common/MekanismGenerators.java | 49 ++++++++++--------- .../mekanism/tools/common/MekanismTools.java | 4 +- 4 files changed, 32 insertions(+), 27 deletions(-) diff --git a/build.properties b/build.properties index d2a61e32c..f54a2b0ff 100644 --- a/build.properties +++ b/build.properties @@ -4,4 +4,4 @@ FMP_version=1.1.2.331 CCLIB_version=1.1.3.136 NEI_version=1.0.4.101 CCC_version=1.0.6.39 -mod_version=8.1.8 +mod_version=8.1.9 diff --git a/src/main/java/mekanism/common/Mekanism.java b/src/main/java/mekanism/common/Mekanism.java index 543433fdb..5723ae14e 100644 --- a/src/main/java/mekanism/common/Mekanism.java +++ b/src/main/java/mekanism/common/Mekanism.java @@ -140,7 +140,7 @@ import cpw.mods.fml.common.registry.GameRegistry; * @author AidanBrady * */ -@Mod(modid = "Mekanism", name = "Mekanism", version = "8.1.8", guiFactory = "mekanism.client.gui.ConfigGuiFactory", +@Mod(modid = "Mekanism", name = "Mekanism", version = "8.1.9", guiFactory = "mekanism.client.gui.ConfigGuiFactory", dependencies = "after:ForgeMultipart;after:BuildCraft;after:BuildCraftAPI;after:IC2;after:CoFHCore;" + "after:ComputerCraft;after:Galacticraft API;after:MetallurgyCore") public class Mekanism @@ -166,7 +166,7 @@ public class Mekanism public static Configuration configuration; /** Mekanism version number */ - public static Version versionNumber = new Version(8, 1, 8); + public static Version versionNumber = new Version(8, 1, 9); /** MultiblockManagers for various structrures */ public static MultiblockManager tankManager = new MultiblockManager("dynamicTank"); diff --git a/src/main/java/mekanism/generators/common/MekanismGenerators.java b/src/main/java/mekanism/generators/common/MekanismGenerators.java index 130eaf489..b911ea5cc 100644 --- a/src/main/java/mekanism/generators/common/MekanismGenerators.java +++ b/src/main/java/mekanism/generators/common/MekanismGenerators.java @@ -1,5 +1,30 @@ package mekanism.generators.common; +import io.netty.buffer.ByteBuf; + +import java.io.IOException; + +import mekanism.api.MekanismConfig.general; +import mekanism.api.MekanismConfig.generators; +import mekanism.api.gas.Gas; +import mekanism.api.gas.GasRegistry; +import mekanism.api.infuse.InfuseRegistry; +import mekanism.common.FuelHandler; +import mekanism.common.Mekanism; +import mekanism.common.MekanismBlocks; +import mekanism.common.MekanismItems; +import mekanism.common.Tier.BaseTier; +import mekanism.common.Version; +import mekanism.common.base.IModule; +import mekanism.common.recipe.RecipeHandler; +import mekanism.common.recipe.ShapedMekanismRecipe; +import mekanism.common.util.MekanismUtils; +import net.minecraft.init.Blocks; +import net.minecraft.item.ItemStack; +import net.minecraft.item.crafting.CraftingManager; +import net.minecraftforge.fluids.FluidContainerRegistry; +import net.minecraftforge.fluids.FluidRegistry; +import net.minecraftforge.oredict.OreDictionary; import buildcraft.api.fuels.BuildcraftFuelRegistry; import buildcraft.api.fuels.IFuel; import cpw.mods.fml.client.event.ConfigChangedEvent.OnConfigChangedEvent; @@ -13,28 +38,8 @@ import cpw.mods.fml.common.event.FMLPostInitializationEvent; import cpw.mods.fml.common.event.FMLPreInitializationEvent; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.network.NetworkRegistry; -import io.netty.buffer.ByteBuf; -import mekanism.api.MekanismConfig.general; -import mekanism.api.MekanismConfig.generators; -import mekanism.api.gas.Gas; -import mekanism.api.gas.GasRegistry; -import mekanism.api.infuse.InfuseRegistry; -import mekanism.common.*; -import mekanism.common.Tier.BaseTier; -import mekanism.common.base.IModule; -import mekanism.common.recipe.ShapedMekanismRecipe; -import mekanism.common.recipe.RecipeHandler; -import mekanism.common.util.MekanismUtils; -import net.minecraft.init.Blocks; -import net.minecraft.item.ItemStack; -import net.minecraft.item.crafting.CraftingManager; -import net.minecraftforge.fluids.FluidContainerRegistry; -import net.minecraftforge.fluids.FluidRegistry; -import net.minecraftforge.oredict.OreDictionary; -import java.io.IOException; - -@Mod(modid = "MekanismGenerators", name = "MekanismGenerators", version = "8.1.8", dependencies = "required-after:Mekanism", guiFactory = "mekanism.generators.client.gui.GeneratorsGuiFactory") +@Mod(modid = "MekanismGenerators", name = "MekanismGenerators", version = "8.1.9", dependencies = "required-after:Mekanism", guiFactory = "mekanism.generators.client.gui.GeneratorsGuiFactory") public class MekanismGenerators implements IModule { /** Mekanism Generators Packet Pipeline */ @@ -47,7 +52,7 @@ public class MekanismGenerators implements IModule public static MekanismGenerators instance; /** MekanismGenerators version number */ - public static Version versionNumber = new Version(8, 1, 8); + public static Version versionNumber = new Version(8, 1, 9); @EventHandler public void preInit(FMLPreInitializationEvent event) diff --git a/src/main/java/mekanism/tools/common/MekanismTools.java b/src/main/java/mekanism/tools/common/MekanismTools.java index 2fdda0e63..53cbb54be 100644 --- a/src/main/java/mekanism/tools/common/MekanismTools.java +++ b/src/main/java/mekanism/tools/common/MekanismTools.java @@ -28,7 +28,7 @@ import net.minecraftforge.event.entity.living.LivingSpawnEvent; import java.io.IOException; -@Mod(modid = "MekanismTools", name = "MekanismTools", version = "8.1.8", dependencies = "required-after:Mekanism", guiFactory = "mekanism.tools.client.gui.ToolsGuiFactory") +@Mod(modid = "MekanismTools", name = "MekanismTools", version = "8.1.9", dependencies = "required-after:Mekanism", guiFactory = "mekanism.tools.client.gui.ToolsGuiFactory") public class MekanismTools implements IModule { @SidedProxy(clientSide = "mekanism.tools.client.ToolsClientProxy", serverSide = "mekanism.tools.common.ToolsCommonProxy") @@ -38,7 +38,7 @@ public class MekanismTools implements IModule public static MekanismTools instance; /** MekanismTools version number */ - public static Version versionNumber = new Version(8, 1, 8); + public static Version versionNumber = new Version(8, 1, 9); //Enums: Tools public static ToolMaterial toolOBSIDIAN; From 9d55f6cc8a6c65a49a1ec00673c6b63bda159e81 Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Fri, 26 Feb 2016 19:51:37 -0500 Subject: [PATCH 09/52] Lots of work on resistive heaters, still mostly unfinished --- .../java/mekanism/api/MekanismConfig.java | 1 + .../java/mekanism/client/ClientProxy.java | 17 ++- .../mekanism/client/gui/GuiElectricPump.java | 2 +- .../mekanism/client/gui/GuiFluidTank.java | 4 +- .../client/gui/GuiFluidicPlenisher.java | 2 +- .../client/gui/GuiResistiveHeater.java | 96 ++++++++++++ .../java/mekanism/common/CommonProxy.java | 9 +- src/main/java/mekanism/common/Mekanism.java | 6 +- .../mekanism/common/block/BlockMachine.java | 3 + .../common/content/boiler/BoilerManager.java | 94 ------------ ...tableTank.java => ContainerFluidTank.java} | 4 +- .../container/ContainerResistiveHeater.java | 124 ++++++++++++++++ .../common/item/ItemBlockMachine.java | 1 + .../tile/TileEntityResistiveHeater.java | 140 +++++++++++++++++- .../assets/mekanism/gui/GuiMOreDictFilter.png | Bin 4755 -> 4784 bytes .../mekanism/gui/GuiResistiveHeater.png | Bin 0 -> 3898 bytes .../resources/assets/mekanism/lang/en_US.lang | 2 + .../resources/assets/mekanism/sounds.json | 1 + .../mekanism/sounds/ResistiveHeater.ogg | Bin 0 -> 156806 bytes 19 files changed, 391 insertions(+), 115 deletions(-) create mode 100644 src/main/java/mekanism/client/gui/GuiResistiveHeater.java delete mode 100644 src/main/java/mekanism/common/content/boiler/BoilerManager.java rename src/main/java/mekanism/common/inventory/container/{ContainerPortableTank.java => ContainerFluidTank.java} (95%) create mode 100644 src/main/java/mekanism/common/inventory/container/ContainerResistiveHeater.java create mode 100644 src/main/resources/assets/mekanism/gui/GuiResistiveHeater.png create mode 100644 src/main/resources/assets/mekanism/sounds/ResistiveHeater.ogg diff --git a/src/main/java/mekanism/api/MekanismConfig.java b/src/main/java/mekanism/api/MekanismConfig.java index e6bc01795..01ed80b3b 100644 --- a/src/main/java/mekanism/api/MekanismConfig.java +++ b/src/main/java/mekanism/api/MekanismConfig.java @@ -61,6 +61,7 @@ public class MekanismConfig public static double evaporationTempMultiplier = 0.1; public static double evaporationSolarMultiplier = 0.2; public static double evaporationMaxTemp = 3000; + public static double energyPerHeat = 1000; } public static class client diff --git a/src/main/java/mekanism/client/ClientProxy.java b/src/main/java/mekanism/client/ClientProxy.java index 06e6f1fde..28454db88 100644 --- a/src/main/java/mekanism/client/ClientProxy.java +++ b/src/main/java/mekanism/client/ClientProxy.java @@ -29,6 +29,7 @@ import mekanism.client.gui.GuiEnergyCube; import mekanism.client.gui.GuiEnrichmentChamber; import mekanism.client.gui.GuiEntangledBlock; import mekanism.client.gui.GuiFactory; +import mekanism.client.gui.GuiFluidTank; import mekanism.client.gui.GuiFluidicPlenisher; import mekanism.client.gui.GuiGasTank; import mekanism.client.gui.GuiInductionMatrix; @@ -41,9 +42,9 @@ import mekanism.client.gui.GuiOsmiumCompressor; import mekanism.client.gui.GuiPRC; import mekanism.client.gui.GuiPasswordEnter; import mekanism.client.gui.GuiPasswordModify; -import mekanism.client.gui.GuiFluidTank; import mekanism.client.gui.GuiPrecisionSawmill; import mekanism.client.gui.GuiPurificationChamber; +import mekanism.client.gui.GuiResistiveHeater; import mekanism.client.gui.GuiRobitCrafting; import mekanism.client.gui.GuiRobitInventory; import mekanism.client.gui.GuiRobitMain; @@ -53,9 +54,9 @@ import mekanism.client.gui.GuiRotaryCondensentrator; import mekanism.client.gui.GuiSeismicReader; import mekanism.client.gui.GuiSeismicVibrator; import mekanism.client.gui.GuiSideConfiguration; -import mekanism.client.gui.GuiThermalEvaporationController; import mekanism.client.gui.GuiSolarNeutronActivator; import mekanism.client.gui.GuiTeleporter; +import mekanism.client.gui.GuiThermalEvaporationController; import mekanism.client.gui.GuiTransporterConfig; import mekanism.client.gui.GuiUpgradeManagement; import mekanism.client.render.MekanismRenderer; @@ -85,6 +86,7 @@ import mekanism.client.render.tileentity.RenderElectricChest; import mekanism.client.render.tileentity.RenderElectricPump; import mekanism.client.render.tileentity.RenderElectrolyticSeparator; import mekanism.client.render.tileentity.RenderEnergyCube; +import mekanism.client.render.tileentity.RenderFluidTank; import mekanism.client.render.tileentity.RenderFluidicPlenisher; import mekanism.client.render.tileentity.RenderGasTank; import mekanism.client.render.tileentity.RenderLaser; @@ -93,13 +95,12 @@ import mekanism.client.render.tileentity.RenderLaserTractorBeam; import mekanism.client.render.tileentity.RenderLogisticalSorter; import mekanism.client.render.tileentity.RenderMetallurgicInfuser; import mekanism.client.render.tileentity.RenderObsidianTNT; -import mekanism.client.render.tileentity.RenderFluidTank; import mekanism.client.render.tileentity.RenderPressurizedReactionChamber; import mekanism.client.render.tileentity.RenderRotaryCondensentrator; -import mekanism.client.render.tileentity.RenderThermalEvaporationController; import mekanism.client.render.tileentity.RenderSeismicVibrator; import mekanism.client.render.tileentity.RenderSolarNeutronActivator; import mekanism.client.render.tileentity.RenderTeleporter; +import mekanism.client.render.tileentity.RenderThermalEvaporationController; import mekanism.common.CommonProxy; import mekanism.common.Mekanism; import mekanism.common.MekanismBlocks; @@ -144,6 +145,7 @@ import mekanism.common.tile.TileEntityEnergyCube; import mekanism.common.tile.TileEntityEnrichmentChamber; import mekanism.common.tile.TileEntityEntangledBlock; import mekanism.common.tile.TileEntityFactory; +import mekanism.common.tile.TileEntityFluidTank; import mekanism.common.tile.TileEntityFluidicPlenisher; import mekanism.common.tile.TileEntityGasTank; import mekanism.common.tile.TileEntityInductionCasing; @@ -160,15 +162,15 @@ import mekanism.common.tile.TileEntityObsidianTNT; import mekanism.common.tile.TileEntityOredictionificator; import mekanism.common.tile.TileEntityOsmiumCompressor; import mekanism.common.tile.TileEntityPRC; -import mekanism.common.tile.TileEntityFluidTank; import mekanism.common.tile.TileEntityPrecisionSawmill; import mekanism.common.tile.TileEntityPurificationChamber; +import mekanism.common.tile.TileEntityResistiveHeater; import mekanism.common.tile.TileEntityRotaryCondensentrator; import mekanism.common.tile.TileEntitySeismicVibrator; -import mekanism.common.tile.TileEntityThermalEvaporationController; import mekanism.common.tile.TileEntitySolarNeutronActivator; import mekanism.common.tile.TileEntityStructuralGlass; import mekanism.common.tile.TileEntityTeleporter; +import mekanism.common.tile.TileEntityThermalEvaporationController; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.gui.GuiScreen; @@ -333,6 +335,7 @@ public class ClientProxy extends CommonProxy GameRegistry.registerTileEntity(TileEntityInductionProvider.class, "InductionProvider"); GameRegistry.registerTileEntity(TileEntityOredictionificator.class, "Oredictionificator"); GameRegistry.registerTileEntity(TileEntityStructuralGlass.class, "StructuralGlass"); + GameRegistry.registerTileEntity(TileEntityResistiveHeater.class, "ResistiveHeater"); } @Override @@ -513,6 +516,8 @@ public class ClientProxy extends CommonProxy return new GuiTransporterConfig(player, (ISideConfiguration)tileEntity); case 52: return new GuiOredictionificator(player.inventory, (TileEntityOredictionificator)tileEntity); + case 53: + return new GuiResistiveHeater(player.inventory, (TileEntityResistiveHeater)tileEntity); } return null; diff --git a/src/main/java/mekanism/client/gui/GuiElectricPump.java b/src/main/java/mekanism/client/gui/GuiElectricPump.java index 704c3da29..9a11de9c3 100644 --- a/src/main/java/mekanism/client/gui/GuiElectricPump.java +++ b/src/main/java/mekanism/client/gui/GuiElectricPump.java @@ -66,7 +66,7 @@ public class GuiElectricPump extends GuiMekanism @Override protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) { - fontRendererObj.drawString(tileEntity.getInventoryName(), 45, 6, 0x404040); + fontRendererObj.drawString(tileEntity.getInventoryName(), (xSize / 2) - (fontRendererObj.getStringWidth(tileEntity.getInventoryName()) / 2), 6, 0x404040); fontRendererObj.drawString(LangUtils.localize("container.inventory"), 8, (ySize - 94) + 2, 0x404040); fontRendererObj.drawString(MekanismUtils.getEnergyDisplay(tileEntity.getEnergy()), 51, 26, 0x00CD00); diff --git a/src/main/java/mekanism/client/gui/GuiFluidTank.java b/src/main/java/mekanism/client/gui/GuiFluidTank.java index f60d72a5e..fb038f2b2 100644 --- a/src/main/java/mekanism/client/gui/GuiFluidTank.java +++ b/src/main/java/mekanism/client/gui/GuiFluidTank.java @@ -6,7 +6,7 @@ import mekanism.client.gui.element.GuiSlot; import mekanism.client.gui.element.GuiFluidGauge.IFluidInfoHandler; import mekanism.client.gui.element.GuiSlot.SlotOverlay; import mekanism.client.gui.element.GuiSlot.SlotType; -import mekanism.common.inventory.container.ContainerPortableTank; +import mekanism.common.inventory.container.ContainerFluidTank; import mekanism.common.tile.TileEntityFluidTank; import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; @@ -25,7 +25,7 @@ public class GuiFluidTank extends GuiMekanism public GuiFluidTank(InventoryPlayer inventory, TileEntityFluidTank tentity) { - super(tentity, new ContainerPortableTank(inventory, tentity)); + super(tentity, new ContainerFluidTank(inventory, tentity)); tileEntity = tentity; guiElements.add(new GuiContainerEditMode(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiBlank.png"))); guiElements.add(new GuiFluidGauge(new IFluidInfoHandler() diff --git a/src/main/java/mekanism/client/gui/GuiFluidicPlenisher.java b/src/main/java/mekanism/client/gui/GuiFluidicPlenisher.java index 31e0b8b42..8a8fde335 100644 --- a/src/main/java/mekanism/client/gui/GuiFluidicPlenisher.java +++ b/src/main/java/mekanism/client/gui/GuiFluidicPlenisher.java @@ -66,7 +66,7 @@ public class GuiFluidicPlenisher extends GuiMekanism @Override protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) { - fontRendererObj.drawString(tileEntity.getInventoryName(), 45, 6, 0x404040); + fontRendererObj.drawString(tileEntity.getInventoryName(), (xSize / 2) - (fontRendererObj.getStringWidth(tileEntity.getInventoryName()) / 2), 6, 0x404040); fontRendererObj.drawString(LangUtils.localize("container.inventory"), 8, (ySize - 94) + 2, 0x404040); fontRendererObj.drawString(MekanismUtils.getEnergyDisplay(tileEntity.getEnergy()), 51, 26, 0x00CD00); fontRendererObj.drawString(LangUtils.localize("gui.finished") + ": " + LangUtils.transYesNo(tileEntity.finishedCalc), 51, 35, 0x00CD00); diff --git a/src/main/java/mekanism/client/gui/GuiResistiveHeater.java b/src/main/java/mekanism/client/gui/GuiResistiveHeater.java new file mode 100644 index 000000000..c07367c6f --- /dev/null +++ b/src/main/java/mekanism/client/gui/GuiResistiveHeater.java @@ -0,0 +1,96 @@ +package mekanism.client.gui; + +import mekanism.client.gui.element.GuiSlot; +import mekanism.client.gui.element.GuiSlot.SlotOverlay; +import mekanism.client.gui.element.GuiSlot.SlotType; +import mekanism.common.inventory.container.ContainerResistiveHeater; +import mekanism.common.tile.TileEntityResistiveHeater; +import mekanism.common.util.LangUtils; +import mekanism.common.util.MekanismUtils; +import mekanism.common.util.MekanismUtils.ResourceType; +import net.minecraft.client.gui.GuiTextField; +import net.minecraft.entity.player.InventoryPlayer; + +import org.lwjgl.input.Keyboard; +import org.lwjgl.opengl.GL11; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + +@SideOnly(Side.CLIENT) +public class GuiResistiveHeater extends GuiMekanism +{ + public TileEntityResistiveHeater tileEntity; + + private GuiTextField energyUsageField; + + public GuiResistiveHeater(InventoryPlayer inventory, TileEntityResistiveHeater tentity) + { + super(tentity, new ContainerResistiveHeater(inventory, tentity)); + tileEntity = tentity; + + guiElements.add(new GuiSlot(SlotType.POWER, this, MekanismUtils.getResource(ResourceType.GUI, "GuiBlank.png"), 27, 34).with(SlotOverlay.POWER)); + } + + @Override + public void initGui() + { + super.initGui(); + + int guiWidth = (width - xSize) / 2; + int guiHeight = (height - ySize) / 2; + + String prevEnergyUsage = energyUsageField != null ? energyUsageField.getText() : ""; + + energyUsageField = new GuiTextField(fontRendererObj, guiWidth + 50, guiHeight + 104, 86, 11); + energyUsageField.setMaxStringLength(7); + energyUsageField.setEnableBackgroundDrawing(false); + energyUsageField.setText(prevEnergyUsage); + } + + @Override + protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) + { + fontRendererObj.drawString(tileEntity.getInventoryName(), (xSize / 2) - (fontRendererObj.getStringWidth(tileEntity.getInventoryName()) / 2), 6, 0x404040); + fontRendererObj.drawString(LangUtils.localize("container.inventory"), 8, (ySize - 94) + 2, 0x404040); + + super.drawGuiContainerForegroundLayer(mouseX, mouseY); + } + + @Override + protected void drawGuiContainerBackgroundLayer(float partialTick, int mouseX, int mouseY) + { + mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.GUI, "GuiBlank.png")); + GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + int guiWidth = (width - xSize) / 2; + int guiHeight = (height - ySize) / 2; + drawTexturedModalRect(guiWidth, guiHeight, 0, 0, xSize, ySize); + + super.drawGuiContainerBackgroundLayer(partialTick, mouseX, mouseY); + } + + private void setEnergyUsage() + { + + } + + @Override + public void keyTyped(char c, int i) + { + if(!energyUsageField.isFocused() || i == Keyboard.KEY_ESCAPE) + { + super.keyTyped(c, i); + } + + if(energyUsageField.isFocused() && i == Keyboard.KEY_RETURN) + { + setEnergyUsage(); + return; + } + + if(Character.isDigit(c) || i == Keyboard.KEY_BACK || i == Keyboard.KEY_DELETE || i == Keyboard.KEY_LEFT || i == Keyboard.KEY_RIGHT) + { + energyUsageField.textboxKeyTyped(c, i); + } + } +} diff --git a/src/main/java/mekanism/common/CommonProxy.java b/src/main/java/mekanism/common/CommonProxy.java index 29b71547b..b24a0d392 100644 --- a/src/main/java/mekanism/common/CommonProxy.java +++ b/src/main/java/mekanism/common/CommonProxy.java @@ -32,6 +32,7 @@ import mekanism.common.inventory.container.ContainerElectrolyticSeparator; import mekanism.common.inventory.container.ContainerEnergyCube; import mekanism.common.inventory.container.ContainerFactory; import mekanism.common.inventory.container.ContainerFilter; +import mekanism.common.inventory.container.ContainerFluidTank; import mekanism.common.inventory.container.ContainerFluidicPlenisher; import mekanism.common.inventory.container.ContainerGasTank; import mekanism.common.inventory.container.ContainerInductionMatrix; @@ -41,7 +42,7 @@ import mekanism.common.inventory.container.ContainerMetallurgicInfuser; import mekanism.common.inventory.container.ContainerNull; import mekanism.common.inventory.container.ContainerOredictionificator; import mekanism.common.inventory.container.ContainerPRC; -import mekanism.common.inventory.container.ContainerPortableTank; +import mekanism.common.inventory.container.ContainerResistiveHeater; import mekanism.common.inventory.container.ContainerRobitCrafting; import mekanism.common.inventory.container.ContainerRobitInventory; import mekanism.common.inventory.container.ContainerRobitMain; @@ -101,6 +102,7 @@ import mekanism.common.tile.TileEntityOsmiumCompressor; import mekanism.common.tile.TileEntityPRC; import mekanism.common.tile.TileEntityPrecisionSawmill; import mekanism.common.tile.TileEntityPurificationChamber; +import mekanism.common.tile.TileEntityResistiveHeater; import mekanism.common.tile.TileEntityRotaryCondensentrator; import mekanism.common.tile.TileEntitySeismicVibrator; import mekanism.common.tile.TileEntitySolarNeutronActivator; @@ -193,6 +195,7 @@ public class CommonProxy implements IGuiProvider GameRegistry.registerTileEntity(TileEntityInductionProvider.class, "InductionProvider"); GameRegistry.registerTileEntity(TileEntityOredictionificator.class, "Oredictionificator"); GameRegistry.registerTileEntity(TileEntityStructuralGlass.class, "StructuralGlass"); + GameRegistry.registerTileEntity(TileEntityResistiveHeater.class, "ResistiveHeater"); } public void handleTeleporterUpdate(PortableTeleporterMessage message) {} @@ -508,7 +511,7 @@ public class CommonProxy implements IGuiProvider case 40: return new ContainerPRC(player.inventory, (TileEntityPRC)tileEntity); case 41: - return new ContainerPortableTank(player.inventory, (TileEntityFluidTank)tileEntity); + return new ContainerFluidTank(player.inventory, (TileEntityFluidTank)tileEntity); case 42: return new ContainerFluidicPlenisher(player.inventory, (TileEntityFluidicPlenisher)tileEntity); case 43: @@ -531,6 +534,8 @@ public class CommonProxy implements IGuiProvider return new ContainerNull(player, (TileEntityContainerBlock)tileEntity); case 52: return new ContainerOredictionificator(player.inventory, (TileEntityOredictionificator)tileEntity); + case 53: + return new ContainerResistiveHeater(player.inventory, (TileEntityResistiveHeater)tileEntity); } return null; diff --git a/src/main/java/mekanism/common/Mekanism.java b/src/main/java/mekanism/common/Mekanism.java index 58ab386a4..df9ee73cf 100644 --- a/src/main/java/mekanism/common/Mekanism.java +++ b/src/main/java/mekanism/common/Mekanism.java @@ -43,7 +43,6 @@ import mekanism.common.base.IFactory.RecipeType; import mekanism.common.base.IModule; import mekanism.common.block.BlockMachine.MachineType; import mekanism.common.chunkloading.ChunkManager; -import mekanism.common.content.boiler.BoilerManager; import mekanism.common.content.boiler.SynchronizedBoilerData; import mekanism.common.content.matrix.SynchronizedMatrixData; import mekanism.common.content.tank.SynchronizedTankData; @@ -174,7 +173,7 @@ public class Mekanism /** MultiblockManagers for various structrures */ public static MultiblockManager tankManager = new MultiblockManager("dynamicTank"); public static MultiblockManager matrixManager = new MultiblockManager("inductionMatrix"); - public static MultiblockManager boilerManager = new BoilerManager("thermoelectricBoiler"); + public static MultiblockManager boilerManager = new MultiblockManager("thermoelectricBoiler"); /** FrequencyManagers for various networks */ public static FrequencyManager publicTeleporters = new FrequencyManager(Frequency.class); @@ -511,6 +510,9 @@ public class Mekanism CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.BasicBlock2, 1, 5), new Object[] { "ACA", "CIC", "ACA", Character.valueOf('I'), new ItemStack(MekanismBlocks.BasicBlock, 1, 8), Character.valueOf('C'), "ingotCopper", Character.valueOf('A'), "alloyBasic" })); + MachineType.RESISTIVE_HEATER.addRecipe(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.MachineBlock3, 1, 4), new Object[] { + "CRC", "RHR", "CEC", Character.valueOf('C'), "ingotTin", Character.valueOf('R'), "dustRedstone", Character.valueOf('H'), new ItemStack(MekanismBlocks.BasicBlock2, 1, 5), Character.valueOf('E'), MekanismItems.EnergyTablet.getUnchargedItem() + }));; //Energy Cube recipes CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(MekanismUtils.getEnergyCube(EnergyCubeTier.BASIC), new Object[] { diff --git a/src/main/java/mekanism/common/block/BlockMachine.java b/src/main/java/mekanism/common/block/BlockMachine.java index 269629ddf..81b1108c6 100644 --- a/src/main/java/mekanism/common/block/BlockMachine.java +++ b/src/main/java/mekanism/common/block/BlockMachine.java @@ -153,6 +153,7 @@ import cpw.mods.fml.relauncher.SideOnly; * 2:1: Solar Neutron Activator * 2:2: Ambient Accumulator * 2:3: Oredictionificator + * 2:4: Resistive Heater * * @author AidanBrady * @@ -1315,6 +1316,8 @@ public class BlockMachine extends BlockContainer implements ISpecialBounds, IBlo return 0; case AMBIENT_ACCUMULATOR: return 0; + case RESISTIVE_HEATER: + return 100; default: return 0; } diff --git a/src/main/java/mekanism/common/content/boiler/BoilerManager.java b/src/main/java/mekanism/common/content/boiler/BoilerManager.java deleted file mode 100644 index 7e3752b35..000000000 --- a/src/main/java/mekanism/common/content/boiler/BoilerManager.java +++ /dev/null @@ -1,94 +0,0 @@ -package mekanism.common.content.boiler; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Map; - -import mekanism.api.Coord4D; -import mekanism.common.multiblock.MultiblockCache; -import mekanism.common.multiblock.MultiblockManager; -import mekanism.common.tile.TileEntityMultiblock; -import mekanism.common.tile.TileEntityBoilerCasing; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.World; - -/** - * Created by ben on 09/01/15. - */ -public class BoilerManager extends MultiblockManager -{ - public BoilerManager(String s) - { - super(s); - } - - public void tickSelf(World world) - { - ArrayList idsToKill = new ArrayList(); - HashMap> tilesToKill = new HashMap>(); - - for(Map.Entry> entry : inventories.entrySet()) - { - String inventoryID = entry.getKey(); - - HashSet boilers = new HashSet(); - - for(Coord4D obj : entry.getValue().locations) - { - if(obj.dimensionId == world.provider.dimensionId && obj.exists(world)) - { - TileEntity tileEntity = obj.getTileEntity(world); - - if(!(tileEntity instanceof TileEntityMultiblock) || ((TileEntityMultiblock)tileEntity).getManager() != this || (getStructureId(((TileEntityMultiblock)tileEntity)) != null && getStructureId(((TileEntityMultiblock)tileEntity)) != inventoryID)) - { - if(!tilesToKill.containsKey(inventoryID)) - { - tilesToKill.put(inventoryID, new HashSet()); - } - - tilesToKill.get(inventoryID).add(obj); - } - else if(tileEntity instanceof TileEntityBoilerCasing) - { - ((TileEntityBoilerCasing)tileEntity).simulateHeat(); - boilers.add((TileEntityBoilerCasing) tileEntity); - } - } - } - - if(!boilers.isEmpty()) - { - SynchronizedBoilerData data = boilers.iterator().next().getSynchronizedData(); - - if(data != null) - { - boilers.iterator().next().getSynchronizedData().applyTemperatureChange(); - } - - for (TileEntityBoilerCasing boiler : boilers) - { - boiler.applyTemperatureChange(); - } - } - - if(entry.getValue().locations.isEmpty()) - { - idsToKill.add(inventoryID); - } - } - - for(Map.Entry> entry : tilesToKill.entrySet()) - { - for(Coord4D obj : entry.getValue()) - { - inventories.get(entry.getKey()).locations.remove(obj); - } - } - - for(String inventoryID : idsToKill) - { - inventories.remove(inventoryID); - } - } -} diff --git a/src/main/java/mekanism/common/inventory/container/ContainerPortableTank.java b/src/main/java/mekanism/common/inventory/container/ContainerFluidTank.java similarity index 95% rename from src/main/java/mekanism/common/inventory/container/ContainerPortableTank.java rename to src/main/java/mekanism/common/inventory/container/ContainerFluidTank.java index 986978c37..664a0077a 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerPortableTank.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerFluidTank.java @@ -10,11 +10,11 @@ import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidContainerRegistry; -public class ContainerPortableTank extends Container +public class ContainerFluidTank extends Container { private TileEntityFluidTank tileEntity; - public ContainerPortableTank(InventoryPlayer inventory, TileEntityFluidTank tentity) + public ContainerFluidTank(InventoryPlayer inventory, TileEntityFluidTank tentity) { tileEntity = tentity; addSlotToContainer(new Slot(tentity, 0, 146, 19)); diff --git a/src/main/java/mekanism/common/inventory/container/ContainerResistiveHeater.java b/src/main/java/mekanism/common/inventory/container/ContainerResistiveHeater.java new file mode 100644 index 000000000..46ae9328a --- /dev/null +++ b/src/main/java/mekanism/common/inventory/container/ContainerResistiveHeater.java @@ -0,0 +1,124 @@ +package mekanism.common.inventory.container; + +import mekanism.common.inventory.slot.SlotEnergy.SlotDischarge; +import mekanism.common.tile.TileEntityResistiveHeater; +import mekanism.common.util.ChargeUtils; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.inventory.Container; +import net.minecraft.inventory.Slot; +import net.minecraft.item.ItemStack; + +public class ContainerResistiveHeater extends Container +{ + private TileEntityResistiveHeater tileEntity; + + public ContainerResistiveHeater(InventoryPlayer inventory, TileEntityResistiveHeater tentity) + { + tileEntity = tentity; + addSlotToContainer(new SlotDischarge(tentity, 0, 28, 35)); + + int slotY; + + for(slotY = 0; slotY < 3; slotY++) + { + for(int slotX = 0; slotX < 9; slotX++) + { + addSlotToContainer(new Slot(inventory, slotX + slotY * 9 + 9, 8 + slotX * 18, 84 + slotY * 18)); + } + } + + for(slotY = 0; slotY < 9; slotY++) + { + addSlotToContainer(new Slot(inventory, slotY, 8 + slotY * 18, 142)); + } + + tileEntity.open(inventory.player); + tileEntity.openInventory(); + } + + @Override + public void onContainerClosed(EntityPlayer entityplayer) + { + super.onContainerClosed(entityplayer); + + tileEntity.close(entityplayer); + tileEntity.closeInventory(); + } + + @Override + public boolean canInteractWith(EntityPlayer entityplayer) + { + return tileEntity.isUseableByPlayer(entityplayer); + } + + @Override + public ItemStack transferStackInSlot(EntityPlayer player, int slotID) + { + ItemStack stack = null; + Slot currentSlot = (Slot)inventorySlots.get(slotID); + + if(currentSlot != null && currentSlot.getHasStack()) + { + ItemStack slotStack = currentSlot.getStack(); + stack = slotStack.copy(); + + if(ChargeUtils.canBeDischarged(slotStack)) + { + if(slotID != 0) + { + if(!mergeItemStack(slotStack, 0, 1, false)) + { + return null; + } + } + else if(slotID == 0) + { + if(!mergeItemStack(slotStack, 1, inventorySlots.size(), true)) + { + return null; + } + } + } + else { + if(slotID >= 1 && slotID <= 27) + { + if(!mergeItemStack(slotStack, 28, inventorySlots.size(), false)) + { + return null; + } + } + else if(slotID > 27) + { + if(!mergeItemStack(slotStack, 1, 27, false)) + { + return null; + } + } + else { + if(!mergeItemStack(slotStack, 1, inventorySlots.size(), true)) + { + return null; + } + } + } + + if(slotStack.stackSize == 0) + { + currentSlot.putStack((ItemStack)null); + } + else { + currentSlot.onSlotChanged(); + } + + if(slotStack.stackSize == stack.stackSize) + { + return null; + } + + currentSlot.onPickupFromSlot(player, slotStack); + } + + return stack; + } +} diff --git a/src/main/java/mekanism/common/item/ItemBlockMachine.java b/src/main/java/mekanism/common/item/ItemBlockMachine.java index 3b864ed49..0616b5eda 100644 --- a/src/main/java/mekanism/common/item/ItemBlockMachine.java +++ b/src/main/java/mekanism/common/item/ItemBlockMachine.java @@ -108,6 +108,7 @@ import cpw.mods.fml.relauncher.SideOnly; * 2:1: Solar Neutron Activator * 2:2: Ambient Accumulator * 2:3: Oredictionificator + * 2:4: Resistive Heater * @author AidanBrady * */ diff --git a/src/main/java/mekanism/common/tile/TileEntityResistiveHeater.java b/src/main/java/mekanism/common/tile/TileEntityResistiveHeater.java index 4d46a51c5..090be3b6e 100644 --- a/src/main/java/mekanism/common/tile/TileEntityResistiveHeater.java +++ b/src/main/java/mekanism/common/tile/TileEntityResistiveHeater.java @@ -1,26 +1,82 @@ package mekanism.common.tile; +import io.netty.buffer.ByteBuf; + +import java.util.ArrayList; + +import mekanism.api.Coord4D; import mekanism.api.IHeatTransfer; +import mekanism.api.MekanismConfig.general; +import mekanism.api.Range4D; +import mekanism.common.Mekanism; import mekanism.common.block.BlockMachine.MachineType; +import mekanism.common.network.PacketTileEntity.TileEntityMessage; +import mekanism.common.util.ChargeUtils; import mekanism.common.util.HeatUtils; +import mekanism.common.util.MekanismUtils; +import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.common.util.ForgeDirection; -public class TileEntityResistiveHeater extends TileEntityElectricBlock implements IHeatTransfer +public class TileEntityResistiveHeater extends TileEntityNoisyElectricBlock implements IHeatTransfer { + public double energyUsage = 100; + public double temperature; public double heatToAbsorb = 0; + /** Whether or not this machine is in it's active state. */ + public boolean isActive; + + /** The client's current active state. */ + public boolean clientActive; + + /** How many ticks must pass until this block's active state can sync with the client. */ + public int updateDelay; + public TileEntityResistiveHeater() { - super("ResistiveHeater", MachineType.RESISTIVE_HEATER.baseEnergy); + super("machine.resistiveheater", "ResistiveHeater", MachineType.RESISTIVE_HEATER.baseEnergy); + inventory = new ItemStack[1]; } @Override public void onUpdate() { - simulateHeat(); - applyTemperatureChange(); + super.onUpdate(); + + if(worldObj.isRemote && updateDelay > 0) + { + updateDelay--; + + if(updateDelay == 0 && clientActive != isActive) + { + isActive = clientActive; + MekanismUtils.updateBlock(worldObj, xCoord, yCoord, zCoord); + } + } + + if(!worldObj.isRemote) + { + if(updateDelay > 0) + { + updateDelay--; + + if(updateDelay == 0 && clientActive != isActive) + { + Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new ArrayList())), new Range4D(Coord4D.get(this))); + } + } + + ChargeUtils.discharge(0, this); + + double toUse = Math.min(getEnergy(), energyUsage); + heatToAbsorb += toUse/general.energyPerHeat; + setEnergy(getEnergy() - toUse); + + simulateHeat(); + applyTemperatureChange(); + } } @Override @@ -28,7 +84,9 @@ public class TileEntityResistiveHeater extends TileEntityElectricBlock implement { super.readFromNBT(nbtTags); + energyUsage = nbtTags.getDouble("energyUsage"); temperature = nbtTags.getDouble("temperature"); + clientActive = isActive = nbtTags.getBoolean("isActive"); } @Override @@ -36,7 +94,47 @@ public class TileEntityResistiveHeater extends TileEntityElectricBlock implement { super.writeToNBT(nbtTags); + nbtTags.setDouble("energyUsage", energyUsage); nbtTags.setDouble("temperature", temperature); + nbtTags.setBoolean("isActive", isActive); + } + + @Override + public void handlePacketData(ByteBuf dataStream) + { + if(!worldObj.isRemote) + { + energyUsage = dataStream.readDouble(); + + return; + } + + super.handlePacketData(dataStream); + + energyUsage = dataStream.readDouble(); + temperature = dataStream.readDouble(); + clientActive = dataStream.readBoolean(); + maxEnergy = dataStream.readDouble(); + + if(updateDelay == 0 && clientActive != isActive) + { + updateDelay = general.UPDATE_DELAY; + isActive = clientActive; + MekanismUtils.updateBlock(worldObj, xCoord, yCoord, zCoord); + } + } + + @Override + public ArrayList getNetworkedData(ArrayList data) + { + super.getNetworkedData(data); + + data.add(energyUsage); + data.add(temperature); + data.add(isActive); + data.add(maxEnergy); + + return data; } @Override @@ -81,7 +179,7 @@ public class TileEntityResistiveHeater extends TileEntityElectricBlock implement @Override public boolean canConnectHeat(ForgeDirection side) { - return false; + return true; } @Override @@ -89,4 +187,36 @@ public class TileEntityResistiveHeater extends TileEntityElectricBlock implement { return null; } + + @Override + public void setActive(boolean active) + { + isActive = active; + + if(clientActive != active && updateDelay == 0) + { + Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new ArrayList())), new Range4D(Coord4D.get(this))); + + updateDelay = 10; + clientActive = active; + } + } + + @Override + public boolean getActive() + { + return isActive; + } + + @Override + public boolean renderUpdate() + { + return true; + } + + @Override + public boolean lightUpdate() + { + return true; + } } diff --git a/src/main/resources/assets/mekanism/gui/GuiMOreDictFilter.png b/src/main/resources/assets/mekanism/gui/GuiMOreDictFilter.png index bca31627a4a61e1ea85ffeacf731f7208cf1b5ad..7827f2681cfd6d7ca35169562d4b13c30ccd2920 100644 GIT binary patch delta 1067 zcmV+`1l0SJC9oxsBYy-9X+uL$Nkc;*P;zf(X>4Tx062|}Rb6NtRTMtEb7vzY&QokO zg>Hg1+lHrgWSWcKdPn90sKGrRqvPeo9CG3uKX#J{(IASm?@ z+di}}l?o-=)F3E6wD^Ni=!>T7nL9I?X}YoAW$t|Qo$sD|?ti&w?*-_&s#unh6af~R zt}Pcb;&X?Oh&?NigomIP2BB9`9V=a_OaeAf3wO0!-$TNCU)j~&{-3S4MjaI(aUWu{ z=BNvZj{)$fRm*k(dis$cKk8Z@_G0L_F+jvGdbr_Z*TZu@evN5nWtO z;Zej(s*;~Z{0QP}ZGE;J;MNT3ndwE3s`n-8a z_I+}nIqm6u=<|e@EeHIimz0AQ#Dj=`p+-UW=i>gc+)5Aw8EP8kNq;VqqYhgy<6Uj0 z=+8?G7dO-&OBU<;fl{FVM6-)>fUj8wt5J-NPueZH>g)MY#m*OepL~TjtAT&M4YLUa zD3~yZy?+W#SOXDcC_o0^7T9R1gAN8V6s;5)ieI5-7aQlmJn}lUna#nz!j%5V$X|o` zxX!dHWQRV27P1=rj;t2bW$~+pTw@bIek?ZvKPDL<64`^#UNTAck#RBsB6*5DP4<%< zvJ+(Q`q)ZrMP58N*8RMUGg79TMcp~HyP#nIGk+>fTvOMqEDpAYBg-lK1zo-T#$T~q z=`1%wHmU-|3&GWIL{YNX(Qxa>rWCyRuBf>}*(bcU2l~2ICg+(V4}G z#U1l;@#I$zMt+vbndh(cT|8NDE)GVlmj(K2`BoWDjYO>UgY<{AEWIavDE-F0&3(#! z&3}E)eZgG6#@QDHLj zCkzNR&Px>zCja= zBtvA3lr~iNxL5O`B9%|&QfUxVJ5v*>v47M-4~Mg+cA#wn`}`f%scy1T>e6H0eF9n2 zI&SL?%@ub`(vxBuuQn={n(F9?s2GOGOpa(%huUpg8wKy)^pEtLGP@5GTP{bO`wYOo zKk@AQF5-@~0G1qpfyX0m7|+TF-UT@Ggxa#(!5xuEd<)>z_w4q+`Z9Qa{nY8)#2<64 l=PiJ>H#?ob-|uwRK0yDg0B4PV0id6JRZw95Z?hc)b`JF(8s-21 delta 1038 zcmV+p1o8W@C6gtPBYy+%X+uL$Nkc;*P;zf(X>4Tx062|}Ro!pfR1`mnZ(O7nKcKOW z4i$^9Ra0BJ8yc;~21%2p=|UR0&DbiW$#rfTQ`a`O(`{9s_5yDV_yd5l2Of}kLK+Oj z_Ok5(v`JGz71bo9J#^YYXp{DWs&KBaQ@dTpxRI}aIp=pi?|;!XK*v{_pO}_ARv`(`K_~P;r>1*Ox?C;-F2;pN*27;R!QM9q+Ux&wbylgT10KeMtdQo=mnqksdx=&F5&oys0TJd`E>GI|#kK((J)n0eU)DVBJ zYq?3pFC)I@_!%aD74f~sTqTWoFF^8{ntPr?L_-if$s_=TxZzG%&qCb(^K zdCoqnhMa4x{ z6hi)zV+ON`xsmg3L#>3I8=9NTb3f!hwJM>{)UK+QWxX9ld>D=;G@xL^4DLEuumLit zkcSMu9e;39Qv(A`lu*=Clo*MpVGd>OdF6n^am1Jntk;<}MrqIC5$=Q>n{*R}?8oOI zDUw5En2dl--Xw34!z7E+5pr%d2c?H4INKjdmEV*< zl@;X+<-BrtTbJ8*N%&OwR`^l)PWWE<8D!y-a9Q|CxFUQbT#TL7ym&1JoWQ-+)%LMCuYy_wP6ZWs zL5D3kvu*xEYtl=GNMYO54zpQqF~pph71JP#d&LoPNE~Olm7ll=btAavwoIM=mAd9q7A z>MqdgAh7QszoH+g!S^k(^Lixn-v&7J7v5PnBH45U;A;<{`?W~chj-$$p8;Grpf}uw z@Xk*pegW`m`}gsGT^YQaZZ(?^@V@H!1YqOiX7iurW^?09^uGph$@~{t0C9K{wF2RW IvpNKJ4#b%Yl>h($ diff --git a/src/main/resources/assets/mekanism/gui/GuiResistiveHeater.png b/src/main/resources/assets/mekanism/gui/GuiResistiveHeater.png new file mode 100644 index 0000000000000000000000000000000000000000..cd1a0231ed84bdac7cf32b9ded6c067bec8348a0 GIT binary patch literal 3898 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%0A@ycR5LelSm7{WlUJvx5Nn^ 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 P00LI#XU!^3c;5O4^gZmH literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/mekanism/lang/en_US.lang b/src/main/resources/assets/mekanism/lang/en_US.lang index 37715fb03..4df72124e 100644 --- a/src/main/resources/assets/mekanism/lang/en_US.lang +++ b/src/main/resources/assets/mekanism/lang/en_US.lang @@ -521,6 +521,8 @@ gui.temp=Temp gui.usage=Usage gui.transferred=Transferred gui.dissipated=Dissipated +gui.boilRate=Boil Rate +gui.maxBoil=Max Boil gui.reactor.injectionRate=Injection Rate From 7c160cc264fda250756b9a6fd31680568741643e Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Sun, 28 Feb 2016 18:11:50 -0500 Subject: [PATCH 17/52] Interface and rendering fixes --- .../mekanism/api/util/UnitDisplayUtils.java | 4 +- .../mekanism/client/gui/GuiBoilerStats.java | 10 +++ .../client/gui/GuiThermoelectricBoiler.java | 21 +++--- .../client/gui/element/GuiBoilerTab.java | 5 +- .../client/render/MekanismRenderer.java | 1 + .../RenderThermoelectricBoiler.java | 64 +++++++++++++++---- src/main/java/mekanism/common/Mekanism.java | 1 + .../common/content/boiler/BoilerCache.java | 55 +++------------- .../content/boiler/BoilerUpdateProtocol.java | 16 +---- .../boiler/SynchronizedBoilerData.java | 8 ++- .../common/tile/TileEntityBoilerCasing.java | 7 +- .../client/gui/GuiIndustrialTurbine.java | 3 +- .../client/gui/GuiTurbineStats.java | 2 +- .../client/gui/element/GuiTurbineTab.java | 6 +- .../render/RenderIndustrialTurbine.java | 41 ++++++------ .../resources/assets/mekanism/lang/en_US.lang | 1 + 16 files changed, 128 insertions(+), 117 deletions(-) create mode 100644 src/main/java/mekanism/client/gui/GuiBoilerStats.java diff --git a/src/main/java/mekanism/api/util/UnitDisplayUtils.java b/src/main/java/mekanism/api/util/UnitDisplayUtils.java index 9dd3e282d..a30eb630a 100644 --- a/src/main/java/mekanism/api/util/UnitDisplayUtils.java +++ b/src/main/java/mekanism/api/util/UnitDisplayUtils.java @@ -37,8 +37,8 @@ public class UnitDisplayUtils public String name; public String symbol; - double zeroOffset; - double intervalSize; + public double zeroOffset; + public double intervalSize; private TemperatureUnit(String s, String s1, double offset, double size) { diff --git a/src/main/java/mekanism/client/gui/GuiBoilerStats.java b/src/main/java/mekanism/client/gui/GuiBoilerStats.java new file mode 100644 index 000000000..521c3b996 --- /dev/null +++ b/src/main/java/mekanism/client/gui/GuiBoilerStats.java @@ -0,0 +1,10 @@ +package mekanism.client.gui; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + +@SideOnly(Side.CLIENT) +public class GuiBoilerStats +{ + +} diff --git a/src/main/java/mekanism/client/gui/GuiThermoelectricBoiler.java b/src/main/java/mekanism/client/gui/GuiThermoelectricBoiler.java index a514bc9d4..359efc0d7 100644 --- a/src/main/java/mekanism/client/gui/GuiThermoelectricBoiler.java +++ b/src/main/java/mekanism/client/gui/GuiThermoelectricBoiler.java @@ -7,6 +7,7 @@ import mekanism.api.util.ListUtils; import mekanism.api.util.UnitDisplayUtils; import mekanism.api.util.UnitDisplayUtils.TemperatureUnit; import mekanism.client.gui.element.GuiBoilerTab; +import mekanism.client.gui.element.GuiBoilerTab.BoilerTab; import mekanism.client.gui.element.GuiElement.IInfoHandler; import mekanism.client.gui.element.GuiHeatInfo; import mekanism.client.gui.element.GuiRateBar; @@ -17,7 +18,6 @@ import mekanism.common.tile.TileEntityBoilerCasing; import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; -import mekanism.generators.client.gui.element.GuiTurbineTab.BoilerTab; import net.minecraft.entity.player.InventoryPlayer; import net.minecraftforge.fluids.FluidStack; @@ -47,7 +47,7 @@ public class GuiThermoelectricBoiler extends GuiMekanism @Override public double getLevel() { - double max = (int)Math.floor(tileEntity.structure.getHeatAvailable() / tileEntity.structure.enthalpyOfVaporization); + double max = Math.floor(tileEntity.structure.clientHeatAvailable / tileEntity.structure.enthalpyOfVaporization); return (double)tileEntity.structure.lastBoilRate/max; } @@ -57,19 +57,19 @@ public class GuiThermoelectricBoiler extends GuiMekanism @Override public String getTooltip() { - double max = (int)Math.floor(tileEntity.structure.getHeatAvailable() / tileEntity.structure.enthalpyOfVaporization); - double cap = tileEntity.structure.superheatingElements*general.superheatingHeatTransfer; - return LangUtils.localize("gui.maxBoil") + ": " + tileEntity.structure.lastBoilRate + " mB/t"; + int max = (int)Math.floor(tileEntity.structure.clientHeatAvailable / tileEntity.structure.enthalpyOfVaporization); + + return LangUtils.localize("gui.maxBoil") + ": " + max + " mB/t"; } @Override public double getLevel() { - double max = (int)Math.floor(tileEntity.structure.getHeatAvailable() / tileEntity.structure.enthalpyOfVaporization); - - return (double)tileEntity.structure.lastBoilRate/max; + double max = Math.floor(tileEntity.structure.clientHeatAvailable / tileEntity.structure.enthalpyOfVaporization); + double cap = tileEntity.structure.superheatingElements*general.superheatingHeatTransfer; + return max/cap; } - }, MekanismUtils.getResource(ResourceType.GUI, "GuiThermoelectricBoiler.png"), 142, 13)); + }, MekanismUtils.getResource(ResourceType.GUI, "GuiThermoelectricBoiler.png"), 144, 13)); guiElements.add(new GuiHeatInfo(new IInfoHandler() { @Override public List getInfo() @@ -86,9 +86,10 @@ public class GuiThermoelectricBoiler extends GuiMekanism int xAxis = (mouseX - (width - xSize) / 2); int yAxis = (mouseY - (height - ySize) / 2); + fontRendererObj.drawString(LangUtils.localize("container.inventory"), 8, (ySize - 96) + 4, 0x404040); fontRendererObj.drawString(tileEntity.getInventoryName(), (xSize/2)-(fontRendererObj.getStringWidth(tileEntity.getInventoryName())/2), 5, 0x404040); - double max = (int)Math.floor(tileEntity.structure.getHeatAvailable() / tileEntity.structure.enthalpyOfVaporization); + double max = (int)Math.floor(tileEntity.structure.clientHeatAvailable / tileEntity.structure.enthalpyOfVaporization); renderScaledText(LangUtils.localize("gui.temp") + ": " + MekanismUtils.getTemperatureDisplay(tileEntity.structure.temperature, TemperatureUnit.AMBIENT), 43, 30, 0x00CD00, 90); renderScaledText(LangUtils.localize("gui.boilRate") + ": " + tileEntity.structure.lastBoilRate + " mB/t", 43, 39, 0x00CD00, 90); diff --git a/src/main/java/mekanism/client/gui/element/GuiBoilerTab.java b/src/main/java/mekanism/client/gui/element/GuiBoilerTab.java index 1105a70e7..fc828cdcd 100644 --- a/src/main/java/mekanism/client/gui/element/GuiBoilerTab.java +++ b/src/main/java/mekanism/client/gui/element/GuiBoilerTab.java @@ -8,7 +8,6 @@ import mekanism.common.network.PacketSimpleGui.SimpleGuiMessage; import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; -import mekanism.generators.client.gui.element.GuiTurbineTab.BoilerTab; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; import codechicken.lib.vec.Rectangle4i; @@ -84,7 +83,7 @@ public class GuiBoilerTab extends GuiElement } } - public static enum TurbineTab + public static enum BoilerTab { MAIN("GuiGasesTab.png", 54, "gui.main"), STAT("GuiStatsTab.png", 55, "gui.stats"); @@ -93,7 +92,7 @@ public class GuiBoilerTab extends GuiElement private int guiId; private String desc; - private TurbineTab(String s, int id, String s1) + private BoilerTab(String s, int id, String s1) { path = s; guiId = id; diff --git a/src/main/java/mekanism/client/render/MekanismRenderer.java b/src/main/java/mekanism/client/render/MekanismRenderer.java index 4cf2f83c6..f3f13091e 100644 --- a/src/main/java/mekanism/client/render/MekanismRenderer.java +++ b/src/main/java/mekanism/client/render/MekanismRenderer.java @@ -129,6 +129,7 @@ public class MekanismRenderer FluidRegistry.getFluid("brine").setIcons(event.map.registerIcon("mekanism:LiquidBrine")); FluidRegistry.getFluid("heavywater").setIcons(event.map.registerIcon("mekanism:LiquidHeavyWater")); + FluidRegistry.getFluid("steam").setIcons(event.map.registerIcon("mekanism:LiquidSteam")); for(InfuseType type : InfuseRegistry.getInfuseMap().values()) { diff --git a/src/main/java/mekanism/client/render/tileentity/RenderThermoelectricBoiler.java b/src/main/java/mekanism/client/render/tileentity/RenderThermoelectricBoiler.java index 7b7f02170..53089ce2c 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderThermoelectricBoiler.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderThermoelectricBoiler.java @@ -28,7 +28,7 @@ import cpw.mods.fml.relauncher.SideOnly; public class RenderThermoelectricBoiler extends TileEntitySpecialRenderer { private static Map cachedLowerFluids = new HashMap(); - private static Map cachedUpperFluids = new HashMap(); + private static Map cachedUpperFluids = new HashMap(); private static Map cachedValveFluids = new HashMap(); private Fluid STEAM = FluidRegistry.getFluid("steam"); @@ -49,13 +49,15 @@ public class RenderThermoelectricBoiler extends TileEntitySpecialRenderer RenderData data = new RenderData(); data.location = tileEntity.structure.renderLocation; - data.height = tileEntity.structure.volHeight; + data.height = (tileEntity.structure.upperRenderLocation.yCoord-1)-tileEntity.structure.renderLocation.yCoord; data.length = tileEntity.structure.volLength; data.width = tileEntity.structure.volWidth; + + System.out.println("Water height: " + data.height); bindTexture(MekanismRenderer.getBlocksTexture()); - if(data.location != null && tileEntity.structure.waterStored.getFluid() != null) + if(data.location != null && data.height >= 1 && tileEntity.structure.waterStored.getFluid() != null) { push(); @@ -64,7 +66,7 @@ public class RenderThermoelectricBoiler extends TileEntitySpecialRenderer MekanismRenderer.glowOn(tileEntity.structure.waterStored.getFluid().getLuminosity()); MekanismRenderer.colorFluid(tileEntity.structure.waterStored.getFluid()); - DisplayInteger[] displayList = getListAndRender(data, tileEntity.structure.waterStored.getFluid(), tileEntity.getWorldObj(), cachedLowerFluids); + DisplayInteger[] displayList = getLowerDisplay(data, tileEntity.structure.waterStored.getFluid(), tileEntity.getWorldObj()); if(tileEntity.structure.waterStored.getFluid().isGaseous()) { @@ -103,13 +105,15 @@ public class RenderThermoelectricBoiler extends TileEntitySpecialRenderer RenderData data = new RenderData(); data.location = tileEntity.structure.upperRenderLocation; - data.height = tileEntity.structure.volHeight; + data.height = (tileEntity.structure.renderLocation.yCoord+tileEntity.structure.volHeight-2)-(tileEntity.structure.upperRenderLocation.yCoord); data.length = tileEntity.structure.volLength; data.width = tileEntity.structure.volWidth; + + System.out.println("Steam height: " + data.height); bindTexture(MekanismRenderer.getBlocksTexture()); - if(data.location != null && tileEntity.structure.steamStored.getFluid() != null) + if(data.location != null && data.height >= 1 && tileEntity.structure.steamStored.getFluid() != null) { push(); @@ -118,10 +122,10 @@ public class RenderThermoelectricBoiler extends TileEntitySpecialRenderer MekanismRenderer.glowOn(tileEntity.structure.steamStored.getFluid().getLuminosity()); MekanismRenderer.colorFluid(tileEntity.structure.steamStored.getFluid()); - DisplayInteger[] displayList = getListAndRender(data, tileEntity.structure.waterStored.getFluid(), tileEntity.getWorldObj(), cachedUpperFluids); + DisplayInteger display = getUpperDisplay(data, tileEntity.structure.steamStored.getFluid(), tileEntity.getWorldObj()); GL11.glColor4f(1F, 1F, 1F, Math.min(1, ((float)tileEntity.structure.steamStored.amount / (float)tileEntity.clientSteamCapacity)+0.3F)); - displayList[getStages(data.height+1)-1].render(); + display.render(); MekanismRenderer.glowOff(); MekanismRenderer.resetColor(); @@ -148,11 +152,11 @@ public class RenderThermoelectricBoiler extends TileEntitySpecialRenderer GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); } - private DisplayInteger[] getListAndRender(RenderData data, Fluid fluid, World world, Map map) + private DisplayInteger[] getLowerDisplay(RenderData data, Fluid fluid, World world) { - if(map.containsKey(data)) + if(cachedLowerFluids.containsKey(data)) { - return map.get(data); + return cachedLowerFluids.get(data); } Model3D toReturn = new Model3D(); @@ -162,7 +166,7 @@ public class RenderThermoelectricBoiler extends TileEntitySpecialRenderer final int stages = getStages(data.height); DisplayInteger[] displays = new DisplayInteger[stages]; - map.put(data, displays); + cachedLowerFluids.put(data, displays); for(int i = 0; i < stages; i++) { @@ -186,6 +190,40 @@ public class RenderThermoelectricBoiler extends TileEntitySpecialRenderer return displays; } + + private DisplayInteger getUpperDisplay(RenderData data, Fluid fluid, World world) + { + if(cachedUpperFluids.containsKey(data)) + { + return cachedUpperFluids.get(data); + } + + Model3D toReturn = new Model3D(); + toReturn.baseBlock = Blocks.water; + toReturn.setTexture(fluid.getIcon()); + + final int stages = getStages(data.height); + DisplayInteger display = DisplayInteger.createAndStart(); + + cachedUpperFluids.put(data, display); + + if(STEAM.getIcon() != null) + { + toReturn.minX = 0 + .01; + toReturn.minY = 0 + .01; + toReturn.minZ = 0 + .01; + + toReturn.maxX = data.length - .01; + toReturn.maxY = data.height - .01; + toReturn.maxZ = data.width - .01; + + MekanismRenderer.renderObject(toReturn); + } + + GL11.glEndList(); + + return display; + } private DisplayInteger getValveDisplay(ValveRenderData data, Fluid fluid, World world) { @@ -293,7 +331,7 @@ public class RenderThermoelectricBoiler extends TileEntitySpecialRenderer private int getStages(int height) { - return (height-2)*(TankUpdateProtocol.FLUID_PER_TANK/10); + return height*(TankUpdateProtocol.FLUID_PER_TANK/10); } private double getX(int x) diff --git a/src/main/java/mekanism/common/Mekanism.java b/src/main/java/mekanism/common/Mekanism.java index 2137b0af8..4d72d89c0 100644 --- a/src/main/java/mekanism/common/Mekanism.java +++ b/src/main/java/mekanism/common/Mekanism.java @@ -1205,6 +1205,7 @@ public class Mekanism GasRegistry.register(new Gas("lithium")).registerFluid(); FluidRegistry.registerFluid(new Fluid("heavyWater")); + FluidRegistry.registerFluid(new Fluid("steam")); for(Resource resource : Resource.values()) { diff --git a/src/main/java/mekanism/common/content/boiler/BoilerCache.java b/src/main/java/mekanism/common/content/boiler/BoilerCache.java index ced5d0b7c..d74696e7d 100644 --- a/src/main/java/mekanism/common/content/boiler/BoilerCache.java +++ b/src/main/java/mekanism/common/content/boiler/BoilerCache.java @@ -1,96 +1,61 @@ package mekanism.common.content.boiler; import mekanism.common.multiblock.MultiblockCache; -import mekanism.common.util.FluidContainerUtils.ContainerEditMode; -import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.nbt.NBTTagList; -import net.minecraftforge.common.util.Constants.NBT; import net.minecraftforge.fluids.FluidStack; public class BoilerCache extends MultiblockCache { - public ItemStack[] inventory = new ItemStack[2]; - public FluidStack water; public FluidStack steam; - - public ContainerEditMode editMode = ContainerEditMode.BOTH; + + public double temperature; @Override public void apply(SynchronizedBoilerData data) { - data.inventory = inventory; data.waterStored = water; data.steamStored = steam; - data.editMode = editMode; + data.temperature = temperature; } @Override public void sync(SynchronizedBoilerData data) { - inventory = data.inventory; water = data.waterStored; steam = data.steamStored; - editMode = data.editMode; + temperature = data.temperature; } @Override public void load(NBTTagCompound nbtTags) { - editMode = ContainerEditMode.values()[nbtTags.getInteger("editMode")]; - - NBTTagList tagList = nbtTags.getTagList("Items", NBT.TAG_COMPOUND); - inventory = new ItemStack[2]; - - for(int tagCount = 0; tagCount < tagList.tagCount(); tagCount++) - { - NBTTagCompound tagCompound = (NBTTagCompound)tagList.getCompoundTagAt(tagCount); - byte slotID = tagCompound.getByte("Slot"); - - if(slotID >= 0 && slotID < 2) - { - inventory[slotID] = ItemStack.loadItemStackFromNBT(tagCompound); - } - } - if(nbtTags.hasKey("cachedWater")) { water = FluidStack.loadFluidStackFromNBT(nbtTags.getCompoundTag("cachedWater")); } + if(nbtTags.hasKey("cachedSteam")) { steam = FluidStack.loadFluidStackFromNBT(nbtTags.getCompoundTag("cachedSteam")); } + + temperature = nbtTags.getDouble("temperature"); } @Override public void save(NBTTagCompound nbtTags) { - nbtTags.setInteger("editMode", editMode.ordinal()); - - NBTTagList tagList = new NBTTagList(); - - for(int slotCount = 0; slotCount < 2; slotCount++) - { - if(inventory[slotCount] != null) - { - NBTTagCompound tagCompound = new NBTTagCompound(); - tagCompound.setByte("Slot", (byte)slotCount); - inventory[slotCount].writeToNBT(tagCompound); - tagList.appendTag(tagCompound); - } - } - - nbtTags.setTag("Items", tagList); - if(water != null) { nbtTags.setTag("cachedWater", water.writeToNBT(new NBTTagCompound())); } + if(steam != null) { nbtTags.setTag("cachedSteam", steam.writeToNBT(new NBTTagCompound())); } + + nbtTags.setDouble("temperature", temperature); } } diff --git a/src/main/java/mekanism/common/content/boiler/BoilerUpdateProtocol.java b/src/main/java/mekanism/common/content/boiler/BoilerUpdateProtocol.java index ea584b75b..1935ef159 100644 --- a/src/main/java/mekanism/common/content/boiler/BoilerUpdateProtocol.java +++ b/src/main/java/mekanism/common/content/boiler/BoilerUpdateProtocol.java @@ -5,7 +5,6 @@ import java.util.List; import java.util.Set; import mekanism.api.Coord4D; -import mekanism.api.util.StackUtils; import mekanism.common.Mekanism; import mekanism.common.block.BlockBasic.BasicType; import mekanism.common.content.tank.SynchronizedTankData.ValveData; @@ -51,8 +50,6 @@ public class BoilerUpdateProtocol extends UpdateProtocol @Override protected boolean canForm(SynchronizedBoilerData structure) { - System.out.println("hi"); - if(structure.volHeight >= 3) { Set dispersers = new HashSet(); @@ -174,7 +171,7 @@ public class BoilerUpdateProtocol extends UpdateProtocol int steamHeight = (structure.renderLocation.yCoord+structure.volHeight-2)-initDisperser.yCoord; structure.steamVolume = structure.volWidth*structure.volLength*steamHeight; - structure.upperRenderLocation = new Coord4D(structure.renderLocation.xCoord, structure.renderLocation.zCoord, initDisperser.yCoord+1); + structure.upperRenderLocation = new Coord4D(structure.renderLocation.xCoord, initDisperser.yCoord+1, structure.renderLocation.zCoord); System.out.println(structure.superheatingElements + " " + structure.waterVolume + " " + structure.steamVolume); return true; @@ -221,15 +218,8 @@ public class BoilerUpdateProtocol extends UpdateProtocol { ((BoilerCache)cache).steam.amount += ((BoilerCache)merge).steam.amount; } - - List rejects = StackUtils.getMergeRejects(((BoilerCache)cache).inventory, ((BoilerCache)merge).inventory); - - if(!rejects.isEmpty()) - { - rejectedItems.addAll(rejects); - } - - StackUtils.merge(((BoilerCache)cache).inventory, ((BoilerCache)merge).inventory); + + ((BoilerCache)cache).temperature = Math.max(((BoilerCache)cache).temperature, ((BoilerCache)merge).temperature); } @Override diff --git a/src/main/java/mekanism/common/content/boiler/SynchronizedBoilerData.java b/src/main/java/mekanism/common/content/boiler/SynchronizedBoilerData.java index a6ab23f2b..c6f871e4a 100644 --- a/src/main/java/mekanism/common/content/boiler/SynchronizedBoilerData.java +++ b/src/main/java/mekanism/common/content/boiler/SynchronizedBoilerData.java @@ -6,6 +6,7 @@ import java.util.Set; import mekanism.api.Coord4D; import mekanism.api.IHeatTransfer; import mekanism.api.MekanismConfig.general; +import mekanism.api.util.UnitDisplayUtils.TemperatureUnit; import mekanism.common.content.tank.SynchronizedTankData.ValveData; import mekanism.common.multiblock.SynchronizedData; import mekanism.common.util.FluidContainerUtils.ContainerEditMode; @@ -15,8 +16,9 @@ import net.minecraftforge.fluids.FluidStack; public class SynchronizedBoilerData extends SynchronizedData implements IHeatTransfer { - public static double CASING_INSULATION_COEFFICIENT = 50; + public static double CASING_INSULATION_COEFFICIENT = 10; public static double CASING_INVERSE_CONDUCTION_COEFFICIENT = 1; + public static double BASE_BOIL_TEMP = 100-(TemperatureUnit.AMBIENT.zeroOffset-TemperatureUnit.CELSIUS.zeroOffset); public FluidStack waterStored; public FluidStack prevWater; @@ -26,6 +28,8 @@ public class SynchronizedBoilerData extends SynchronizedData= 100 && structure.waterStored != null) + if(structure.temperature >= SynchronizedBoilerData.BASE_BOIL_TEMP && structure.waterStored != null) { int steamAmount = structure.steamStored != null ? structure.steamStored.amount : 0; double heatAvailable = structure.getHeatAvailable(); @@ -148,6 +149,8 @@ public class TileEntityBoilerCasing extends TileEntityMultiblock cachedFluids = new HashMap(); + private static Map cachedFluids = new HashMap(); private Fluid STEAM = FluidRegistry.getFluid("steam"); @@ -80,10 +80,10 @@ public class RenderIndustrialTurbine extends TileEntitySpecialRenderer MekanismRenderer.glowOn(tileEntity.structure.fluidStored.getFluid().getLuminosity()); MekanismRenderer.colorFluid(tileEntity.structure.fluidStored.getFluid()); - DisplayInteger[] displayList = getListAndRender(data, tileEntity.getWorldObj()); + DisplayInteger display = getListAndRender(data, tileEntity.getWorldObj()); GL11.glColor4f(1F, 1F, 1F, Math.min(1, ((float)tileEntity.structure.fluidStored.amount / (float)tileEntity.structure.getFluidCapacity())+0.3F)); - displayList[getStages(data.height+1)-1].render(); + display.render(); MekanismRenderer.glowOff(); MekanismRenderer.resetColor(); @@ -130,7 +130,7 @@ public class RenderIndustrialTurbine extends TileEntitySpecialRenderer return z - TileEntityRendererDispatcher.staticPlayerZ; } - private DisplayInteger[] getListAndRender(RenderData data, World world) + private DisplayInteger getListAndRender(RenderData data, World world) { if(cachedFluids.containsKey(data)) { @@ -142,31 +142,26 @@ public class RenderIndustrialTurbine extends TileEntitySpecialRenderer toReturn.setTexture(STEAM.getIcon()); final int stages = getStages(data.height); - DisplayInteger[] displays = new DisplayInteger[stages]; + DisplayInteger display = DisplayInteger.createAndStart(); - cachedFluids.put(data, displays); - - for(int i = 0; i < stages; i++) + cachedFluids.put(data, display); + + if(STEAM.getIcon() != null) { - displays[i] = DisplayInteger.createAndStart(); + toReturn.minX = 0 + .01; + toReturn.minY = 0 + .01; + toReturn.minZ = 0 + .01; - if(STEAM.getIcon() != null) - { - toReturn.minX = 0 + .01; - toReturn.minY = 0 + .01; - toReturn.minZ = 0 + .01; + toReturn.maxX = data.length - .01; + toReturn.maxY = data.height - .01; + toReturn.maxZ = data.width - .01; - toReturn.maxX = data.length - .01; - toReturn.maxY = ((float)i/(float)stages)*(data.height+1) - .01; - toReturn.maxZ = data.width - .01; - - MekanismRenderer.renderObject(toReturn); - } - - GL11.glEndList(); + MekanismRenderer.renderObject(toReturn); } - return displays; + GL11.glEndList(); + + return display; } public static void resetDisplayInts() diff --git a/src/main/resources/assets/mekanism/lang/en_US.lang b/src/main/resources/assets/mekanism/lang/en_US.lang index 4df72124e..fdda278ca 100644 --- a/src/main/resources/assets/mekanism/lang/en_US.lang +++ b/src/main/resources/assets/mekanism/lang/en_US.lang @@ -459,6 +459,7 @@ gui.incomplete=Incomplete gui.inductionMatrix=Induction Matrix gui.matrixStats=Matrix Statistics gui.turbineStats=Turbine Statistics +gui.boilerStats=Boiler Statistics gui.main=Main gui.outputting=Outputting gui.receiving=Receiving From f09010a92704776289bbe73bd69e35c52f8173bd Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Sun, 28 Feb 2016 19:11:43 -0500 Subject: [PATCH 18/52] Many more fixes --- .../mekanism/client/gui/GuiBoilerStats.java | 87 ++++++++++++++++++- .../client/gui/GuiThermoelectricBoiler.java | 2 +- .../client/render/MekanismRenderer.java | 2 + .../render/tileentity/RenderDynamicTank.java | 2 +- .../render/tileentity/RenderFluidTank.java | 2 +- .../RenderThermoelectricBoiler.java | 12 +-- src/main/java/mekanism/common/Mekanism.java | 2 +- .../content/boiler/BoilerUpdateProtocol.java | 7 -- .../boiler/SynchronizedBoilerData.java | 2 +- .../common/tile/TileEntityBoilerCasing.java | 4 +- .../render/RenderIndustrialTurbine.java | 2 +- 11 files changed, 100 insertions(+), 24 deletions(-) diff --git a/src/main/java/mekanism/client/gui/GuiBoilerStats.java b/src/main/java/mekanism/client/gui/GuiBoilerStats.java index 521c3b996..7144dd880 100644 --- a/src/main/java/mekanism/client/gui/GuiBoilerStats.java +++ b/src/main/java/mekanism/client/gui/GuiBoilerStats.java @@ -1,10 +1,95 @@ package mekanism.client.gui; +import java.util.List; + +import mekanism.api.EnumColor; +import mekanism.api.MekanismConfig.generators; +import mekanism.api.util.ListUtils; +import mekanism.api.util.UnitDisplayUtils; +import mekanism.api.util.UnitDisplayUtils.TemperatureUnit; +import mekanism.client.gui.element.GuiBoilerTab; +import mekanism.client.gui.element.GuiBoilerTab.BoilerTab; +import mekanism.client.gui.element.GuiElement.IInfoHandler; +import mekanism.client.gui.element.GuiHeatInfo; +import mekanism.common.inventory.container.ContainerNull; +import mekanism.common.tile.TileEntityBoilerCasing; +import mekanism.common.util.LangUtils; +import mekanism.common.util.MekanismUtils; +import mekanism.common.util.MekanismUtils.ResourceType; +import net.minecraft.entity.player.InventoryPlayer; + +import org.lwjgl.opengl.GL11; + import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) -public class GuiBoilerStats +public class GuiBoilerStats extends GuiMekanism { + public TileEntityBoilerCasing tileEntity; + public GuiBoilerStats(InventoryPlayer inventory, TileEntityBoilerCasing tentity) + { + super(tentity, new ContainerNull(inventory.player, tentity)); + tileEntity = tentity; + guiElements.add(new GuiBoilerTab(this, tileEntity, BoilerTab.MAIN, 6, MekanismUtils.getResource(ResourceType.GUI, "GuiNull.png"))); + guiElements.add(new GuiHeatInfo(new IInfoHandler() { + @Override + public List getInfo() + { + String loss = UnitDisplayUtils.getDisplayShort(tileEntity.structure.lastEnvironmentLoss, TemperatureUnit.KELVIN); + return ListUtils.asList(LangUtils.localize("gui.dissipated") + ": " + loss + "/t"); + } + }, this, MekanismUtils.getResource(ResourceType.GUI, "GuiNull.png"))); + } + + @Override + protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) + { + int xAxis = (mouseX - (width - xSize) / 2); + int yAxis = (mouseY - (height - ySize) / 2); + + String stats = LangUtils.localize("gui.boilerStats"); + String limiting = EnumColor.DARK_RED + " (" + LangUtils.localize("gui.limiting") + ")"; + + /*fontRendererObj.drawString(stats, (xSize/2)-(fontRendererObj.getStringWidth(stats)/2), 6, 0x404040); + + fontRendererObj.drawString(LangUtils.localize("gui.tankVolume") + ": " + tileEntity.structure.lowerVolume, 8, 26, 0x404040); + + boolean dispersersLimiting = tileEntity.structure.lowerVolume*tileEntity.structure.clientDispersers*generators.turbineDisperserGasFlow < + tileEntity.structure.vents*generators.turbineVentGasFlow; + boolean ventsLimiting = tileEntity.structure.lowerVolume*tileEntity.structure.clientDispersers*generators.turbineDisperserGasFlow > + tileEntity.structure.vents*generators.turbineVentGasFlow; + + fontRendererObj.drawString(LangUtils.localize("gui.steamFlow"), 8, 40, 0x797979); + fontRendererObj.drawString(LangUtils.localize("gui.dispersers") + ": " + tileEntity.structure.clientDispersers + (dispersersLimiting ? limiting : ""), 14, 49, 0x404040); + fontRendererObj.drawString(LangUtils.localize("gui.vents") + ": " + tileEntity.structure.vents + (ventsLimiting ? limiting : ""), 14, 58, 0x404040); + + boolean bladesLimiting = tileEntity.structure.coils*4 > tileEntity.structure.blades; + boolean coilsLimiting = tileEntity.structure.coils*4 < tileEntity.structure.blades; + + fontRendererObj.drawString(LangUtils.localize("gui.production"), 8, 72, 0x797979); + fontRendererObj.drawString(LangUtils.localize("gui.blades") + ": " + tileEntity.structure.blades + (bladesLimiting ? limiting : ""), 14, 81, 0x404040); + fontRendererObj.drawString(LangUtils.localize("gui.coils") + ": " + tileEntity.structure.coils + (coilsLimiting ? limiting : ""), 14, 90, 0x404040); + + double energyMultiplier = generators.turbineBaseEnergyPerSteam*Math.min(tileEntity.structure.blades, tileEntity.structure.coils*generators.turbineBladesPerCoil); + double rate = tileEntity.structure.lowerVolume*(tileEntity.structure.clientDispersers*generators.turbineDisperserGasFlow); + rate = Math.min(rate, tileEntity.structure.vents*generators.turbineVentGasFlow); + + fontRendererObj.drawString(LangUtils.localize("gui.maxProduction") + ": " + MekanismUtils.getEnergyDisplay(rate*energyMultiplier), 8, 104, 0x404040);*/ + + super.drawGuiContainerForegroundLayer(mouseX, mouseY); + } + + @Override + protected void drawGuiContainerBackgroundLayer(float partialTick, int mouseX, int mouseY) + { + mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.GUI, "GuiNull.png")); + GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + int guiWidth = (width - xSize) / 2; + int guiHeight = (height - ySize) / 2; + drawTexturedModalRect(guiWidth, guiHeight, 0, 0, xSize, ySize); + + super.drawGuiContainerBackgroundLayer(partialTick, mouseX, mouseY); + } } diff --git a/src/main/java/mekanism/client/gui/GuiThermoelectricBoiler.java b/src/main/java/mekanism/client/gui/GuiThermoelectricBoiler.java index 359efc0d7..7789329ec 100644 --- a/src/main/java/mekanism/client/gui/GuiThermoelectricBoiler.java +++ b/src/main/java/mekanism/client/gui/GuiThermoelectricBoiler.java @@ -66,7 +66,7 @@ public class GuiThermoelectricBoiler extends GuiMekanism public double getLevel() { double max = Math.floor(tileEntity.structure.clientHeatAvailable / tileEntity.structure.enthalpyOfVaporization); - double cap = tileEntity.structure.superheatingElements*general.superheatingHeatTransfer; + double cap = (tileEntity.structure.superheatingElements*general.superheatingHeatTransfer) / tileEntity.structure.enthalpyOfVaporization; return max/cap; } }, MekanismUtils.getResource(ResourceType.GUI, "GuiThermoelectricBoiler.png"), 144, 13)); diff --git a/src/main/java/mekanism/client/render/MekanismRenderer.java b/src/main/java/mekanism/client/render/MekanismRenderer.java index f3f13091e..bc21fd8f1 100644 --- a/src/main/java/mekanism/client/render/MekanismRenderer.java +++ b/src/main/java/mekanism/client/render/MekanismRenderer.java @@ -60,6 +60,8 @@ public class MekanismRenderer public static IIcon energyIcon; public static IIcon heatIcon; + public static float GAS_RENDER_BASE = 0.2F; + public static Map overlays = new HashMap(); private static float lightmapLastX; diff --git a/src/main/java/mekanism/client/render/tileentity/RenderDynamicTank.java b/src/main/java/mekanism/client/render/tileentity/RenderDynamicTank.java index bcacc1b87..6719019e6 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderDynamicTank.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderDynamicTank.java @@ -61,7 +61,7 @@ public class RenderDynamicTank extends TileEntitySpecialRenderer if(tileEntity.structure.fluidStored.getFluid().isGaseous()) { - GL11.glColor4f(1F, 1F, 1F, Math.min(1, ((float)tileEntity.structure.fluidStored.amount / (float)tileEntity.clientCapacity)+0.3F)); + GL11.glColor4f(1F, 1F, 1F, Math.min(1, ((float)tileEntity.structure.fluidStored.amount / (float)tileEntity.clientCapacity)+MekanismRenderer.GAS_RENDER_BASE)); displayList[getStages(data.height)-1].render(); } else { diff --git a/src/main/java/mekanism/client/render/tileentity/RenderFluidTank.java b/src/main/java/mekanism/client/render/tileentity/RenderFluidTank.java index b081e9eab..91a182113 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderFluidTank.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderFluidTank.java @@ -59,7 +59,7 @@ public class RenderFluidTank extends TileEntitySpecialRenderer if(fluid.isGaseous()) { - GL11.glColor4f(1F, 1F, 1F, Math.min(1, fluidScale+0.3F)); + GL11.glColor4f(1F, 1F, 1F, Math.min(1, fluidScale+MekanismRenderer.GAS_RENDER_BASE)); displayList[stages-1].render(); } else { diff --git a/src/main/java/mekanism/client/render/tileentity/RenderThermoelectricBoiler.java b/src/main/java/mekanism/client/render/tileentity/RenderThermoelectricBoiler.java index 53089ce2c..106761c66 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderThermoelectricBoiler.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderThermoelectricBoiler.java @@ -42,7 +42,7 @@ public class RenderThermoelectricBoiler extends TileEntitySpecialRenderer public void renderAModelAt(TileEntityBoilerCasing tileEntity, double x, double y, double z, float partialTick) { - if(tileEntity.clientHasStructure && tileEntity.isRendering && tileEntity.structure != null) + if(tileEntity.clientHasStructure && tileEntity.isRendering && tileEntity.structure != null && tileEntity.structure.renderLocation != null && tileEntity.structure.upperRenderLocation != null) { if(tileEntity.structure.waterStored != null && tileEntity.structure.waterStored.amount != 0) { @@ -52,8 +52,6 @@ public class RenderThermoelectricBoiler extends TileEntitySpecialRenderer data.height = (tileEntity.structure.upperRenderLocation.yCoord-1)-tileEntity.structure.renderLocation.yCoord; data.length = tileEntity.structure.volLength; data.width = tileEntity.structure.volWidth; - - System.out.println("Water height: " + data.height); bindTexture(MekanismRenderer.getBlocksTexture()); @@ -70,7 +68,7 @@ public class RenderThermoelectricBoiler extends TileEntitySpecialRenderer if(tileEntity.structure.waterStored.getFluid().isGaseous()) { - GL11.glColor4f(1F, 1F, 1F, Math.min(1, ((float)tileEntity.structure.waterStored.amount / (float)tileEntity.clientWaterCapacity)+0.3F)); + GL11.glColor4f(1F, 1F, 1F, Math.min(1, ((float)tileEntity.structure.waterStored.amount / (float)tileEntity.clientWaterCapacity)+MekanismRenderer.GAS_RENDER_BASE)); displayList[getStages(data.height)-1].render(); } else { @@ -108,8 +106,6 @@ public class RenderThermoelectricBoiler extends TileEntitySpecialRenderer data.height = (tileEntity.structure.renderLocation.yCoord+tileEntity.structure.volHeight-2)-(tileEntity.structure.upperRenderLocation.yCoord); data.length = tileEntity.structure.volLength; data.width = tileEntity.structure.volWidth; - - System.out.println("Steam height: " + data.height); bindTexture(MekanismRenderer.getBlocksTexture()); @@ -124,7 +120,7 @@ public class RenderThermoelectricBoiler extends TileEntitySpecialRenderer DisplayInteger display = getUpperDisplay(data, tileEntity.structure.steamStored.getFluid(), tileEntity.getWorldObj()); - GL11.glColor4f(1F, 1F, 1F, Math.min(1, ((float)tileEntity.structure.steamStored.amount / (float)tileEntity.clientSteamCapacity)+0.3F)); + GL11.glColor4f(1F, 1F, 1F, Math.min(1, ((float)tileEntity.structure.steamStored.amount / (float)tileEntity.clientSteamCapacity)+MekanismRenderer.GAS_RENDER_BASE)); display.render(); MekanismRenderer.glowOff(); @@ -179,7 +175,7 @@ public class RenderThermoelectricBoiler extends TileEntitySpecialRenderer toReturn.minZ = 0 + .01; toReturn.maxX = data.length - .01; - toReturn.maxY = ((float)i/(float)stages)*(data.height-2) - .01; + toReturn.maxY = ((float)i/(float)stages)*data.height - .01; toReturn.maxZ = data.width - .01; MekanismRenderer.renderObject(toReturn); diff --git a/src/main/java/mekanism/common/Mekanism.java b/src/main/java/mekanism/common/Mekanism.java index 4d72d89c0..90821d734 100644 --- a/src/main/java/mekanism/common/Mekanism.java +++ b/src/main/java/mekanism/common/Mekanism.java @@ -1205,7 +1205,7 @@ public class Mekanism GasRegistry.register(new Gas("lithium")).registerFluid(); FluidRegistry.registerFluid(new Fluid("heavyWater")); - FluidRegistry.registerFluid(new Fluid("steam")); + FluidRegistry.registerFluid(new Fluid("steam").setGaseous(true)); for(Resource resource : Resource.values()) { diff --git a/src/main/java/mekanism/common/content/boiler/BoilerUpdateProtocol.java b/src/main/java/mekanism/common/content/boiler/BoilerUpdateProtocol.java index 1935ef159..2fd19ca04 100644 --- a/src/main/java/mekanism/common/content/boiler/BoilerUpdateProtocol.java +++ b/src/main/java/mekanism/common/content/boiler/BoilerUpdateProtocol.java @@ -74,7 +74,6 @@ public class BoilerUpdateProtocol extends UpdateProtocol //Ensure at least one disperser exists if(dispersers.size() == 0) { - System.out.println("No dispersers"); return false; } @@ -90,7 +89,6 @@ public class BoilerUpdateProtocol extends UpdateProtocol if(!(tile instanceof TileEntityPressureDisperser)) { - System.out.println("Missing disperser"); return false; } @@ -101,7 +99,6 @@ public class BoilerUpdateProtocol extends UpdateProtocol //If there are more dispersers than those on the plane found, the structure is invalid if(dispersers.size() > 0) { - System.out.println("Bad disperser"); return false; } @@ -118,7 +115,6 @@ public class BoilerUpdateProtocol extends UpdateProtocol if(elements.size() > structure.superheatingElements) { - System.out.println("Disconnected elements"); return false; } @@ -144,7 +140,6 @@ public class BoilerUpdateProtocol extends UpdateProtocol //Some air must exist for the structure to be valid if(initAir == null) { - System.out.println("No air"); return false; } @@ -164,7 +159,6 @@ public class BoilerUpdateProtocol extends UpdateProtocol //Make sure all air blocks are connected if(totalAir > structure.waterVolume) { - System.out.println("nonconnected air"); return false; } @@ -172,7 +166,6 @@ public class BoilerUpdateProtocol extends UpdateProtocol structure.steamVolume = structure.volWidth*structure.volLength*steamHeight; structure.upperRenderLocation = new Coord4D(structure.renderLocation.xCoord, initDisperser.yCoord+1, structure.renderLocation.zCoord); - System.out.println(structure.superheatingElements + " " + structure.waterVolume + " " + structure.steamVolume); return true; } diff --git a/src/main/java/mekanism/common/content/boiler/SynchronizedBoilerData.java b/src/main/java/mekanism/common/content/boiler/SynchronizedBoilerData.java index c6f871e4a..ed97dbd9e 100644 --- a/src/main/java/mekanism/common/content/boiler/SynchronizedBoilerData.java +++ b/src/main/java/mekanism/common/content/boiler/SynchronizedBoilerData.java @@ -16,7 +16,7 @@ import net.minecraftforge.fluids.FluidStack; public class SynchronizedBoilerData extends SynchronizedData implements IHeatTransfer { - public static double CASING_INSULATION_COEFFICIENT = 10; + public static double CASING_INSULATION_COEFFICIENT = 1; public static double CASING_INVERSE_CONDUCTION_COEFFICIENT = 1; public static double BASE_BOIL_TEMP = 100-(TemperatureUnit.AMBIENT.zeroOffset-TemperatureUnit.CELSIUS.zeroOffset); diff --git a/src/main/java/mekanism/common/tile/TileEntityBoilerCasing.java b/src/main/java/mekanism/common/tile/TileEntityBoilerCasing.java index 723379b78..10ba2fa9e 100644 --- a/src/main/java/mekanism/common/tile/TileEntityBoilerCasing.java +++ b/src/main/java/mekanism/common/tile/TileEntityBoilerCasing.java @@ -201,8 +201,8 @@ public class TileEntityBoilerCasing extends TileEntityMultiblock Date: Mon, 29 Feb 2016 00:31:19 -0500 Subject: [PATCH 19/52] Adjusted numbers, everything is now nice and balanced --- src/main/java/mekanism/api/MekanismConfig.java | 2 +- .../client/gui/GuiThermoelectricBoiler.java | 18 ++++++------------ src/main/java/mekanism/common/CommonProxy.java | 2 ++ .../content/boiler/SynchronizedBoilerData.java | 13 +++++++++---- .../common/network/PacketConfigSync.java | 6 ++++++ .../common/tile/TileEntityBoilerCasing.java | 11 ++++++++--- .../client/gui/GuiIndustrialTurbine.java | 6 ++++-- .../generators/client/gui/GuiTurbineStats.java | 6 ++++-- .../common/GeneratorsCommonProxy.java | 1 - .../generators/common/MekanismGenerators.java | 2 -- .../content/turbine/TurbineUpdateProtocol.java | 1 + .../tile/turbine/TileEntityTurbineCasing.java | 3 ++- 12 files changed, 43 insertions(+), 28 deletions(-) diff --git a/src/main/java/mekanism/api/MekanismConfig.java b/src/main/java/mekanism/api/MekanismConfig.java index 29e497bd3..fe85beeb3 100644 --- a/src/main/java/mekanism/api/MekanismConfig.java +++ b/src/main/java/mekanism/api/MekanismConfig.java @@ -62,6 +62,7 @@ public class MekanismConfig public static double evaporationSolarMultiplier = 0.2; public static double evaporationMaxTemp = 3000; public static double energyPerHeat = 1000; + public static double maxEnergyPerSteam = 100; public static double superheatingHeatTransfer = 10000; } @@ -139,7 +140,6 @@ public class MekanismConfig public static int windGenerationMaxY; public static int turbineBladesPerCoil; - public static double turbineBaseEnergyPerSteam; public static double turbineVentGasFlow; public static double turbineDisperserGasFlow; } diff --git a/src/main/java/mekanism/client/gui/GuiThermoelectricBoiler.java b/src/main/java/mekanism/client/gui/GuiThermoelectricBoiler.java index 7789329ec..d8ae6623f 100644 --- a/src/main/java/mekanism/client/gui/GuiThermoelectricBoiler.java +++ b/src/main/java/mekanism/client/gui/GuiThermoelectricBoiler.java @@ -13,6 +13,7 @@ import mekanism.client.gui.element.GuiHeatInfo; import mekanism.client.gui.element.GuiRateBar; import mekanism.client.gui.element.GuiRateBar.IRateInfoHandler; import mekanism.client.render.MekanismRenderer; +import mekanism.common.content.boiler.SynchronizedBoilerData; import mekanism.common.inventory.container.ContainerFilter; import mekanism.common.tile.TileEntityBoilerCasing; import mekanism.common.util.LangUtils; @@ -47,9 +48,7 @@ public class GuiThermoelectricBoiler extends GuiMekanism @Override public double getLevel() { - double max = Math.floor(tileEntity.structure.clientHeatAvailable / tileEntity.structure.enthalpyOfVaporization); - - return (double)tileEntity.structure.lastBoilRate/max; + return (double)tileEntity.structure.lastBoilRate/(double)tileEntity.structure.lastMaxBoil; } }, MekanismUtils.getResource(ResourceType.GUI, "GuiThermoelectricBoiler.png"), 24, 13)); guiElements.add(new GuiRateBar(this, new IRateInfoHandler() @@ -57,17 +56,14 @@ public class GuiThermoelectricBoiler extends GuiMekanism @Override public String getTooltip() { - int max = (int)Math.floor(tileEntity.structure.clientHeatAvailable / tileEntity.structure.enthalpyOfVaporization); - - return LangUtils.localize("gui.maxBoil") + ": " + max + " mB/t"; + return LangUtils.localize("gui.maxBoil") + ": " + tileEntity.structure.lastMaxBoil + " mB/t"; } @Override public double getLevel() { - double max = Math.floor(tileEntity.structure.clientHeatAvailable / tileEntity.structure.enthalpyOfVaporization); - double cap = (tileEntity.structure.superheatingElements*general.superheatingHeatTransfer) / tileEntity.structure.enthalpyOfVaporization; - return max/cap; + double cap = (tileEntity.structure.superheatingElements*general.superheatingHeatTransfer) / SynchronizedBoilerData.getHeatEnthalpy(); + return (double)tileEntity.structure.lastMaxBoil/cap; } }, MekanismUtils.getResource(ResourceType.GUI, "GuiThermoelectricBoiler.png"), 144, 13)); guiElements.add(new GuiHeatInfo(new IInfoHandler() { @@ -89,11 +85,9 @@ public class GuiThermoelectricBoiler extends GuiMekanism fontRendererObj.drawString(LangUtils.localize("container.inventory"), 8, (ySize - 96) + 4, 0x404040); fontRendererObj.drawString(tileEntity.getInventoryName(), (xSize/2)-(fontRendererObj.getStringWidth(tileEntity.getInventoryName())/2), 5, 0x404040); - double max = (int)Math.floor(tileEntity.structure.clientHeatAvailable / tileEntity.structure.enthalpyOfVaporization); - renderScaledText(LangUtils.localize("gui.temp") + ": " + MekanismUtils.getTemperatureDisplay(tileEntity.structure.temperature, TemperatureUnit.AMBIENT), 43, 30, 0x00CD00, 90); renderScaledText(LangUtils.localize("gui.boilRate") + ": " + tileEntity.structure.lastBoilRate + " mB/t", 43, 39, 0x00CD00, 90); - renderScaledText(LangUtils.localize("gui.maxBoil") + ": " + max + " mB/t", 43, 48, 0x00CD00, 90); + renderScaledText(LangUtils.localize("gui.maxBoil") + ": " + tileEntity.structure.lastMaxBoil + " mB/t", 43, 48, 0x00CD00, 90); if(xAxis >= 7 && xAxis <= 23 && yAxis >= 14 && yAxis <= 72) { diff --git a/src/main/java/mekanism/common/CommonProxy.java b/src/main/java/mekanism/common/CommonProxy.java index 81966ca01..c1cd3a73b 100644 --- a/src/main/java/mekanism/common/CommonProxy.java +++ b/src/main/java/mekanism/common/CommonProxy.java @@ -282,6 +282,8 @@ public class CommonProxy implements IGuiProvider general.evaporationSolarMultiplier = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "EvaporationSolarMultiplier", 0.2D).getDouble(); general.evaporationMaxTemp = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "EvaporationMaxTemp", 3000D).getDouble(); general.energyPerHeat = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "EnergyPerHeat", 1000D).getDouble(); + general.maxEnergyPerSteam = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "MaxEnergyPerSteam", 100D).getDouble(); + general.superheatingHeatTransfer = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "SuperheatingHeatTransfer", 10000D).getDouble(); general.blacklistIC2 = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "BlacklistIC2Power", false).getBoolean(); general.blacklistRF = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "BlacklistRFPower", false).getBoolean(); diff --git a/src/main/java/mekanism/common/content/boiler/SynchronizedBoilerData.java b/src/main/java/mekanism/common/content/boiler/SynchronizedBoilerData.java index ed97dbd9e..d90ed2aec 100644 --- a/src/main/java/mekanism/common/content/boiler/SynchronizedBoilerData.java +++ b/src/main/java/mekanism/common/content/boiler/SynchronizedBoilerData.java @@ -28,16 +28,13 @@ public class SynchronizedBoilerData extends SynchronizedData valves = new HashSet(); + /** + * @return how much heat energy is needed to convert one unit of water into steam + */ + public static double getHeatEnthalpy() + { + return general.maxEnergyPerSteam/general.energyPerHeat; + } + public double getHeatAvailable() { double heatAvailable = (temperature-BASE_BOIL_TEMP)*locations.size(); diff --git a/src/main/java/mekanism/common/network/PacketConfigSync.java b/src/main/java/mekanism/common/network/PacketConfigSync.java index 9d0d008bc..a24cfc57d 100644 --- a/src/main/java/mekanism/common/network/PacketConfigSync.java +++ b/src/main/java/mekanism/common/network/PacketConfigSync.java @@ -68,6 +68,9 @@ public class PacketConfigSync implements IMessageHandler getInfo() { - double energyMultiplier = generators.turbineBaseEnergyPerSteam*Math.min(tileEntity.structure.blades, tileEntity.structure.coils*generators.turbineBladesPerCoil); + double energyMultiplier = (general.maxEnergyPerSteam/TurbineUpdateProtocol.MAX_BLADES)*Math.min(tileEntity.structure.blades, tileEntity.structure.coils*generators.turbineBladesPerCoil); return ListUtils.asList( LangUtils.localize("gui.storing") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getEnergy()), @@ -77,7 +79,7 @@ public class GuiIndustrialTurbine extends GuiMekanism fontRendererObj.drawString(LangUtils.localize("container.inventory"), 8, (ySize - 96) + 4, 0x404040); fontRendererObj.drawString(tileEntity.getInventoryName(), (xSize/2)-(fontRendererObj.getStringWidth(tileEntity.getInventoryName())/2), 5, 0x404040); - double energyMultiplier = generators.turbineBaseEnergyPerSteam*Math.min(tileEntity.structure.blades, tileEntity.structure.coils*generators.turbineBladesPerCoil); + double energyMultiplier = (general.maxEnergyPerSteam/TurbineUpdateProtocol.MAX_BLADES)*Math.min(tileEntity.structure.blades, tileEntity.structure.coils*generators.turbineBladesPerCoil); double rate = tileEntity.structure.lowerVolume*(tileEntity.structure.clientDispersers*generators.turbineDisperserGasFlow); rate = Math.min(rate, tileEntity.structure.vents*generators.turbineVentGasFlow); diff --git a/src/main/java/mekanism/generators/client/gui/GuiTurbineStats.java b/src/main/java/mekanism/generators/client/gui/GuiTurbineStats.java index 2bdac5b4d..a389fde46 100644 --- a/src/main/java/mekanism/generators/client/gui/GuiTurbineStats.java +++ b/src/main/java/mekanism/generators/client/gui/GuiTurbineStats.java @@ -3,6 +3,7 @@ package mekanism.generators.client.gui; import java.util.List; import mekanism.api.EnumColor; +import mekanism.api.MekanismConfig.general; import mekanism.api.MekanismConfig.generators; import mekanism.api.util.ListUtils; import mekanism.client.gui.GuiMekanism; @@ -14,6 +15,7 @@ import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import mekanism.generators.client.gui.element.GuiTurbineTab; import mekanism.generators.client.gui.element.GuiTurbineTab.TurbineTab; +import mekanism.generators.common.content.turbine.TurbineUpdateProtocol; import mekanism.generators.common.tile.turbine.TileEntityTurbineCasing; import net.minecraft.entity.player.InventoryPlayer; @@ -37,7 +39,7 @@ public class GuiTurbineStats extends GuiMekanism @Override public List getInfo() { - double energyMultiplier = generators.turbineBaseEnergyPerSteam*Math.min(tileEntity.structure.blades, tileEntity.structure.coils*generators.turbineBladesPerCoil); + double energyMultiplier = (general.maxEnergyPerSteam/TurbineUpdateProtocol.MAX_BLADES)*Math.min(tileEntity.structure.blades, tileEntity.structure.coils*generators.turbineBladesPerCoil); return ListUtils.asList( LangUtils.localize("gui.storing") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getEnergy()), @@ -75,7 +77,7 @@ public class GuiTurbineStats extends GuiMekanism fontRendererObj.drawString(LangUtils.localize("gui.blades") + ": " + tileEntity.structure.blades + (bladesLimiting ? limiting : ""), 14, 81, 0x404040); fontRendererObj.drawString(LangUtils.localize("gui.coils") + ": " + tileEntity.structure.coils + (coilsLimiting ? limiting : ""), 14, 90, 0x404040); - double energyMultiplier = generators.turbineBaseEnergyPerSteam*Math.min(tileEntity.structure.blades, tileEntity.structure.coils*generators.turbineBladesPerCoil); + double energyMultiplier = (general.maxEnergyPerSteam/TurbineUpdateProtocol.MAX_BLADES)*Math.min(tileEntity.structure.blades, tileEntity.structure.coils*generators.turbineBladesPerCoil); double rate = tileEntity.structure.lowerVolume*(tileEntity.structure.clientDispersers*generators.turbineDisperserGasFlow); rate = Math.min(rate, tileEntity.structure.vents*generators.turbineVentGasFlow); diff --git a/src/main/java/mekanism/generators/common/GeneratorsCommonProxy.java b/src/main/java/mekanism/generators/common/GeneratorsCommonProxy.java index 0e7c95588..ef41bbec4 100644 --- a/src/main/java/mekanism/generators/common/GeneratorsCommonProxy.java +++ b/src/main/java/mekanism/generators/common/GeneratorsCommonProxy.java @@ -100,7 +100,6 @@ public class GeneratorsCommonProxy implements IGuiProvider loadWindConfiguration(); generators.turbineBladesPerCoil = Mekanism.configuration.get("generation", "TurbineBladesPerCoil", 4).getInt(); - generators.turbineBaseEnergyPerSteam = Mekanism.configuration.get("generation", "TurbineBaseEnergyPerSteam", 10D).getDouble(); generators.turbineVentGasFlow = Mekanism.configuration.get("generation", "TurbineVentGasFlow", 16000D).getDouble(); generators.turbineDisperserGasFlow = Mekanism.configuration.get("generation", "TurbineDisperserGasFlow", 640D).getDouble(); diff --git a/src/main/java/mekanism/generators/common/MekanismGenerators.java b/src/main/java/mekanism/generators/common/MekanismGenerators.java index 9b00244c8..a4208a7de 100644 --- a/src/main/java/mekanism/generators/common/MekanismGenerators.java +++ b/src/main/java/mekanism/generators/common/MekanismGenerators.java @@ -208,7 +208,6 @@ public class MekanismGenerators implements IModule dataStream.writeInt(generators.windGenerationMaxY); dataStream.writeInt(generators.turbineBladesPerCoil); - dataStream.writeDouble(generators.turbineBaseEnergyPerSteam); dataStream.writeDouble(generators.turbineVentGasFlow); dataStream.writeDouble(generators.turbineDisperserGasFlow); } @@ -230,7 +229,6 @@ public class MekanismGenerators implements IModule generators.windGenerationMaxY = dataStream.readInt(); generators.turbineBladesPerCoil = dataStream.readInt(); - generators.turbineBaseEnergyPerSteam = dataStream.readDouble(); generators.turbineVentGasFlow = dataStream.readDouble(); generators.turbineDisperserGasFlow = dataStream.readDouble(); } diff --git a/src/main/java/mekanism/generators/common/content/turbine/TurbineUpdateProtocol.java b/src/main/java/mekanism/generators/common/content/turbine/TurbineUpdateProtocol.java index 9a65de0dd..21cdc3b05 100644 --- a/src/main/java/mekanism/generators/common/content/turbine/TurbineUpdateProtocol.java +++ b/src/main/java/mekanism/generators/common/content/turbine/TurbineUpdateProtocol.java @@ -25,6 +25,7 @@ import net.minecraftforge.common.util.ForgeDirection; public class TurbineUpdateProtocol extends UpdateProtocol { public static final int FLUID_PER_TANK = TankUpdateProtocol.FLUID_PER_TANK; + public static final int MAX_BLADES = 28; public TurbineUpdateProtocol(TileEntityTurbineCasing tileEntity) { diff --git a/src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineCasing.java b/src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineCasing.java index b6dec8d98..39879c3e8 100644 --- a/src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineCasing.java +++ b/src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineCasing.java @@ -5,6 +5,7 @@ import io.netty.buffer.ByteBuf; import java.util.ArrayList; import mekanism.api.Coord4D; +import mekanism.api.MekanismConfig.general; import mekanism.api.MekanismConfig.generators; import mekanism.api.Range4D; import mekanism.api.energy.IStrictEnergyStorage; @@ -63,7 +64,7 @@ public class TileEntityTurbineCasing extends TileEntityMultiblock 0 && getEnergy() < structure.getEnergyCapacity()) { - double energyMultiplier = generators.turbineBaseEnergyPerSteam*Math.min(structure.blades, structure.coils*generators.turbineBladesPerCoil); + double energyMultiplier = (general.maxEnergyPerSteam/TurbineUpdateProtocol.MAX_BLADES)*Math.min(structure.blades, structure.coils*generators.turbineBladesPerCoil); double rate = structure.lowerVolume*(structure.getDispersers()*generators.turbineDisperserGasFlow); rate = Math.min(rate, structure.vents*generators.turbineVentGasFlow); From 4644e7520225966e4d3307ddfbf6981a91b21530 Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Tue, 1 Mar 2016 10:22:24 -0500 Subject: [PATCH 20/52] Work on boiler stats panel, hopefully fix build --- .../java/mekanism/client/ClientProxy.java | 3 ++ .../mekanism/client/gui/GuiBoilerStats.java | 35 ++++++------------- .../client/gui/element/GuiBoilerTab.java | 2 +- .../java/mekanism/common/CommonProxy.java | 2 ++ .../content/boiler/BoilerUpdateProtocol.java | 4 +-- .../resources/assets/mekanism/lang/en_US.lang | 5 +++ 6 files changed, 22 insertions(+), 29 deletions(-) diff --git a/src/main/java/mekanism/client/ClientProxy.java b/src/main/java/mekanism/client/ClientProxy.java index 7c2869019..6f7aa3862 100644 --- a/src/main/java/mekanism/client/ClientProxy.java +++ b/src/main/java/mekanism/client/ClientProxy.java @@ -9,6 +9,7 @@ import mekanism.api.Pos3D; import mekanism.client.SparkleAnimation.INodeChecker; import mekanism.client.entity.EntityLaser; import mekanism.client.gui.GuiAmbientAccumulator; +import mekanism.client.gui.GuiBoilerStats; import mekanism.client.gui.GuiChemicalCrystallizer; import mekanism.client.gui.GuiChemicalDissolutionChamber; import mekanism.client.gui.GuiChemicalInfuser; @@ -526,6 +527,8 @@ public class ClientProxy extends CommonProxy return new GuiResistiveHeater(player.inventory, (TileEntityResistiveHeater)tileEntity); case 54: return new GuiThermoelectricBoiler(player.inventory, (TileEntityBoilerCasing)tileEntity); + case 55: + return new GuiBoilerStats(player.inventory, (TileEntityBoilerCasing)tileEntity); } return null; diff --git a/src/main/java/mekanism/client/gui/GuiBoilerStats.java b/src/main/java/mekanism/client/gui/GuiBoilerStats.java index 7144dd880..02fd50c80 100644 --- a/src/main/java/mekanism/client/gui/GuiBoilerStats.java +++ b/src/main/java/mekanism/client/gui/GuiBoilerStats.java @@ -2,8 +2,7 @@ package mekanism.client.gui; import java.util.List; -import mekanism.api.EnumColor; -import mekanism.api.MekanismConfig.generators; +import mekanism.api.MekanismConfig.general; import mekanism.api.util.ListUtils; import mekanism.api.util.UnitDisplayUtils; import mekanism.api.util.UnitDisplayUtils.TemperatureUnit; @@ -11,6 +10,8 @@ import mekanism.client.gui.element.GuiBoilerTab; import mekanism.client.gui.element.GuiBoilerTab.BoilerTab; import mekanism.client.gui.element.GuiElement.IInfoHandler; import mekanism.client.gui.element.GuiHeatInfo; +import mekanism.common.content.boiler.BoilerUpdateProtocol; +import mekanism.common.content.boiler.SynchronizedBoilerData; import mekanism.common.inventory.container.ContainerNull; import mekanism.common.tile.TileEntityBoilerCasing; import mekanism.common.util.LangUtils; @@ -50,33 +51,17 @@ public class GuiBoilerStats extends GuiMekanism int yAxis = (mouseY - (height - ySize) / 2); String stats = LangUtils.localize("gui.boilerStats"); - String limiting = EnumColor.DARK_RED + " (" + LangUtils.localize("gui.limiting") + ")"; - /*fontRendererObj.drawString(stats, (xSize/2)-(fontRendererObj.getStringWidth(stats)/2), 6, 0x404040); + fontRendererObj.drawString(stats, (xSize/2)-(fontRendererObj.getStringWidth(stats)/2), 6, 0x404040); - fontRendererObj.drawString(LangUtils.localize("gui.tankVolume") + ": " + tileEntity.structure.lowerVolume, 8, 26, 0x404040); + fontRendererObj.drawString(LangUtils.localize("gui.maxWater") + ": " + tileEntity.structure.waterVolume*BoilerUpdateProtocol.WATER_PER_TANK, 8, 26, 0x404040); + fontRendererObj.drawString(LangUtils.localize("gui.maxSteam") + ": " + tileEntity.structure.steamVolume*BoilerUpdateProtocol.STEAM_PER_TANK, 8, 35, 0x404040); - boolean dispersersLimiting = tileEntity.structure.lowerVolume*tileEntity.structure.clientDispersers*generators.turbineDisperserGasFlow < - tileEntity.structure.vents*generators.turbineVentGasFlow; - boolean ventsLimiting = tileEntity.structure.lowerVolume*tileEntity.structure.clientDispersers*generators.turbineDisperserGasFlow > - tileEntity.structure.vents*generators.turbineVentGasFlow; + fontRendererObj.drawString(LangUtils.localize("gui.heatTransfer"), 8, 49, 0x797979); + fontRendererObj.drawString(LangUtils.localize("gui.superheaters") + ": " + tileEntity.structure.superheatingElements, 14, 58, 0x404040); - fontRendererObj.drawString(LangUtils.localize("gui.steamFlow"), 8, 40, 0x797979); - fontRendererObj.drawString(LangUtils.localize("gui.dispersers") + ": " + tileEntity.structure.clientDispersers + (dispersersLimiting ? limiting : ""), 14, 49, 0x404040); - fontRendererObj.drawString(LangUtils.localize("gui.vents") + ": " + tileEntity.structure.vents + (ventsLimiting ? limiting : ""), 14, 58, 0x404040); - - boolean bladesLimiting = tileEntity.structure.coils*4 > tileEntity.structure.blades; - boolean coilsLimiting = tileEntity.structure.coils*4 < tileEntity.structure.blades; - - fontRendererObj.drawString(LangUtils.localize("gui.production"), 8, 72, 0x797979); - fontRendererObj.drawString(LangUtils.localize("gui.blades") + ": " + tileEntity.structure.blades + (bladesLimiting ? limiting : ""), 14, 81, 0x404040); - fontRendererObj.drawString(LangUtils.localize("gui.coils") + ": " + tileEntity.structure.coils + (coilsLimiting ? limiting : ""), 14, 90, 0x404040); - - double energyMultiplier = generators.turbineBaseEnergyPerSteam*Math.min(tileEntity.structure.blades, tileEntity.structure.coils*generators.turbineBladesPerCoil); - double rate = tileEntity.structure.lowerVolume*(tileEntity.structure.clientDispersers*generators.turbineDisperserGasFlow); - rate = Math.min(rate, tileEntity.structure.vents*generators.turbineVentGasFlow); - - fontRendererObj.drawString(LangUtils.localize("gui.maxProduction") + ": " + MekanismUtils.getEnergyDisplay(rate*energyMultiplier), 8, 104, 0x404040);*/ + int boilCapacity = (int)((tileEntity.structure.superheatingElements*general.superheatingHeatTransfer)/SynchronizedBoilerData.getHeatEnthalpy()); + fontRendererObj.drawString(LangUtils.localize("gui.boilCapacity") + ": " + boilCapacity + " mB/t", 8, 72, 0x404040); super.drawGuiContainerForegroundLayer(mouseX, mouseY); } diff --git a/src/main/java/mekanism/client/gui/element/GuiBoilerTab.java b/src/main/java/mekanism/client/gui/element/GuiBoilerTab.java index fc828cdcd..24d2b24b8 100644 --- a/src/main/java/mekanism/client/gui/element/GuiBoilerTab.java +++ b/src/main/java/mekanism/client/gui/element/GuiBoilerTab.java @@ -106,7 +106,7 @@ public class GuiBoilerTab extends GuiElement public void openGui(TileEntity tile) { - Mekanism.packetHandler.sendToServer(new SimpleGuiMessage(Coord4D.get(tile), 1, guiId)); + Mekanism.packetHandler.sendToServer(new SimpleGuiMessage(Coord4D.get(tile), 0, guiId)); } public String getDesc() diff --git a/src/main/java/mekanism/common/CommonProxy.java b/src/main/java/mekanism/common/CommonProxy.java index c1cd3a73b..d62938b70 100644 --- a/src/main/java/mekanism/common/CommonProxy.java +++ b/src/main/java/mekanism/common/CommonProxy.java @@ -545,6 +545,8 @@ public class CommonProxy implements IGuiProvider return new ContainerResistiveHeater(player.inventory, (TileEntityResistiveHeater)tileEntity); case 54: return new ContainerFilter(player.inventory, (TileEntityContainerBlock)tileEntity); + case 55: + return new ContainerNull(player, (TileEntityContainerBlock)tileEntity); } return null; diff --git a/src/main/java/mekanism/common/content/boiler/BoilerUpdateProtocol.java b/src/main/java/mekanism/common/content/boiler/BoilerUpdateProtocol.java index 2fd19ca04..70360bb52 100644 --- a/src/main/java/mekanism/common/content/boiler/BoilerUpdateProtocol.java +++ b/src/main/java/mekanism/common/content/boiler/BoilerUpdateProtocol.java @@ -143,11 +143,9 @@ public class BoilerUpdateProtocol extends UpdateProtocol return false; } - final int total = totalAir; - structure.waterVolume = new NodeCounter(new NodeChecker() { @Override - public boolean isValid(Coord4D coord) + public final boolean isValid(Coord4D coord) { return coord.yCoord >= structure.renderLocation.yCoord-1 && coord.yCoord < initDisperser.yCoord && coord.xCoord >= structure.renderLocation.xCoord && coord.xCoord < structure.renderLocation.xCoord+structure.volLength && diff --git a/src/main/resources/assets/mekanism/lang/en_US.lang b/src/main/resources/assets/mekanism/lang/en_US.lang index fdda278ca..64163622c 100644 --- a/src/main/resources/assets/mekanism/lang/en_US.lang +++ b/src/main/resources/assets/mekanism/lang/en_US.lang @@ -524,6 +524,11 @@ gui.transferred=Transferred gui.dissipated=Dissipated gui.boilRate=Boil Rate gui.maxBoil=Max Boil +gui.maxWater=Max Water +gui.maxSteam=Max Steam +gui.heatTransfer=Heat Transfer +gui.superheaters=Superheaters +gui.boilCapacity=Boil Capacity gui.reactor.injectionRate=Injection Rate From 8b9098b350cd760f3845c0a19eea082be54bb189 Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Tue, 1 Mar 2016 10:25:06 -0500 Subject: [PATCH 21/52] Another build fix attempt --- .../common/content/boiler/BoilerUpdateProtocol.java | 6 ++++-- .../java/mekanism/common/multiblock/UpdateProtocol.java | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/main/java/mekanism/common/content/boiler/BoilerUpdateProtocol.java b/src/main/java/mekanism/common/content/boiler/BoilerUpdateProtocol.java index 70360bb52..027261b6b 100644 --- a/src/main/java/mekanism/common/content/boiler/BoilerUpdateProtocol.java +++ b/src/main/java/mekanism/common/content/boiler/BoilerUpdateProtocol.java @@ -78,7 +78,7 @@ public class BoilerUpdateProtocol extends UpdateProtocol } //Find a single disperser contained within this multiblock - Coord4D initDisperser = dispersers.iterator().next(); + final Coord4D initDisperser = dispersers.iterator().next(); //Ensure that a full horizontal plane of dispersers exist, surrounding the found disperser for(int x = structure.renderLocation.xCoord+1; x < structure.renderLocation.xCoord+structure.volLength-1; x++) @@ -143,9 +143,11 @@ public class BoilerUpdateProtocol extends UpdateProtocol return false; } + final Coord4D renderLocation = structure.renderLocation.clone(); + structure.waterVolume = new NodeCounter(new NodeChecker() { @Override - public final boolean isValid(Coord4D coord) + public final boolean isValid(final Coord4D coord) { return coord.yCoord >= structure.renderLocation.yCoord-1 && coord.yCoord < initDisperser.yCoord && coord.xCoord >= structure.renderLocation.xCoord && coord.xCoord < structure.renderLocation.xCoord+structure.volLength && diff --git a/src/main/java/mekanism/common/multiblock/UpdateProtocol.java b/src/main/java/mekanism/common/multiblock/UpdateProtocol.java index 7a43bbcee..f537ffc4b 100644 --- a/src/main/java/mekanism/common/multiblock/UpdateProtocol.java +++ b/src/main/java/mekanism/common/multiblock/UpdateProtocol.java @@ -581,7 +581,7 @@ public abstract class UpdateProtocol> public static abstract class NodeChecker { - public abstract boolean isValid(Coord4D coord); + public abstract boolean isValid(final Coord4D coord); public boolean shouldContinue(int iterated) { From 30fbfc32d61c9bae7f65fa5ac8511ff56a662316 Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Tue, 1 Mar 2016 10:26:57 -0500 Subject: [PATCH 22/52] Another try --- .../common/content/boiler/BoilerUpdateProtocol.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/mekanism/common/content/boiler/BoilerUpdateProtocol.java b/src/main/java/mekanism/common/content/boiler/BoilerUpdateProtocol.java index 027261b6b..5f322cdb2 100644 --- a/src/main/java/mekanism/common/content/boiler/BoilerUpdateProtocol.java +++ b/src/main/java/mekanism/common/content/boiler/BoilerUpdateProtocol.java @@ -147,11 +147,11 @@ public class BoilerUpdateProtocol extends UpdateProtocol structure.waterVolume = new NodeCounter(new NodeChecker() { @Override - public final boolean isValid(final Coord4D coord) + public final boolean isValid(Coord4D coord) { - return coord.yCoord >= structure.renderLocation.yCoord-1 && coord.yCoord < initDisperser.yCoord && - coord.xCoord >= structure.renderLocation.xCoord && coord.xCoord < structure.renderLocation.xCoord+structure.volLength && - coord.zCoord >= structure.renderLocation.zCoord && coord.zCoord < structure.renderLocation.zCoord+structure.volWidth && + return coord.yCoord >= renderLocation.yCoord-1 && coord.yCoord < initDisperser.yCoord && + coord.xCoord >= renderLocation.xCoord && coord.xCoord < renderLocation.xCoord+structure.volLength && + coord.zCoord >= renderLocation.zCoord && coord.zCoord < renderLocation.zCoord+structure.volWidth && (coord.isAirBlock(pointer.getWorldObj()) || isViableNode(coord.xCoord, coord.yCoord, coord.zCoord)); } }).calculate(initAir); From 382116b659217f4ec15b51a47d2acdef869576ad Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Tue, 1 Mar 2016 10:29:43 -0500 Subject: [PATCH 23/52] Hopefully final build fix --- .../common/content/boiler/BoilerUpdateProtocol.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/java/mekanism/common/content/boiler/BoilerUpdateProtocol.java b/src/main/java/mekanism/common/content/boiler/BoilerUpdateProtocol.java index 5f322cdb2..4c6fcaacf 100644 --- a/src/main/java/mekanism/common/content/boiler/BoilerUpdateProtocol.java +++ b/src/main/java/mekanism/common/content/boiler/BoilerUpdateProtocol.java @@ -144,14 +144,16 @@ public class BoilerUpdateProtocol extends UpdateProtocol } final Coord4D renderLocation = structure.renderLocation.clone(); + final int volLength = structure.volLength; + final int volWidth = structure.volWidth; structure.waterVolume = new NodeCounter(new NodeChecker() { @Override public final boolean isValid(Coord4D coord) { return coord.yCoord >= renderLocation.yCoord-1 && coord.yCoord < initDisperser.yCoord && - coord.xCoord >= renderLocation.xCoord && coord.xCoord < renderLocation.xCoord+structure.volLength && - coord.zCoord >= renderLocation.zCoord && coord.zCoord < renderLocation.zCoord+structure.volWidth && + coord.xCoord >= renderLocation.xCoord && coord.xCoord < renderLocation.xCoord+volLength && + coord.zCoord >= renderLocation.zCoord && coord.zCoord < renderLocation.zCoord+volWidth && (coord.isAirBlock(pointer.getWorldObj()) || isViableNode(coord.xCoord, coord.yCoord, coord.zCoord)); } }).calculate(initAir); From cfb0986a4854fea5f7b81392f012f22c7a55ad67 Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Tue, 1 Mar 2016 13:37:19 -0500 Subject: [PATCH 24/52] Added fancy graphs to display boil rate and max boil value of boilers, boiler valves now connect to corresponding tanks of multiblock based on location --- .../mekanism/client/gui/GuiBoilerStats.java | 39 ++++- .../mekanism/client/gui/element/GuiGraph.java | 152 ++++++++++++++++++ .../client/gui/element/GuiScrollList.java | 4 +- .../content/boiler/BoilerUpdateProtocol.java | 1 + .../common/tile/TileEntityBoilerCasing.java | 8 +- .../common/tile/TileEntityBoilerValve.java | 83 ++++++++-- .../assets/mekanism/gui/GuiBoilerStats.png | Bin 0 -> 3075 bytes .../assets/mekanism/gui/GuiDictionary.png | Bin 3365 -> 3394 bytes .../assets/mekanism/gui/elements/GuiGraph.png | Bin 0 -> 2331 bytes 9 files changed, 267 insertions(+), 20 deletions(-) create mode 100644 src/main/java/mekanism/client/gui/element/GuiGraph.java create mode 100644 src/main/resources/assets/mekanism/gui/GuiBoilerStats.png create mode 100644 src/main/resources/assets/mekanism/gui/elements/GuiGraph.png diff --git a/src/main/java/mekanism/client/gui/GuiBoilerStats.java b/src/main/java/mekanism/client/gui/GuiBoilerStats.java index 02fd50c80..fcb976f18 100644 --- a/src/main/java/mekanism/client/gui/GuiBoilerStats.java +++ b/src/main/java/mekanism/client/gui/GuiBoilerStats.java @@ -9,6 +9,8 @@ import mekanism.api.util.UnitDisplayUtils.TemperatureUnit; import mekanism.client.gui.element.GuiBoilerTab; import mekanism.client.gui.element.GuiBoilerTab.BoilerTab; import mekanism.client.gui.element.GuiElement.IInfoHandler; +import mekanism.client.gui.element.GuiGraph; +import mekanism.client.gui.element.GuiGraph.GraphDataHandler; import mekanism.client.gui.element.GuiHeatInfo; import mekanism.common.content.boiler.BoilerUpdateProtocol; import mekanism.common.content.boiler.SynchronizedBoilerData; @@ -28,12 +30,15 @@ import cpw.mods.fml.relauncher.SideOnly; public class GuiBoilerStats extends GuiMekanism { public TileEntityBoilerCasing tileEntity; + + public GuiGraph boilGraph; + public GuiGraph maxGraph; public GuiBoilerStats(InventoryPlayer inventory, TileEntityBoilerCasing tentity) { super(tentity, new ContainerNull(inventory.player, tentity)); tileEntity = tentity; - guiElements.add(new GuiBoilerTab(this, tileEntity, BoilerTab.MAIN, 6, MekanismUtils.getResource(ResourceType.GUI, "GuiNull.png"))); + guiElements.add(new GuiBoilerTab(this, tileEntity, BoilerTab.MAIN, 6, MekanismUtils.getResource(ResourceType.GUI, "GuiBoilerStats.png"))); guiElements.add(new GuiHeatInfo(new IInfoHandler() { @Override public List getInfo() @@ -41,7 +46,22 @@ public class GuiBoilerStats extends GuiMekanism String loss = UnitDisplayUtils.getDisplayShort(tileEntity.structure.lastEnvironmentLoss, TemperatureUnit.KELVIN); return ListUtils.asList(LangUtils.localize("gui.dissipated") + ": " + loss + "/t"); } - }, this, MekanismUtils.getResource(ResourceType.GUI, "GuiNull.png"))); + }, this, MekanismUtils.getResource(ResourceType.GUI, "GuiBoilerStats.png"))); + guiElements.add(boilGraph = new GuiGraph(this, MekanismUtils.getResource(ResourceType.GUI, "GuiBoilerStats.png"), 8, 83, 160, 36, new GraphDataHandler() { + @Override + public String getDataDisplay(int data) + { + return LangUtils.localize("gui.boilRate") + ": " + data + " mB/t"; + } + })); + guiElements.add(maxGraph = new GuiGraph(this, MekanismUtils.getResource(ResourceType.GUI, "GuiBoilerStats.png"), 8, 122, 160, 36, new GraphDataHandler() { + @Override + public String getDataDisplay(int data) + { + return LangUtils.localize("gui.maxBoil") + ": " + data + " mB/t"; + } + })); + maxGraph.enableFixedScale((int)((tentity.structure.superheatingElements*general.superheatingHeatTransfer)/SynchronizedBoilerData.getHeatEnthalpy())); } @Override @@ -54,8 +74,8 @@ public class GuiBoilerStats extends GuiMekanism fontRendererObj.drawString(stats, (xSize/2)-(fontRendererObj.getStringWidth(stats)/2), 6, 0x404040); - fontRendererObj.drawString(LangUtils.localize("gui.maxWater") + ": " + tileEntity.structure.waterVolume*BoilerUpdateProtocol.WATER_PER_TANK, 8, 26, 0x404040); - fontRendererObj.drawString(LangUtils.localize("gui.maxSteam") + ": " + tileEntity.structure.steamVolume*BoilerUpdateProtocol.STEAM_PER_TANK, 8, 35, 0x404040); + fontRendererObj.drawString(LangUtils.localize("gui.maxWater") + ": " + tileEntity.clientWaterCapacity + " mB", 8, 26, 0x404040); + fontRendererObj.drawString(LangUtils.localize("gui.maxSteam") + ": " + tileEntity.clientSteamCapacity + " mB", 8, 35, 0x404040); fontRendererObj.drawString(LangUtils.localize("gui.heatTransfer"), 8, 49, 0x797979); fontRendererObj.drawString(LangUtils.localize("gui.superheaters") + ": " + tileEntity.structure.superheatingElements, 14, 58, 0x404040); @@ -66,10 +86,19 @@ public class GuiBoilerStats extends GuiMekanism super.drawGuiContainerForegroundLayer(mouseX, mouseY); } + @Override + public void updateScreen() + { + super.updateScreen(); + + boilGraph.addData(tileEntity.structure.lastBoilRate); + maxGraph.addData(tileEntity.structure.lastMaxBoil); + } + @Override protected void drawGuiContainerBackgroundLayer(float partialTick, int mouseX, int mouseY) { - mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.GUI, "GuiNull.png")); + mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.GUI, "GuiBoilerStats.png")); GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); int guiWidth = (width - xSize) / 2; int guiHeight = (height - ySize) / 2; diff --git a/src/main/java/mekanism/client/gui/element/GuiGraph.java b/src/main/java/mekanism/client/gui/element/GuiGraph.java new file mode 100644 index 000000000..4fbd0f4b2 --- /dev/null +++ b/src/main/java/mekanism/client/gui/element/GuiGraph.java @@ -0,0 +1,152 @@ +package mekanism.client.gui.element; + +import java.util.ArrayList; +import java.util.List; + +import mekanism.client.gui.IGuiWrapper; +import mekanism.client.render.MekanismRenderer; +import mekanism.common.util.MekanismUtils; +import mekanism.common.util.MekanismUtils.ResourceType; +import net.minecraft.util.ResourceLocation; + +import org.lwjgl.opengl.GL11; + +import codechicken.lib.vec.Rectangle4i; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + +@SideOnly(Side.CLIENT) +public class GuiGraph extends GuiElement +{ + public int xPosition; + public int yPosition; + + public int xSize; + public int ySize; + + public int currentScale = 10; + public boolean fixedScale = false; + + public List graphData = new ArrayList(); + + public GraphDataHandler dataHandler; + + public GuiGraph(IGuiWrapper gui, ResourceLocation def, int x, int y, int sizeX, int sizeY, GraphDataHandler handler) + { + super(MekanismUtils.getResource(ResourceType.GUI_ELEMENT, "GuiGraph.png"), gui, def); + + xPosition = x; + yPosition = y; + + xSize = sizeX; + ySize = sizeY; + + dataHandler = handler; + } + + public void enableFixedScale(int scale) + { + fixedScale = true; + currentScale = scale; + } + + public void addData(int data) + { + if(graphData.size() == xSize) + { + graphData.remove(0); + } + + graphData.add(data); + + if(!fixedScale) + { + for(int i : graphData) + { + if(i > currentScale) + { + currentScale = i; + } + } + } + } + + @Override + public Rectangle4i getBounds(int guiWidth, int guiHeight) + { + return new Rectangle4i(guiWidth + xPosition, guiHeight + yPosition, xSize, ySize); + } + + @Override + public void renderBackground(int xAxis, int yAxis, int guiWidth, int guiHeight) + { + mc.renderEngine.bindTexture(RESOURCE); + + drawBlack(guiWidth, guiHeight); + drawGraph(guiWidth, guiHeight); + + mc.renderEngine.bindTexture(defaultLocation); + } + + @Override + public void renderForeground(int xAxis, int yAxis) + { + if(xAxis >= xPosition && xAxis <= xPosition+xSize && yAxis >= yPosition && yAxis <= yPosition+ySize) + { + int height = ySize-(yAxis-yPosition); + int scaled = (int)(((double)height/(double)ySize)*currentScale); + + displayTooltip(dataHandler.getDataDisplay(scaled), xAxis, yAxis); + } + } + + @Override + public void preMouseClicked(int xAxis, int yAxis, int button) {} + + @Override + public void mouseClicked(int xAxis, int yAxis, int button) {} + + public void drawBlack(int guiWidth, int guiHeight) + { + int xDisplays = xSize/10 + (xSize%10 > 0 ? 1 : 0); + int yDisplays = ySize/10 + (ySize%10 > 0 ? 1 : 0); + + for(int yIter = 0; yIter < yDisplays; yIter++) + { + for(int xIter = 0; xIter < xDisplays; xIter++) + { + int width = (xSize%10 > 0 && xIter == xDisplays-1 ? xSize%10 : 10); + int height = (ySize%10 > 0 && yIter == yDisplays-1 ? ySize%10 : 10); + + guiObj.drawTexturedRect(guiWidth + xPosition + (xIter*10), guiHeight + yPosition + (yIter*10), 0, 0, width, height); + } + } + } + + public void drawGraph(int guiWidth, int guiHeight) + { + for(int i = 0; i < graphData.size(); i++) + { + int data = Math.min(currentScale, graphData.get(i)); + int relativeHeight = (int)(((double)data/(double)currentScale)*ySize); + + guiObj.drawTexturedRect(guiWidth + xPosition + i, guiHeight + yPosition + (ySize-relativeHeight), 10, 0, 1, 1); + + int displays = (relativeHeight-1)/10 + ((relativeHeight-1)%10 > 0 ? 1 : 0); + + for(int iter = 0; iter < displays; iter++) + { + MekanismRenderer.blendOn(); + GL11.glColor4f(1.0F, 1.0F, 1.0F, 0.2F + (0.8F*((float)i/(float)graphData.size()))); + int height = ((relativeHeight-1)%10 > 0 && iter == displays-1 ? (relativeHeight-1)%10 : 10); + guiObj.drawTexturedRect(guiWidth + xPosition + i, guiHeight + yPosition + (ySize-(iter*10)) - 10 + (10-height), 11, 0, 1, height); + MekanismRenderer.blendOff(); + } + } + } + + public static interface GraphDataHandler + { + public String getDataDisplay(int data); + } +} diff --git a/src/main/java/mekanism/client/gui/element/GuiScrollList.java b/src/main/java/mekanism/client/gui/element/GuiScrollList.java index 647f85b7f..5c9f0a421 100644 --- a/src/main/java/mekanism/client/gui/element/GuiScrollList.java +++ b/src/main/java/mekanism/client/gui/element/GuiScrollList.java @@ -100,7 +100,7 @@ public class GuiScrollList extends GuiElement { for(int xIter = 0; xIter < xDisplays; xIter++) { - int width = (xSize%10 > 0 && xIter == xDisplays ? xSize%10 : 10); + int width = (xSize%10 > 0 && xIter == xDisplays-1 ? xSize%10 : 10); guiObj.drawTexturedRect(guiWidth + xPosition + (xIter*10), guiHeight + yPosition + (yIter*10), 0, 0, width, 10); } } @@ -116,7 +116,7 @@ public class GuiScrollList extends GuiElement for(int xIter = 0; xIter < xDisplays; xIter++) { - int width = (xSize%10 > 0 && xIter == xDisplays ? xSize%10 : 10); + int width = (xSize%10 > 0 && xIter == xDisplays-1 ? xSize%10 : 10); guiObj.drawTexturedRect(guiWidth + xPosition + (xIter*10), guiHeight + yPosition + (index-scroll)*10, 0, 10, width, 10); } } diff --git a/src/main/java/mekanism/common/content/boiler/BoilerUpdateProtocol.java b/src/main/java/mekanism/common/content/boiler/BoilerUpdateProtocol.java index 4c6fcaacf..a8cc2c4af 100644 --- a/src/main/java/mekanism/common/content/boiler/BoilerUpdateProtocol.java +++ b/src/main/java/mekanism/common/content/boiler/BoilerUpdateProtocol.java @@ -143,6 +143,7 @@ public class BoilerUpdateProtocol extends UpdateProtocol return false; } + //Gradle build requires these fields to be final final Coord4D renderLocation = structure.renderLocation.clone(); final int volLength = structure.volLength; final int volWidth = structure.volWidth; diff --git a/src/main/java/mekanism/common/tile/TileEntityBoilerCasing.java b/src/main/java/mekanism/common/tile/TileEntityBoilerCasing.java index e8a6f1ec9..4ef947cfd 100644 --- a/src/main/java/mekanism/common/tile/TileEntityBoilerCasing.java +++ b/src/main/java/mekanism/common/tile/TileEntityBoilerCasing.java @@ -235,10 +235,10 @@ public class TileEntityBoilerCasing extends TileEntityMultiblock toSend = new HashSet(); for(ValveData valveData : structure.valves) @@ -293,11 +293,11 @@ public class TileEntityBoilerCasing extends TileEntityMultiblock= structure.upperRenderLocation.yCoord) + { + if(structure.steamStored != null && structure.steamStored.amount > 0) + { + for(ForgeDirection side : ForgeDirection.VALID_DIRECTIONS) + { + TileEntity tile = Coord4D.get(this).getFromSide(side).getTileEntity(worldObj); + + if(tile instanceof IFluidHandler && !(tile instanceof TileEntityBoilerValve)) + { + if(((IFluidHandler)tile).canFill(side.getOpposite(), structure.steamStored.getFluid())) + { + structure.steamStored.amount -= ((IFluidHandler)tile).fill(side.getOpposite(), structure.steamStored, true); + + if(structure.steamStored.amount <= 0) + { + structure.steamStored = null; + } + } + } + } + } + } + } + } @Override public FluidTankInfo[] getTankInfo(ForgeDirection from) { - return ((!worldObj.isRemote && structure != null) || (worldObj.isRemote && clientHasStructure)) ? new FluidTankInfo[] {waterTank.getInfo(), steamTank.getInfo()} : PipeUtils.EMPTY; + if((!worldObj.isRemote && structure != null) || (worldObj.isRemote && clientHasStructure)) + { + if(structure.upperRenderLocation != null && yCoord >= structure.upperRenderLocation.yCoord) + { + return new FluidTankInfo[] {steamTank.getInfo()}; + } + else { + return new FluidTankInfo[] {waterTank.getInfo()}; + } + } + + return PipeUtils.EMPTY; } @Override public int fill(ForgeDirection from, FluidStack resource, boolean doFill) { - return waterTank.fill(resource, doFill); + if(structure != null && structure.upperRenderLocation != null && yCoord < structure.upperRenderLocation.yCoord) + { + return waterTank.fill(resource, doFill); + } + + return 0; } @Override public FluidStack drain(ForgeDirection from, FluidStack resource, boolean doDrain) { - if(structure != null && structure.steamStored != null) + if(structure != null && structure.upperRenderLocation != null && yCoord >= structure.upperRenderLocation.yCoord) { - if(resource.getFluid() == structure.steamStored.getFluid()) + if(structure.steamStored != null) { - return steamTank.drain(resource.amount, doDrain); + if(resource.getFluid() == structure.steamStored.getFluid()) + { + return steamTank.drain(resource.amount, doDrain); + } } } @@ -51,7 +106,7 @@ public class TileEntityBoilerValve extends TileEntityBoilerCasing implements IFl @Override public FluidStack drain(ForgeDirection from, int maxDrain, boolean doDrain) { - if(structure != null) + if(structure != null && structure.upperRenderLocation != null && yCoord >= structure.upperRenderLocation.yCoord) { return steamTank.drain(maxDrain, doDrain); } @@ -62,12 +117,22 @@ public class TileEntityBoilerValve extends TileEntityBoilerCasing implements IFl @Override public boolean canFill(ForgeDirection from, Fluid fluid) { - return ((!worldObj.isRemote && structure != null) || (worldObj.isRemote && clientHasStructure)); + if((!worldObj.isRemote && structure != null) || (worldObj.isRemote && clientHasStructure)) + { + return structure.upperRenderLocation != null && yCoord < structure.upperRenderLocation.yCoord; + } + + return false; } @Override public boolean canDrain(ForgeDirection from, Fluid fluid) { - return ((!worldObj.isRemote && structure != null) || (worldObj.isRemote && clientHasStructure)); + if((!worldObj.isRemote && structure != null) || (worldObj.isRemote && clientHasStructure)) + { + return structure.upperRenderLocation != null && yCoord >= structure.upperRenderLocation.yCoord; + } + + return false; } } diff --git a/src/main/resources/assets/mekanism/gui/GuiBoilerStats.png b/src/main/resources/assets/mekanism/gui/GuiBoilerStats.png new file mode 100644 index 0000000000000000000000000000000000000000..71f0b307b26af82972f9f317997a8d94a6598faf GIT binary patch literal 3075 zcmeH}*H=>s5XSGlCRAyLE=`f5G(iLuBvBAWT4>S*r3q^&!KFw`77>spqM?(ps~|qtmw!IRYi|82br2^5ejwYOf>UW`W z<9e;fd`e?O3aZBSKN8UN)Y9cV!&7+ytu<4=D>2L>Msf5?i$4QSZ>ex5WQl^}`7bmi zbmqd6GLz4#J-C}hlHe+FvXxcyD7S?4Z1^J@+@?)lM|*zycalwf-ee{#rVuKBqwdQy z{^U$>wal?E9K5rWC68QkmD{{QZ_-9}Y29g_^&WW>W*nCu;P+X5ZZH|{XdjrIBb@oZ z`-j;-xGOjFQsomcQ1EWnt`#*J%q&r}O)wqfB>qUPWErjKvbq zd|Qm6Gw%{KxOboCJW3GjN=S|`F+0CWn`75ZToFDX6)3%69#KKv`tI58PjN4THdzprb@&RV-oc$@$qDVI$pSH?#ZNf zJ}c(~B0j1pu4(bno8<|DTsor9MWyb0miS2=rcsR6&(`PlcamQ}V!wUsnXuhVtv}(D zWc-JCt@Lh2mH43VT4kcUHv$=_t`8xVr4$Z*N*K7NW4@UcsskR4x^HB)nJrU`@L}wX zUb%JgnvwqS-mA1zcBKUuC(qQkk-YX#ov?JbAE{CoY`mw~cboaa#ddUbSPXe|T=r_Pl>zxYBJG%oPue3r zhplEOX35dVHVbwE!uE#ti1M1D^Fm2=rQswD#M+hpw>+rUZs{NIsaVKm@NCesK)+ao z#Xs3Mq+jZtAmlI6lb=c6duy3-(>`eo<9Zm*nA*tPD9~vWLbz#ODr6m`kdbR&S(3N4p@Z0G1poiy0;b`qi7esj1Q69q`>EWxX zDK@%XxoMclFq{1!^~}y!VdIs*Z++Y9WidXQ&XmK$ZDQNZa#-+f_S#4K*o%Di>hZnZ z+P&`$1(w?FtgTF^)qZ3@9Zt6M8gJ|y-#)yIBzd}SWI~bA(JUdYWhI`NV#-?N?)Dsw zxxHQ)&ufYHWW&+&w$?< za&rb@ghOb+qB}qe@`m`l-uDGS7QCvsr*riO@!BB#MHEV?P6%?p0 zR_4o-##yedRmQ8XL;`+t8(Lc#j4f95rI=y>UkY)e3^CC4=xg8=jx?R|0}HLoE?s*g z1rbloX#F`b-|hnBG)*>sV@^$~A(|CuE`2aWWfM1vxNMx9$_Ez|c-wkllGl@v^MezV6|N0_>+(9N^+Z(<-69uQzmR7rjFXdMh{o#H$jW!xdl-+f0tyF!(68p_2!Vru5T5IFEN|*c3Fo;7 N%r9D-zPRA^$A9Gss8|31 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/mekanism/gui/GuiDictionary.png b/src/main/resources/assets/mekanism/gui/GuiDictionary.png index 05fdc0e539735c0f3fd39a9f1913ee6c5ca18d9b..5c8d64c25e2148e8d32b0d4d87d90bf755c361f0 100644 GIT binary patch delta 1067 zcmV+`1l0Sb8p0ZoBYy-9X+uL$Nkc;*P;zf(X>4Tx062|}Rb6NtRTMtEb7vzY&QokO zg>Hg1+lHrgWSWcKdPn90sKGrRqvPeo9CG3uKX#J{(IASm?@ z+di}}l?o-=)F3E6wD^Ni=!>T7nL9I?X}YoAW$t|Qo$sD|?ti&w?*-_&s#unh6af~R zt}Pcb;&X?Oh&?NigomIP2BB9`9V=a_OaeAf3wO0!-$TNCU)j~&{-3S4MjaI(aUWu{ z=BNvZj{)$fRm*k(dis$cKk8Z@_G0L_F+jvGdbr_Z*TZu@evN5nWtO z;Zej(s*;~Z{0QP}ZGE;J;MNT3ndwE3s`n-8a z_I+}nIqm6u=<|e@EeHIimz0AQ#Dj=`p+-UW=i>gc+)5Aw8EP8kNq;VqqYhgy<6Uj0 z=+8?G7dO-&OBU<;fl{FVM6-)>fUj8wt5J-NPueZH>g)MY#m*OepL~TjtAT&M4YLUa zD3~yZy?+W#SOXDcC_o0^7T9R1gAN8V6s;5)ieI5-7aQlmJn}lUna#nz!j%5V$X|o` zxX!dHWQRV27P1=rj;t2bW$~+pTw@bIek?ZvKPDL<64`^#UNTAck#RBsB6*5DP4<%< zvJ+(Q`q)ZrMP58N*8RMUGg79TMcp~HyP#nIGk+>fTvOMqEDpAYBg-lK1zo-T#$T~q z=`1%wHmU-|3&GWIL{YNX(Qxa>rWCyRuBf>}*(bcU2l~2ICg+(V4}G z#U1l;@#I$zMt+vbndh(cT|8NDE)GVlmj(K2`BoWDjYO>UgY<{AEWIavDE-F0&3(#! z&3}E)eZgG6#@QDHLj zCkzNR&Px>zCja= zBtvA3lr~iNxL5O`B9%|&QfUxVJ5v*>v47M-4~Mg+cA#wn`}`f%scy1T>e6H0eF9n2 zI&SL?%@ub`(vxBuuQn={n(F9?s2GOGOpa(%huUpg8wKy)^pEtLGP@5GTP{bO`wYOo zKk@AQF5-@~0G1qpfyX0m7|+TF-UT@Ggxa#(!5xuEd<)>z_w4q+`Z9Qa{nY8)#2<64 l=PiJ>H#?ob-|uwRK0yDg0B4PV0id6JRZw95Z?hc)2njB(8i4=+ delta 1038 zcmV+p1o8XA8l@VLBYy+%X+uL$Nkc;*P;zf(X>4Tx062|}Ro!pfR1`mnZ(O7nKcKOW z4i$^9Ra0BJ8yc;~21%2p=|UR0&DbiW$#rfTQ`a`O(`{9s_5yDV_yd5l2Of}kLK+Oj z_Ok5(v`JGz71bo9J#^YYXp{DWs&KBaQ@dTpxRI}aIp=pi?|;!XK*v{_pO}_ARv`(`K_~P;r>1*Ox?C;-F2;pN*27;R!QM9q+Ux&wbylgT10KeMtdQo=mnqksdx=&F5&oys0TJd`E>GI|#kK((J)n0eU)DVBJ zYq?3pFC)I@_!%aD74f~sTqTWoFF^8{ntPr?L_-if$s_=TxZzG%&qCb(^K zdCoqnhMa4x{ z6hi)zV+ON`xsmg3L#>3I8=9NTb3f!hwJM>{)UK+QWxX9ld>D=;G@xL^4DLEuumLit zkcSMu9e;39Qv(A`lu*=Clo*MpVGd>OdF6n^am1Jntk;<}MrqIC5$=Q>n{*R}?8oOI zDUw5En2dl--Xw34!z7E+5pr%d2c?H4INKjdmEV*< zl@;X+<-BrtTbJ8*N%&OwR`^l)PWWE<8D!y-a9Q|CxFUQbT#TL7ym&1JoWQ-+)%LMCuYy_wP6ZWs zL5D3kvu*xEYtl=GNMYO54zpQqF~pph71JP#d&LoPNE~Olm7ll=btAavwoIM=mAd9q7A z>MqdgAh7QszoH+g!S^k(^Lixn-v&7J7v5PnBH45U;A;<{`?W~chj-$$p8;Grpf}uw z@Xk*pegW`m`}gsGT^YQaZZ(?^@V@H!1YqOiX7iurW^?09^uGph$@~{t0C9K{wF2RW IvpNI_3H*c$FaQ7m diff --git a/src/main/resources/assets/mekanism/gui/elements/GuiGraph.png b/src/main/resources/assets/mekanism/gui/elements/GuiGraph.png new file mode 100644 index 0000000000000000000000000000000000000000..0a87e28b352cc7d11b182fcef777a6cd969a8a09 GIT binary patch literal 2331 zcmeH}`#aMM0LH%?n@fgV=8{EpQEoLgLPkd9Zbojo=9W>@P0XcX6iKu~+MLr7GdWlh z84Hz!r${2#(#ERAoRw{q|Ka@Vr}y*o`@HY_y!l=p$6)f>@&Ew9T%0jJ007!R5FiWP zkYGYhGyq7$;v5{jTpS$qya-9raS5jYz_PFq7ZR(3Q?qSPjxpFdh)p<{bFKyr+XXA} zJ6OeR%b1)*B~n~a~)2$k18T`}L2m?nvikqXfotCV4{^oL5-(SRK8j z_b&TFPs^deuKc#3@}(C9F&=wwnKQq5sJuTl1tSqXO>q_y3Dm>i7SgzaY>J7D zCL|tgUmjK;H$Yqt_m6!Bf73|o+!(Q z_8ZfDjgZ+80Il;bDD)gRd9uh`_3jX}h~b_6_7?MYg>HZ_<`rXTXO~ zE!E`&N2;RJjV-|F-CBAoA4o$dkuJjGvq+GB%2gY8VTn$YY7}2Ic09rHq>aVs+S3Aa zpXv(7$-~TcTG(&%eQv?n_Y7mj$GHamd&Q8D4$1S-#^42G3-8BsT9s}7gR7ydJPA^0 zB#FO2lkwSqsfF+&@O68WTld$56Ui5G+IZ+E_>VVbz4^Te!P%wH{z^{il)f@f!%B!v zK$5AV6XP~S6u;`H#O z1?&uLlFpUW%nX;ok?r)u02Pw}u(YhQo?RvY+JsFLHj}W~g8$P3iTu-*XxKyNnS)sy Prw4Fx^uRnk8g}ImZ0yEQ literal 0 HcmV?d00001 From 679aa28dd353b095c0e19f5bfc65b9590528c06e Mon Sep 17 00:00:00 2001 From: EzerArch Date: Wed, 2 Mar 2016 12:05:26 -0300 Subject: [PATCH 25/52] Part pt_BR update Partial pt_BR locale update. --- .../resources/assets/mekanism/lang/pt_BR.lang | 87 +++++++++++++------ 1 file changed, 59 insertions(+), 28 deletions(-) diff --git a/src/main/resources/assets/mekanism/lang/pt_BR.lang b/src/main/resources/assets/mekanism/lang/pt_BR.lang index 3cc4d63a3..e57a0e8e7 100644 --- a/src/main/resources/assets/mekanism/lang/pt_BR.lang +++ b/src/main/resources/assets/mekanism/lang/pt_BR.lang @@ -10,6 +10,8 @@ item.AtomicAlloy.name=Liga Atômica item.EnergyTablet.name=Tablete de Energia item.SpeedUpgrade.name=Upgrade de Velocidade item.EnergyUpgrade.name=Upgrade de Energia +item.FilterUpgrade.name=Filter Upgrade +item.GasUpgrade.name=Gas Upgrade item.Robit.name=Robit item.AtomicDisassembler.name=Desintegrador Atômico item.ElectricBow.name=Arco Elétrico @@ -31,22 +33,26 @@ item.ElectrolyticCore.name=Núcleo Eletrolítico item.Sawdust.name=Serragem item.Salt.name=Sal item.BrineBucket.name=Balde de Salmoura +item.LithiumBucket.name=Balde de Lítio +item.HeavyWaterBucket.name=Balde de Água Pesada item.FreeRunners.name=Corredores item.ArmoredJetpack.name=Jetpack Blindado item.FilterCard.name=Cartão de Filtro item.SeismicReader.name=Leitor Sísmico -item.HDPEPellet.name=Pelota de HDPE -item.HDPERod.name=Vara de HDPE -item.HDPESheet.name=Folha de HDPE +item.HDPEPellet.name=Pelota de PEAD +item.HDPERod.name=Vara de PEAD +item.HDPESheet.name=Folha de PEAD item.PlaStick.name=Plástico item.Substrate.name=Substrato item.Flamethrower.name=Lança-Chamas +item.GaugeDropper.name=Medidor Conta-Gotas +item.BioFuel.name=Biocombustível //Control Circuits item.BasicControlCircuit.name=Circuito de Controle Básico item.AdvancedControlCircuit.name=Circuito de Controle Avançado item.EliteControlCircuit.name=Circuito de Controle Elite -item.UltimateControlCircuit.name=Circuito de Controle Ultimate +item.UltimateControlCircuit.name=Circuito de Controle Final //Gas Tank tile.GasTank.GasTank.name=Tanque de Gás @@ -65,7 +71,7 @@ tile.BasicBlock.OsmiumBlock.name=Bloco de Ósmio tile.BasicBlock.BronzeBlock.name=Bloco de Bronze tile.BasicBlock.RefinedObsidian.name=Obsidiana Refinada tile.BasicBlock.CharcoalBlock.name=Bloco de Carvão Vegetal -tile.BasicBlock.RefinedGlowstone.name=Glowstone Refinada +tile.BasicBlock.RefinedGlowstone.name=Pedra Luminosa Refinada tile.BasicBlock.SteelBlock.name=Bloco de Aço tile.BasicBlock.Bin.name=Silo tile.BasicBlock.TeleporterFrame.name=Moldura do Teletransportador @@ -75,32 +81,40 @@ tile.BasicBlock.DynamicGlass.name=Vidro Dinâmico tile.BasicBlock.DynamicValve.name=Válvula Dinâmica tile.BasicBlock.CopperBlock.name=Bloco de Cobre tile.BasicBlock.TinBlock.name=Bloco de Estanho -tile.BasicBlock.SalinationController.name=Controlador de Salinização -tile.BasicBlock.SalinationValve.name=Válvula de Salinização +tile.BasicBlock.SolarEvaporationController.name=Controlador de Salinização +tile.BasicBlock.SolarEvaporationValve.name=Válvula de Salinização //Basic Block 2 (second ID iteration) -tile.BasicBlock2.SalinationBlock.name=Bloco de Salinização +tile.BasicBlock2.SolarEvaporationBlock.name=Bloco de Salinização +tile.BasicBlock2.InductionCasing.name=Caixa de Indução +tile.BasicBlock2.InductionPort.name=Porta de Indução +tile.BasicBlock2.InductionCellBasic.name=Célula de Indução Básica +tile.BasicBlock2.InductionCellAdvanced.name=Célula de Indução Avançada +tile.BasicBlock2.InductionCellElite.name=Célula de Indução Elite +tile.BasicBlock2.InductionCellUltimate.name=Célula de Indução Final +tile.BasicBlock2.InductionProviderBasic.name=Provedor de Indução Básico +tile.BasicBlock2.InductionProviderAdvanced.name=Provedor de Indução Avançado +tile.BasicBlock2.InductionProviderElite.name=Provedor de Indução Elite +tile.BasicBlock2.InductionProviderUltimate.name=Provedor de Indução Final //Machine Block tile.MachineBlock.EnrichmentChamber.name=Câmara de Enriquecimento tile.MachineBlock.OsmiumCompressor.name=Compressor de Ósmio tile.MachineBlock.Combiner.name=Combinador tile.MachineBlock.Crusher.name=Triturador -tile.MachineBlock.BasicFactory.name=Fábrica Básica -tile.MachineBlock.AdvancedFactory.name=Fábrica Avançada -tile.MachineBlock.EliteFactory.name=Fábrica de Elite +tile.MachineBlock.Factory.name=Fábrica tile.MachineBlock.MetallurgicInfuser.name=Infusor Metalúrgico tile.MachineBlock.PurificationChamber.name=Câmara de Purificação tile.MachineBlock.EnergizedSmelter.name=Fundição Energizada tile.MachineBlock.Teleporter.name=Teletransportador tile.MachineBlock.ElectricPump.name=Bomba Elétrica tile.MachineBlock.ElectricChest.name=Baú Elétrico -tile.MachineBlock.Chargepad.name=Plataforma Recarregadora +tile.MachineBlock.Chargepad.name=Base de Recarga tile.MachineBlock.LogisticalSorter.name=Classificador Logístico tile.MachineBlock.DigitalMiner.name=Minerador Digital //Machine Block 2 (second ID iteration) -tile.MachineBlock2.RotaryCondensentrator.name=Condensentrator Rotatório +tile.MachineBlock2.RotaryCondensentrator.name=Condensentrador Rotativo tile.MachineBlock2.ChemicalOxidizer.name=Oxidador Químico tile.MachineBlock2.ChemicalInfuser.name=Infusor Químico tile.MachineBlock2.ChemicalCombiner.name=Combinador Químico @@ -112,12 +126,16 @@ tile.MachineBlock2.ChemicalWasher.name=Lavador Químico tile.MachineBlock2.ChemicalCrystallizer.name=Cristalizador Químico tile.MachineBlock2.SeismicVibrator.name=Vibrador Sísmico tile.MachineBlock2.PressurizedReactionChamber.name=Câmara de Reação Pressurizada -tile.MachineBlock2.PressurizedReactionChamber.short.name=PRC +tile.MachineBlock2.PressurizedReactionChamber.short.name=CRP tile.MachineBlock2.PortableTank.name=Tanque Portátil -tile.MachineBlock2.FluidicPlenisher.name=Fluidic Plenisher +tile.MachineBlock2.FluidicPlenisher.name=Abastecedor Fluídico tile.MachineBlock2.Laser.name=Laser tile.MachineBlock2.LaserAmplifier.name=Amplificador de Laser -tile.MachineBlock2.LaserTractorBeam.name=Feixe do trator do Laser +tile.MachineBlock2.LaserTractorBeam.name=Feixe Trator do Laser + +//Machine Block 3 (third ID iteration) +tile.MachineBlock3.SolarNeutronActivator.name=Ativador Neutrônico Solar +tile.MachineBlock3.Oredictionificator.name=Oredictionificador //Plastic tile.PlasticBlock.name=Bloco de Plástico @@ -135,6 +153,7 @@ infuse.diamond=Diamante infuse.redstone=Redstone infuse.fungi=Fungos infuse.obsidian=Obsidiana +infuse.bio=Biomassa //Ore Block tile.OreBlock.OsmiumOre.name=Minério de Ósmio @@ -146,23 +165,23 @@ item.MultipartTransmitter.PressurizedTube.name=Tubo Pressurizado item.MultipartTransmitter.BasicUniversalCable.name=Cabo Universal Básico item.MultipartTransmitter.AdvancedUniversalCable.name=Cabo Universal Avançado item.MultipartTransmitter.EliteUniversalCable.name=Cabo Universal Elite -item.MultipartTransmitter.UltimateUniversalCable.name=Cabo Universal Ultimate +item.MultipartTransmitter.UltimateUniversalCable.name=Cabo Universal Final item.MultipartTransmitter.BasicMechanicalPipe.name=Tubo Mecânico Básico item.MultipartTransmitter.AdvancedMechanicalPipe.name=Tubo Mecânico Avançado item.MultipartTransmitter.EliteMechanicalPipe.name=Tubo Mecânico Elite -item.MultipartTransmitter.UltimateMechanicalPipe.name=Tubo Mecânico Ultimate +item.MultipartTransmitter.UltimateMechanicalPipe.name=Tubo Mecânico Final item.MultipartTransmitter.LogisticalTransporter.name=Transportador Logístico item.MultipartTransmitter.RestrictiveTransporter.name=Transportador Restritivo item.MultipartTransmitter.DiversionTransporter.name=Transportador Redirecionador //Glow Panel -item.GlowPanel.name=Painel de Glowstone +item.GlowPanel.name=Painel de Pedra Luminosa //Energy Cubes tile.EnergyCube.Basic.name=Cubo de Energia Básico tile.EnergyCube.Advanced.name=Cubo de Energia Avançado tile.EnergyCube.Elite.name=Cubo de Energia de Elite -tile.EnergyCube.Ultimate.name=Cubo de Energia Ultimate +tile.EnergyCube.Ultimate.name=Cubo de Energia Final tile.EnergyCube.Creative.name=Cubo de Energia Criativo //Dust @@ -177,6 +196,7 @@ item.tinDust.name=Pó de Estanho item.silverDust.name=Pó de Prata item.leadDust.name=Pó de Chumbo item.sulfurDust.name=Pó de Enxofre +item.lithiumDust.name=Pó de Lítio //Clumps item.ironClump.name=Aglomerado de Ferro @@ -189,14 +209,14 @@ item.obsidianClump.name=Aglomerado de Obsidiana item.leadClump.name=Aglomerado de Chumbo //Shards -item.ironShard.name=Fragmento de Ferro -item.goldShard.name=Fragmento de Ouro -item.osmiumShard.name=Fragmento de Ósmio -item.copperShard.name=Fragmento de Cobre -item.tinShard.name=Fragmento de Estanho -item.silverShard.name=Fragmento de Prata -item.obsidianShard.name=Fragmento de Obsidiana -item.leadShard.name=Fragmento de Chumbo +item.ironShard.name=Estilhaço de Ferro +item.goldShard.name=Estilhaço de Ouro +item.osmiumShard.name=Estilhaço de Ósmio +item.copperShard.name=Estilhaço de Cobre +item.tinShard.name=Estilhaço de Estanho +item.silverShard.name=Estilhaço de Prata +item.obsidianShard.name=Estilhaço de Obsidiana +item.leadShard.name=Estilhaço de Chumbo //Crystals item.ironCrystal.name=Cristal de Ferro @@ -241,6 +261,10 @@ gas.liquidStone=Pedra Líquida gas.ethene=Etileno gas.sodium=Sódio gas.brine=Salmoura Gasosa +gas.deuterium=Deutério +gas.tritium=Trítio +gas.lithium=Lítio +gas.fusionFuelDT=Combustível D-T gas.iron=Lodo de Ferro gas.gold=Lodo de Ouro @@ -286,6 +310,13 @@ oregas.silver=Minério de Prata oregas.obsidian=Minério de Obsidiana oregas.lead=Minério de Chumbo +//Tier names +tier.Basic=Básico +tier.Advanced=Avançado +tier.Elite=Elite +tier.Ultimate=Final +tier.Creative=Criativo + //Update handler text update.consider=Considere atualizar para a versão update.newFeatures=Novas funcionalidades From ad15e359ac67b955ccf60a9d24065b247fdaf12d Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Fri, 4 Mar 2016 11:06:05 -0500 Subject: [PATCH 26/52] Work on Quantum Entangloporters. I get the feeling this is gonna be a big project --- .../java/mekanism/client/ClientProxy.java | 4 +- .../client/gui/GuiEntangledBlock.java | 6 +- .../client/gui/GuiQuantumEntangloporter.java | 5 + src/main/java/mekanism/common/Mekanism.java | 9 +- .../mekanism/common/block/BlockMachine.java | 35 +- .../entangloporter/InventoryFrequency.java | 178 ++++++++++ .../SharedInventory.java | 2 +- .../SharedInventoryManager.java | 2 +- .../common/frequency/FrequencyManager.java | 2 +- .../common/tile/TileEntityElectricBlock.java | 12 +- .../common/tile/TileEntityEntangledBlock.java | 198 ----------- .../tile/TileEntityQuantumEntangloporter.java | 324 ++++++++++++++++++ .../resources/assets/mekanism/lang/en_US.lang | 5 +- 13 files changed, 562 insertions(+), 220 deletions(-) create mode 100644 src/main/java/mekanism/client/gui/GuiQuantumEntangloporter.java create mode 100644 src/main/java/mekanism/common/content/entangloporter/InventoryFrequency.java rename src/main/java/mekanism/common/content/{teleportation => entangloporter}/SharedInventory.java (98%) rename src/main/java/mekanism/common/content/{teleportation => entangloporter}/SharedInventoryManager.java (97%) delete mode 100644 src/main/java/mekanism/common/tile/TileEntityEntangledBlock.java create mode 100644 src/main/java/mekanism/common/tile/TileEntityQuantumEntangloporter.java diff --git a/src/main/java/mekanism/client/ClientProxy.java b/src/main/java/mekanism/client/ClientProxy.java index 6f7aa3862..bfa116de1 100644 --- a/src/main/java/mekanism/client/ClientProxy.java +++ b/src/main/java/mekanism/client/ClientProxy.java @@ -148,7 +148,7 @@ import mekanism.common.tile.TileEntityEliteFactory; import mekanism.common.tile.TileEntityEnergizedSmelter; import mekanism.common.tile.TileEntityEnergyCube; import mekanism.common.tile.TileEntityEnrichmentChamber; -import mekanism.common.tile.TileEntityEntangledBlock; +import mekanism.common.tile.TileEntityQuantumEntangloporter; import mekanism.common.tile.TileEntityFactory; import mekanism.common.tile.TileEntityFluidTank; import mekanism.common.tile.TileEntityFluidicPlenisher; @@ -510,7 +510,7 @@ public class ClientProxy extends CommonProxy case 45: return new GuiLaserTractorBeam(player.inventory, (TileEntityLaserTractorBeam)tileEntity); case 46: - return new GuiEntangledBlock(player.inventory, (TileEntityEntangledBlock)tileEntity); + return new GuiEntangledBlock(player.inventory, (TileEntityQuantumEntangloporter)tileEntity); case 47: return new GuiSolarNeutronActivator(player.inventory, (TileEntitySolarNeutronActivator)tileEntity); case 48: diff --git a/src/main/java/mekanism/client/gui/GuiEntangledBlock.java b/src/main/java/mekanism/client/gui/GuiEntangledBlock.java index 96ee1f026..81db28151 100644 --- a/src/main/java/mekanism/client/gui/GuiEntangledBlock.java +++ b/src/main/java/mekanism/client/gui/GuiEntangledBlock.java @@ -6,7 +6,7 @@ import mekanism.api.Coord4D; import mekanism.common.Mekanism; import mekanism.common.inventory.container.ContainerNull; import mekanism.common.network.PacketTileEntity.TileEntityMessage; -import mekanism.common.tile.TileEntityEntangledBlock; +import mekanism.common.tile.TileEntityQuantumEntangloporter; import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; @@ -22,13 +22,13 @@ import cpw.mods.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class GuiEntangledBlock extends GuiMekanism { - public TileEntityEntangledBlock tileEntity; + public TileEntityQuantumEntangloporter tileEntity; public GuiTextField frequencyField; public boolean isCreative; - public GuiEntangledBlock(InventoryPlayer inventory, TileEntityEntangledBlock tentity) + public GuiEntangledBlock(InventoryPlayer inventory, TileEntityQuantumEntangloporter tentity) { super(tentity, new ContainerNull(inventory.player, tentity)); tileEntity = tentity; diff --git a/src/main/java/mekanism/client/gui/GuiQuantumEntangloporter.java b/src/main/java/mekanism/client/gui/GuiQuantumEntangloporter.java new file mode 100644 index 000000000..6c5bc02df --- /dev/null +++ b/src/main/java/mekanism/client/gui/GuiQuantumEntangloporter.java @@ -0,0 +1,5 @@ +package mekanism.client.gui; + +public class GuiQuantumEntangloporter { + +} diff --git a/src/main/java/mekanism/common/Mekanism.java b/src/main/java/mekanism/common/Mekanism.java index 90821d734..766e2d7f2 100644 --- a/src/main/java/mekanism/common/Mekanism.java +++ b/src/main/java/mekanism/common/Mekanism.java @@ -44,6 +44,7 @@ import mekanism.common.base.IModule; import mekanism.common.block.BlockMachine.MachineType; import mekanism.common.chunkloading.ChunkManager; import mekanism.common.content.boiler.SynchronizedBoilerData; +import mekanism.common.content.entangloporter.InventoryFrequency; import mekanism.common.content.matrix.SynchronizedMatrixData; import mekanism.common.content.tank.SynchronizedTankData; import mekanism.common.content.transporter.PathfinderCache; @@ -75,8 +76,8 @@ import mekanism.common.tile.TileEntityAdvancedBoundingBlock; import mekanism.common.tile.TileEntityBoundingBlock; import mekanism.common.tile.TileEntityCardboardBox; import mekanism.common.tile.TileEntityElectricBlock; -import mekanism.common.tile.TileEntityEntangledBlock; import mekanism.common.tile.TileEntityPressureDisperser; +import mekanism.common.tile.TileEntityQuantumEntangloporter; import mekanism.common.tile.TileEntitySuperheatingElement; import mekanism.common.tile.TileEntityThermalEvaporationBlock; import mekanism.common.tile.TileEntityThermalEvaporationValve; @@ -177,6 +178,9 @@ public class Mekanism public static FrequencyManager publicTeleporters = new FrequencyManager(Frequency.class); public static Map privateTeleporters = new HashMap(); + public static FrequencyManager publicEntangloporters = new FrequencyManager(InventoryFrequency.class); + public static Map privateEntangloporters = new HashMap(); + /** Mekanism creative tab */ public static CreativeTabMekanism tabMekanism = new CreativeTabMekanism(); @@ -1111,7 +1115,7 @@ public class Mekanism GameRegistry.registerTileEntity(TileEntityCardboardBox.class, "CardboardBox"); GameRegistry.registerTileEntity(TileEntityThermalEvaporationValve.class, "SalinationValve"); //TODO rename GameRegistry.registerTileEntity(TileEntityThermalEvaporationBlock.class, "SalinationTank"); //TODO rename - GameRegistry.registerTileEntity(TileEntityEntangledBlock.class, "EntangledBlock"); + GameRegistry.registerTileEntity(TileEntityQuantumEntangloporter.class, "EntangledBlock"); GameRegistry.registerTileEntity(TileEntityPressureDisperser.class, "PressureDisperser"); GameRegistry.registerTileEntity(TileEntitySuperheatingElement.class, "SuperheatingElement"); @@ -1154,6 +1158,7 @@ public class Mekanism activeVibrators.clear(); worldTickHandler.resetRegenChunks(); privateTeleporters.clear(); + privateEntangloporters.clear(); //Reset consistent managers MultiblockManager.reset(); diff --git a/src/main/java/mekanism/common/block/BlockMachine.java b/src/main/java/mekanism/common/block/BlockMachine.java index d100cdcb0..ea0069887 100644 --- a/src/main/java/mekanism/common/block/BlockMachine.java +++ b/src/main/java/mekanism/common/block/BlockMachine.java @@ -63,7 +63,6 @@ import mekanism.common.tile.TileEntityElectrolyticSeparator; import mekanism.common.tile.TileEntityEliteFactory; import mekanism.common.tile.TileEntityEnergizedSmelter; import mekanism.common.tile.TileEntityEnrichmentChamber; -import mekanism.common.tile.TileEntityEntangledBlock; import mekanism.common.tile.TileEntityFactory; import mekanism.common.tile.TileEntityFluidTank; import mekanism.common.tile.TileEntityFluidicPlenisher; @@ -77,6 +76,7 @@ import mekanism.common.tile.TileEntityOsmiumCompressor; import mekanism.common.tile.TileEntityPRC; import mekanism.common.tile.TileEntityPrecisionSawmill; import mekanism.common.tile.TileEntityPurificationChamber; +import mekanism.common.tile.TileEntityQuantumEntangloporter; import mekanism.common.tile.TileEntityResistiveHeater; import mekanism.common.tile.TileEntityRotaryCondensentrator; import mekanism.common.tile.TileEntitySeismicVibrator; @@ -149,7 +149,7 @@ import cpw.mods.fml.relauncher.SideOnly; * 1:13: Laser * 1:14: Laser Amplifier * 1:15: Laser Tractor Beam - * 2:0: Entangled Block + * 2:0: Quantum Entangloporter * 2:1: Solar Neutron Activator * 2:2: Ambient Accumulator * 2:3: Oredictionificator @@ -312,6 +312,11 @@ public class BlockMachine extends BlockContainer implements ISpecialBounds, IBlo TileEntityTeleporter teleporter = (TileEntityTeleporter)tileEntity; teleporter.owner = entityliving.getCommandSenderName(); } + else if(tileEntity instanceof TileEntityQuantumEntangloporter) + { + TileEntityQuantumEntangloporter entangloporter = (TileEntityQuantumEntangloporter)tileEntity; + entangloporter.owner = entityliving.getCommandSenderName(); + } tileEntity.setFacing((short)change); tileEntity.redstone = world.isBlockIndirectlyGettingPowered(x, y, z); @@ -666,6 +671,26 @@ public class BlockMachine extends BlockContainer implements ISpecialBounds, IBlo entityplayer.addChatMessage(new ChatComponentText(EnumColor.DARK_BLUE + "[Mekanism] " + EnumColor.GREY + LangUtils.localize("gui.teleporter.noAccess"))); } + return true; + } + case QUANTUM_ENTANGLOPORTER: + if(!entityplayer.isSneaking()) + { + TileEntityQuantumEntangloporter teleporter = (TileEntityQuantumEntangloporter)tileEntity; + + if(teleporter.owner == null) + { + teleporter.owner = entityplayer.getCommandSenderName(); + } + + if(teleporter.owner.equals(entityplayer.getCommandSenderName()) || MekanismUtils.isOp((EntityPlayerMP)entityplayer)) + { + entityplayer.openGui(Mekanism.instance, type.guiId, world, x, y, z); + } + else { + entityplayer.addChatMessage(new ChatComponentText(EnumColor.DARK_BLUE + "[Mekanism] " + EnumColor.GREY + LangUtils.localize("gui.entangloporter.noAccess"))); + } + return true; } default: @@ -1144,7 +1169,7 @@ public class BlockMachine extends BlockContainer implements ISpecialBounds, IBlo LASER(MachineBlock.MACHINE_BLOCK_2, 13, "Laser", -1, TileEntityLaser.class, true, true, false), LASER_AMPLIFIER(MachineBlock.MACHINE_BLOCK_2, 14, "LaserAmplifier", 44, TileEntityLaserAmplifier.class, false, true, false), LASER_TRACTOR_BEAM(MachineBlock.MACHINE_BLOCK_2, 15, "LaserTractorBeam", 45, TileEntityLaserTractorBeam.class, false, true, false), - ENTANGLED_BLOCK(MachineBlock.MACHINE_BLOCK_3, 0, "EntangledBlock", 46, TileEntityEntangledBlock.class, true, false, false), + QUANTUM_ENTANGLOPORTER(MachineBlock.MACHINE_BLOCK_3, 0, "QuantumEntangloporter", 46, TileEntityQuantumEntangloporter.class, true, false, false), SOLAR_NEUTRON_ACTIVATOR(MachineBlock.MACHINE_BLOCK_3, 1, "SolarNeutronActivator", 47, TileEntitySolarNeutronActivator.class, false, true, false), AMBIENT_ACCUMULATOR(MachineBlock.MACHINE_BLOCK_3, 2, "AmbientAccumulator", 48, TileEntityAmbientAccumulator.class, true, false, false), OREDICTIONIFICATOR(MachineBlock.MACHINE_BLOCK_3, 3, "Oredictionificator", 52, TileEntityOredictionificator.class, false, false, false), @@ -1199,7 +1224,7 @@ public class BlockMachine extends BlockContainer implements ISpecialBounds, IBlo for(MachineType type : MachineType.values()) { - if(type != ENTANGLED_BLOCK && type != AMBIENT_ACCUMULATOR) + if(type != QUANTUM_ENTANGLOPORTER && type != AMBIENT_ACCUMULATOR) { ret.add(type); } @@ -1311,7 +1336,7 @@ public class BlockMachine extends BlockContainer implements ISpecialBounds, IBlo return 0; case LASER_TRACTOR_BEAM: return 0; - case ENTANGLED_BLOCK: + case QUANTUM_ENTANGLOPORTER: return 0; case SOLAR_NEUTRON_ACTIVATOR: return 0; diff --git a/src/main/java/mekanism/common/content/entangloporter/InventoryFrequency.java b/src/main/java/mekanism/common/content/entangloporter/InventoryFrequency.java new file mode 100644 index 000000000..e42c9ee61 --- /dev/null +++ b/src/main/java/mekanism/common/content/entangloporter/InventoryFrequency.java @@ -0,0 +1,178 @@ +package mekanism.common.content.entangloporter; + +import io.netty.buffer.ByteBuf; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.Map; + +import mekanism.api.gas.GasStack; +import mekanism.api.gas.GasTank; +import mekanism.api.transmitters.TransmissionType; +import mekanism.common.frequency.Frequency; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraftforge.fluids.FluidRegistry; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.FluidTank; + +public class InventoryFrequency extends Frequency +{ + public static final double MAX_ENERGY = 1000000; + + public double storedEnergy; + public FluidTank storedFluid = new FluidTank(1000); + public GasTank storedGas = new GasTank(1000); + public ItemStack storedItem; + public double temperature; + + public Map transmissions = new HashMap(); + + public InventoryFrequency(String n, String o) + { + super(n, o); + } + + public InventoryFrequency(NBTTagCompound nbtTags) + { + super(nbtTags); + } + + public InventoryFrequency(ByteBuf dataStream) + { + super(dataStream); + } + + @Override + public void write(NBTTagCompound nbtTags) + { + super.write(nbtTags); + + nbtTags.setDouble("storedEnergy", storedEnergy); + + if(storedFluid != null) + { + nbtTags.setTag("storedFluid", storedFluid.writeToNBT(new NBTTagCompound())); + } + + if(storedGas != null) + { + nbtTags.setTag("storedGas", storedGas.write(new NBTTagCompound())); + } + + if(storedItem != null) + { + nbtTags.setTag("storedItem", storedItem.writeToNBT(new NBTTagCompound())); + } + + nbtTags.setDouble("temperature", temperature); + + for(TransmissionType type : TransmissionType.values()) + { + nbtTags.setInteger("transmission" + type.ordinal(), transmissions.get(type).ordinal()); + } + } + + @Override + protected void read(NBTTagCompound nbtTags) + { + super.read(nbtTags); + + storedEnergy = nbtTags.getDouble("storedEnergy"); + + if(nbtTags.hasKey("storedFluid")) + { + storedFluid.readFromNBT(nbtTags.getCompoundTag("storedFluid")); + } + + if(nbtTags.hasKey("storedGas")) + { + storedGas.read(nbtTags.getCompoundTag("storedGas")); + } + + if(nbtTags.hasKey("storedItem")) + { + storedItem.readFromNBT(nbtTags.getCompoundTag("storedItem")); + } + + temperature = nbtTags.getDouble("temperature"); + + for(TransmissionType type : TransmissionType.values()) + { + transmissions.put(type, TransferType.values()[nbtTags.getInteger("transmission" + type.ordinal())]); + } + } + + @Override + public void write(ArrayList data) + { + super.write(data); + + data.add(storedEnergy); + + if(storedFluid.getFluid() != null) + { + data.add(true); + data.add(storedFluid.getFluid().getFluidID()); + data.add(storedFluid.getFluidAmount()); + } + else { + data.add(false); + } + + if(storedGas.getGas() != null) + { + data.add(true); + data.add(storedGas.getGasType().getID()); + data.add(storedGas.getStored()); + } + else { + data.add(false); + } + + data.add(temperature); + + for(TransmissionType type : TransmissionType.values()) + { + data.add(transmissions.get(type).ordinal()); + } + } + + @Override + protected void read(ByteBuf dataStream) + { + super.read(dataStream); + + storedEnergy = dataStream.readDouble(); + + if(dataStream.readBoolean()) + { + storedFluid.setFluid(new FluidStack(FluidRegistry.getFluid(dataStream.readInt()), dataStream.readInt())); + } + else { + storedFluid.setFluid(null); + } + + if(dataStream.readBoolean()) + { + storedGas.setGas(new GasStack(dataStream.readInt(), dataStream.readInt())); + } + else { + storedGas.setGas(null); + } + + temperature = dataStream.readDouble(); + + for(TransmissionType type : TransmissionType.values()) + { + transmissions.put(type, TransferType.values()[dataStream.readInt()]); + } + } + + public static enum TransferType + { + RECEIVE, + SEND, + BOTH; + } +} diff --git a/src/main/java/mekanism/common/content/teleportation/SharedInventory.java b/src/main/java/mekanism/common/content/entangloporter/SharedInventory.java similarity index 98% rename from src/main/java/mekanism/common/content/teleportation/SharedInventory.java rename to src/main/java/mekanism/common/content/entangloporter/SharedInventory.java index 75501909b..96a5a4fff 100644 --- a/src/main/java/mekanism/common/content/teleportation/SharedInventory.java +++ b/src/main/java/mekanism/common/content/entangloporter/SharedInventory.java @@ -1,4 +1,4 @@ -package mekanism.common.content.teleportation; +package mekanism.common.content.entangloporter; import mekanism.api.energy.IStrictEnergyStorage; import mekanism.api.gas.Gas; diff --git a/src/main/java/mekanism/common/content/teleportation/SharedInventoryManager.java b/src/main/java/mekanism/common/content/entangloporter/SharedInventoryManager.java similarity index 97% rename from src/main/java/mekanism/common/content/teleportation/SharedInventoryManager.java rename to src/main/java/mekanism/common/content/entangloporter/SharedInventoryManager.java index 8d6aded9e..970713a3d 100644 --- a/src/main/java/mekanism/common/content/teleportation/SharedInventoryManager.java +++ b/src/main/java/mekanism/common/content/entangloporter/SharedInventoryManager.java @@ -1,4 +1,4 @@ -package mekanism.common.content.teleportation; +package mekanism.common.content.entangloporter; import java.util.Arrays; import java.util.HashMap; diff --git a/src/main/java/mekanism/common/frequency/FrequencyManager.java b/src/main/java/mekanism/common/frequency/FrequencyManager.java index 3e0c05231..c0bcc29a4 100644 --- a/src/main/java/mekanism/common/frequency/FrequencyManager.java +++ b/src/main/java/mekanism/common/frequency/FrequencyManager.java @@ -282,7 +282,7 @@ public class FrequencyManager try { for(int i = 0; i < size; i++) { - Frequency freq = frequencyClass.newInstance(); + Frequency freq = frequencyClass.getConstructor(new Class[] {ByteBuf.class}).newInstance(dataStream); freq.read(dataStream); ret.add(freq); } diff --git a/src/main/java/mekanism/common/tile/TileEntityElectricBlock.java b/src/main/java/mekanism/common/tile/TileEntityElectricBlock.java index afb2677a1..95b4c65c3 100644 --- a/src/main/java/mekanism/common/tile/TileEntityElectricBlock.java +++ b/src/main/java/mekanism/common/tile/TileEntityElectricBlock.java @@ -213,14 +213,14 @@ public abstract class TileEntityElectricBlock extends TileEntityContainerBlock i { if(getConsumingSides().contains(from)) { - double toAdd = (int)Math.min(getMaxEnergy()-getEnergy(), maxReceive* general.FROM_TE); + double toAdd = (int)Math.min(getMaxEnergy()-getEnergy(), maxReceive*general.FROM_TE); if(!simulate) { setEnergy(getEnergy() + toAdd); } - return (int)Math.round(toAdd* general.TO_TE); + return (int)Math.round(toAdd*general.TO_TE); } return 0; @@ -232,14 +232,14 @@ public abstract class TileEntityElectricBlock extends TileEntityContainerBlock i { if(getOutputtingSides().contains(from)) { - double toSend = Math.min(getEnergy(), Math.min(getMaxOutput(), maxExtract* general.FROM_TE)); + double toSend = Math.min(getEnergy(), Math.min(getMaxOutput(), maxExtract*general.FROM_TE)); if(!simulate) { setEnergy(getEnergy() - toSend); } - return (int)Math.round(toSend* general.TO_TE); + return (int)Math.round(toSend*general.TO_TE); } return 0; @@ -256,14 +256,14 @@ public abstract class TileEntityElectricBlock extends TileEntityContainerBlock i @Method(modid = "CoFHCore") public int getEnergyStored(ForgeDirection from) { - return (int)Math.round(getEnergy()* general.TO_TE); + return (int)Math.round(getEnergy()*general.TO_TE); } @Override @Method(modid = "CoFHCore") public int getMaxEnergyStored(ForgeDirection from) { - return (int)Math.round(getMaxEnergy()* general.TO_TE); + return (int)Math.round(getMaxEnergy()*general.TO_TE); } @Override diff --git a/src/main/java/mekanism/common/tile/TileEntityEntangledBlock.java b/src/main/java/mekanism/common/tile/TileEntityEntangledBlock.java deleted file mode 100644 index 2961b63da..000000000 --- a/src/main/java/mekanism/common/tile/TileEntityEntangledBlock.java +++ /dev/null @@ -1,198 +0,0 @@ -package mekanism.common.tile; - -import io.netty.buffer.ByteBuf; - -import java.util.ArrayList; -import java.util.EnumSet; - -import mekanism.api.gas.Gas; -import mekanism.api.gas.GasStack; -import mekanism.api.gas.IGasHandler; -import mekanism.api.gas.ITubeConnection; -import mekanism.common.PacketHandler; -import mekanism.common.content.teleportation.SharedInventory; -import mekanism.common.content.teleportation.SharedInventoryManager; -import mekanism.common.util.CableUtils; -import net.minecraft.item.ItemStack; -import net.minecraftforge.common.util.ForgeDirection; -import net.minecraftforge.fluids.Fluid; -import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.fluids.FluidTankInfo; -import net.minecraftforge.fluids.IFluidHandler; - -public class TileEntityEntangledBlock extends TileEntityElectricBlock implements IFluidHandler, IGasHandler, ITubeConnection -{ - public SharedInventory sharedInventory; - - public static final EnumSet nothing = EnumSet.noneOf(ForgeDirection.class); - - public TileEntityEntangledBlock() - { - super("Entangled", 0); - inventory = new ItemStack[0]; - } - - @Override - public void onUpdate() - { - super.onUpdate(); - - CableUtils.emit(this); - } - - public void setInventory(String frequency) - { - sharedInventory = SharedInventoryManager.getInventory(frequency); - markDirty(); - } - - @Override - public void handlePacketData(ByteBuf dataStream) - { - if(!worldObj.isRemote) - { - switch(dataStream.readInt()) - { - case 0: - setInventory(PacketHandler.readString(dataStream)); - return; - } - } - - super.handlePacketData(dataStream); - setEnergy(dataStream.readDouble()); - } - - @Override - public ArrayList getNetworkedData(ArrayList data) - { - super.getNetworkedData(data); - data.add(getEnergy()); - return data; - } - - @Override - public EnumSet getOutputtingSides() - { - return sharedInventory == null ? nothing : EnumSet.of(ForgeDirection.UP); - } - - @Override - public EnumSet getConsumingSides() - { - return sharedInventory == null ? nothing : EnumSet.complementOf(EnumSet.of(ForgeDirection.UNKNOWN, ForgeDirection.UP)); - } - - @Override - public double getMaxOutput() - { - return sharedInventory == null ? 0 : 1000; - } - - @Override - public double getEnergy() - { - return sharedInventory == null ? 0 : sharedInventory.getEnergy(); - } - - @Override - public void setEnergy(double energy) - { - if(sharedInventory != null) - { - sharedInventory.setEnergy(energy); - } - } - - @Override - public double getMaxEnergy() - { - return sharedInventory == null ? 0 : sharedInventory.getMaxEnergy(); - } - - @Override - public int fill(ForgeDirection from, FluidStack resource, boolean doFill) - { - return sharedInventory == null ? 0 : sharedInventory.fill(from, resource, doFill); - } - - @Override - public FluidStack drain(ForgeDirection from, FluidStack resource, boolean doDrain) - { - if(sharedInventory == null) - { - return null; - } - return sharedInventory.drain(from, resource, doDrain); - } - - @Override - public FluidStack drain(ForgeDirection from, int maxDrain, boolean doDrain) - { - if(sharedInventory == null) - { - return null; - } - return sharedInventory.drain(from, maxDrain, doDrain); - } - - @Override - public boolean canFill(ForgeDirection from, Fluid fluid) - { - return sharedInventory == null ? false : sharedInventory.canFill(from, fluid); - } - - @Override - public boolean canDrain(ForgeDirection from, Fluid fluid) - { - return sharedInventory == null ? false : sharedInventory.canDrain(from, fluid); - } - - @Override - public FluidTankInfo[] getTankInfo(ForgeDirection from) - { - return sharedInventory == null ? new FluidTankInfo[0] : sharedInventory.getTankInfo(from); - } - - @Override - public int receiveGas(ForgeDirection side, GasStack stack, boolean doTransfer) - { - return sharedInventory == null ? 0 : sharedInventory.receiveGas(side, stack, doTransfer); - } - - @Override - public int receiveGas(ForgeDirection side, GasStack stack) - { - return receiveGas(side, stack, true); - } - - @Override - public GasStack drawGas(ForgeDirection side, int amount, boolean doTransfer) - { - return sharedInventory == null ? null : sharedInventory.drawGas(side, amount, doTransfer); - } - - @Override - public GasStack drawGas(ForgeDirection side, int amount) - { - return drawGas(side, amount, true); - } - - @Override - public boolean canReceiveGas(ForgeDirection side, Gas type) - { - return sharedInventory == null ? false : sharedInventory.canReceiveGas(side, type); - } - - @Override - public boolean canDrawGas(ForgeDirection side, Gas type) - { - return sharedInventory == null ? false : sharedInventory.canDrawGas(side, type); - } - - @Override - public boolean canTubeConnect(ForgeDirection side) - { - return sharedInventory == null ? false : true; - } -} diff --git a/src/main/java/mekanism/common/tile/TileEntityQuantumEntangloporter.java b/src/main/java/mekanism/common/tile/TileEntityQuantumEntangloporter.java new file mode 100644 index 000000000..fd197137f --- /dev/null +++ b/src/main/java/mekanism/common/tile/TileEntityQuantumEntangloporter.java @@ -0,0 +1,324 @@ +package mekanism.common.tile; + +import io.netty.buffer.ByteBuf; + +import java.util.ArrayList; +import java.util.EnumSet; + +import mekanism.api.Coord4D; +import mekanism.api.gas.Gas; +import mekanism.api.gas.GasStack; +import mekanism.api.gas.IGasHandler; +import mekanism.common.Mekanism; +import mekanism.common.PacketHandler; +import mekanism.common.content.entangloporter.InventoryFrequency; +import mekanism.common.frequency.Frequency; +import mekanism.common.frequency.FrequencyManager; +import mekanism.common.frequency.IFrequencyHandler; +import mekanism.common.util.CableUtils; +import mekanism.common.util.MekanismUtils; +import mekanism.common.util.PipeUtils; +import net.minecraft.item.ItemStack; +import net.minecraftforge.common.util.ForgeDirection; +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.FluidTankInfo; +import net.minecraftforge.fluids.IFluidHandler; + +public class TileEntityQuantumEntangloporter extends TileEntityElectricBlock implements IFluidHandler, IFrequencyHandler, IGasHandler +{ + public String owner; + + public InventoryFrequency frequency; + + public static final EnumSet nothing = EnumSet.noneOf(ForgeDirection.class); + + public TileEntityQuantumEntangloporter() + { + super("QuantumEntangloporter", 0); + inventory = new ItemStack[0]; + } + + @Override + public void onUpdate() + { + super.onUpdate(); + + CableUtils.emit(this); + } + + @Override + public Frequency getFrequency() + { + return frequency; + } + + public FrequencyManager getManager(Frequency freq) + { + if(owner == null || freq == null) + { + return null; + } + + if(freq.isPublic()) + { + return Mekanism.publicEntangloporters; + } + else { + if(!Mekanism.privateEntangloporters.containsKey(owner)) + { + FrequencyManager manager = new FrequencyManager(InventoryFrequency.class, owner); + Mekanism.privateEntangloporters.put(owner, manager); + manager.createOrLoad(worldObj); + } + + return Mekanism.privateEntangloporters.get(owner); + } + } + + public void setFrequency(String name, boolean publicFreq) + { + if(name.equals(frequency)) + { + return; + } + + FrequencyManager manager = getManager(new Frequency(name, null).setPublic(publicFreq)); + manager.deactivate(Coord4D.get(this)); + + for(Frequency freq : manager.getFrequencies()) + { + if(freq.name.equals(name)) + { + frequency = (InventoryFrequency)freq; + frequency.activeCoords.add(Coord4D.get(this)); + + return; + } + } + + Frequency freq = new Frequency(name, owner).setPublic(publicFreq); + freq.activeCoords.add(Coord4D.get(this)); + manager.addFrequency(freq); + frequency = (InventoryFrequency)freq; + + MekanismUtils.saveChunk(this); + markDirty(); + } + + @Override + public void handlePacketData(ByteBuf dataStream) + { + if(!worldObj.isRemote) + { + int type = dataStream.readInt(); + + if(type == 0) + { + String name = PacketHandler.readString(dataStream); + boolean isPublic = dataStream.readBoolean(); + + setFrequency(name, isPublic); + } + else if(type == 1) + { + String freq = PacketHandler.readString(dataStream); + boolean isPublic = dataStream.readBoolean(); + + FrequencyManager manager = getManager(new Frequency(freq, null).setPublic(isPublic)); + + if(manager != null) + { + manager.remove(freq, owner); + } + } + + return; + } + + super.handlePacketData(dataStream); + + setEnergy(dataStream.readDouble()); + } + + @Override + public ArrayList getNetworkedData(ArrayList data) + { + super.getNetworkedData(data); + data.add(getEnergy()); + return data; + } + + @Override + public EnumSet getOutputtingSides() + { + return frequency == null ? nothing : EnumSet.of(ForgeDirection.UP); + } + + @Override + public EnumSet getConsumingSides() + { + return frequency == null ? nothing : EnumSet.complementOf(EnumSet.of(ForgeDirection.UNKNOWN, ForgeDirection.UP)); + } + + @Override + public double getMaxOutput() + { + return frequency == null ? 0 : InventoryFrequency.MAX_ENERGY; + } + + @Override + public double getEnergy() + { + return frequency == null ? 0 : frequency.storedEnergy; + } + + @Override + public void setEnergy(double energy) + { + if(frequency != null) + { + frequency.storedEnergy = Math.min(InventoryFrequency.MAX_ENERGY, energy); + } + } + + @Override + public double getMaxEnergy() + { + return frequency == null ? 0 : frequency.MAX_ENERGY; + } + + @Override + public int fill(ForgeDirection from, FluidStack resource, boolean doFill) + { + return frequency == null ? 0 : frequency.storedFluid.fill(resource, doFill); + } + + @Override + public FluidStack drain(ForgeDirection from, FluidStack resource, boolean doDrain) + { + if(frequency != null && resource.isFluidEqual(frequency.storedFluid.getFluid())) + { + return frequency.storedFluid.drain(resource.amount, doDrain); + } + + return null; + } + + @Override + public FluidStack drain(ForgeDirection from, int maxDrain, boolean doDrain) + { + if(frequency != null) + { + return frequency.storedFluid.drain(maxDrain, doDrain); + } + + return null; + } + + @Override + public boolean canFill(ForgeDirection from, Fluid fluid) + { + if(frequency != null) + { + return frequency.storedFluid.getFluid() == null || fluid == frequency.storedFluid.getFluid().getFluid(); + } + + return false; + } + + @Override + public boolean canDrain(ForgeDirection from, Fluid fluid) + { + if(frequency != null) + { + return frequency.storedFluid.getFluid() == null || fluid == frequency.storedFluid.getFluid().getFluid(); + } + + return false; + } + + @Override + public FluidTankInfo[] getTankInfo(ForgeDirection from) + { + return frequency == null ? PipeUtils.EMPTY : new FluidTankInfo[] {frequency.storedFluid.getInfo()}; + } + + @Override + public int receiveGas(ForgeDirection side, GasStack stack, boolean doTransfer) + { + return frequency == null ? 0 : frequency.storedGas.receive(stack, doTransfer); + } + + @Override + public int receiveGas(ForgeDirection side, GasStack stack) + { + return receiveGas(side, stack, true); + } + + @Override + public GasStack drawGas(ForgeDirection side, int amount, boolean doTransfer) + { + return frequency == null ? null : frequency.storedGas.draw(amount, doTransfer); + } + + @Override + public GasStack drawGas(ForgeDirection side, int amount) + { + return drawGas(side, amount, true); + } + + @Override + public boolean canReceiveGas(ForgeDirection side, Gas type) + { + if(frequency != null) + { + return frequency.storedGas.getGasType() == null || type == frequency.storedGas.getGasType(); + } + + return false; + } + + @Override + public boolean canDrawGas(ForgeDirection side, Gas type) + { + if(frequency != null) + { + return frequency.storedGas.getGasType() == null || type == frequency.storedGas.getGasType(); + } + + return false; + } + + @Override + public boolean handleInventory() + { + return false; + } + + @Override + public int getSizeInventory() + { + return 1; + } + + @Override + public ItemStack getStackInSlot(int slotID) + { + return frequency != null && slotID == 0 ? frequency.storedItem : null; + } + + @Override + public void setInventorySlotContents(int slotID, ItemStack itemstack) + { + if(frequency != null && slotID == 0) + { + frequency.storedItem = itemstack; + + if(itemstack != null && itemstack.stackSize > getInventoryStackLimit()) + { + itemstack.stackSize = getInventoryStackLimit(); + } + } + } +} diff --git a/src/main/resources/assets/mekanism/lang/en_US.lang b/src/main/resources/assets/mekanism/lang/en_US.lang index 64163622c..9553238aa 100644 --- a/src/main/resources/assets/mekanism/lang/en_US.lang +++ b/src/main/resources/assets/mekanism/lang/en_US.lang @@ -147,6 +147,7 @@ tile.MachineBlock2.LaserAmplifier.name=Laser Amplifier tile.MachineBlock2.LaserTractorBeam.name=Laser Tractor Beam //Machine Block 3 (third ID iteration) +tile.MachineBlock3.QuantumEntangloporter.name=Quantum Entangloporter tile.MachineBlock3.SolarNeutronActivator.name=Solar Neutron Activator tile.MachineBlock3.Oredictionificator.name=Oredictionificator tile.MachineBlock3.ResistiveHeater.name=Resistive Heater @@ -627,9 +628,11 @@ gui.teleporter.noFrame=No frame gui.teleporter.noLink=No link gui.teleporter.exceeds=Links > 2 gui.teleporter.needsEnergy=Needs energy -gui.teleporter.noAccess=You don't have access to this teleporter. +gui.teleporter.noAccess=You don't have access to this Teleporter. gui.teleporter.noFreq=No frequency +gui.entangloporter.noAccess=You don't have access to this Entangloporter. + gui.digitalMinerConfig=Digital Miner Config gui.digitalMiner.autoPull=Auto-pull From c03b712ed2421a1cd49563fa82060246d3d41fb6 Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Fri, 4 Mar 2016 12:07:34 -0500 Subject: [PATCH 27/52] More work. I'm gonna let the configuration component determine send/receive instead of cluttering the GUI more --- .../client/gui/element/GuiFluidGauge.java | 2 +- .../client/gui/element/GuiGasGauge.java | 2 +- src/main/java/mekanism/common/SideData.java | 7 +- .../common/item/ItemConfigurator.java | 3 + .../tile/TileEntityQuantumEntangloporter.java | 329 +++++++++++++++++- .../tile/component/TileComponentEjector.java | 30 +- 6 files changed, 347 insertions(+), 26 deletions(-) diff --git a/src/main/java/mekanism/client/gui/element/GuiFluidGauge.java b/src/main/java/mekanism/client/gui/element/GuiFluidGauge.java index 1f491648d..51ef948eb 100644 --- a/src/main/java/mekanism/client/gui/element/GuiFluidGauge.java +++ b/src/main/java/mekanism/client/gui/element/GuiFluidGauge.java @@ -56,7 +56,7 @@ public class GuiFluidGauge extends GuiGauge { TileEntity tile = ((GuiMekanism)guiObj).getTileEntity(); - if(tile instanceof ITankManager) + if(tile instanceof ITankManager && ((ITankManager)tile).getTanks() != null) { int index = Arrays.asList(((ITankManager)tile).getTanks()).indexOf(infoHandler.getTank()); diff --git a/src/main/java/mekanism/client/gui/element/GuiGasGauge.java b/src/main/java/mekanism/client/gui/element/GuiGasGauge.java index 97069a2e1..939edaaa1 100644 --- a/src/main/java/mekanism/client/gui/element/GuiGasGauge.java +++ b/src/main/java/mekanism/client/gui/element/GuiGasGauge.java @@ -56,7 +56,7 @@ public class GuiGasGauge extends GuiGauge { TileEntity tile = ((GuiMekanism)guiObj).getTileEntity(); - if(tile instanceof ITankManager) + if(tile instanceof ITankManager && ((ITankManager)tile).getTanks() != null) { int index = Arrays.asList(((ITankManager)tile).getTanks()).indexOf(infoHandler.getTank()); diff --git a/src/main/java/mekanism/common/SideData.java b/src/main/java/mekanism/common/SideData.java index 7a82f00f9..68a174dcc 100644 --- a/src/main/java/mekanism/common/SideData.java +++ b/src/main/java/mekanism/common/SideData.java @@ -64,6 +64,11 @@ public class SideData Object[] tanks = manager.getTanks(); List infos = new ArrayList(); + if(tanks == null) + { + return infos.toArray(new FluidTankInfo[] {}); + } + for(int slot : availableSlots) { if(slot <= tanks.length-1 && tanks[slot] instanceof IFluidTank) @@ -79,7 +84,7 @@ public class SideData { Object[] tanks = manager.getTanks(); - if(tanks.length < 1 || !(tanks[0] instanceof GasTank)) + if(tanks == null || tanks.length < 1 || !(tanks[0] instanceof GasTank)) { return null; } diff --git a/src/main/java/mekanism/common/item/ItemConfigurator.java b/src/main/java/mekanism/common/item/ItemConfigurator.java index 4d3a9edfe..a56c4bb16 100644 --- a/src/main/java/mekanism/common/item/ItemConfigurator.java +++ b/src/main/java/mekanism/common/item/ItemConfigurator.java @@ -287,6 +287,7 @@ public class ItemConfigurator extends ItemEnergized implements IMekWrench, ITool CONFIGURATE_FLUIDS("configurate", "(" + TransmissionType.FLUID.localize() + ")", EnumColor.BRIGHT_GREEN, true), CONFIGURATE_GASES("configurate", "(" + TransmissionType.GAS.localize() + ")", EnumColor.BRIGHT_GREEN, true), CONFIGURATE_ENERGY("configurate", "(" + TransmissionType.ENERGY.localize() + ")", EnumColor.BRIGHT_GREEN, true), + CONFIGURATE_HEAT("configurate", "(" + TransmissionType.HEAT.localize() + ")", EnumColor.BRIGHT_GREEN, true), EMPTY("empty", "", EnumColor.DARK_RED, false), ROTATE("rotate", "", EnumColor.YELLOW, false), WRENCH("wrench", "", EnumColor.PINK, false); @@ -331,6 +332,8 @@ public class ItemConfigurator extends ItemEnergized implements IMekWrench, ITool return TransmissionType.GAS; case CONFIGURATE_ENERGY: return TransmissionType.ENERGY; + case CONFIGURATE_HEAT: + return TransmissionType.HEAT; default: return null; } diff --git a/src/main/java/mekanism/common/tile/TileEntityQuantumEntangloporter.java b/src/main/java/mekanism/common/tile/TileEntityQuantumEntangloporter.java index fd197137f..b632ba822 100644 --- a/src/main/java/mekanism/common/tile/TileEntityQuantumEntangloporter.java +++ b/src/main/java/mekanism/common/tile/TileEntityQuantumEntangloporter.java @@ -4,39 +4,83 @@ import io.netty.buffer.ByteBuf; import java.util.ArrayList; import java.util.EnumSet; +import java.util.List; import mekanism.api.Coord4D; +import mekanism.api.EnumColor; +import mekanism.api.IHeatTransfer; import mekanism.api.gas.Gas; import mekanism.api.gas.GasStack; import mekanism.api.gas.IGasHandler; +import mekanism.api.transmitters.TransmissionType; import mekanism.common.Mekanism; import mekanism.common.PacketHandler; +import mekanism.common.SideData; +import mekanism.common.SideData.IOState; +import mekanism.common.base.IEjector; +import mekanism.common.base.ISideConfiguration; +import mekanism.common.base.ITankManager; import mekanism.common.content.entangloporter.InventoryFrequency; import mekanism.common.frequency.Frequency; import mekanism.common.frequency.FrequencyManager; import mekanism.common.frequency.IFrequencyHandler; +import mekanism.common.tile.component.TileComponentConfig; +import mekanism.common.tile.component.TileComponentEjector; import mekanism.common.util.CableUtils; +import mekanism.common.util.HeatUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.PipeUtils; import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.IFluidHandler; -public class TileEntityQuantumEntangloporter extends TileEntityElectricBlock implements IFluidHandler, IFrequencyHandler, IGasHandler +public class TileEntityQuantumEntangloporter extends TileEntityElectricBlock implements ISideConfiguration, ITankManager, IFluidHandler, IFrequencyHandler, IGasHandler, IHeatTransfer { public String owner; public InventoryFrequency frequency; + + public double heatToAbsorb = 0; + + public double lastTransferLoss; + public double lastEnvironmentLoss; + + public List publicCache = new ArrayList(); + public List privateCache = new ArrayList(); public static final EnumSet nothing = EnumSet.noneOf(ForgeDirection.class); + + public TileComponentEjector ejectorComponent; + public TileComponentConfig configComponent; public TileEntityQuantumEntangloporter() { super("QuantumEntangloporter", 0); + + configComponent = new TileComponentConfig(this, TransmissionType.ITEM, TransmissionType.ENERGY); + + for(TransmissionType type : TransmissionType.values()) + { + if(type != TransmissionType.HEAT) + { + configComponent.setIOConfig(type); + } + else { + configComponent.setInputConfig(type); + } + } + inventory = new ItemStack[0]; + + ejectorComponent = new TileComponentEjector(this); + ejectorComponent.setOutputData(TransmissionType.ITEM, new SideData("dummy", EnumColor.GREY, new int[] {0})); + ejectorComponent.setOutputData(TransmissionType.FLUID, new SideData("dummy", EnumColor.GREY, new int[] {0})); + ejectorComponent.setOutputData(TransmissionType.GAS, new SideData("dummy", EnumColor.GREY, new int[] {1})); } @Override @@ -44,7 +88,56 @@ public class TileEntityQuantumEntangloporter extends TileEntityElectricBlock imp { super.onUpdate(); - CableUtils.emit(this); + if(!worldObj.isRemote) + { + if(configComponent.isEjecting(TransmissionType.ENERGY)) + { + CableUtils.emit(this); + } + + double[] loss = simulateHeat(); + applyTemperatureChange(); + + lastTransferLoss = loss[0]; + lastEnvironmentLoss = loss[1]; + + FrequencyManager manager = getManager(frequency); + + if(manager != null) + { + if(frequency != null && !frequency.valid) + { + frequency = (InventoryFrequency)manager.validateFrequency(owner, Coord4D.get(this), frequency); + } + + if(frequency != null) + { + frequency = (InventoryFrequency)manager.update(owner, Coord4D.get(this), frequency); + } + } + else { + frequency = null; + } + } + } + + @Override + public void invalidate() + { + super.invalidate(); + + if(!worldObj.isRemote) + { + if(frequency != null) + { + FrequencyManager manager = getManager(frequency); + + if(manager != null) + { + manager.deactivate(Coord4D.get(this)); + } + } + } } @Override @@ -105,6 +198,41 @@ public class TileEntityQuantumEntangloporter extends TileEntityElectricBlock imp MekanismUtils.saveChunk(this); markDirty(); } + + @Override + public void readFromNBT(NBTTagCompound nbtTags) + { + super.readFromNBT(nbtTags); + + if(nbtTags.hasKey("owner")) + { + owner = nbtTags.getString("owner"); + } + + if(nbtTags.hasKey("frequency")) + { + frequency = new InventoryFrequency(nbtTags.getCompoundTag("frequency")); + frequency.valid = false; + } + } + + @Override + public void writeToNBT(NBTTagCompound nbtTags) + { + super.writeToNBT(nbtTags); + + if(owner != null) + { + nbtTags.setString("owner", owner); + } + + if(frequency != null) + { + NBTTagCompound frequencyTag = new NBTTagCompound(); + frequency.write(frequencyTag); + nbtTags.setTag("frequency", frequencyTag); + } + } @Override public void handlePacketData(ByteBuf dataStream) @@ -138,27 +266,104 @@ public class TileEntityQuantumEntangloporter extends TileEntityElectricBlock imp super.handlePacketData(dataStream); - setEnergy(dataStream.readDouble()); + lastTransferLoss = dataStream.readDouble(); + lastEnvironmentLoss = dataStream.readDouble(); + + if(dataStream.readBoolean()) + { + owner = PacketHandler.readString(dataStream); + } + else { + owner = null; + } + + if(dataStream.readBoolean()) + { + frequency = new InventoryFrequency(dataStream); + } + else { + frequency = null; + } + + publicCache.clear(); + privateCache.clear(); + + int amount = dataStream.readInt(); + + for(int i = 0; i < amount; i++) + { + publicCache.add(new Frequency(dataStream)); + } + + amount = dataStream.readInt(); + + for(int i = 0; i < amount; i++) + { + privateCache.add(new Frequency(dataStream)); + } } @Override public ArrayList getNetworkedData(ArrayList data) { super.getNetworkedData(data); - data.add(getEnergy()); + + data.add(lastTransferLoss); + data.add(lastEnvironmentLoss); + + if(owner != null) + { + data.add(true); + data.add(owner); + } + else { + data.add(false); + } + + if(frequency != null) + { + data.add(true); + frequency.write(data); + } + else { + data.add(false); + } + + data.add(Mekanism.publicEntangloporters.getFrequencies().size()); + + for(Frequency freq : Mekanism.publicEntangloporters.getFrequencies()) + { + freq.write(data); + } + + FrequencyManager manager = getManager(new Frequency(null, null).setPublic(false)); + + if(manager != null) + { + data.add(manager.getFrequencies().size()); + + for(Frequency freq : manager.getFrequencies()) + { + freq.write(data); + } + } + else { + data.add(0); + } + return data; } @Override public EnumSet getOutputtingSides() { - return frequency == null ? nothing : EnumSet.of(ForgeDirection.UP); + return frequency == null ? nothing : configComponent.getSidesForData(TransmissionType.ENERGY, facing, 2); } @Override public EnumSet getConsumingSides() { - return frequency == null ? nothing : EnumSet.complementOf(EnumSet.of(ForgeDirection.UNKNOWN, ForgeDirection.UP)); + return frequency == null ? nothing : configComponent.getSidesForData(TransmissionType.ENERGY, facing, 1); } @Override @@ -219,7 +424,7 @@ public class TileEntityQuantumEntangloporter extends TileEntityElectricBlock imp @Override public boolean canFill(ForgeDirection from, Fluid fluid) { - if(frequency != null) + if(frequency != null && configComponent.getOutput(TransmissionType.FLUID, from.ordinal(), facing).ioState == IOState.INPUT) { return frequency.storedFluid.getFluid() == null || fluid == frequency.storedFluid.getFluid().getFluid(); } @@ -230,7 +435,7 @@ public class TileEntityQuantumEntangloporter extends TileEntityElectricBlock imp @Override public boolean canDrain(ForgeDirection from, Fluid fluid) { - if(frequency != null) + if(frequency != null && configComponent.getOutput(TransmissionType.FLUID, from.ordinal(), facing).ioState == IOState.OUTPUT) { return frequency.storedFluid.getFluid() == null || fluid == frequency.storedFluid.getFluid().getFluid(); } @@ -241,7 +446,15 @@ public class TileEntityQuantumEntangloporter extends TileEntityElectricBlock imp @Override public FluidTankInfo[] getTankInfo(ForgeDirection from) { - return frequency == null ? PipeUtils.EMPTY : new FluidTankInfo[] {frequency.storedFluid.getInfo()}; + if(frequency != null) + { + if(configComponent.getOutput(TransmissionType.FLUID, from.ordinal(), facing).ioState != IOState.OFF) + { + return new FluidTankInfo[] {frequency.storedFluid.getInfo()}; + } + } + + return PipeUtils.EMPTY; } @Override @@ -271,7 +484,7 @@ public class TileEntityQuantumEntangloporter extends TileEntityElectricBlock imp @Override public boolean canReceiveGas(ForgeDirection side, Gas type) { - if(frequency != null) + if(frequency != null && configComponent.getOutput(TransmissionType.GAS, side.ordinal(), facing).ioState == IOState.INPUT) { return frequency.storedGas.getGasType() == null || type == frequency.storedGas.getGasType(); } @@ -282,7 +495,7 @@ public class TileEntityQuantumEntangloporter extends TileEntityElectricBlock imp @Override public boolean canDrawGas(ForgeDirection side, Gas type) { - if(frequency != null) + if(frequency != null && configComponent.getOutput(TransmissionType.GAS, side.ordinal(), facing).ioState == IOState.OUTPUT) { return frequency.storedGas.getGasType() == null || type == frequency.storedGas.getGasType(); } @@ -321,4 +534,98 @@ public class TileEntityQuantumEntangloporter extends TileEntityElectricBlock imp } } } + + @Override + public double getTemp() + { + return frequency != null ? frequency.temperature : 0; + } + + @Override + public double getInverseConductionCoefficient() + { + return 1; + } + + @Override + public double getInsulationCoefficient(ForgeDirection side) + { + return 1000; + } + + @Override + public void transferHeatTo(double heat) + { + heatToAbsorb += heat; + } + + @Override + public double[] simulateHeat() + { + return HeatUtils.simulate(this); + } + + @Override + public double applyTemperatureChange() + { + if(frequency != null) + { + frequency.temperature += heatToAbsorb; + } + + heatToAbsorb = 0; + + return frequency != null ? frequency.temperature : 0; + } + + @Override + public boolean canConnectHeat(ForgeDirection side) + { + return frequency != null && configComponent.getOutput(TransmissionType.HEAT, side.ordinal(), facing).ioState != IOState.OFF; + } + + @Override + public IHeatTransfer getAdjacent(ForgeDirection side) + { + TileEntity adj = Coord4D.get(this).getFromSide(side).getTileEntity(worldObj); + + if(configComponent.getOutput(TransmissionType.HEAT, side.ordinal(), facing).ioState == IOState.INPUT) + { + if(adj instanceof IHeatTransfer) + { + return (IHeatTransfer)adj; + } + } + + return null; + } + + @Override + public Object[] getTanks() + { + if(frequency == null) + { + return null; + } + + return new Object[] {frequency.storedFluid, frequency.storedGas}; + } + + @Override + public TileComponentConfig getConfig() + { + return configComponent; + } + + @Override + public int getOrientation() + { + return facing; + } + + @Override + public IEjector getEjector() + { + return ejectorComponent; + } } diff --git a/src/main/java/mekanism/common/tile/component/TileComponentEjector.java b/src/main/java/mekanism/common/tile/component/TileComponentEjector.java index ff1f1a146..d4feaea49 100644 --- a/src/main/java/mekanism/common/tile/component/TileComponentEjector.java +++ b/src/main/java/mekanism/common/tile/component/TileComponentEjector.java @@ -115,13 +115,16 @@ public class TileComponentEjector implements ITileComponent, IEjector SideData data = sideData.get(TransmissionType.GAS); List outputSides = getOutputSides(TransmissionType.GAS, data); - GasTank tank = (GasTank)((ITankManager)tileEntity).getTanks()[data.availableSlots[0]]; - - if(tank.getStored() > 0) + if(((ITankManager)tileEntity).getTanks() != null) { - GasStack toEmit = tank.getGas().copy().withAmount(Math.min(GAS_OUTPUT, tank.getStored())); - int emit = GasTransmission.emit(toEmit, tileEntity, outputSides); - tank.draw(emit, true); + GasTank tank = (GasTank)((ITankManager)tileEntity).getTanks()[data.availableSlots[0]]; + + if(tank.getStored() > 0) + { + GasStack toEmit = tank.getGas().copy().withAmount(Math.min(GAS_OUTPUT, tank.getStored())); + int emit = GasTransmission.emit(toEmit, tileEntity, outputSides); + tank.draw(emit, true); + } } } @@ -130,13 +133,16 @@ public class TileComponentEjector implements ITileComponent, IEjector SideData data = sideData.get(TransmissionType.FLUID); List outputSides = getOutputSides(TransmissionType.FLUID, data); - FluidTank tank = (FluidTank)((ITankManager)tileEntity).getTanks()[data.availableSlots[0]]; - - if(tank.getFluidAmount() > 0) + if(((ITankManager)tileEntity).getTanks() != null) { - FluidStack toEmit = new FluidStack(tank.getFluid().getFluid(), Math.min(FLUID_OUTPUT, tank.getFluidAmount())); - int emit = PipeUtils.emit(outputSides, toEmit, tileEntity); - tank.drain(emit, true); + FluidTank tank = (FluidTank)((ITankManager)tileEntity).getTanks()[data.availableSlots[0]]; + + if(tank.getFluidAmount() > 0) + { + FluidStack toEmit = new FluidStack(tank.getFluid().getFluid(), Math.min(FLUID_OUTPUT, tank.getFluidAmount())); + int emit = PipeUtils.emit(outputSides, toEmit, tileEntity); + tank.drain(emit, true); + } } } } From f8f8dfa737d5180ea635004299bac5c8f2a01711 Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Fri, 4 Mar 2016 13:14:48 -0500 Subject: [PATCH 28/52] More work on entangloporters --- .../java/mekanism/client/ClientProxy.java | 6 +- .../client/gui/GuiQuantumEntangloporter.java | 338 +++++++++++++++++- .../java/mekanism/common/CommonProxy.java | 4 +- src/main/java/mekanism/common/Mekanism.java | 4 +- .../mekanism/common/block/BlockMachine.java | 4 +- .../entangloporter/InventoryFrequency.java | 25 -- .../common/frequency/FrequencyManager.java | 16 +- .../ContainerQuantumEntangloporter.java | 102 ++++++ .../tile/TileEntityQuantumEntangloporter.java | 4 +- .../common/tile/TileEntityTeleporter.java | 3 +- .../assets/mekanism/gui/GuiTeleporter.png | Bin 5923 -> 5928 bytes 11 files changed, 463 insertions(+), 43 deletions(-) create mode 100644 src/main/java/mekanism/common/inventory/container/ContainerQuantumEntangloporter.java diff --git a/src/main/java/mekanism/client/ClientProxy.java b/src/main/java/mekanism/client/ClientProxy.java index bfa116de1..482cb167e 100644 --- a/src/main/java/mekanism/client/ClientProxy.java +++ b/src/main/java/mekanism/client/ClientProxy.java @@ -28,7 +28,6 @@ import mekanism.client.gui.GuiElectrolyticSeparator; import mekanism.client.gui.GuiEnergizedSmelter; import mekanism.client.gui.GuiEnergyCube; import mekanism.client.gui.GuiEnrichmentChamber; -import mekanism.client.gui.GuiEntangledBlock; import mekanism.client.gui.GuiFactory; import mekanism.client.gui.GuiFluidTank; import mekanism.client.gui.GuiFluidicPlenisher; @@ -45,6 +44,7 @@ import mekanism.client.gui.GuiPasswordEnter; import mekanism.client.gui.GuiPasswordModify; import mekanism.client.gui.GuiPrecisionSawmill; import mekanism.client.gui.GuiPurificationChamber; +import mekanism.client.gui.GuiQuantumEntangloporter; import mekanism.client.gui.GuiResistiveHeater; import mekanism.client.gui.GuiRobitCrafting; import mekanism.client.gui.GuiRobitInventory; @@ -148,7 +148,6 @@ import mekanism.common.tile.TileEntityEliteFactory; import mekanism.common.tile.TileEntityEnergizedSmelter; import mekanism.common.tile.TileEntityEnergyCube; import mekanism.common.tile.TileEntityEnrichmentChamber; -import mekanism.common.tile.TileEntityQuantumEntangloporter; import mekanism.common.tile.TileEntityFactory; import mekanism.common.tile.TileEntityFluidTank; import mekanism.common.tile.TileEntityFluidicPlenisher; @@ -169,6 +168,7 @@ import mekanism.common.tile.TileEntityOsmiumCompressor; import mekanism.common.tile.TileEntityPRC; import mekanism.common.tile.TileEntityPrecisionSawmill; import mekanism.common.tile.TileEntityPurificationChamber; +import mekanism.common.tile.TileEntityQuantumEntangloporter; import mekanism.common.tile.TileEntityResistiveHeater; import mekanism.common.tile.TileEntityRotaryCondensentrator; import mekanism.common.tile.TileEntitySeismicVibrator; @@ -510,7 +510,7 @@ public class ClientProxy extends CommonProxy case 45: return new GuiLaserTractorBeam(player.inventory, (TileEntityLaserTractorBeam)tileEntity); case 46: - return new GuiEntangledBlock(player.inventory, (TileEntityQuantumEntangloporter)tileEntity); + return new GuiQuantumEntangloporter(player.inventory, (TileEntityQuantumEntangloporter)tileEntity); case 47: return new GuiSolarNeutronActivator(player.inventory, (TileEntitySolarNeutronActivator)tileEntity); case 48: diff --git a/src/main/java/mekanism/client/gui/GuiQuantumEntangloporter.java b/src/main/java/mekanism/client/gui/GuiQuantumEntangloporter.java index 6c5bc02df..e6a1a9d47 100644 --- a/src/main/java/mekanism/client/gui/GuiQuantumEntangloporter.java +++ b/src/main/java/mekanism/client/gui/GuiQuantumEntangloporter.java @@ -1,5 +1,341 @@ package mekanism.client.gui; -public class GuiQuantumEntangloporter { +import java.util.ArrayList; +import java.util.List; +import mekanism.api.Coord4D; +import mekanism.api.EnumColor; +import mekanism.client.gui.element.GuiScrollList; +import mekanism.client.gui.element.GuiSideConfigurationTab; +import mekanism.client.gui.element.GuiTransporterConfigTab; +import mekanism.client.sound.SoundHandler; +import mekanism.common.Mekanism; +import mekanism.common.frequency.Frequency; +import mekanism.common.inventory.container.ContainerQuantumEntangloporter; +import mekanism.common.network.PacketPortableTeleporter.PortableTeleporterMessage; +import mekanism.common.network.PacketPortableTeleporter.PortableTeleporterPacketType; +import mekanism.common.network.PacketTileEntity.TileEntityMessage; +import mekanism.common.tile.TileEntityQuantumEntangloporter; +import mekanism.common.util.LangUtils; +import mekanism.common.util.MekanismUtils; +import mekanism.common.util.MekanismUtils.ResourceType; +import net.minecraft.client.gui.GuiButton; +import net.minecraft.client.gui.GuiTextField; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.util.ResourceLocation; + +import org.lwjgl.input.Keyboard; +import org.lwjgl.opengl.GL11; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + +@SideOnly(Side.CLIENT) +public class GuiQuantumEntangloporter extends GuiMekanism +{ + public static int MAX_LENGTH = 16; + + public ResourceLocation resource; + + public TileEntityQuantumEntangloporter tileEntity; + + public EntityPlayer entityPlayer; + + public GuiButton publicButton; + public GuiButton privateButton; + + public GuiButton setButton; + public GuiButton deleteButton; + + public GuiButton teleportButton; + + public GuiScrollList scrollList; + + public GuiTextField frequencyField; + + public boolean privateMode; + + public GuiQuantumEntangloporter(InventoryPlayer inventory, TileEntityQuantumEntangloporter tentity) + { + super(tentity, new ContainerQuantumEntangloporter(inventory, tentity)); + tileEntity = tentity; + resource = MekanismUtils.getResource(ResourceType.GUI, "GuiTeleporter.png"); + + guiElements.add(scrollList = new GuiScrollList(this, resource, 28, 37, 120, 4)); + guiElements.add(new GuiSideConfigurationTab(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiTeleporter.png"))); + guiElements.add(new GuiTransporterConfigTab(this, 34, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiTeleporter.png"))); + + if(tileEntity.frequency != null) + { + privateMode = !tileEntity.frequency.publicFreq; + } + + ySize+=64; + } + + @Override + public void initGui() + { + super.initGui(); + + int guiWidth = (width - xSize) / 2; + int guiHeight = (height - ySize) / 2; + + buttonList.clear(); + + publicButton = new GuiButton(0, guiWidth + 27, guiHeight + 14, 60, 20, LangUtils.localize("gui.public")); + privateButton = new GuiButton(1, guiWidth + 89, guiHeight + 14, 60, 20, LangUtils.localize("gui.private")); + + setButton = new GuiButton(2, guiWidth + 27, guiHeight + 116, 60, 20, LangUtils.localize("gui.set")); + deleteButton = new GuiButton(3, guiWidth + 89, guiHeight + 116, 60, 20, LangUtils.localize("gui.delete")); + + frequencyField = new GuiTextField(fontRendererObj, guiWidth + 50, guiHeight + 104, 86, 11); + frequencyField.setMaxStringLength(MAX_LENGTH); + frequencyField.setEnableBackgroundDrawing(false); + + updateButtons(); + + buttonList.add(publicButton); + buttonList.add(privateButton); + buttonList.add(setButton); + buttonList.add(deleteButton); + } + + public void setFrequency(String freq) + { + if(freq.isEmpty()) + { + return; + } + + ArrayList data = new ArrayList(); + data.add(0); + data.add(freq); + data.add(!privateMode); + + Mekanism.packetHandler.sendToServer(new TileEntityMessage(Coord4D.get(tileEntity), data)); + } + + public String getSecurity(Frequency freq) + { + return !freq.publicFreq ? EnumColor.DARK_RED + LangUtils.localize("gui.private") : LangUtils.localize("gui.public"); + } + + public void updateButtons() + { + if(tileEntity.owner == null) + { + return; + } + + List text = new ArrayList(); + + if(privateMode) + { + for(Frequency freq : tileEntity.privateCache) + { + text.add(freq.name); + } + } + else { + for(Frequency freq : tileEntity.publicCache) + { + text.add(freq.name + " (" + freq.owner + ")"); + } + } + + scrollList.setText(text); + + if(privateMode) + { + publicButton.enabled = true; + privateButton.enabled = false; + } + else { + publicButton.enabled = false; + privateButton.enabled = true; + } + + if(scrollList.hasSelection()) + { + Frequency freq = privateMode ? tileEntity.privateCache.get(scrollList.selected) : tileEntity.publicCache.get(scrollList.selected); + + if(tileEntity.getFrequency() == null || !tileEntity.getFrequency().equals(freq)) + { + setButton.enabled = true; + } + else { + setButton.enabled = false; + } + + if(tileEntity.owner.equals(freq.owner)) + { + deleteButton.enabled = true; + } + else { + deleteButton.enabled = false; + } + } + else { + setButton.enabled = false; + deleteButton.enabled = false; + } + } + + @Override + public void updateScreen() + { + super.updateScreen(); + + updateButtons(); + + frequencyField.updateCursorCounter(); + } + + @Override + public void mouseClicked(int mouseX, int mouseY, int button) + { + super.mouseClicked(mouseX, mouseY, button); + + updateButtons(); + + frequencyField.mouseClicked(mouseX, mouseY, button); + + if(button == 0) + { + int xAxis = (mouseX - (width - xSize) / 2); + int yAxis = (mouseY - (height - ySize) / 2); + + if(xAxis >= 137 && xAxis <= 148 && yAxis >= 103 && yAxis <= 114) + { + setFrequency(frequencyField.getText()); + frequencyField.setText(""); + SoundHandler.playSound("gui.button.press"); + } + } + } + + @Override + public void keyTyped(char c, int i) + { + if(!frequencyField.isFocused() || i == Keyboard.KEY_ESCAPE) + { + super.keyTyped(c, i); + } + + if(i == Keyboard.KEY_RETURN) + { + if(frequencyField.isFocused()) + { + setFrequency(frequencyField.getText()); + frequencyField.setText(""); + } + } + + if(Character.isDigit(c) || Character.isLetter(c) || i == Keyboard.KEY_BACK || i == Keyboard.KEY_DELETE || i == Keyboard.KEY_LEFT || i == Keyboard.KEY_RIGHT) + { + frequencyField.textboxKeyTyped(c, i); + } + + updateButtons(); + } + + @Override + protected void actionPerformed(GuiButton guibutton) + { + super.actionPerformed(guibutton); + + if(guibutton.id == 0) + { + privateMode = false; + } + else if(guibutton.id == 1) + { + privateMode = true; + } + else if(guibutton.id == 2) + { + int selection = scrollList.getSelection(); + + if(selection != -1) + { + Frequency freq = privateMode ? tileEntity.privateCache.get(selection) : tileEntity.publicCache.get(selection); + setFrequency(freq.name); + } + } + else if(guibutton.id == 3) + { + int selection = scrollList.getSelection(); + + if(selection != -1) + { + Frequency freq = privateMode ? tileEntity.privateCache.get(selection) : tileEntity.publicCache.get(selection); + + if(tileEntity != null) + { + ArrayList data = new ArrayList(); + data.add(1); + data.add(freq.name); + data.add(freq.publicFreq); + + Mekanism.packetHandler.sendToServer(new TileEntityMessage(Coord4D.get(tileEntity), data)); + } + else { + Mekanism.packetHandler.sendToServer(new PortableTeleporterMessage(PortableTeleporterPacketType.DEL_FREQ, freq)); + Mekanism.packetHandler.sendToServer(new PortableTeleporterMessage(PortableTeleporterPacketType.DATA_REQUEST, null)); + } + + scrollList.selected = -1; + } + } + + updateButtons(); + } + + @Override + protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) + { + int xAxis = (mouseX-(width-xSize)/2); + int yAxis = (mouseY-(height-ySize)/2); + + fontRendererObj.drawString(tileEntity.getInventoryName(), (xSize/2)-(fontRendererObj.getStringWidth(tileEntity.getInventoryName())/2), 4, 0x404040); + fontRendererObj.drawString(LangUtils.localize("gui.owner") + ": " + (tileEntity.owner != null ? tileEntity.owner : LangUtils.localize("gui.none")), 8, (ySize-96)+4, 0x404040); + + fontRendererObj.drawString(LangUtils.localize("gui.freq") + ":", 32, 81, 0x404040); + fontRendererObj.drawString(LangUtils.localize("gui.security") + ":", 32, 91, 0x404040); + + fontRendererObj.drawString(" " + (tileEntity.getFrequency() != null ? tileEntity.getFrequency().name : EnumColor.DARK_RED + LangUtils.localize("gui.none")), 32 + fontRendererObj.getStringWidth(LangUtils.localize("gui.freq") + ":"), 81, 0x797979); + fontRendererObj.drawString(" " + (tileEntity.getFrequency() != null ? getSecurity(tileEntity.getFrequency()) : EnumColor.DARK_RED + LangUtils.localize("gui.none")), 32 + fontRendererObj.getStringWidth(LangUtils.localize("gui.security") + ":"), 91, 0x797979); + + String str = LangUtils.localize("gui.set") + ":"; + renderScaledText(str, 27, 104, 0x404040, 20); + + super.drawGuiContainerForegroundLayer(mouseX, mouseY); + } + + @Override + protected void drawGuiContainerBackgroundLayer(float partialTick, int mouseX, int mouseY) + { + mc.renderEngine.bindTexture(resource); + GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + int guiWidth = (width-xSize)/2; + int guiHeight = (height-ySize)/2; + drawTexturedModalRect(guiWidth, guiHeight, 0, 0, xSize, ySize); + + int xAxis = (mouseX - (width - xSize) / 2); + int yAxis = (mouseY - (height - ySize) / 2); + + if(xAxis >= 137 && xAxis <= 148 && yAxis >= 103 && yAxis <= 114) + { + drawTexturedModalRect(guiWidth + 137, guiHeight + 103, xSize, 0, 11, 11); + } + else { + drawTexturedModalRect(guiWidth + 137, guiHeight + 103, xSize, 11, 11, 11); + } + + super.drawGuiContainerBackgroundLayer(partialTick, mouseX, mouseY); + + frequencyField.drawTextBox(); + } } diff --git a/src/main/java/mekanism/common/CommonProxy.java b/src/main/java/mekanism/common/CommonProxy.java index d62938b70..c6ebe7984 100644 --- a/src/main/java/mekanism/common/CommonProxy.java +++ b/src/main/java/mekanism/common/CommonProxy.java @@ -42,6 +42,7 @@ import mekanism.common.inventory.container.ContainerMetallurgicInfuser; import mekanism.common.inventory.container.ContainerNull; import mekanism.common.inventory.container.ContainerOredictionificator; import mekanism.common.inventory.container.ContainerPRC; +import mekanism.common.inventory.container.ContainerQuantumEntangloporter; import mekanism.common.inventory.container.ContainerResistiveHeater; import mekanism.common.inventory.container.ContainerRobitCrafting; import mekanism.common.inventory.container.ContainerRobitInventory; @@ -104,6 +105,7 @@ import mekanism.common.tile.TileEntityOsmiumCompressor; import mekanism.common.tile.TileEntityPRC; import mekanism.common.tile.TileEntityPrecisionSawmill; import mekanism.common.tile.TileEntityPurificationChamber; +import mekanism.common.tile.TileEntityQuantumEntangloporter; import mekanism.common.tile.TileEntityResistiveHeater; import mekanism.common.tile.TileEntityRotaryCondensentrator; import mekanism.common.tile.TileEntitySeismicVibrator; @@ -528,7 +530,7 @@ public class CommonProxy implements IGuiProvider case 45: return new ContainerLaserTractorBeam(player.inventory, (TileEntityLaserTractorBeam)tileEntity); case 46: - return new ContainerNull(player, (TileEntityContainerBlock)tileEntity); + return new ContainerQuantumEntangloporter(player.inventory, (TileEntityQuantumEntangloporter)tileEntity); case 47: return new ContainerSolarNeutronActivator(player.inventory, (TileEntitySolarNeutronActivator)tileEntity); case 48: diff --git a/src/main/java/mekanism/common/Mekanism.java b/src/main/java/mekanism/common/Mekanism.java index 766e2d7f2..c8445f29c 100644 --- a/src/main/java/mekanism/common/Mekanism.java +++ b/src/main/java/mekanism/common/Mekanism.java @@ -175,10 +175,10 @@ public class Mekanism public static MultiblockManager boilerManager = new MultiblockManager("thermoelectricBoiler"); /** FrequencyManagers for various networks */ - public static FrequencyManager publicTeleporters = new FrequencyManager(Frequency.class); + public static FrequencyManager publicTeleporters = new FrequencyManager(Frequency.class, "Teleporter"); public static Map privateTeleporters = new HashMap(); - public static FrequencyManager publicEntangloporters = new FrequencyManager(InventoryFrequency.class); + public static FrequencyManager publicEntangloporters = new FrequencyManager(InventoryFrequency.class, "Entangloporter"); public static Map privateEntangloporters = new HashMap(); /** Mekanism creative tab */ diff --git a/src/main/java/mekanism/common/block/BlockMachine.java b/src/main/java/mekanism/common/block/BlockMachine.java index ea0069887..a5bb7d046 100644 --- a/src/main/java/mekanism/common/block/BlockMachine.java +++ b/src/main/java/mekanism/common/block/BlockMachine.java @@ -223,7 +223,7 @@ public class BlockMachine extends BlockContainer implements ISpecialBounds, IBlo MekanismRenderer.loadDynamicTextures(register, MachineType.PRECISION_SAWMILL.name, icons[5], def); break; case MACHINE_BLOCK_3: - icons[0][0] = register.registerIcon("mekanism:AmbientAccumulator"); + icons[0][0] = BASE_ICON; icons[2][0] = BASE_ICON; icons[4][0] = BASE_ICON; MekanismRenderer.loadDynamicTextures(register, MachineType.OREDICTIONIFICATOR.name, icons[3], DefIcon.getAll(register.registerIcon("mekanism:OredictionificatorSide"))); @@ -1224,7 +1224,7 @@ public class BlockMachine extends BlockContainer implements ISpecialBounds, IBlo for(MachineType type : MachineType.values()) { - if(type != QUANTUM_ENTANGLOPORTER && type != AMBIENT_ACCUMULATOR) + if(type != AMBIENT_ACCUMULATOR) { ret.add(type); } diff --git a/src/main/java/mekanism/common/content/entangloporter/InventoryFrequency.java b/src/main/java/mekanism/common/content/entangloporter/InventoryFrequency.java index e42c9ee61..e59a6ca92 100644 --- a/src/main/java/mekanism/common/content/entangloporter/InventoryFrequency.java +++ b/src/main/java/mekanism/common/content/entangloporter/InventoryFrequency.java @@ -3,12 +3,9 @@ package mekanism.common.content.entangloporter; import io.netty.buffer.ByteBuf; import java.util.ArrayList; -import java.util.HashMap; -import java.util.Map; import mekanism.api.gas.GasStack; import mekanism.api.gas.GasTank; -import mekanism.api.transmitters.TransmissionType; import mekanism.common.frequency.Frequency; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -26,8 +23,6 @@ public class InventoryFrequency extends Frequency public ItemStack storedItem; public double temperature; - public Map transmissions = new HashMap(); - public InventoryFrequency(String n, String o) { super(n, o); @@ -66,11 +61,6 @@ public class InventoryFrequency extends Frequency } nbtTags.setDouble("temperature", temperature); - - for(TransmissionType type : TransmissionType.values()) - { - nbtTags.setInteger("transmission" + type.ordinal(), transmissions.get(type).ordinal()); - } } @Override @@ -96,11 +86,6 @@ public class InventoryFrequency extends Frequency } temperature = nbtTags.getDouble("temperature"); - - for(TransmissionType type : TransmissionType.values()) - { - transmissions.put(type, TransferType.values()[nbtTags.getInteger("transmission" + type.ordinal())]); - } } @Override @@ -131,11 +116,6 @@ public class InventoryFrequency extends Frequency } data.add(temperature); - - for(TransmissionType type : TransmissionType.values()) - { - data.add(transmissions.get(type).ordinal()); - } } @Override @@ -162,11 +142,6 @@ public class InventoryFrequency extends Frequency } temperature = dataStream.readDouble(); - - for(TransmissionType type : TransmissionType.values()) - { - transmissions.put(type, TransferType.values()[dataStream.readInt()]); - } } public static enum TransferType diff --git a/src/main/java/mekanism/common/frequency/FrequencyManager.java b/src/main/java/mekanism/common/frequency/FrequencyManager.java index c0bcc29a4..de97292f6 100644 --- a/src/main/java/mekanism/common/frequency/FrequencyManager.java +++ b/src/main/java/mekanism/common/frequency/FrequencyManager.java @@ -28,17 +28,21 @@ public class FrequencyManager private String owner; + private String name; + private Class frequencyClass; - public FrequencyManager(Class c) + public FrequencyManager(Class c, String n) { frequencyClass = c; + name = n; + managers.add(this); } - public FrequencyManager(Class c, String s) + public FrequencyManager(Class c, String n, String s) { - this(c); + this(c, n); owner = s; } @@ -173,9 +177,9 @@ public class FrequencyManager } } - public static FrequencyManager loadOnly(World world, String owner, Class freqClass) + public static FrequencyManager loadOnly(World world, String owner, Class freqClass, String n) { - FrequencyManager manager = new FrequencyManager(freqClass); + FrequencyManager manager = new FrequencyManager(freqClass, n); String name = manager.getName(); FrequencyDataHandler handler = (FrequencyDataHandler)world.perWorldStorage.loadData(FrequencyDataHandler.class, name); @@ -295,7 +299,7 @@ public class FrequencyManager public String getName() { - return owner != null ? owner + "FrequencyHandler" : "FrequencyHandler"; + return owner != null ? (owner + "_" + name + "FrequencyHandler") : (name + "FrequencyHandler"); } public static void reset() diff --git a/src/main/java/mekanism/common/inventory/container/ContainerQuantumEntangloporter.java b/src/main/java/mekanism/common/inventory/container/ContainerQuantumEntangloporter.java new file mode 100644 index 000000000..e43016c93 --- /dev/null +++ b/src/main/java/mekanism/common/inventory/container/ContainerQuantumEntangloporter.java @@ -0,0 +1,102 @@ +package mekanism.common.inventory.container; + +import mekanism.common.tile.TileEntityQuantumEntangloporter; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.inventory.Container; +import net.minecraft.inventory.Slot; +import net.minecraft.item.ItemStack; + +public class ContainerQuantumEntangloporter extends Container +{ + private TileEntityQuantumEntangloporter tileEntity; + + public ContainerQuantumEntangloporter(InventoryPlayer inventory, TileEntityQuantumEntangloporter tentity) + { + tileEntity = tentity; + + int slotX; + + for(slotX = 0; slotX < 3; slotX++) + { + for(int slotY = 0; slotY < 9; slotY++) + { + addSlotToContainer(new Slot(inventory, slotY + slotX * 9 + 9, 8 + slotY * 18, 148 + slotX * 18)); + } + } + + for(slotX = 0; slotX < 9; slotX++) + { + addSlotToContainer(new Slot(inventory, slotX, 8 + slotX * 18, 206)); + } + + tileEntity.open(inventory.player); + tileEntity.openInventory(); + } + + @Override + public void onContainerClosed(EntityPlayer entityplayer) + { + super.onContainerClosed(entityplayer); + + tileEntity.close(entityplayer); + tileEntity.closeInventory(); + } + + @Override + public boolean canInteractWith(EntityPlayer entityplayer) + { + return tileEntity.isUseableByPlayer(entityplayer); + } + + @Override + public ItemStack transferStackInSlot(EntityPlayer player, int slotID) + { + ItemStack stack = null; + Slot currentSlot = (Slot)inventorySlots.get(slotID); + + if(currentSlot != null && currentSlot.getHasStack()) + { + ItemStack slotStack = currentSlot.getStack(); + stack = slotStack.copy(); + + if(slotID >= 0 && slotID <= 26) + { + if(!mergeItemStack(slotStack, 27, inventorySlots.size(), false)) + { + return null; + } + } + else if(slotID > 26) + { + if(!mergeItemStack(slotStack, 0, 26, false)) + { + return null; + } + } + else { + if(!mergeItemStack(slotStack, 0, inventorySlots.size(), true)) + { + return null; + } + } + + if(slotStack.stackSize == 0) + { + currentSlot.putStack((ItemStack)null); + } + else { + currentSlot.onSlotChanged(); + } + + if(slotStack.stackSize == stack.stackSize) + { + return null; + } + + currentSlot.onPickupFromSlot(player, slotStack); + } + + return stack; + } +} diff --git a/src/main/java/mekanism/common/tile/TileEntityQuantumEntangloporter.java b/src/main/java/mekanism/common/tile/TileEntityQuantumEntangloporter.java index b632ba822..bb4a40b1f 100644 --- a/src/main/java/mekanism/common/tile/TileEntityQuantumEntangloporter.java +++ b/src/main/java/mekanism/common/tile/TileEntityQuantumEntangloporter.java @@ -62,7 +62,7 @@ public class TileEntityQuantumEntangloporter extends TileEntityElectricBlock imp { super("QuantumEntangloporter", 0); - configComponent = new TileComponentConfig(this, TransmissionType.ITEM, TransmissionType.ENERGY); + configComponent = new TileComponentConfig(this, TransmissionType.ITEM, TransmissionType.FLUID, TransmissionType.GAS, TransmissionType.ENERGY, TransmissionType.HEAT); for(TransmissionType type : TransmissionType.values()) { @@ -190,7 +190,7 @@ public class TileEntityQuantumEntangloporter extends TileEntityElectricBlock imp } } - Frequency freq = new Frequency(name, owner).setPublic(publicFreq); + Frequency freq = new InventoryFrequency(name, owner).setPublic(publicFreq); freq.activeCoords.add(Coord4D.get(this)); manager.addFrequency(freq); frequency = (InventoryFrequency)freq; diff --git a/src/main/java/mekanism/common/tile/TileEntityTeleporter.java b/src/main/java/mekanism/common/tile/TileEntityTeleporter.java index 8b0155f9f..3e1138ef1 100644 --- a/src/main/java/mekanism/common/tile/TileEntityTeleporter.java +++ b/src/main/java/mekanism/common/tile/TileEntityTeleporter.java @@ -179,6 +179,7 @@ public class TileEntityTeleporter extends TileEntityElectricBlock implements ICo { frequency = freq; frequency.activeCoords.add(Coord4D.get(this)); + return; } } @@ -221,7 +222,7 @@ public class TileEntityTeleporter extends TileEntityElectricBlock implements ICo return Mekanism.privateTeleporters.get(owner); } - return FrequencyManager.loadOnly(world, owner, Frequency.class); + return FrequencyManager.loadOnly(world, owner, Frequency.class, "Teleporter"); } @Override diff --git a/src/main/resources/assets/mekanism/gui/GuiTeleporter.png b/src/main/resources/assets/mekanism/gui/GuiTeleporter.png index 3ddea9267e77f51dafda44981883028cf6da9a7b..1c32f08b0b3b7d1ee3cf18d0c8ca6d64e53c7df2 100644 GIT binary patch literal 5928 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 Date: Fri, 4 Mar 2016 21:58:13 -0500 Subject: [PATCH 29/52] Entangloporters work perfectly! --- src/main/java/mekanism/common/Tier.java | 2 +- .../entangloporter/InventoryFrequency.java | 17 ++- .../entangloporter/SharedInventory.java | 130 ------------------ .../SharedInventoryManager.java | 66 --------- .../common/item/ItemBlockEnergyCube.java | 2 +- .../common/tile/TileEntityEnergyCube.java | 2 +- .../tile/TileEntityQuantumEntangloporter.java | 111 ++++++++++----- .../tile/component/TileComponentEjector.java | 6 +- .../java/mekanism/common/util/PipeUtils.java | 2 +- 9 files changed, 97 insertions(+), 241 deletions(-) delete mode 100644 src/main/java/mekanism/common/content/entangloporter/SharedInventory.java delete mode 100644 src/main/java/mekanism/common/content/entangloporter/SharedInventoryManager.java diff --git a/src/main/java/mekanism/common/Tier.java b/src/main/java/mekanism/common/Tier.java index e697be2be..847e8b5d8 100644 --- a/src/main/java/mekanism/common/Tier.java +++ b/src/main/java/mekanism/common/Tier.java @@ -66,7 +66,7 @@ public final class Tier ADVANCED(8000000, 3200), ELITE(32000000, 12800), ULTIMATE(128000000, 51200), - CREATIVE(Integer.MAX_VALUE, Integer.MAX_VALUE); + CREATIVE(Double.MAX_VALUE, Double.MAX_VALUE); public double maxEnergy; private double baseMaxEnergy; diff --git a/src/main/java/mekanism/common/content/entangloporter/InventoryFrequency.java b/src/main/java/mekanism/common/content/entangloporter/InventoryFrequency.java index e59a6ca92..4a09b5344 100644 --- a/src/main/java/mekanism/common/content/entangloporter/InventoryFrequency.java +++ b/src/main/java/mekanism/common/content/entangloporter/InventoryFrequency.java @@ -18,14 +18,17 @@ public class InventoryFrequency extends Frequency public static final double MAX_ENERGY = 1000000; public double storedEnergy; - public FluidTank storedFluid = new FluidTank(1000); - public GasTank storedGas = new GasTank(1000); + public FluidTank storedFluid; + public GasTank storedGas; public ItemStack storedItem; public double temperature; public InventoryFrequency(String n, String o) { super(n, o); + + storedFluid = new FluidTank(1000); + storedGas = new GasTank(1000); } public InventoryFrequency(NBTTagCompound nbtTags) @@ -45,12 +48,12 @@ public class InventoryFrequency extends Frequency nbtTags.setDouble("storedEnergy", storedEnergy); - if(storedFluid != null) + if(storedFluid.getFluid() != null) { nbtTags.setTag("storedFluid", storedFluid.writeToNBT(new NBTTagCompound())); } - if(storedGas != null) + if(storedGas.getGas() != null) { nbtTags.setTag("storedGas", storedGas.write(new NBTTagCompound())); } @@ -68,6 +71,9 @@ public class InventoryFrequency extends Frequency { super.read(nbtTags); + storedFluid = new FluidTank(1000); + storedGas = new GasTank(1000); + storedEnergy = nbtTags.getDouble("storedEnergy"); if(nbtTags.hasKey("storedFluid")) @@ -123,6 +129,9 @@ public class InventoryFrequency extends Frequency { super.read(dataStream); + storedFluid = new FluidTank(1000); + storedGas = new GasTank(1000); + storedEnergy = dataStream.readDouble(); if(dataStream.readBoolean()) diff --git a/src/main/java/mekanism/common/content/entangloporter/SharedInventory.java b/src/main/java/mekanism/common/content/entangloporter/SharedInventory.java deleted file mode 100644 index 96a5a4fff..000000000 --- a/src/main/java/mekanism/common/content/entangloporter/SharedInventory.java +++ /dev/null @@ -1,130 +0,0 @@ -package mekanism.common.content.entangloporter; - -import mekanism.api.energy.IStrictEnergyStorage; -import mekanism.api.gas.Gas; -import mekanism.api.gas.GasStack; -import mekanism.api.gas.GasTank; -import mekanism.api.gas.IGasHandler; -import net.minecraft.item.ItemStack; -import net.minecraftforge.common.util.ForgeDirection; -import net.minecraftforge.fluids.Fluid; -import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.fluids.FluidTank; -import net.minecraftforge.fluids.FluidTankInfo; -import net.minecraftforge.fluids.IFluidHandler; - -public class SharedInventory implements IStrictEnergyStorage, IFluidHandler, IGasHandler -{ - public String name; - - public double storedEnergy; - public double MAX_ENERGY = 1000; - public FluidTank storedFluid; - public GasTank storedGas; - public ItemStack storedItem; - - public SharedInventory(String freq) - { - name = freq; - - storedEnergy = 0; - storedFluid = new FluidTank(1000); - storedGas = new GasTank(1000); - storedItem = null; - } - - @Override - public int fill(ForgeDirection from, FluidStack resource, boolean doFill) - { - return storedFluid.fill(resource, doFill); - } - - @Override - public FluidStack drain(ForgeDirection from, FluidStack resource, boolean doDrain) - { - if(resource.isFluidEqual(storedFluid.getFluid())) - { - return storedFluid.drain(resource.amount, doDrain); - } - - return null; - } - - @Override - public FluidStack drain(ForgeDirection from, int maxDrain, boolean doDrain) - { - return storedFluid.drain(maxDrain, doDrain); - } - - @Override - public boolean canFill(ForgeDirection from, Fluid fluid) - { - return storedFluid.getFluid() == null || fluid == storedFluid.getFluid().getFluid(); - } - - @Override - public boolean canDrain(ForgeDirection from, Fluid fluid) - { - return storedFluid.getFluid() == null || fluid == storedFluid.getFluid().getFluid(); - } - - @Override - public FluidTankInfo[] getTankInfo(ForgeDirection from) - { - return new FluidTankInfo[]{new FluidTankInfo(storedFluid)}; - } - - @Override - public int receiveGas(ForgeDirection side, GasStack stack, boolean doTransfer) - { - return storedGas.receive(stack, doTransfer); - } - - @Override - public int receiveGas(ForgeDirection side, GasStack stack) - { - return receiveGas(side, stack, true); - } - - @Override - public GasStack drawGas(ForgeDirection side, int amount, boolean doTransfer) - { - return storedGas.draw(amount, doTransfer); - } - - @Override - public GasStack drawGas(ForgeDirection side, int amount) - { - return drawGas(side, amount, true); - } - - @Override - public boolean canReceiveGas(ForgeDirection side, Gas type) - { - return storedGas.getGasType() == null || type == storedGas.getGasType(); - } - - @Override - public boolean canDrawGas(ForgeDirection side, Gas type) - { - return storedGas.getGasType() == null || type == storedGas.getGasType(); - } - - @Override - public double getEnergy() - { - return storedEnergy; - } - - @Override - public void setEnergy(double energy) - { - storedEnergy = Math.max(0, Math.min(energy, MAX_ENERGY)); - } - - @Override - public double getMaxEnergy() - { - return MAX_ENERGY; - } -} diff --git a/src/main/java/mekanism/common/content/entangloporter/SharedInventoryManager.java b/src/main/java/mekanism/common/content/entangloporter/SharedInventoryManager.java deleted file mode 100644 index 970713a3d..000000000 --- a/src/main/java/mekanism/common/content/entangloporter/SharedInventoryManager.java +++ /dev/null @@ -1,66 +0,0 @@ -package mekanism.common.content.entangloporter; - -import java.util.Arrays; -import java.util.HashMap; -import java.util.Iterator; - -import mekanism.api.gas.GasRegistry; -import mekanism.api.gas.GasStack; -import net.minecraftforge.fluids.FluidRegistry; -import net.minecraftforge.fluids.FluidStack; - -public class SharedInventoryManager -{ - public static HashMap inventories = new HashMap(); - - public static SharedInventory getInventory(String frequency) - { - if(frequency.length() <= 0) - { - return null; - } - - SharedInventory inv = inventories.get(frequency); - - if(inv == null) - { - inv = new SharedInventory(frequency); - - inventories.put(frequency, inv); - } - - if(frequency.startsWith("creative.")) - { - Iterator creativeFreqs = Arrays.asList(frequency.substring(9).split("\\.")).iterator(); - while(creativeFreqs.hasNext()) - { - String type = creativeFreqs.next(); - if(type.equals("energy")) - { - inv.MAX_ENERGY = Integer.MAX_VALUE; - inv.setEnergy(Integer.MAX_VALUE); - } - else if(type.equals("fluid") && creativeFreqs.hasNext()) - { - String fluidType = creativeFreqs.next(); - if(FluidRegistry.isFluidRegistered(fluidType)) - { - inv.storedFluid.setCapacity(Integer.MAX_VALUE); - inv.storedFluid.setFluid(new FluidStack(FluidRegistry.getFluid(fluidType), Integer.MAX_VALUE)); - } - } - else if(type.equals("gas") && creativeFreqs.hasNext()) - { - String gasType = creativeFreqs.next(); - if(GasRegistry.containsGas(gasType)) - { - inv.storedGas.setMaxGas(Integer.MAX_VALUE); - inv.storedGas.setGas(new GasStack(GasRegistry.getGas(gasType), Integer.MAX_VALUE)); - } - } - } - } - - return inv; - } -} diff --git a/src/main/java/mekanism/common/item/ItemBlockEnergyCube.java b/src/main/java/mekanism/common/item/ItemBlockEnergyCube.java index b0712eaa2..60bd7bd67 100644 --- a/src/main/java/mekanism/common/item/ItemBlockEnergyCube.java +++ b/src/main/java/mekanism/common/item/ItemBlockEnergyCube.java @@ -214,7 +214,7 @@ public class ItemBlockEnergyCube extends ItemBlock implements IEnergizedItem, IE @Override public void setEnergy(ItemStack itemStack, double amount) { - if(getEnergyCubeTier(itemStack) == EnergyCubeTier.CREATIVE && amount != Integer.MAX_VALUE) + if(getEnergyCubeTier(itemStack) == EnergyCubeTier.CREATIVE && amount != Double.MAX_VALUE) { return; } diff --git a/src/main/java/mekanism/common/tile/TileEntityEnergyCube.java b/src/main/java/mekanism/common/tile/TileEntityEnergyCube.java index db9bac845..8d74a87ec 100644 --- a/src/main/java/mekanism/common/tile/TileEntityEnergyCube.java +++ b/src/main/java/mekanism/common/tile/TileEntityEnergyCube.java @@ -238,7 +238,7 @@ public class TileEntityEnergyCube extends TileEntityElectricBlock implements ICo @Override public void setEnergy(double energy) { - if(tier == EnergyCubeTier.CREATIVE && energy != Integer.MAX_VALUE) + if(tier == EnergyCubeTier.CREATIVE && energy != Double.MAX_VALUE) { return; } diff --git a/src/main/java/mekanism/common/tile/TileEntityQuantumEntangloporter.java b/src/main/java/mekanism/common/tile/TileEntityQuantumEntangloporter.java index bb4a40b1f..ec89e9207 100644 --- a/src/main/java/mekanism/common/tile/TileEntityQuantumEntangloporter.java +++ b/src/main/java/mekanism/common/tile/TileEntityQuantumEntangloporter.java @@ -7,7 +7,6 @@ import java.util.EnumSet; import java.util.List; import mekanism.api.Coord4D; -import mekanism.api.EnumColor; import mekanism.api.IHeatTransfer; import mekanism.api.gas.Gas; import mekanism.api.gas.GasStack; @@ -15,7 +14,6 @@ import mekanism.api.gas.IGasHandler; import mekanism.api.transmitters.TransmissionType; import mekanism.common.Mekanism; import mekanism.common.PacketHandler; -import mekanism.common.SideData; import mekanism.common.SideData.IOState; import mekanism.common.base.IEjector; import mekanism.common.base.ISideConfiguration; @@ -28,6 +26,7 @@ import mekanism.common.tile.component.TileComponentConfig; import mekanism.common.tile.component.TileComponentEjector; import mekanism.common.util.CableUtils; import mekanism.common.util.HeatUtils; +import mekanism.common.util.InventoryUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.PipeUtils; import net.minecraft.item.ItemStack; @@ -77,10 +76,14 @@ public class TileEntityQuantumEntangloporter extends TileEntityElectricBlock imp inventory = new ItemStack[0]; + configComponent.getOutputs(TransmissionType.ITEM).get(2).availableSlots = new int[] {0}; + configComponent.getOutputs(TransmissionType.FLUID).get(2).availableSlots = new int[] {0}; + configComponent.getOutputs(TransmissionType.GAS).get(2).availableSlots = new int[] {1}; + ejectorComponent = new TileComponentEjector(this); - ejectorComponent.setOutputData(TransmissionType.ITEM, new SideData("dummy", EnumColor.GREY, new int[] {0})); - ejectorComponent.setOutputData(TransmissionType.FLUID, new SideData("dummy", EnumColor.GREY, new int[] {0})); - ejectorComponent.setOutputData(TransmissionType.GAS, new SideData("dummy", EnumColor.GREY, new int[] {1})); + ejectorComponent.setOutputData(TransmissionType.ITEM, configComponent.getOutputs(TransmissionType.ITEM).get(2)); + ejectorComponent.setOutputData(TransmissionType.FLUID, configComponent.getOutputs(TransmissionType.FLUID).get(2)); + ejectorComponent.setOutputData(TransmissionType.GAS, configComponent.getOutputs(TransmissionType.GAS).get(2)); } @Override @@ -102,25 +105,42 @@ public class TileEntityQuantumEntangloporter extends TileEntityElectricBlock imp lastEnvironmentLoss = loss[1]; FrequencyManager manager = getManager(frequency); + Frequency lastFreq = frequency; if(manager != null) { if(frequency != null && !frequency.valid) { frequency = (InventoryFrequency)manager.validateFrequency(owner, Coord4D.get(this), frequency); + markDirty(); } if(frequency != null) { frequency = (InventoryFrequency)manager.update(owner, Coord4D.get(this), frequency); + + if(frequency == null) + { + markDirty(); + } } } else { frequency = null; + + if(lastFreq != null) + { + markDirty(); + } } } } + private boolean hasFrequency() + { + return frequency != null && frequency.valid; + } + @Override public void invalidate() { @@ -176,7 +196,7 @@ public class TileEntityQuantumEntangloporter extends TileEntityElectricBlock imp return; } - FrequencyManager manager = getManager(new Frequency(name, null).setPublic(publicFreq)); + FrequencyManager manager = getManager(new InventoryFrequency(name, null).setPublic(publicFreq)); manager.deactivate(Coord4D.get(this)); for(Frequency freq : manager.getFrequencies()) @@ -253,7 +273,7 @@ public class TileEntityQuantumEntangloporter extends TileEntityElectricBlock imp String freq = PacketHandler.readString(dataStream); boolean isPublic = dataStream.readBoolean(); - FrequencyManager manager = getManager(new Frequency(freq, null).setPublic(isPublic)); + FrequencyManager manager = getManager(new InventoryFrequency(freq, null).setPublic(isPublic)); if(manager != null) { @@ -292,14 +312,14 @@ public class TileEntityQuantumEntangloporter extends TileEntityElectricBlock imp for(int i = 0; i < amount; i++) { - publicCache.add(new Frequency(dataStream)); + publicCache.add(new InventoryFrequency(dataStream)); } amount = dataStream.readInt(); for(int i = 0; i < amount; i++) { - privateCache.add(new Frequency(dataStream)); + privateCache.add(new InventoryFrequency(dataStream)); } } @@ -336,7 +356,7 @@ public class TileEntityQuantumEntangloporter extends TileEntityElectricBlock imp freq.write(data); } - FrequencyManager manager = getManager(new Frequency(null, null).setPublic(false)); + FrequencyManager manager = getManager(new InventoryFrequency(null, null).setPublic(false)); if(manager != null) { @@ -357,31 +377,31 @@ public class TileEntityQuantumEntangloporter extends TileEntityElectricBlock imp @Override public EnumSet getOutputtingSides() { - return frequency == null ? nothing : configComponent.getSidesForData(TransmissionType.ENERGY, facing, 2); + return !hasFrequency() ? nothing : configComponent.getSidesForData(TransmissionType.ENERGY, facing, 2); } @Override public EnumSet getConsumingSides() { - return frequency == null ? nothing : configComponent.getSidesForData(TransmissionType.ENERGY, facing, 1); + return !hasFrequency() ? nothing : configComponent.getSidesForData(TransmissionType.ENERGY, facing, 1); } @Override public double getMaxOutput() { - return frequency == null ? 0 : InventoryFrequency.MAX_ENERGY; + return !hasFrequency() ? 0 : InventoryFrequency.MAX_ENERGY; } @Override public double getEnergy() { - return frequency == null ? 0 : frequency.storedEnergy; + return !hasFrequency() ? 0 : frequency.storedEnergy; } @Override public void setEnergy(double energy) { - if(frequency != null) + if(hasFrequency()) { frequency.storedEnergy = Math.min(InventoryFrequency.MAX_ENERGY, energy); } @@ -390,19 +410,19 @@ public class TileEntityQuantumEntangloporter extends TileEntityElectricBlock imp @Override public double getMaxEnergy() { - return frequency == null ? 0 : frequency.MAX_ENERGY; + return !hasFrequency() ? 0 : frequency.MAX_ENERGY; } @Override public int fill(ForgeDirection from, FluidStack resource, boolean doFill) { - return frequency == null ? 0 : frequency.storedFluid.fill(resource, doFill); + return !hasFrequency() ? 0 : frequency.storedFluid.fill(resource, doFill); } @Override public FluidStack drain(ForgeDirection from, FluidStack resource, boolean doDrain) { - if(frequency != null && resource.isFluidEqual(frequency.storedFluid.getFluid())) + if(hasFrequency() && resource.isFluidEqual(frequency.storedFluid.getFluid())) { return frequency.storedFluid.drain(resource.amount, doDrain); } @@ -413,7 +433,7 @@ public class TileEntityQuantumEntangloporter extends TileEntityElectricBlock imp @Override public FluidStack drain(ForgeDirection from, int maxDrain, boolean doDrain) { - if(frequency != null) + if(hasFrequency()) { return frequency.storedFluid.drain(maxDrain, doDrain); } @@ -424,7 +444,7 @@ public class TileEntityQuantumEntangloporter extends TileEntityElectricBlock imp @Override public boolean canFill(ForgeDirection from, Fluid fluid) { - if(frequency != null && configComponent.getOutput(TransmissionType.FLUID, from.ordinal(), facing).ioState == IOState.INPUT) + if(hasFrequency() && configComponent.getOutput(TransmissionType.FLUID, from.ordinal(), facing).ioState == IOState.INPUT) { return frequency.storedFluid.getFluid() == null || fluid == frequency.storedFluid.getFluid().getFluid(); } @@ -435,7 +455,7 @@ public class TileEntityQuantumEntangloporter extends TileEntityElectricBlock imp @Override public boolean canDrain(ForgeDirection from, Fluid fluid) { - if(frequency != null && configComponent.getOutput(TransmissionType.FLUID, from.ordinal(), facing).ioState == IOState.OUTPUT) + if(hasFrequency() && configComponent.getOutput(TransmissionType.FLUID, from.ordinal(), facing).ioState == IOState.OUTPUT) { return frequency.storedFluid.getFluid() == null || fluid == frequency.storedFluid.getFluid().getFluid(); } @@ -446,7 +466,7 @@ public class TileEntityQuantumEntangloporter extends TileEntityElectricBlock imp @Override public FluidTankInfo[] getTankInfo(ForgeDirection from) { - if(frequency != null) + if(hasFrequency()) { if(configComponent.getOutput(TransmissionType.FLUID, from.ordinal(), facing).ioState != IOState.OFF) { @@ -460,7 +480,7 @@ public class TileEntityQuantumEntangloporter extends TileEntityElectricBlock imp @Override public int receiveGas(ForgeDirection side, GasStack stack, boolean doTransfer) { - return frequency == null ? 0 : frequency.storedGas.receive(stack, doTransfer); + return !hasFrequency() ? 0 : frequency.storedGas.receive(stack, doTransfer); } @Override @@ -472,7 +492,7 @@ public class TileEntityQuantumEntangloporter extends TileEntityElectricBlock imp @Override public GasStack drawGas(ForgeDirection side, int amount, boolean doTransfer) { - return frequency == null ? null : frequency.storedGas.draw(amount, doTransfer); + return !hasFrequency() ? null : frequency.storedGas.draw(amount, doTransfer); } @Override @@ -484,7 +504,7 @@ public class TileEntityQuantumEntangloporter extends TileEntityElectricBlock imp @Override public boolean canReceiveGas(ForgeDirection side, Gas type) { - if(frequency != null && configComponent.getOutput(TransmissionType.GAS, side.ordinal(), facing).ioState == IOState.INPUT) + if(hasFrequency() && configComponent.getOutput(TransmissionType.GAS, side.ordinal(), facing).ioState == IOState.INPUT) { return frequency.storedGas.getGasType() == null || type == frequency.storedGas.getGasType(); } @@ -495,7 +515,7 @@ public class TileEntityQuantumEntangloporter extends TileEntityElectricBlock imp @Override public boolean canDrawGas(ForgeDirection side, Gas type) { - if(frequency != null && configComponent.getOutput(TransmissionType.GAS, side.ordinal(), facing).ioState == IOState.OUTPUT) + if(hasFrequency() && configComponent.getOutput(TransmissionType.GAS, side.ordinal(), facing).ioState == IOState.OUTPUT) { return frequency.storedGas.getGasType() == null || type == frequency.storedGas.getGasType(); } @@ -518,13 +538,13 @@ public class TileEntityQuantumEntangloporter extends TileEntityElectricBlock imp @Override public ItemStack getStackInSlot(int slotID) { - return frequency != null && slotID == 0 ? frequency.storedItem : null; + return hasFrequency() && slotID == 0 ? frequency.storedItem : null; } @Override public void setInventorySlotContents(int slotID, ItemStack itemstack) { - if(frequency != null && slotID == 0) + if(hasFrequency() && slotID == 0) { frequency.storedItem = itemstack; @@ -538,7 +558,7 @@ public class TileEntityQuantumEntangloporter extends TileEntityElectricBlock imp @Override public double getTemp() { - return frequency != null ? frequency.temperature : 0; + return hasFrequency() ? frequency.temperature : 0; } @Override @@ -568,20 +588,20 @@ public class TileEntityQuantumEntangloporter extends TileEntityElectricBlock imp @Override public double applyTemperatureChange() { - if(frequency != null) + if(hasFrequency()) { frequency.temperature += heatToAbsorb; } heatToAbsorb = 0; - return frequency != null ? frequency.temperature : 0; + return hasFrequency() ? frequency.temperature : 0; } @Override public boolean canConnectHeat(ForgeDirection side) { - return frequency != null && configComponent.getOutput(TransmissionType.HEAT, side.ordinal(), facing).ioState != IOState.OFF; + return hasFrequency() && configComponent.getOutput(TransmissionType.HEAT, side.ordinal(), facing).ioState != IOState.OFF; } @Override @@ -589,7 +609,7 @@ public class TileEntityQuantumEntangloporter extends TileEntityElectricBlock imp { TileEntity adj = Coord4D.get(this).getFromSide(side).getTileEntity(worldObj); - if(configComponent.getOutput(TransmissionType.HEAT, side.ordinal(), facing).ioState == IOState.INPUT) + if(hasFrequency() && configComponent.getOutput(TransmissionType.HEAT, side.ordinal(), facing).ioState == IOState.INPUT) { if(adj instanceof IHeatTransfer) { @@ -599,11 +619,34 @@ public class TileEntityQuantumEntangloporter extends TileEntityElectricBlock imp return null; } + + @Override + public boolean canInsertItem(int slotID, ItemStack itemstack, int side) + { + return hasFrequency() && configComponent.getOutput(TransmissionType.ITEM, side, facing).ioState == IOState.INPUT; + } + + @Override + public int[] getAccessibleSlotsFromSide(int side) + { + if(hasFrequency() && configComponent.getOutput(TransmissionType.ITEM, side, facing).ioState != IOState.OFF) + { + return new int[] {0}; + } + + return InventoryUtils.EMPTY; + } + + @Override + public boolean canExtractItem(int slotID, ItemStack itemstack, int side) + { + return hasFrequency() && configComponent.getOutput(TransmissionType.ITEM, side, facing).ioState == IOState.OUTPUT; + } @Override public Object[] getTanks() { - if(frequency == null) + if(!hasFrequency()) { return null; } diff --git a/src/main/java/mekanism/common/tile/component/TileComponentEjector.java b/src/main/java/mekanism/common/tile/component/TileComponentEjector.java index d4feaea49..5b9ec713d 100644 --- a/src/main/java/mekanism/common/tile/component/TileComponentEjector.java +++ b/src/main/java/mekanism/common/tile/component/TileComponentEjector.java @@ -179,12 +179,12 @@ public class TileComponentEjector implements ITileComponent, IEjector { int slotID = sideData.get(TransmissionType.ITEM).availableSlots[index]; - if(tileEntity.inventory[slotID] == null) + if(tileEntity.getStackInSlot(slotID) == null) { continue; } - ItemStack stack = tileEntity.inventory[slotID]; + ItemStack stack = tileEntity.getStackInSlot(slotID); List outputs = getTrackedOutputs(TransmissionType.ITEM, index, outputSides); for(ForgeDirection side : outputs) @@ -217,7 +217,7 @@ public class TileComponentEjector implements ITileComponent, IEjector } } - tileEntity.inventory[slotID] = stack; + tileEntity.setInventorySlotContents(slotID, stack); tileEntity.markDirty(); } diff --git a/src/main/java/mekanism/common/util/PipeUtils.java b/src/main/java/mekanism/common/util/PipeUtils.java index 8e83c2883..5f241fab8 100644 --- a/src/main/java/mekanism/common/util/PipeUtils.java +++ b/src/main/java/mekanism/common/util/PipeUtils.java @@ -57,7 +57,7 @@ public final class PipeUtils { TileEntity acceptor = Coord4D.get(tileEntity).getFromSide(orientation).getTileEntity(tileEntity.getWorldObj()); - if(acceptor instanceof IFluidHandler && !(acceptor instanceof ITransmitterTile)) + if(acceptor instanceof IFluidHandler) { acceptors[orientation.ordinal()] = (IFluidHandler)acceptor; } From 866c76bafec4687928931156576d4db03d068512 Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Sat, 5 Mar 2016 13:17:58 -0500 Subject: [PATCH 30/52] Redesigned Filter Cards to serve as Configuration Cards, fixed inventory interaction bug, fixed Creative Energy Cube bug, added new recipes --- .../java/mekanism/api/IConfigCardAccess.java | 34 ++++ src/main/java/mekanism/api/IFilterAccess.java | 31 --- .../java/mekanism/api/util/StackUtils.java | 1 + .../client/gui/element/GuiEnergyGauge.java | 5 + .../client/render/RenderTickHandler.java | 37 ++++ src/main/java/mekanism/common/Mekanism.java | 5 +- .../java/mekanism/common/MekanismItems.java | 6 +- src/main/java/mekanism/common/Tier.java | 21 +- .../common/base/IAdvancedBoundingBlock.java | 4 +- .../java/mekanism/common/base/IEjector.java | 21 -- .../common/base/ISideConfiguration.java | 3 +- .../transporter/TransporterManager.java | 114 ++++++++--- .../common/item/ItemBlockEnergyCube.java | 12 +- .../common/item/ItemConfigurationCard.java | 184 ++++++++++++++++++ .../mekanism/common/item/ItemFilterCard.java | 119 ----------- .../tile/TileEntityAdvancedBoundingBlock.java | 12 +- .../common/tile/TileEntityBasicMachine.java | 6 +- .../tile/TileEntityChemicalCrystallizer.java | 6 +- .../common/tile/TileEntityDigitalMiner.java | 8 +- .../common/tile/TileEntityEnergyCube.java | 3 +- .../common/tile/TileEntityFactory.java | 26 ++- .../common/tile/TileEntityGasTank.java | 3 +- .../tile/TileEntityLogisticalSorter.java | 14 +- .../tile/TileEntityMetallurgicInfuser.java | 6 +- .../tile/TileEntityOredictionificator.java | 14 +- .../tile/TileEntityQuantumEntangloporter.java | 43 +++- .../common/tile/TileEntityTeleporter.java | 2 +- .../tile/component/TileComponentEjector.java | 10 +- .../mekanism/common/util/InventoryUtils.java | 120 +++++++++--- .../mekanism/common/util/MekanismUtils.java | 2 +- .../resources/assets/mekanism/lang/en_US.lang | 11 +- .../{FilterCard.png => ConfigurationCard.png} | Bin 32 files changed, 577 insertions(+), 306 deletions(-) create mode 100644 src/main/java/mekanism/api/IConfigCardAccess.java delete mode 100644 src/main/java/mekanism/api/IFilterAccess.java delete mode 100644 src/main/java/mekanism/common/base/IEjector.java create mode 100644 src/main/java/mekanism/common/item/ItemConfigurationCard.java delete mode 100644 src/main/java/mekanism/common/item/ItemFilterCard.java rename src/main/resources/assets/mekanism/textures/items/{FilterCard.png => ConfigurationCard.png} (100%) diff --git a/src/main/java/mekanism/api/IConfigCardAccess.java b/src/main/java/mekanism/api/IConfigCardAccess.java new file mode 100644 index 000000000..881d8a035 --- /dev/null +++ b/src/main/java/mekanism/api/IConfigCardAccess.java @@ -0,0 +1,34 @@ +package mekanism.api; + +import net.minecraft.nbt.NBTTagCompound; + +/** + * Implement this in your TileEntity class if you wish for Mekanism filters to be able to store any of their + * information. + * @author aidancbrady + * + */ +public interface IConfigCardAccess +{ + public static interface ISpecialConfigData extends IConfigCardAccess + { + /** + * Collects the TileEntity's filter card data into the parameterized NBTTagCompound. + * @param nbtTags - the NBTTagCompound of the filter card ItemStack + * @return the NBTTagCompound that now contains the TileEntity's filter card data + */ + public NBTTagCompound getConfigurationData(NBTTagCompound nbtTags); + + /** + * Retrieves the TileEntity's data contained in the filter card based on the given NBTTagCompopund. + * @param nbtTags - the NBTTagCompound of the filter card ItemStack + */ + public void setConfigurationData(NBTTagCompound nbtTags); + + /** + * A String name of this TileEntity that will be displayed as the type of data on the filter card. + * @return the String name of this TileEntity + */ + public String getDataType(); + } +} diff --git a/src/main/java/mekanism/api/IFilterAccess.java b/src/main/java/mekanism/api/IFilterAccess.java deleted file mode 100644 index abdcf29a8..000000000 --- a/src/main/java/mekanism/api/IFilterAccess.java +++ /dev/null @@ -1,31 +0,0 @@ -package mekanism.api; - -import net.minecraft.nbt.NBTTagCompound; - -/** - * Implement this in your TileEntity class if you wish for Mekanism filters to be able to store any of their - * information. - * @author aidancbrady - * - */ -public interface IFilterAccess -{ - /** - * Collects the TileEntity's filter card data into the parameterized NBTTagCompound. - * @param nbtTags - the NBTTagCompound of the filter card ItemStack - * @return the NBTTagCompound that now contains the TileEntity's filter card data - */ - public NBTTagCompound getFilterData(NBTTagCompound nbtTags); - - /** - * Retrieves the TileEntity's data contained in the filter card based on the given NBTTagCompopund. - * @param nbtTags - the NBTTagCompound of the filter card ItemStack - */ - public void setFilterData(NBTTagCompound nbtTags); - - /** - * A String name of this TileEntity that will be displayed as the type of data on the filter card. - * @return the String name of this TileEntity - */ - public String getDataType(); -} diff --git a/src/main/java/mekanism/api/util/StackUtils.java b/src/main/java/mekanism/api/util/StackUtils.java index 567caeb20..4b2b61fbd 100644 --- a/src/main/java/mekanism/api/util/StackUtils.java +++ b/src/main/java/mekanism/api/util/StackUtils.java @@ -139,6 +139,7 @@ public final class StackUtils ItemStack ret = stack.copy(); ret.stackSize = size; + return ret; } diff --git a/src/main/java/mekanism/client/gui/element/GuiEnergyGauge.java b/src/main/java/mekanism/client/gui/element/GuiEnergyGauge.java index d46f497d5..53a388f3d 100644 --- a/src/main/java/mekanism/client/gui/element/GuiEnergyGauge.java +++ b/src/main/java/mekanism/client/gui/element/GuiEnergyGauge.java @@ -36,6 +36,11 @@ public class GuiEnergyGauge extends GuiGauge @Override public int getScaledLevel() { + if(infoHandler.getEnergyStorage().getEnergy() == Double.MAX_VALUE) + { + return height-2; + } + return (int)(infoHandler.getEnergyStorage().getEnergy()*(height-2) / infoHandler.getEnergyStorage().getMaxEnergy()); } diff --git a/src/main/java/mekanism/client/render/RenderTickHandler.java b/src/main/java/mekanism/client/render/RenderTickHandler.java index 6c467d7ee..ebb950d4c 100644 --- a/src/main/java/mekanism/client/render/RenderTickHandler.java +++ b/src/main/java/mekanism/client/render/RenderTickHandler.java @@ -17,6 +17,7 @@ import mekanism.common.util.MekanismUtils; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.gui.ScaledResolution; +import net.minecraft.client.particle.EntityBubbleFX; import net.minecraft.client.particle.EntityFX; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -165,6 +166,38 @@ public class RenderTickHandler } } + synchronized(Mekanism.gasmaskOn) + { + if(world.getWorldTime() % 4 == 0) + { + for(String s : Mekanism.gasmaskOn) + { + EntityPlayer p = mc.theWorld.getPlayerEntityByName(s); + + if(p == null || !p.isInWater()) + { + continue; + } + + Pos3D playerPos = new Pos3D(p); + + if(p != mc.thePlayer) + { + playerPos.translate(0, 1.7, 0); + } + + float xRand = (rand.nextFloat() - 0.5F) * 0.08F; + float yRand = (rand.nextFloat() - 0.5F) * 0.05F; + + Pos3D vec = new Pos3D(0, 0, 0.4).rotate(p.rotationYawHead, p.rotationPitch); + Pos3D motion = vec.clone().scale(0.2).translate(new Pos3D(p.motionX, p.motionY, p.motionZ)); + + Pos3D v = playerPos.clone().translate(vec); + spawnAndSetParticle("bubble", world, v.xPos, v.yPos, v.zPos, motion.xPos, motion.yPos, motion.zPos); + } + } + } + if(world.getWorldTime() % 4 == 0) { for(EntityPlayer p : (List)world.playerEntities) @@ -230,6 +263,10 @@ public class RenderTickHandler { fx = new EntityJetpackSmokeFX(world, x, y, z, velX, velY, velZ); } + else if(s.equals("bubble")) + { + fx = new EntityBubbleFX(world, x, y, z, velX, velY, velZ); + } mc.effectRenderer.addEffect(fx); } diff --git a/src/main/java/mekanism/common/Mekanism.java b/src/main/java/mekanism/common/Mekanism.java index c8445f29c..b2256dbe5 100644 --- a/src/main/java/mekanism/common/Mekanism.java +++ b/src/main/java/mekanism/common/Mekanism.java @@ -445,7 +445,7 @@ public class Mekanism CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(MekanismItems.ArmoredJetpack.getEmptyItem(), new Object[] { "D D", "BSB", " J ", Character.valueOf('D'), "dustDiamond", Character.valueOf('B'), "ingotBronze", Character.valueOf('S'), "blockSteel", Character.valueOf('J'), MekanismItems.Jetpack.getEmptyItem() })); - CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismItems.FilterCard), new Object[] { + CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismItems.ConfigurationCard), new Object[] { " A ", "ACA", " A ", Character.valueOf('A'), MekanismItems.EnrichedAlloy, Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.BASIC) })); CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(MekanismItems.SeismicReader.getUnchargedItem(), new Object[] { @@ -515,6 +515,9 @@ public class Mekanism MachineType.RESISTIVE_HEATER.addRecipe(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.MachineBlock3, 1, 4), new Object[] { "CRC", "RHR", "CEC", Character.valueOf('C'), "ingotTin", Character.valueOf('R'), "dustRedstone", Character.valueOf('H'), new ItemStack(MekanismBlocks.BasicBlock2, 1, 5), Character.valueOf('E'), MekanismItems.EnergyTablet.getUnchargedItem() }));; + MachineType.QUANTUM_ENTANGLOPORTER.addRecipe(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.MachineBlock3, 1, 0), new Object[] { + "OCO", "ATA", "OCO", Character.valueOf('O'), "ingotRefinedObsidian", Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.ULTIMATE), Character.valueOf('A'), "alloyUltimate", Character.valueOf('T'), MekanismItems.TeleportationCore + })); //Energy Cube recipes CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(MekanismUtils.getEnergyCube(EnergyCubeTier.BASIC), new Object[] { diff --git a/src/main/java/mekanism/common/MekanismItems.java b/src/main/java/mekanism/common/MekanismItems.java index 920f522c4..8abd9d5c9 100644 --- a/src/main/java/mekanism/common/MekanismItems.java +++ b/src/main/java/mekanism/common/MekanismItems.java @@ -13,7 +13,7 @@ import mekanism.common.item.ItemDust; import mekanism.common.item.ItemElectricBow; import mekanism.common.item.ItemEnergized; import mekanism.common.item.ItemFactoryInstaller; -import mekanism.common.item.ItemFilterCard; +import mekanism.common.item.ItemConfigurationCard; import mekanism.common.item.ItemFlamethrower; import mekanism.common.item.ItemFreeRunners; import mekanism.common.item.ItemGasMask; @@ -81,7 +81,7 @@ public class MekanismItems public static final ItemSeismicReader SeismicReader = (ItemSeismicReader)new ItemSeismicReader().setUnlocalizedName("SeismicReader"); public static final Item Dictionary = new ItemDictionary().setUnlocalizedName("Dictionary"); public static final ItemGaugeDropper GaugeDropper = (ItemGaugeDropper)new ItemGaugeDropper().setUnlocalizedName("GaugeDropper"); - public static final Item FilterCard = new ItemFilterCard().setUnlocalizedName("FilterCard"); + public static final Item ConfigurationCard = new ItemConfigurationCard().setUnlocalizedName("ConfigurationCard"); public static final Item PartTransmitter = new ItemPartTransmitter().setUnlocalizedName("MultipartTransmitter"); public static final Item GlowPanel = new ItemGlowPanel().setUnlocalizedName("GlowPanel"); public static final ItemScubaTank ScubaTank = (ItemScubaTank)new ItemScubaTank().setUnlocalizedName("ScubaTank"); @@ -152,7 +152,7 @@ public class MekanismItems GameRegistry.registerItem(Crystal, "Crystal"); GameRegistry.registerItem(FreeRunners, "FreeRunners"); GameRegistry.registerItem(ArmoredJetpack, "ArmoredJetpack"); - GameRegistry.registerItem(FilterCard, "FilterCard"); + GameRegistry.registerItem(ConfigurationCard, "ConfigurationCard"); GameRegistry.registerItem(SeismicReader, "SeismicReader"); GameRegistry.registerItem(Substrate, "Substrate"); GameRegistry.registerItem(Polyethene, "Polyethene"); diff --git a/src/main/java/mekanism/common/Tier.java b/src/main/java/mekanism/common/Tier.java index 847e8b5d8..c3a3fd104 100644 --- a/src/main/java/mekanism/common/Tier.java +++ b/src/main/java/mekanism/common/Tier.java @@ -89,20 +89,29 @@ public final class Tier protected void loadConfig() { - maxEnergy = Mekanism.configuration.get("tier", getBaseTier().getName() + "EnergyCubeMaxEnergy", baseMaxEnergy).getDouble(); - output = Mekanism.configuration.get("tier", getBaseTier().getName() + "EnergyCubeOutput", baseOutput).getDouble(); + if(this != CREATIVE) + { + maxEnergy = Mekanism.configuration.get("tier", getBaseTier().getName() + "EnergyCubeMaxEnergy", baseMaxEnergy).getDouble(); + output = Mekanism.configuration.get("tier", getBaseTier().getName() + "EnergyCubeOutput", baseOutput).getDouble(); + } } protected void readConfig(ByteBuf dataStream) { - maxEnergy = dataStream.readDouble(); - output = dataStream.readDouble(); + if(this != CREATIVE) + { + maxEnergy = dataStream.readDouble(); + output = dataStream.readDouble(); + } } protected void writeConfig(ByteBuf dataStream) { - dataStream.writeDouble(maxEnergy); - dataStream.writeDouble(output); + if(this != CREATIVE) + { + dataStream.writeDouble(maxEnergy); + dataStream.writeDouble(output); + } } public BaseTier getBaseTier() diff --git a/src/main/java/mekanism/common/base/IAdvancedBoundingBlock.java b/src/main/java/mekanism/common/base/IAdvancedBoundingBlock.java index 87498523b..7a53f2d31 100644 --- a/src/main/java/mekanism/common/base/IAdvancedBoundingBlock.java +++ b/src/main/java/mekanism/common/base/IAdvancedBoundingBlock.java @@ -2,7 +2,7 @@ package mekanism.common.base; import ic2.api.energy.tile.IEnergySink; import mekanism.api.Coord4D; -import mekanism.api.IFilterAccess; +import mekanism.api.IConfigCardAccess.ISpecialConfigData; import mekanism.api.energy.IStrictEnergyAcceptor; import mekanism.api.energy.IStrictEnergyStorage; import mekanism.common.integration.IComputerIntegration; @@ -16,7 +16,7 @@ import cpw.mods.fml.common.Optional.InterfaceList; @Interface(iface = "ic2.api.energy.tile.IEnergySink", modid = "IC2"), @Interface(iface = "cofh.api.energy.IEnergyHandler", modid = "CoFHCore") }) -public interface IAdvancedBoundingBlock extends IBoundingBlock, ISidedInventory, IEnergySink, IStrictEnergyAcceptor, IStrictEnergyStorage, IEnergyHandler, IComputerIntegration, IFilterAccess +public interface IAdvancedBoundingBlock extends IBoundingBlock, ISidedInventory, IEnergySink, IStrictEnergyAcceptor, IStrictEnergyStorage, IEnergyHandler, IComputerIntegration, ISpecialConfigData { public int[] getBoundSlots(Coord4D location, int side); diff --git a/src/main/java/mekanism/common/base/IEjector.java b/src/main/java/mekanism/common/base/IEjector.java deleted file mode 100644 index 2509b6eb9..000000000 --- a/src/main/java/mekanism/common/base/IEjector.java +++ /dev/null @@ -1,21 +0,0 @@ -package mekanism.common.base; - -import mekanism.api.EnumColor; -import net.minecraftforge.common.util.ForgeDirection; - -public interface IEjector -{ - public void outputItems(); - - public EnumColor getOutputColor(); - - public void setOutputColor(EnumColor color); - - public EnumColor getInputColor(ForgeDirection side); - - public void setInputColor(ForgeDirection side, EnumColor color); - - public boolean hasStrictInput(); - - public void setStrictInput(boolean strict); -} diff --git a/src/main/java/mekanism/common/base/ISideConfiguration.java b/src/main/java/mekanism/common/base/ISideConfiguration.java index d1d4a5dfd..408d3bade 100644 --- a/src/main/java/mekanism/common/base/ISideConfiguration.java +++ b/src/main/java/mekanism/common/base/ISideConfiguration.java @@ -1,6 +1,7 @@ package mekanism.common.base; import mekanism.common.tile.component.TileComponentConfig; +import mekanism.common.tile.component.TileComponentEjector; /** * Implement this if your TileEntity is capable of being modified by a Configurator in it's 'modify' mode. @@ -25,5 +26,5 @@ public interface ISideConfiguration * Gets this machine's ejector. * @return */ - public IEjector getEjector(); + public TileComponentEjector getEjector(); } diff --git a/src/main/java/mekanism/common/content/transporter/TransporterManager.java b/src/main/java/mekanism/common/content/transporter/TransporterManager.java index 31014f76d..eddcc7eb7 100644 --- a/src/main/java/mekanism/common/content/transporter/TransporterManager.java +++ b/src/main/java/mekanism/common/content/transporter/TransporterManager.java @@ -153,12 +153,30 @@ public class TransporterManager if(inSlot == null) { - copy.inventory[i] = toInsert; - return; + if(toInsert.stackSize <= inv.getInventoryStackLimit()) + { + copy.inventory[i] = toInsert; + return; + } + else { + int rejects = toInsert.stackSize - inv.getInventoryStackLimit(); + + ItemStack toSet = toInsert.copy(); + toSet.stackSize = inv.getInventoryStackLimit(); + + ItemStack remains = toInsert.copy(); + remains.stackSize = rejects; + + copy.inventory[i] = toSet; + + toInsert = remains; + } } - else if(InventoryUtils.areItemsStackable(toInsert, inSlot) && inSlot.stackSize < inSlot.getMaxStackSize() && inSlot.stackSize < inv.getInventoryStackLimit()) + else if(InventoryUtils.areItemsStackable(toInsert, inSlot) && inSlot.stackSize < Math.min(inSlot.getMaxStackSize(), inv.getInventoryStackLimit())) { - if(inSlot.stackSize + toInsert.stackSize <= inSlot.getMaxStackSize()) + int max = Math.min(inSlot.getMaxStackSize(), inv.getInventoryStackLimit()); + + if(inSlot.stackSize + toInsert.stackSize <= max) { ItemStack toSet = toInsert.copy(); toSet.stackSize += inSlot.stackSize; @@ -167,10 +185,10 @@ public class TransporterManager return; } else { - int rejects = (inSlot.stackSize + toInsert.stackSize) - inSlot.getMaxStackSize(); + int rejects = (inSlot.stackSize + toInsert.stackSize) - max; ItemStack toSet = toInsert.copy(); - toSet.stackSize = inSlot.getMaxStackSize(); + toSet.stackSize = max; ItemStack remains = toInsert.copy(); remains.stackSize = rejects; @@ -224,12 +242,30 @@ public class TransporterManager if(inSlot == null) { - copy.inventory[slotID] = toInsert; - return; + if(toInsert.stackSize <= inv.getInventoryStackLimit()) + { + copy.inventory[slotID] = toInsert; + return; + } + else { + int rejects = toInsert.stackSize - inv.getInventoryStackLimit(); + + ItemStack toSet = toInsert.copy(); + toSet.stackSize = inv.getInventoryStackLimit(); + + ItemStack remains = toInsert.copy(); + remains.stackSize = rejects; + + copy.inventory[slotID] = toSet; + + toInsert = remains; + } } - else if(InventoryUtils.areItemsStackable(toInsert, inSlot) && inSlot.stackSize < inSlot.getMaxStackSize() && inSlot.stackSize < inv.getInventoryStackLimit()) + else if(InventoryUtils.areItemsStackable(toInsert, inSlot) && inSlot.stackSize < Math.min(inSlot.getMaxStackSize(), inv.getInventoryStackLimit())) { - if(inSlot.stackSize + toInsert.stackSize <= inSlot.getMaxStackSize()) + int max = Math.min(inSlot.getMaxStackSize(), inv.getInventoryStackLimit()); + + if(inSlot.stackSize + toInsert.stackSize <= max) { ItemStack toSet = toInsert.copy(); toSet.stackSize += inSlot.stackSize; @@ -238,10 +274,10 @@ public class TransporterManager return; } else { - int rejects = (inSlot.stackSize + toInsert.stackSize) - inSlot.getMaxStackSize(); + int rejects = (inSlot.stackSize + toInsert.stackSize) - max; ItemStack toSet = toInsert.copy(); - toSet.stackSize = inSlot.getMaxStackSize(); + toSet.stackSize = max; ItemStack remains = toInsert.copy(); remains.stackSize = rejects; @@ -324,18 +360,35 @@ public class TransporterManager ItemStack inSlot = copy.inventory[i]; - if(inSlot == null || toInsert == null) + if(toInsert == null) { return null; } - else if(InventoryUtils.areItemsStackable(toInsert, inSlot) && inSlot.stackSize < inSlot.getMaxStackSize() && inSlot.stackSize < inventory.getInventoryStackLimit()) + else if(inSlot == null) { - if(inSlot.stackSize + toInsert.stackSize <= inSlot.getMaxStackSize()) + if(toInsert.stackSize <= inventory.getInventoryStackLimit()) { return null; } else { - int rejects = (inSlot.stackSize + toInsert.stackSize) - inSlot.getMaxStackSize(); + int rejects = toInsert.stackSize - inventory.getInventoryStackLimit(); + + if(rejects < toInsert.stackSize) + { + toInsert = StackUtils.size(toInsert, rejects); + } + } + } + else if(InventoryUtils.areItemsStackable(toInsert, inSlot) && inSlot.stackSize < Math.min(inSlot.getMaxStackSize(), inventory.getInventoryStackLimit())) + { + int max = Math.min(inSlot.getMaxStackSize(), inventory.getInventoryStackLimit()); + + if(inSlot.stackSize + toInsert.stackSize <= max) + { + return null; + } + else { + int rejects = (inSlot.stackSize + toInsert.stackSize) - max; if(rejects < toInsert.stackSize) { @@ -381,23 +434,40 @@ public class TransporterManager } ItemStack inSlot = copy.inventory[slotID]; - - if(inSlot == null) + + if(toInsert == null) { return null; } - else if(InventoryUtils.areItemsStackable(toInsert, inSlot) && inSlot.stackSize < inSlot.getMaxStackSize() && inSlot.stackSize < inventory.getInventoryStackLimit()) + else if(inSlot == null) { - if(inSlot.stackSize + toInsert.stackSize <= inSlot.getMaxStackSize()) + if(toInsert.stackSize <= inventory.getInventoryStackLimit()) { return null; } else { - int rejects = (inSlot.stackSize + toInsert.stackSize) - inSlot.getMaxStackSize(); + int rejects = toInsert.stackSize - inventory.getInventoryStackLimit(); + + if(rejects < toInsert.stackSize) + { + toInsert = StackUtils.size(toInsert, rejects); + } + } + } + else if(InventoryUtils.areItemsStackable(toInsert, inSlot) && inSlot.stackSize < Math.min(inSlot.getMaxStackSize(), inventory.getInventoryStackLimit())) + { + int max = Math.min(inSlot.getMaxStackSize(), inventory.getInventoryStackLimit()); + + if(inSlot.stackSize + toInsert.stackSize <= max) + { + return null; + } + else { + int rejects = (inSlot.stackSize + toInsert.stackSize) - max; if(rejects < toInsert.stackSize) { - toInsert = MekanismUtils.size(toInsert, rejects); + toInsert = StackUtils.size(toInsert, rejects); } } } diff --git a/src/main/java/mekanism/common/item/ItemBlockEnergyCube.java b/src/main/java/mekanism/common/item/ItemBlockEnergyCube.java index 60bd7bd67..bc20b2670 100644 --- a/src/main/java/mekanism/common/item/ItemBlockEnergyCube.java +++ b/src/main/java/mekanism/common/item/ItemBlockEnergyCube.java @@ -259,14 +259,14 @@ public class ItemBlockEnergyCube extends ItemBlock implements IEnergizedItem, IE if(canReceive(theItem)) { double energyNeeded = getMaxEnergy(theItem)-getEnergy(theItem); - double toReceive = Math.min(energy* general.FROM_TE, energyNeeded); + double toReceive = Math.min(energy*general.FROM_TE, energyNeeded); if(!simulate) { setEnergy(theItem, getEnergy(theItem) + toReceive); } - return (int)Math.round(toReceive* general.TO_TE); + return (int)Math.round(toReceive*general.TO_TE); } return 0; @@ -278,14 +278,14 @@ public class ItemBlockEnergyCube extends ItemBlock implements IEnergizedItem, IE if(canSend(theItem)) { double energyRemaining = getEnergy(theItem); - double toSend = Math.min((energy* general.FROM_TE), energyRemaining); + double toSend = Math.min((energy*general.FROM_TE), energyRemaining); if(!simulate) { setEnergy(theItem, getEnergy(theItem) - toSend); } - return (int)Math.round(toSend* general.TO_TE); + return (int)Math.round(toSend*general.TO_TE); } return 0; @@ -294,13 +294,13 @@ public class ItemBlockEnergyCube extends ItemBlock implements IEnergizedItem, IE @Override public int getEnergyStored(ItemStack theItem) { - return (int)(getEnergy(theItem)* general.TO_TE); + return (int)(getEnergy(theItem)*general.TO_TE); } @Override public int getMaxEnergyStored(ItemStack theItem) { - return (int)(getMaxEnergy(theItem)* general.TO_TE); + return (int)(getMaxEnergy(theItem)*general.TO_TE); } @Override diff --git a/src/main/java/mekanism/common/item/ItemConfigurationCard.java b/src/main/java/mekanism/common/item/ItemConfigurationCard.java new file mode 100644 index 000000000..ce4af3e1a --- /dev/null +++ b/src/main/java/mekanism/common/item/ItemConfigurationCard.java @@ -0,0 +1,184 @@ +package mekanism.common.item; + +import java.util.List; + +import mekanism.api.EnumColor; +import mekanism.api.IConfigCardAccess; +import mekanism.api.IConfigCardAccess.ISpecialConfigData; +import mekanism.common.base.IRedstoneControl; +import mekanism.common.base.IRedstoneControl.RedstoneControl; +import mekanism.common.base.ISideConfiguration; +import mekanism.common.tile.TileEntityContainerBlock; +import mekanism.common.util.LangUtils; +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.world.World; + +public class ItemConfigurationCard extends ItemMekanism +{ + public ItemConfigurationCard() + { + super(); + + setMaxStackSize(1); + } + + @Override + public void addInformation(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) + { + super.addInformation(itemstack, entityplayer, list, flag); + + list.add(EnumColor.GREY + LangUtils.localize("gui.data") + ": " + EnumColor.INDIGO + LangUtils.localize(getDataType(itemstack))); + } + + @Override + public boolean onItemUseFirst(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ) + { + if(!world.isRemote) + { + TileEntity tileEntity = world.getTileEntity(x, y, z); + + if(tileEntity instanceof IConfigCardAccess) + { + if(player.isSneaking()) + { + NBTTagCompound data = getBaseData(tileEntity); + + if(tileEntity instanceof ISpecialConfigData) + { + data = ((ISpecialConfigData)tileEntity).getConfigurationData(data); + } + + if(data != null) + { + data.setString("dataType", getNameFromTile(tileEntity)); + setData(stack, data); + player.addChatMessage(new ChatComponentText(EnumColor.DARK_BLUE + "[Mekanism] " + EnumColor.GREY + LangUtils.localize("tooltip.configurationCard.got").replaceAll("%s", EnumColor.INDIGO + LangUtils.localize(data.getString("dataType")) + EnumColor.GREY))); + } + + return true; + } + else if(getData(stack) != null) + { + if(getNameFromTile(tileEntity).equals(getDataType(stack))) + { + setBaseData(getData(stack), tileEntity); + + if(tileEntity instanceof ISpecialConfigData) + { + ((ISpecialConfigData)tileEntity).setConfigurationData(getData(stack)); + } + + player.addChatMessage(new ChatComponentText(EnumColor.DARK_BLUE + "[Mekanism] " + EnumColor.DARK_GREEN + LangUtils.localize("tooltip.configurationCard.set").replaceAll("%s", EnumColor.INDIGO + LangUtils.localize(getDataType(stack)) + EnumColor.DARK_GREEN))); + setData(stack, null); + } + else { + player.addChatMessage(new ChatComponentText(EnumColor.DARK_BLUE + "[Mekanism] " + EnumColor.RED + LangUtils.localize("tooltip.configurationCard.unequal") + ".")); + } + + return true; + } + } + } + + return false; + } + + private NBTTagCompound getBaseData(TileEntity tile) + { + NBTTagCompound nbtTags = new NBTTagCompound(); + + if(tile instanceof IRedstoneControl) + { + nbtTags.setInteger("controlType", ((IRedstoneControl)tile).getControlType().ordinal()); + } + + if(tile instanceof ISideConfiguration) + { + ((ISideConfiguration)tile).getConfig().write(nbtTags); + ((ISideConfiguration)tile).getEjector().write(nbtTags); + } + + return nbtTags; + } + + private void setBaseData(NBTTagCompound nbtTags, TileEntity tile) + { + if(tile instanceof IRedstoneControl) + { + ((IRedstoneControl)tile).setControlType(RedstoneControl.values()[nbtTags.getInteger("controlType")]); + } + + if(tile instanceof ISideConfiguration) + { + ((ISideConfiguration)tile).getConfig().read(nbtTags); + ((ISideConfiguration)tile).getEjector().read(nbtTags); + } + } + + private String getNameFromTile(TileEntity tile) + { + String ret = Integer.toString(tile.hashCode()); + + if(tile instanceof TileEntityContainerBlock) + { + ret = tile.getBlockType().getUnlocalizedName() + "." + ((TileEntityContainerBlock)tile).fullName + ".name"; + } + + if(tile instanceof ISpecialConfigData) + { + ret = ((ISpecialConfigData)tile).getDataType(); + } + + return ret; + } + + public void setData(ItemStack itemstack, NBTTagCompound data) + { + if(itemstack.stackTagCompound == null) + { + itemstack.setTagCompound(new NBTTagCompound()); + } + + if(data != null) + { + itemstack.stackTagCompound.setTag("data", data); + } + else { + itemstack.stackTagCompound.removeTag("data"); + } + } + + public NBTTagCompound getData(ItemStack itemstack) + { + if(itemstack.stackTagCompound == null) + { + return null; + } + + NBTTagCompound data = itemstack.stackTagCompound.getCompoundTag("data"); + + if(data.hasNoTags()) + { + return null; + } + else { + return itemstack.stackTagCompound.getCompoundTag("data"); + } + } + + public String getDataType(ItemStack itemstack) + { + NBTTagCompound data = getData(itemstack); + + if(data != null) + { + return data.getString("dataType"); + } + + return "gui.none"; + } +} diff --git a/src/main/java/mekanism/common/item/ItemFilterCard.java b/src/main/java/mekanism/common/item/ItemFilterCard.java deleted file mode 100644 index 4579e3cb3..000000000 --- a/src/main/java/mekanism/common/item/ItemFilterCard.java +++ /dev/null @@ -1,119 +0,0 @@ -package mekanism.common.item; - -import java.util.List; - -import mekanism.api.EnumColor; -import mekanism.api.IFilterAccess; -import mekanism.common.util.LangUtils; -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.world.World; - -public class ItemFilterCard extends ItemMekanism -{ - public ItemFilterCard() - { - super(); - - setMaxStackSize(1); - } - - @Override - public void addInformation(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) - { - super.addInformation(itemstack, entityplayer, list, flag); - - list.add(EnumColor.GREY + LangUtils.localize("gui.data") + ": " + EnumColor.INDIGO + LangUtils.localize(getDataType(itemstack))); - } - - @Override - public boolean onItemUseFirst(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ) - { - if(!world.isRemote) - { - TileEntity tileEntity = world.getTileEntity(x, y, z); - - if(tileEntity instanceof IFilterAccess) - { - if(player.isSneaking()) - { - NBTTagCompound data = ((IFilterAccess)tileEntity).getFilterData(new NBTTagCompound()); - - if(data != null) - { - data.setString("dataType", ((IFilterAccess)tileEntity).getDataType()); - setData(stack, data); - player.addChatMessage(new ChatComponentText(EnumColor.DARK_BLUE + "[Mekanism] " + EnumColor.GREY + LangUtils.localize("tooltip.filterCard.got").replaceAll("%s", EnumColor.INDIGO + LangUtils.localize(data.getString("dataType")) + EnumColor.GREY))); - } - - return true; - } - else if(getData(stack) != null) - { - if(((IFilterAccess)tileEntity).getDataType().equals(getDataType(stack))) - { - ((IFilterAccess)tileEntity).setFilterData(getData(stack)); - player.addChatMessage(new ChatComponentText(EnumColor.DARK_BLUE + "[Mekanism] " + EnumColor.DARK_GREEN + LangUtils.localize("tooltip.filterCard.set").replaceAll("%s", EnumColor.INDIGO + LangUtils.localize(getDataType(stack)) + EnumColor.DARK_GREEN))); - setData(stack, null); - } - else { - player.addChatMessage(new ChatComponentText(EnumColor.DARK_BLUE + "[Mekanism] " + EnumColor.RED + LangUtils.localize("tooltip.filterCard.unequal") + ".")); - } - - return true; - } - } - } - - return false; - } - - public void setData(ItemStack itemstack, NBTTagCompound data) - { - if(itemstack.stackTagCompound == null) - { - itemstack.setTagCompound(new NBTTagCompound()); - } - - if(data != null) - { - itemstack.stackTagCompound.setTag("data", data); - } - else { - itemstack.stackTagCompound.removeTag("data"); - } - } - - public NBTTagCompound getData(ItemStack itemstack) - { - if(itemstack.stackTagCompound == null) - { - return null; - } - - NBTTagCompound data = itemstack.stackTagCompound.getCompoundTag("data"); - - if(data.hasNoTags()) - { - return null; - } - else { - return itemstack.stackTagCompound.getCompoundTag("data"); - } - } - - public String getDataType(ItemStack itemstack) - { - NBTTagCompound data = getData(itemstack); - - if(data != null) - { - return data.getString("dataType"); - } - - return "gui.none"; - } -} diff --git a/src/main/java/mekanism/common/tile/TileEntityAdvancedBoundingBlock.java b/src/main/java/mekanism/common/tile/TileEntityAdvancedBoundingBlock.java index a84099986..81bbf04c4 100644 --- a/src/main/java/mekanism/common/tile/TileEntityAdvancedBoundingBlock.java +++ b/src/main/java/mekanism/common/tile/TileEntityAdvancedBoundingBlock.java @@ -2,7 +2,7 @@ package mekanism.common.tile; import ic2.api.energy.tile.IEnergySink; import mekanism.api.Coord4D; -import mekanism.api.IFilterAccess; +import mekanism.api.IConfigCardAccess.ISpecialConfigData; import mekanism.api.energy.IStrictEnergyAcceptor; import mekanism.common.base.IAdvancedBoundingBlock; import mekanism.common.integration.IComputerIntegration; @@ -22,7 +22,7 @@ import cpw.mods.fml.common.Optional.Method; @Interface(iface = "ic2.api.energy.tile.IEnergySink", modid = "IC2"), @Interface(iface = "cofh.api.energy.IEnergyHandler", modid = "CoFHCore") }) -public class TileEntityAdvancedBoundingBlock extends TileEntityBoundingBlock implements ISidedInventory, IEnergySink, IStrictEnergyAcceptor, IEnergyHandler, IComputerIntegration, IFilterAccess +public class TileEntityAdvancedBoundingBlock extends TileEntityBoundingBlock implements ISidedInventory, IEnergySink, IStrictEnergyAcceptor, IEnergyHandler, IComputerIntegration, ISpecialConfigData { @Override public int getSizeInventory() @@ -410,25 +410,25 @@ public class TileEntityAdvancedBoundingBlock extends TileEntityBoundingBlock imp } @Override - public NBTTagCompound getFilterData(NBTTagCompound nbtTags) + public NBTTagCompound getConfigurationData(NBTTagCompound nbtTags) { if(getInv() == null) { return new NBTTagCompound(); } - return getInv().getFilterData(nbtTags); + return getInv().getConfigurationData(nbtTags); } @Override - public void setFilterData(NBTTagCompound nbtTags) + public void setConfigurationData(NBTTagCompound nbtTags) { if(getInv() == null) { return; } - getInv().setFilterData(nbtTags); + getInv().setConfigurationData(nbtTags); } @Override diff --git a/src/main/java/mekanism/common/tile/TileEntityBasicMachine.java b/src/main/java/mekanism/common/tile/TileEntityBasicMachine.java index 4892eb7c5..39d961322 100644 --- a/src/main/java/mekanism/common/tile/TileEntityBasicMachine.java +++ b/src/main/java/mekanism/common/tile/TileEntityBasicMachine.java @@ -6,12 +6,12 @@ import java.util.ArrayList; import java.util.EnumSet; import mekanism.api.Coord4D; +import mekanism.api.IConfigCardAccess; import mekanism.api.MekanismConfig.general; import mekanism.api.Range4D; import mekanism.api.transmitters.TransmissionType; import mekanism.common.Mekanism; import mekanism.common.Upgrade; -import mekanism.common.base.IEjector; import mekanism.common.base.IElectricMachine; import mekanism.common.base.IRedstoneControl; import mekanism.common.base.ISideConfiguration; @@ -29,7 +29,7 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.ResourceLocation; import net.minecraftforge.common.util.ForgeDirection; -public abstract class TileEntityBasicMachine, OUTPUT extends MachineOutput, RECIPE extends MachineRecipe> extends TileEntityNoisyElectricBlock implements IElectricMachine, IComputerIntegration, ISideConfiguration, IUpgradeTile, IRedstoneControl +public abstract class TileEntityBasicMachine, OUTPUT extends MachineOutput, RECIPE extends MachineRecipe> extends TileEntityNoisyElectricBlock implements IElectricMachine, IComputerIntegration, ISideConfiguration, IUpgradeTile, IRedstoneControl, IConfigCardAccess { /** How much energy this machine uses per tick, un-upgraded. */ public double BASE_ENERGY_PER_TICK; @@ -289,7 +289,7 @@ public abstract class TileEntityBasicMachine, } @Override - public IEjector getEjector() + public TileComponentEjector getEjector() { return ejectorComponent; } diff --git a/src/main/java/mekanism/common/tile/TileEntityChemicalCrystallizer.java b/src/main/java/mekanism/common/tile/TileEntityChemicalCrystallizer.java index 6241c8d16..7d1161de0 100644 --- a/src/main/java/mekanism/common/tile/TileEntityChemicalCrystallizer.java +++ b/src/main/java/mekanism/common/tile/TileEntityChemicalCrystallizer.java @@ -6,6 +6,7 @@ import java.util.ArrayList; import mekanism.api.Coord4D; import mekanism.api.EnumColor; +import mekanism.api.IConfigCardAccess; import mekanism.api.MekanismConfig.usage; import mekanism.api.Range4D; import mekanism.api.gas.Gas; @@ -20,7 +21,6 @@ import mekanism.api.transmitters.TransmissionType; import mekanism.common.Mekanism; import mekanism.common.SideData; import mekanism.common.Upgrade; -import mekanism.common.base.IEjector; import mekanism.common.base.IRedstoneControl; import mekanism.common.base.ISideConfiguration; import mekanism.common.base.ISustainedData; @@ -41,7 +41,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.common.util.ForgeDirection; -public class TileEntityChemicalCrystallizer extends TileEntityNoisyElectricBlock implements IGasHandler, ITubeConnection, IRedstoneControl, ISideConfiguration, IUpgradeTile, ISustainedData, ITankManager +public class TileEntityChemicalCrystallizer extends TileEntityNoisyElectricBlock implements IGasHandler, ITubeConnection, IRedstoneControl, ISideConfiguration, IUpgradeTile, ISustainedData, ITankManager, IConfigCardAccess { public static final int MAX_GAS = 10000; @@ -437,7 +437,7 @@ public class TileEntityChemicalCrystallizer extends TileEntityNoisyElectricBlock } @Override - public IEjector getEjector() + public TileComponentEjector getEjector() { return ejectorComponent; } diff --git a/src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java b/src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java index e85135f4c..f6cf82941 100644 --- a/src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java +++ b/src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java @@ -1364,7 +1364,7 @@ public class TileEntityDigitalMiner extends TileEntityElectricBlock implements I } @Override - public NBTTagCompound getFilterData(NBTTagCompound nbtTags) + public NBTTagCompound getConfigurationData(NBTTagCompound nbtTags) { nbtTags.setInteger("radius", radius); nbtTags.setInteger("minY", minY); @@ -1372,7 +1372,6 @@ public class TileEntityDigitalMiner extends TileEntityElectricBlock implements I nbtTags.setBoolean("doEject", doEject); nbtTags.setBoolean("doPull", doPull); nbtTags.setBoolean("silkTouch", silkTouch); - nbtTags.setInteger("controlType", controlType.ordinal()); nbtTags.setBoolean("inverse", inverse); NBTTagList filterTags = new NBTTagList(); @@ -1391,7 +1390,7 @@ public class TileEntityDigitalMiner extends TileEntityElectricBlock implements I } @Override - public void setFilterData(NBTTagCompound nbtTags) + public void setConfigurationData(NBTTagCompound nbtTags) { radius = nbtTags.getInteger("radius"); minY = nbtTags.getInteger("minY"); @@ -1399,7 +1398,6 @@ public class TileEntityDigitalMiner extends TileEntityElectricBlock implements I doEject = nbtTags.getBoolean("doEject"); doPull = nbtTags.getBoolean("doPull"); silkTouch = nbtTags.getBoolean("silkTouch"); - controlType = RedstoneControl.values()[nbtTags.getInteger("controlType")]; inverse = nbtTags.getBoolean("inverse"); if(nbtTags.hasKey("filters")) @@ -1416,7 +1414,7 @@ public class TileEntityDigitalMiner extends TileEntityElectricBlock implements I @Override public String getDataType() { - return "tooltip.filterCard.digitalMiner"; + return getBlockType().getUnlocalizedName() + "." + fullName + ".name"; } public void writeSustainedData(ItemStack itemStack) diff --git a/src/main/java/mekanism/common/tile/TileEntityEnergyCube.java b/src/main/java/mekanism/common/tile/TileEntityEnergyCube.java index 8d74a87ec..0f290f655 100644 --- a/src/main/java/mekanism/common/tile/TileEntityEnergyCube.java +++ b/src/main/java/mekanism/common/tile/TileEntityEnergyCube.java @@ -12,7 +12,6 @@ import mekanism.api.transmitters.TransmissionType; import mekanism.common.Mekanism; import mekanism.common.SideData; import mekanism.common.Tier.EnergyCubeTier; -import mekanism.common.base.IEjector; import mekanism.common.base.IRedstoneControl; import mekanism.common.base.ISideConfiguration; import mekanism.common.integration.IComputerIntegration; @@ -279,7 +278,7 @@ public class TileEntityEnergyCube extends TileEntityElectricBlock implements ICo } @Override - public IEjector getEjector() + public TileComponentEjector getEjector() { return ejectorComponent; } diff --git a/src/main/java/mekanism/common/tile/TileEntityFactory.java b/src/main/java/mekanism/common/tile/TileEntityFactory.java index f1a14ac47..fbb5196f7 100644 --- a/src/main/java/mekanism/common/tile/TileEntityFactory.java +++ b/src/main/java/mekanism/common/tile/TileEntityFactory.java @@ -8,6 +8,7 @@ import java.util.List; import mekanism.api.Coord4D; import mekanism.api.EnumColor; +import mekanism.api.IConfigCardAccess.ISpecialConfigData; import mekanism.api.MekanismConfig.general; import mekanism.api.MekanismConfig.usage; import mekanism.api.Range4D; @@ -31,7 +32,6 @@ import mekanism.common.PacketHandler; import mekanism.common.SideData; import mekanism.common.Tier.FactoryTier; import mekanism.common.Upgrade; -import mekanism.common.base.IEjector; import mekanism.common.base.IFactory.RecipeType; import mekanism.common.base.IRedstoneControl; import mekanism.common.base.ISideConfiguration; @@ -60,7 +60,7 @@ import net.minecraftforge.common.util.ForgeDirection; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -public class TileEntityFactory extends TileEntityNoisyElectricBlock implements IComputerIntegration, ISideConfiguration, IUpgradeTile, IRedstoneControl, IGasHandler, ITubeConnection +public class TileEntityFactory extends TileEntityNoisyElectricBlock implements IComputerIntegration, ISideConfiguration, IUpgradeTile, IRedstoneControl, IGasHandler, ITubeConnection, ISpecialConfigData { /** This Factory's tier. */ public FactoryTier tier; @@ -1080,7 +1080,7 @@ public class TileEntityFactory extends TileEntityNoisyElectricBlock implements I } @Override - public IEjector getEjector() + public TileComponentEjector getEjector() { return ejectorComponent; } @@ -1165,4 +1165,24 @@ public class TileEntityFactory extends TileEntityNoisyElectricBlock implements I break; } } + + @Override + public NBTTagCompound getConfigurationData(NBTTagCompound nbtTags) + { + nbtTags.setBoolean("sorting", sorting); + + return nbtTags; + } + + @Override + public void setConfigurationData(NBTTagCompound nbtTags) + { + sorting = nbtTags.getBoolean("sorting"); + } + + @Override + public String getDataType() + { + return tier.getBaseTier().getLocalizedName() + " " + recipeType.getLocalizedName() + " " + super.getInventoryName(); + } } \ No newline at end of file diff --git a/src/main/java/mekanism/common/tile/TileEntityGasTank.java b/src/main/java/mekanism/common/tile/TileEntityGasTank.java index ead765dbc..4eb51c047 100644 --- a/src/main/java/mekanism/common/tile/TileEntityGasTank.java +++ b/src/main/java/mekanism/common/tile/TileEntityGasTank.java @@ -18,7 +18,6 @@ import mekanism.api.transmitters.TransmissionType; import mekanism.common.Mekanism; import mekanism.common.SideData; import mekanism.common.Tier.GasTankTier; -import mekanism.common.base.IEjector; import mekanism.common.base.IRedstoneControl; import mekanism.common.base.ISideConfiguration; import mekanism.common.network.PacketTileEntity.TileEntityMessage; @@ -333,7 +332,7 @@ public class TileEntityGasTank extends TileEntityContainerBlock implements IGasH } @Override - public IEjector getEjector() + public TileComponentEjector getEjector() { return ejectorComponent; } diff --git a/src/main/java/mekanism/common/tile/TileEntityLogisticalSorter.java b/src/main/java/mekanism/common/tile/TileEntityLogisticalSorter.java index a9fc13871..fc613a224 100644 --- a/src/main/java/mekanism/common/tile/TileEntityLogisticalSorter.java +++ b/src/main/java/mekanism/common/tile/TileEntityLogisticalSorter.java @@ -7,7 +7,7 @@ import java.util.EnumSet; import mekanism.api.Coord4D; import mekanism.api.EnumColor; -import mekanism.api.IFilterAccess; +import mekanism.api.IConfigCardAccess.ISpecialConfigData; import mekanism.api.Range4D; import mekanism.common.HashList; import mekanism.common.Mekanism; @@ -37,7 +37,7 @@ import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.Constants.NBT; import net.minecraftforge.common.util.ForgeDirection; -public class TileEntityLogisticalSorter extends TileEntityElectricBlock implements IRedstoneControl, IActiveState, IFilterAccess, ISustainedData +public class TileEntityLogisticalSorter extends TileEntityElectricBlock implements IRedstoneControl, IActiveState, ISpecialConfigData, ISustainedData { public HashList filters = new HashList(); @@ -589,10 +589,8 @@ public class TileEntityLogisticalSorter extends TileEntityElectricBlock implemen } @Override - public NBTTagCompound getFilterData(NBTTagCompound nbtTags) + public NBTTagCompound getConfigurationData(NBTTagCompound nbtTags) { - nbtTags.setInteger("controlType", controlType.ordinal()); - if(color != null) { nbtTags.setInteger("color", TransporterUtils.colors.indexOf(color)); @@ -621,10 +619,8 @@ public class TileEntityLogisticalSorter extends TileEntityElectricBlock implemen } @Override - public void setFilterData(NBTTagCompound nbtTags) + public void setConfigurationData(NBTTagCompound nbtTags) { - controlType = RedstoneControl.values()[nbtTags.getInteger("controlType")]; - if(nbtTags.hasKey("color")) { color = TransporterUtils.colors.get(nbtTags.getInteger("color")); @@ -649,7 +645,7 @@ public class TileEntityLogisticalSorter extends TileEntityElectricBlock implemen @Override public String getDataType() { - return "tooltip.filterCard.logisticalSorter"; + return getBlockType().getUnlocalizedName() + "." + fullName + ".name"; } @Override diff --git a/src/main/java/mekanism/common/tile/TileEntityMetallurgicInfuser.java b/src/main/java/mekanism/common/tile/TileEntityMetallurgicInfuser.java index 4c7b6b20d..5c08e9a0d 100644 --- a/src/main/java/mekanism/common/tile/TileEntityMetallurgicInfuser.java +++ b/src/main/java/mekanism/common/tile/TileEntityMetallurgicInfuser.java @@ -7,6 +7,7 @@ import java.util.EnumSet; import mekanism.api.Coord4D; import mekanism.api.EnumColor; +import mekanism.api.IConfigCardAccess; import mekanism.api.MekanismConfig.general; import mekanism.api.MekanismConfig.usage; import mekanism.api.Range4D; @@ -20,7 +21,6 @@ import mekanism.common.MekanismItems; import mekanism.common.PacketHandler; import mekanism.common.SideData; import mekanism.common.Upgrade; -import mekanism.common.base.IEjector; import mekanism.common.base.IFactory.RecipeType; import mekanism.common.base.IRedstoneControl; import mekanism.common.base.ISideConfiguration; @@ -42,7 +42,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.common.util.ForgeDirection; -public class TileEntityMetallurgicInfuser extends TileEntityNoisyElectricBlock implements IComputerIntegration, ISideConfiguration, IUpgradeTile, IRedstoneControl +public class TileEntityMetallurgicInfuser extends TileEntityNoisyElectricBlock implements IComputerIntegration, ISideConfiguration, IUpgradeTile, IRedstoneControl, IConfigCardAccess { /** The maxiumum amount of infuse this machine can store. */ public int MAX_INFUSE = 1000; @@ -540,7 +540,7 @@ public class TileEntityMetallurgicInfuser extends TileEntityNoisyElectricBlock i } @Override - public IEjector getEjector() + public TileComponentEjector getEjector() { return ejectorComponent; } diff --git a/src/main/java/mekanism/common/tile/TileEntityOredictionificator.java b/src/main/java/mekanism/common/tile/TileEntityOredictionificator.java index c5b0a4026..181d98173 100644 --- a/src/main/java/mekanism/common/tile/TileEntityOredictionificator.java +++ b/src/main/java/mekanism/common/tile/TileEntityOredictionificator.java @@ -7,7 +7,7 @@ import java.util.Arrays; import java.util.List; import mekanism.api.Coord4D; -import mekanism.api.IFilterAccess; +import mekanism.api.IConfigCardAccess.ISpecialConfigData; import mekanism.api.Range4D; import mekanism.common.HashList; import mekanism.common.Mekanism; @@ -27,7 +27,7 @@ import net.minecraft.nbt.NBTTagList; import net.minecraftforge.common.util.Constants.NBT; import net.minecraftforge.oredict.OreDictionary; -public class TileEntityOredictionificator extends TileEntityContainerBlock implements IRedstoneControl, IFilterAccess, ISustainedData +public class TileEntityOredictionificator extends TileEntityContainerBlock implements IRedstoneControl, ISpecialConfigData, ISustainedData { public static final int MAX_LENGTH = 24; @@ -316,10 +316,8 @@ public class TileEntityOredictionificator extends TileEntityContainerBlock imple } @Override - public NBTTagCompound getFilterData(NBTTagCompound nbtTags) + public NBTTagCompound getConfigurationData(NBTTagCompound nbtTags) { - nbtTags.setInteger("controlType", controlType.ordinal()); - NBTTagList filterTags = new NBTTagList(); for(OredictionificatorFilter filter : filters) @@ -338,10 +336,8 @@ public class TileEntityOredictionificator extends TileEntityContainerBlock imple } @Override - public void setFilterData(NBTTagCompound nbtTags) + public void setConfigurationData(NBTTagCompound nbtTags) { - controlType = RedstoneControl.values()[nbtTags.getInteger("controlType")]; - if(nbtTags.hasKey("filters")) { NBTTagList tagList = nbtTags.getTagList("filters", NBT.TAG_COMPOUND); @@ -356,7 +352,7 @@ public class TileEntityOredictionificator extends TileEntityContainerBlock imple @Override public String getDataType() { - return "tooltip.filterCard.oredictionificator"; + return getBlockType().getUnlocalizedName() + "." + fullName + ".name"; } @Override diff --git a/src/main/java/mekanism/common/tile/TileEntityQuantumEntangloporter.java b/src/main/java/mekanism/common/tile/TileEntityQuantumEntangloporter.java index ec89e9207..8cec6ce40 100644 --- a/src/main/java/mekanism/common/tile/TileEntityQuantumEntangloporter.java +++ b/src/main/java/mekanism/common/tile/TileEntityQuantumEntangloporter.java @@ -11,17 +11,18 @@ import mekanism.api.IHeatTransfer; import mekanism.api.gas.Gas; import mekanism.api.gas.GasStack; import mekanism.api.gas.IGasHandler; +import mekanism.api.gas.ITubeConnection; import mekanism.api.transmitters.TransmissionType; import mekanism.common.Mekanism; import mekanism.common.PacketHandler; import mekanism.common.SideData.IOState; -import mekanism.common.base.IEjector; import mekanism.common.base.ISideConfiguration; import mekanism.common.base.ITankManager; import mekanism.common.content.entangloporter.InventoryFrequency; import mekanism.common.frequency.Frequency; import mekanism.common.frequency.FrequencyManager; import mekanism.common.frequency.IFrequencyHandler; +import mekanism.common.integration.IComputerIntegration; import mekanism.common.tile.component.TileComponentConfig; import mekanism.common.tile.component.TileComponentEjector; import mekanism.common.util.CableUtils; @@ -38,7 +39,7 @@ import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.IFluidHandler; -public class TileEntityQuantumEntangloporter extends TileEntityElectricBlock implements ISideConfiguration, ITankManager, IFluidHandler, IFrequencyHandler, IGasHandler, IHeatTransfer +public class TileEntityQuantumEntangloporter extends TileEntityElectricBlock implements ISideConfiguration, ITankManager, IFluidHandler, IFrequencyHandler, IGasHandler, IHeatTransfer, ITubeConnection, IComputerIntegration { public String owner; @@ -667,8 +668,44 @@ public class TileEntityQuantumEntangloporter extends TileEntityElectricBlock imp } @Override - public IEjector getEjector() + public TileComponentEjector getEjector() { return ejectorComponent; } + + @Override + public boolean canTubeConnect(ForgeDirection side) + { + return frequency != null && configComponent.getOutput(TransmissionType.GAS, side.ordinal(), facing).ioState != IOState.OFF; + } + + private static final String[] methods = new String[] {"setFrequency"}; + + @Override + public String[] getMethods() + { + return methods; + } + + @Override + public Object[] invoke(int method, Object[] arguments) throws Exception + { + switch(method) + { + case 0: + if(!(arguments[0] instanceof String) || !(arguments[1] instanceof Boolean)) + { + return new Object[] {"Invalid parameters."}; + } + + String freq = ((String)arguments[0]).trim(); + boolean isPublic = (Boolean)arguments[1]; + + setFrequency(freq, isPublic); + + return new Object[] {"Frequency set."}; + default: + throw new NoSuchMethodException(); + } + } } diff --git a/src/main/java/mekanism/common/tile/TileEntityTeleporter.java b/src/main/java/mekanism/common/tile/TileEntityTeleporter.java index 3e1138ef1..9460e8ca2 100644 --- a/src/main/java/mekanism/common/tile/TileEntityTeleporter.java +++ b/src/main/java/mekanism/common/tile/TileEntityTeleporter.java @@ -699,7 +699,7 @@ public class TileEntityTeleporter extends TileEntityElectricBlock implements ICo return ChargeUtils.canBeOutputted(itemstack, false); } - private static final String[] methods = new String[] {"getEnergy", "canTeleport", "getMaxEnergy", "teleport", "set"}; + private static final String[] methods = new String[] {"getEnergy", "canTeleport", "getMaxEnergy", "teleport", "setFrequency"}; @Override public String[] getMethods() diff --git a/src/main/java/mekanism/common/tile/component/TileComponentEjector.java b/src/main/java/mekanism/common/tile/component/TileComponentEjector.java index 5b9ec713d..c239d29f0 100644 --- a/src/main/java/mekanism/common/tile/component/TileComponentEjector.java +++ b/src/main/java/mekanism/common/tile/component/TileComponentEjector.java @@ -14,7 +14,6 @@ import mekanism.api.gas.GasTank; import mekanism.api.gas.GasTransmission; import mekanism.api.transmitters.TransmissionType; import mekanism.common.SideData; -import mekanism.common.base.IEjector; import mekanism.common.base.ISideConfiguration; import mekanism.common.base.ITankManager; import mekanism.common.base.ITileComponent; @@ -33,7 +32,7 @@ import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTank; -public class TileComponentEjector implements ITileComponent, IEjector +public class TileComponentEjector implements ITileComponent { public TileEntityContainerBlock tileEntity; @@ -164,7 +163,6 @@ public class TileComponentEjector implements ITileComponent, IEjector return outputSides; } - @Override public void outputItems() { if(!getEjecting(TransmissionType.ITEM) || tileEntity.getWorldObj().isRemote) @@ -224,40 +222,34 @@ public class TileComponentEjector implements ITileComponent, IEjector tickDelay = 20; } - @Override public boolean hasStrictInput() { return strictInput; } - @Override public void setStrictInput(boolean strict) { strictInput = strict; MekanismUtils.saveChunk(tileEntity); } - @Override public void setOutputColor(EnumColor color) { outputColor = color; MekanismUtils.saveChunk(tileEntity); } - @Override public EnumColor getOutputColor() { return outputColor; } - @Override public void setInputColor(ForgeDirection side, EnumColor color) { inputColors[side.ordinal()] = color; MekanismUtils.saveChunk(tileEntity); } - @Override public EnumColor getInputColor(ForgeDirection side) { return inputColors[side.ordinal()]; diff --git a/src/main/java/mekanism/common/util/InventoryUtils.java b/src/main/java/mekanism/common/util/InventoryUtils.java index 14e869563..205ac5d6d 100644 --- a/src/main/java/mekanism/common/util/InventoryUtils.java +++ b/src/main/java/mekanism/common/util/InventoryUtils.java @@ -91,14 +91,33 @@ public final class InventoryUtils if(inSlot == null) { - inventory.setInventorySlotContents(i, toInsert); - inventory.markDirty(); - - return null; + if(toInsert.stackSize <= inventory.getInventoryStackLimit()) + { + inventory.setInventorySlotContents(i, toInsert); + inventory.markDirty(); + + return null; + } + else { + int rejects = toInsert.stackSize - inventory.getInventoryStackLimit(); + + ItemStack toSet = toInsert.copy(); + toSet.stackSize = inventory.getInventoryStackLimit(); + + ItemStack remains = toInsert.copy(); + remains.stackSize = rejects; + + inventory.setInventorySlotContents(i, toSet); + inventory.markDirty(); + + toInsert = remains; + } } - else if(areItemsStackable(toInsert, inSlot) && inSlot.stackSize < inSlot.getMaxStackSize() && inSlot.stackSize < inventory.getInventoryStackLimit()) + else if(areItemsStackable(toInsert, inSlot) && inSlot.stackSize < Math.min(inSlot.getMaxStackSize(), inventory.getInventoryStackLimit())) { - if(inSlot.stackSize + toInsert.stackSize <= inSlot.getMaxStackSize()) + int max = Math.min(inSlot.getMaxStackSize(), inventory.getInventoryStackLimit()); + + if(inSlot.stackSize + toInsert.stackSize <= max) { ItemStack toSet = toInsert.copy(); toSet.stackSize += inSlot.stackSize; @@ -109,10 +128,10 @@ public final class InventoryUtils return null; } else { - int rejects = (inSlot.stackSize + toInsert.stackSize) - inSlot.getMaxStackSize(); + int rejects = (inSlot.stackSize + toInsert.stackSize) - max; ItemStack toSet = toInsert.copy(); - toSet.stackSize = inSlot.getMaxStackSize(); + toSet.stackSize = max; ItemStack remains = toInsert.copy(); remains.stackSize = rejects; @@ -152,14 +171,33 @@ public final class InventoryUtils if(inSlot == null) { - inventory.setInventorySlotContents(slotID, toInsert); - inventory.markDirty(); - - return null; + if(toInsert.stackSize <= inventory.getInventoryStackLimit()) + { + inventory.setInventorySlotContents(slotID, toInsert); + inventory.markDirty(); + + return null; + } + else { + int rejects = toInsert.stackSize - inventory.getInventoryStackLimit(); + + ItemStack toSet = toInsert.copy(); + toSet.stackSize = inventory.getInventoryStackLimit(); + + ItemStack remains = toInsert.copy(); + remains.stackSize = rejects; + + inventory.setInventorySlotContents(slotID, toSet); + inventory.markDirty(); + + toInsert = remains; + } } - else if(areItemsStackable(toInsert, inSlot) && inSlot.stackSize < inSlot.getMaxStackSize() && inSlot.stackSize < inventory.getInventoryStackLimit()) + else if(areItemsStackable(toInsert, inSlot) && inSlot.stackSize < Math.min(inSlot.getMaxStackSize(), inventory.getInventoryStackLimit())) { - if(inSlot.stackSize + toInsert.stackSize <= inSlot.getMaxStackSize()) + int max = Math.min(inSlot.getMaxStackSize(), inventory.getInventoryStackLimit()); + + if(inSlot.stackSize + toInsert.stackSize <= max) { ItemStack toSet = toInsert.copy(); toSet.stackSize += inSlot.stackSize; @@ -170,10 +208,10 @@ public final class InventoryUtils return null; } else { - int rejects = (inSlot.stackSize + toInsert.stackSize) - inSlot.getMaxStackSize(); + int rejects = (inSlot.stackSize + toInsert.stackSize) - max; ItemStack toSet = toInsert.copy(); - toSet.stackSize = inSlot.getMaxStackSize(); + toSet.stackSize = max; ItemStack remains = toInsert.copy(); remains.stackSize = rejects; @@ -406,16 +444,29 @@ public final class InventoryUtils if(inSlot == null) { - return true; - } - else if(areItemsStackable(itemStack, inSlot) && inSlot.stackSize < inSlot.getMaxStackSize() && inSlot.stackSize < inventory.getInventoryStackLimit()) - { - if(inSlot.stackSize + itemStack.stackSize <= inSlot.getMaxStackSize()) + if(itemStack.stackSize <= inventory.getInventoryStackLimit()) { return true; } else { - int rejects = (inSlot.stackSize + itemStack.stackSize) - inSlot.getMaxStackSize(); + int rejects = itemStack.stackSize - inventory.getInventoryStackLimit(); + + if(rejects < itemStack.stackSize) + { + return true; + } + } + } + else if(areItemsStackable(itemStack, inSlot) && inSlot.stackSize < Math.min(inSlot.getMaxStackSize(), inventory.getInventoryStackLimit())) + { + int max = Math.min(inSlot.getMaxStackSize(), inventory.getInventoryStackLimit()); + + if(inSlot.stackSize + itemStack.stackSize <= max) + { + return true; + } + else { + int rejects = (inSlot.stackSize + itemStack.stackSize) - max; if(rejects < itemStack.stackSize) { @@ -452,16 +503,29 @@ public final class InventoryUtils if(inSlot == null) { - return true; - } - else if(areItemsStackable(itemStack, inSlot) && inSlot.stackSize < inSlot.getMaxStackSize() && inSlot.stackSize < inventory.getInventoryStackLimit()) - { - if(inSlot.stackSize + itemStack.stackSize <= inSlot.getMaxStackSize()) + if(itemStack.stackSize <= inventory.getInventoryStackLimit()) { return true; } else { - int rejects = (inSlot.stackSize + itemStack.stackSize) - inSlot.getMaxStackSize(); + int rejects = itemStack.stackSize - inventory.getInventoryStackLimit(); + + if(rejects < itemStack.stackSize) + { + return true; + } + } + } + else if(areItemsStackable(itemStack, inSlot) && inSlot.stackSize < Math.min(inSlot.getMaxStackSize(), inventory.getInventoryStackLimit())) + { + int max = Math.min(inSlot.getMaxStackSize(), inventory.getInventoryStackLimit()); + + if(inSlot.stackSize + itemStack.stackSize <= max) + { + return true; + } + else { + int rejects = (inSlot.stackSize + itemStack.stackSize) - max; if(rejects < itemStack.stackSize) { diff --git a/src/main/java/mekanism/common/util/MekanismUtils.java b/src/main/java/mekanism/common/util/MekanismUtils.java index 30418e2b6..7f471b83c 100644 --- a/src/main/java/mekanism/common/util/MekanismUtils.java +++ b/src/main/java/mekanism/common/util/MekanismUtils.java @@ -1155,7 +1155,7 @@ public final class MekanismUtils */ public static String getEnergyDisplay(double energy) { - if(energy == Integer.MAX_VALUE) + if(energy == Double.MAX_VALUE) { return LangUtils.localize("gui.infinite"); } diff --git a/src/main/resources/assets/mekanism/lang/en_US.lang b/src/main/resources/assets/mekanism/lang/en_US.lang index 9553238aa..4182d402e 100644 --- a/src/main/resources/assets/mekanism/lang/en_US.lang +++ b/src/main/resources/assets/mekanism/lang/en_US.lang @@ -38,7 +38,7 @@ item.LithiumBucket.name=Lithium Bucket item.HeavyWaterBucket.name=Heavy Water Bucket item.FreeRunners.name=Free Runners item.ArmoredJetpack.name=Armored Jetpack -item.FilterCard.name=Filter Card +item.ConfigurationCard.name=Configuration Card item.SeismicReader.name=Seismic Reader item.HDPEPellet.name=HDPE Pellet item.HDPERod.name=HDPE Rod @@ -727,12 +727,9 @@ tooltip.disassembler.fast=fast tooltip.disassembler.vein=vein tooltip.disassembler.off=off -tooltip.filterCard.got=Retrieved filter data from %s -tooltip.filterCard.set=Injected filter data of type %s -tooltip.filterCard.unequal=Unequal filter data formats -tooltip.filterCard.logisticalSorter=Logistical Sorter -tooltip.filterCard.digitalMiner=Digital Miner -tooltip.filterCard.oredictionificator=Oredictionificator +tooltip.configurationCard.got=Retrieved configuration data from %s +tooltip.configurationCard.set=Injected configuration data of type %s +tooltip.configurationCard.unequal=Unequal configuration data formats tooltip.balloon=Balloon diff --git a/src/main/resources/assets/mekanism/textures/items/FilterCard.png b/src/main/resources/assets/mekanism/textures/items/ConfigurationCard.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/items/FilterCard.png rename to src/main/resources/assets/mekanism/textures/items/ConfigurationCard.png From 4e41b46df793500ba68d56aef4b6241fc5030942 Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Sat, 5 Mar 2016 15:18:40 -0500 Subject: [PATCH 31/52] Fix up Bin rendering --- .../client/render/tileentity/RenderBin.java | 35 ++++--------------- 1 file changed, 7 insertions(+), 28 deletions(-) diff --git a/src/main/java/mekanism/client/render/tileentity/RenderBin.java b/src/main/java/mekanism/client/render/tileentity/RenderBin.java index 6516cedab..74efa2abb 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderBin.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderBin.java @@ -1,19 +1,16 @@ package mekanism.client.render.tileentity; import mekanism.api.Coord4D; +import mekanism.client.render.MekanismRenderer; import mekanism.common.tile.TileEntityBin; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; -import net.minecraft.client.renderer.OpenGlHelper; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.entity.RenderItem; -import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.client.renderer.texture.TextureManager; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; -import net.minecraft.entity.item.EntityItem; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; import org.lwjgl.opengl.GL11; @@ -25,7 +22,7 @@ import cpw.mods.fml.relauncher.SideOnly; public class RenderBin extends TileEntitySpecialRenderer { private final RenderBlocks renderBlocks = new RenderBlocks(); - private final RenderItem renderItem = (RenderItem)RenderManager.instance.getEntityClassRenderObject(EntityItem.class); + private final RenderItem renderItem = new RenderItem(); @Override public void renderTileEntityAt(TileEntity tileEntity, double x, double y, double z, float partialTick) @@ -53,9 +50,8 @@ public class RenderBin extends TileEntitySpecialRenderer return; } - doLight(tileEntity.getWorldObj(), obj); - OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, 240, 240); - + MekanismRenderer.glowOn(); + if(itemStack != null) { GL11.glPushMatrix(); @@ -82,17 +78,13 @@ public class RenderBin extends TileEntitySpecialRenderer float scale = 0.03125F; float scaler = 0.9F; - GL11.glScalef(scale*scaler, scale*scaler, 0); + GL11.glScalef(scale*scaler, scale*scaler, -0.0001F); GL11.glRotatef(180, 0, 0, 1); TextureManager renderEngine = Minecraft.getMinecraft().renderEngine; - GL11.glDisable(GL11.GL_LIGHTING); - GL11.glEnable(GL11.GL_DEPTH_TEST); - renderItem.renderItemAndEffectIntoGUI(func_147498_b()/*getFontRenderer()*/, renderEngine, itemStack, 0, 0); - GL11.glEnable(GL11.GL_LIGHTING); GL11.glPopMatrix(); } @@ -100,24 +92,11 @@ public class RenderBin extends TileEntitySpecialRenderer { renderText(amount, ForgeDirection.getOrientation(tileEntity.facing), 0.02F, x, y - 0.31F, z); } + + MekanismRenderer.glowOff(); } } - private void doLight(World world, Coord4D obj) - { - if(world.getBlock(obj.xCoord, obj.yCoord, obj.zCoord).isOpaqueCube()) - { - return; - } - - int brightness = world.getLightBrightnessForSkyBlocks(obj.xCoord, obj.yCoord, obj.zCoord, 0); - int lightX = brightness % 65536; - int lightY = brightness / 65536; - float scale = 0.6F; - - OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, lightX * scale, lightY * scale); - } - @SuppressWarnings("incomplete-switch") private void renderText(String text, ForgeDirection side, float maxScale, double x, double y, double z) { From 13996faacb62c4973a74170b9c6179e3d1967ca7 Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Sat, 5 Mar 2016 18:28:52 -0500 Subject: [PATCH 32/52] Better particle rendering, bubbles when scuba tank is active, improved jetpack hover mode to disable when player is grounded --- .../mekanism/client/ClientTickHandler.java | 42 ++++++++++++--- .../client/render/RenderTickHandler.java | 11 ++-- .../render/particle/EntityScubaBubbleFX.java | 41 +++++++++++++++ .../common/CommonPlayerTickHandler.java | 51 +++++++++++++++++-- 4 files changed, 128 insertions(+), 17 deletions(-) create mode 100644 src/main/java/mekanism/client/render/particle/EntityScubaBubbleFX.java diff --git a/src/main/java/mekanism/client/ClientTickHandler.java b/src/main/java/mekanism/client/ClientTickHandler.java index cefdb776d..09d420ba7 100644 --- a/src/main/java/mekanism/client/ClientTickHandler.java +++ b/src/main/java/mekanism/client/ClientTickHandler.java @@ -15,6 +15,7 @@ import mekanism.api.IClientTicker; import mekanism.api.MekanismConfig.client; import mekanism.api.gas.GasStack; import mekanism.client.sound.SoundHandler; +import mekanism.common.CommonPlayerTickHandler; import mekanism.common.KeySync; import mekanism.common.Mekanism; import mekanism.common.item.ItemFlamethrower; @@ -34,6 +35,7 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.entity.AbstractClientPlayer; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import net.minecraft.potion.PotionEffect; import net.minecraft.util.StringUtils; import com.mojang.authlib.minecraft.MinecraftProfileTexture; @@ -310,7 +312,7 @@ public class ClientTickHandler flamethrower.useGas(mc.thePlayer.getCurrentEquippedItem()); } } - + if(isJetpackOn(mc.thePlayer)) { ItemJetpack jetpack = (ItemJetpack)mc.thePlayer.getEquipmentInSlot(3).getItem(); @@ -330,7 +332,10 @@ public class ClientTickHandler } else if(mc.thePlayer.motionY < 0) { - mc.thePlayer.motionY = Math.min(mc.thePlayer.motionY + 0.15D, 0); + if(!CommonPlayerTickHandler.isOnGround(mc.thePlayer)) + { + mc.thePlayer.motionY = Math.min(mc.thePlayer.motionY + 0.15D, 0); + } } } else { @@ -340,7 +345,10 @@ public class ClientTickHandler } else if(mc.gameSettings.keyBindSneak.getIsKeyPressed() && mc.currentScreen == null) { - mc.thePlayer.motionY = Math.max(mc.thePlayer.motionY - 0.15D, -0.2D); + if(!CommonPlayerTickHandler.isOnGround(mc.thePlayer)) + { + mc.thePlayer.motionY = Math.max(mc.thePlayer.motionY - 0.15D, -0.2D); + } } } @@ -355,17 +363,26 @@ public class ClientTickHandler ItemScubaTank tank = (ItemScubaTank)mc.thePlayer.getEquipmentInSlot(3).getItem(); final int max = 300; - + tank.useGas(mc.thePlayer.getEquipmentInSlot(3)); GasStack received = tank.useGas(mc.thePlayer.getEquipmentInSlot(3), max-mc.thePlayer.getAir()); if(received != null) { mc.thePlayer.setAir(mc.thePlayer.getAir()+received.amount); - - if(mc.thePlayer.getAir() == max) + } + + if(mc.thePlayer.getAir() == max) + { + for(Object obj : mc.thePlayer.getActivePotionEffects()) { - mc.thePlayer.clearActivePotions(); + if(obj instanceof PotionEffect) + { + for(int i = 0; i < 9; i++) + { + ((PotionEffect)obj).onUpdate(mc.thePlayer); + } + } } } } @@ -392,7 +409,7 @@ public class ClientTickHandler ItemStack stack = player.inventory.armorInventory[2]; - if(stack != null) + if(stack != null && !player.capabilities.isCreativeMode) { if(stack.getItem() instanceof ItemJetpack) { @@ -406,6 +423,15 @@ public class ClientTickHandler } else if(jetpack.getMode(stack) == JetpackMode.HOVER) { + if((!mc.gameSettings.keyBindJump.getIsKeyPressed() && !mc.gameSettings.keyBindSneak.getIsKeyPressed()) || (mc.gameSettings.keyBindJump.getIsKeyPressed() && mc.gameSettings.keyBindSneak.getIsKeyPressed()) || mc.currentScreen != null) + { + return !player.onGround; + } + else if(mc.gameSettings.keyBindSneak.getIsKeyPressed() && mc.currentScreen == null) + { + return !player.onGround; + } + return true; } } diff --git a/src/main/java/mekanism/client/render/RenderTickHandler.java b/src/main/java/mekanism/client/render/RenderTickHandler.java index ebb950d4c..69d5c8ff8 100644 --- a/src/main/java/mekanism/client/render/RenderTickHandler.java +++ b/src/main/java/mekanism/client/render/RenderTickHandler.java @@ -9,6 +9,7 @@ import mekanism.api.MekanismAPI; import mekanism.api.Pos3D; import mekanism.client.render.particle.EntityJetpackFlameFX; import mekanism.client.render.particle.EntityJetpackSmokeFX; +import mekanism.client.render.particle.EntityScubaBubbleFX; import mekanism.common.Mekanism; import mekanism.common.item.ItemFlamethrower; import mekanism.common.item.ItemJetpack; @@ -17,7 +18,6 @@ import mekanism.common.util.MekanismUtils; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.gui.ScaledResolution; -import net.minecraft.client.particle.EntityBubbleFX; import net.minecraft.client.particle.EntityFX; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -128,18 +128,21 @@ public class RenderTickHandler vLeft.xPos -= 0.43; vLeft.yPos -= 0.55; vLeft.zPos -= 0.54; + vLeft.rotatePitch(p.isSneaking() ? 25 : 0); vLeft.rotateYaw(p.renderYawOffset); Pos3D vRight = new Pos3D(); vRight.xPos += 0.43; vRight.yPos -= 0.55; vRight.zPos -= 0.54; + vRight.rotatePitch(p.isSneaking() ? 25 : 0); vRight.rotateYaw(p.renderYawOffset); Pos3D vCenter = new Pos3D(); vCenter.xPos = (rand.nextFloat() - 0.5F) * 0.4F; vCenter.yPos -= 0.86; vCenter.zPos -= 0.30; + vCenter.rotatePitch(p.isSneaking() ? 25 : 0); vCenter.rotateYaw(p.renderYawOffset); Pos3D rLeft = vLeft.clone().scale(random); @@ -189,11 +192,11 @@ public class RenderTickHandler float xRand = (rand.nextFloat() - 0.5F) * 0.08F; float yRand = (rand.nextFloat() - 0.5F) * 0.05F; - Pos3D vec = new Pos3D(0, 0, 0.4).rotate(p.rotationYawHead, p.rotationPitch); + Pos3D vec = new Pos3D(0.4, 0.4, 0.4).multiply(new Pos3D(p.getLook(90))).translate(0, -0.2, 0); Pos3D motion = vec.clone().scale(0.2).translate(new Pos3D(p.motionX, p.motionY, p.motionZ)); Pos3D v = playerPos.clone().translate(vec); - spawnAndSetParticle("bubble", world, v.xPos, v.yPos, v.zPos, motion.xPos, motion.yPos, motion.zPos); + spawnAndSetParticle("bubble", world, v.xPos, v.yPos, v.zPos, motion.xPos, motion.yPos + 0.2, motion.zPos); } } } @@ -265,7 +268,7 @@ public class RenderTickHandler } else if(s.equals("bubble")) { - fx = new EntityBubbleFX(world, x, y, z, velX, velY, velZ); + fx = new EntityScubaBubbleFX(world, x, y, z, velX, velY, velZ); } mc.effectRenderer.addEffect(fx); diff --git a/src/main/java/mekanism/client/render/particle/EntityScubaBubbleFX.java b/src/main/java/mekanism/client/render/particle/EntityScubaBubbleFX.java new file mode 100644 index 000000000..468f7bd1a --- /dev/null +++ b/src/main/java/mekanism/client/render/particle/EntityScubaBubbleFX.java @@ -0,0 +1,41 @@ +package mekanism.client.render.particle; + +import net.minecraft.client.Minecraft; +import net.minecraft.client.particle.EntityBubbleFX; +import net.minecraft.client.renderer.Tessellator; +import net.minecraft.world.World; +import cpw.mods.fml.client.FMLClientHandler; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + +@SideOnly(Side.CLIENT) +public class EntityScubaBubbleFX extends EntityBubbleFX +{ + private static Minecraft mc = FMLClientHandler.instance().getClient(); + + public EntityScubaBubbleFX(World world, double posX, double posY, double posZ, double velX, double velY, double velZ) + { + super(world, posX, posY, posZ, velX, velY, velZ); + + particleScale = (rand.nextFloat()*0.2F)+0.5F; + particleMaxAge *= 2; + } + + @Override + public void onUpdate() + { + super.onUpdate(); + + particleAge++; + } + + @Override + public void renderParticle(Tessellator p_70539_1_, float p_70539_2_, float p_70539_3_, float p_70539_4_, float p_70539_5_, float p_70539_6_, float p_70539_7_) + { + if(particleAge > 0) + { + particleAlpha = Math.min(1, (particleAge+p_70539_2_)/20F); + super.renderParticle(p_70539_1_, p_70539_2_, p_70539_3_, p_70539_4_, p_70539_5_, p_70539_6_, p_70539_7_); + } + } +} diff --git a/src/main/java/mekanism/common/CommonPlayerTickHandler.java b/src/main/java/mekanism/common/CommonPlayerTickHandler.java index 679bb311e..45f73d635 100644 --- a/src/main/java/mekanism/common/CommonPlayerTickHandler.java +++ b/src/main/java/mekanism/common/CommonPlayerTickHandler.java @@ -9,10 +9,14 @@ import mekanism.common.item.ItemJetpack; import mekanism.common.item.ItemJetpack.JetpackMode; import mekanism.common.item.ItemScubaTank; import mekanism.common.util.MekanismUtils; +import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; import net.minecraft.network.NetHandlerPlayServer; +import net.minecraft.potion.PotionEffect; +import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.MathHelper; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.gameevent.TickEvent.Phase; import cpw.mods.fml.common.gameevent.TickEvent.PlayerTickEvent; @@ -70,7 +74,10 @@ public class CommonPlayerTickHandler } else if(player.motionY < 0) { - player.motionY = Math.min(player.motionY + 0.15D, 0); + if(!isOnGround(player)) + { + player.motionY = Math.min(player.motionY + 0.15D, 0); + } } } else { @@ -80,7 +87,10 @@ public class CommonPlayerTickHandler } else if(Mekanism.keyMap.has(player, KeySync.DESCEND)) { - player.motionY = Math.max(player.motionY - 0.15D, -0.2D); + if(!isOnGround(player)) + { + player.motionY = Math.max(player.motionY - 0.15D, -0.2D); + } } } } @@ -107,14 +117,36 @@ public class CommonPlayerTickHandler if(received != null) { player.setAir(player.getAir()+received.amount); - - if(player.getAir() == max) + } + + if(player.getAir() == max) + { + for(Object obj : player.getActivePotionEffects()) { - player.clearActivePotions(); + if(obj instanceof PotionEffect) + { + for(int i = 0; i < 9; i++) + { + ((PotionEffect)obj).onUpdate(player); + } + } } } } } + + public static boolean isOnGround(EntityPlayer player) + { + int x = MathHelper.floor_double(player.posX); + int y = (int)Math.round(player.posY-player.yOffset - 1); + int z = MathHelper.floor_double(player.posZ); + + Block b = player.worldObj.getBlock(x, y, z); + AxisAlignedBB box = b.getCollisionBoundingBoxFromPool(player.worldObj, x, y, z); + AxisAlignedBB playerBox = player.boundingBox.copy().offset(0, -0.01, 0); + + return box != null && playerBox.intersectsWith(box); + } public boolean isJetpackOn(EntityPlayer player) { @@ -134,6 +166,15 @@ public class CommonPlayerTickHandler } else if(jetpack.getMode(stack) == JetpackMode.HOVER) { + if((!Mekanism.keyMap.has(player, KeySync.ASCEND) && !Mekanism.keyMap.has(player, KeySync.DESCEND)) || (Mekanism.keyMap.has(player, KeySync.ASCEND) && Mekanism.keyMap.has(player, KeySync.DESCEND))) + { + return !player.onGround; + } + else if(Mekanism.keyMap.has(player, KeySync.DESCEND)) + { + return !player.onGround; + } + return true; } } From b13d8ee1abe1c9df85183952e0041186c021bcac Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Sat, 5 Mar 2016 18:48:49 -0500 Subject: [PATCH 33/52] Fixed fluid duplication --- .../java/mekanism/common/tile/TileEntityChemicalWasher.java | 2 +- src/main/java/mekanism/common/tile/TileEntityDynamicTank.java | 4 ++-- src/main/java/mekanism/common/tile/TileEntityFluidTank.java | 4 ++-- .../java/mekanism/common/tile/TileEntityFluidicPlenisher.java | 2 +- .../mekanism/common/tile/TileEntityRotaryCondensentrator.java | 4 ++-- .../common/tile/TileEntityThermalEvaporationController.java | 4 ++-- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/main/java/mekanism/common/tile/TileEntityChemicalWasher.java b/src/main/java/mekanism/common/tile/TileEntityChemicalWasher.java index 186132e2d..98fcaf7ee 100644 --- a/src/main/java/mekanism/common/tile/TileEntityChemicalWasher.java +++ b/src/main/java/mekanism/common/tile/TileEntityChemicalWasher.java @@ -230,7 +230,7 @@ public class TileEntityChemicalWasher extends TileEntityNoisyElectricBlock imple if(containerItem != null) { - if(inventory[1] == null || (inventory[1].isItemEqual(containerItem) && inventory[1].stackSize+1 <= containerItem.getMaxStackSize())) + if(inventory[1] == null || (ItemStack.areItemStacksEqual(inventory[1], containerItem) && inventory[1].stackSize+1 <= containerItem.getMaxStackSize())) { inventory[0] = null; diff --git a/src/main/java/mekanism/common/tile/TileEntityDynamicTank.java b/src/main/java/mekanism/common/tile/TileEntityDynamicTank.java index 445c705a8..862bc34d8 100644 --- a/src/main/java/mekanism/common/tile/TileEntityDynamicTank.java +++ b/src/main/java/mekanism/common/tile/TileEntityDynamicTank.java @@ -190,7 +190,7 @@ public class TileEntityDynamicTank extends TileEntityMultiblock inventory[3].stackSize) + else if(ItemStack.areItemStacksEqual(tempStack, inventory[3]) && tempStack.getMaxStackSize() > inventory[3].stackSize) { outputTank.drain(FluidContainerRegistry.BUCKET_VOLUME, true); @@ -287,7 +287,7 @@ public class TileEntityThermalEvaporationController extends TileEntityThermalEva if(containerItem != null) { - if(inventory[1] == null || (inventory[1].isItemEqual(containerItem) && inventory[1].stackSize+1 <= containerItem.getMaxStackSize())) + if(inventory[1] == null || (ItemStack.areItemStacksEqual(inventory[1], containerItem) && inventory[1].stackSize+1 <= containerItem.getMaxStackSize())) { inventory[0] = null; From d77de295f2aaabf7db1a9112c73f67f8ee2915b8 Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Sat, 5 Mar 2016 19:33:02 -0500 Subject: [PATCH 34/52] Modified factory-capable machine side data to match that of factories, allowing for configuration preservation --- .../tile/TileEntityAdvancedElectricMachine.java | 14 ++++++++++---- .../common/tile/TileEntityElectricMachine.java | 17 ++++++++++++++--- .../mekanism/common/tile/TileEntityFactory.java | 9 +++++---- .../tile/TileEntityMetallurgicInfuser.java | 14 ++++++++++---- 4 files changed, 39 insertions(+), 15 deletions(-) diff --git a/src/main/java/mekanism/common/tile/TileEntityAdvancedElectricMachine.java b/src/main/java/mekanism/common/tile/TileEntityAdvancedElectricMachine.java index 9de3ea37a..a8e9b5584 100644 --- a/src/main/java/mekanism/common/tile/TileEntityAdvancedElectricMachine.java +++ b/src/main/java/mekanism/common/tile/TileEntityAdvancedElectricMachine.java @@ -68,11 +68,11 @@ public abstract class TileEntityAdvancedElectricMachine Date: Sun, 6 Mar 2016 02:15:56 -0500 Subject: [PATCH 35/52] More consolidated fluid container management- I've been meaning to get to this for a long time --- .../java/mekanism/api/util/StackUtils.java | 9 +- .../common/tile/TileEntityChemicalWasher.java | 62 +---- .../common/tile/TileEntityDynamicTank.java | 147 +---------- .../common/tile/TileEntityElectricPump.java | 62 +---- .../common/tile/TileEntityFluidTank.java | 120 ++------- .../tile/TileEntityFluidicPlenisher.java | 66 +---- .../tile/TileEntityRotaryCondensentrator.java | 106 +------- ...ileEntityThermalEvaporationController.java | 62 ++--- .../common/util/FluidContainerUtils.java | 245 +++++++++++++++++- .../mekanism/common/util/RecipeUtils.java | 3 +- .../common/tile/TileEntityHeatGenerator.java | 3 +- 11 files changed, 321 insertions(+), 564 deletions(-) diff --git a/src/main/java/mekanism/api/util/StackUtils.java b/src/main/java/mekanism/api/util/StackUtils.java index 4b2b61fbd..649046583 100644 --- a/src/main/java/mekanism/api/util/StackUtils.java +++ b/src/main/java/mekanism/api/util/StackUtils.java @@ -65,7 +65,14 @@ public final class StackUtils public static boolean equalsWildcardWithNBT(ItemStack wild, ItemStack check) { - return equalsWildcard(wild, check) && (wild.stackTagCompound == null ? check.stackTagCompound == null : (wild.stackTagCompound == check.stackTagCompound || wild.stackTagCompound.equals(check.stackTagCompound))); + boolean wildcard = equalsWildcard(wild, check); + + if(wild == null || check == null) + { + return wildcard; + } + + return wildcard && (wild.stackTagCompound == null ? check.stackTagCompound == null : (wild.stackTagCompound == check.stackTagCompound || wild.stackTagCompound.equals(check.stackTagCompound))); } public static List even(ItemStack stack1, ItemStack stack2) diff --git a/src/main/java/mekanism/common/tile/TileEntityChemicalWasher.java b/src/main/java/mekanism/common/tile/TileEntityChemicalWasher.java index 98fcaf7ee..fa9a9d121 100644 --- a/src/main/java/mekanism/common/tile/TileEntityChemicalWasher.java +++ b/src/main/java/mekanism/common/tile/TileEntityChemicalWasher.java @@ -31,6 +31,7 @@ import mekanism.common.recipe.machines.WasherRecipe; import mekanism.common.tile.component.TileComponentUpgrade; import mekanism.common.util.ChargeUtils; import mekanism.common.util.FluidContainerUtils; +import mekanism.common.util.FluidContainerUtils.FluidChecker; import mekanism.common.util.InventoryUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.PipeUtils; @@ -200,68 +201,11 @@ public class TileEntityChemicalWasher extends TileEntityNoisyElectricBlock imple { if(inventory[0].getItem() instanceof IFluidContainerItem) { - fluidTank.fill(FluidContainerUtils.extractFluid(fluidTank, inventory[0], FluidRegistry.WATER), true); - - if(((IFluidContainerItem)inventory[0].getItem()).getFluid(inventory[0]) == null || fluidTank.getFluidAmount() == fluidTank.getCapacity()) - { - if(inventory[1] == null) - { - inventory[1] = inventory[0].copy(); - inventory[0] = null; - - markDirty(); - } - } + FluidContainerUtils.handleContainerItemEmpty(this, fluidTank, 0, 1, FluidChecker.check(FluidRegistry.WATER)); } else if(FluidContainerRegistry.isFilledContainer(inventory[0])) { - FluidStack itemFluid = FluidContainerRegistry.getFluidForFilledItem(inventory[0]); - - if((fluidTank.getFluid() == null && itemFluid.amount <= MAX_FLUID) || fluidTank.getFluid().amount+itemFluid.amount <= MAX_FLUID) - { - if(itemFluid.getFluid() != FluidRegistry.WATER || (fluidTank.getFluid() != null && !fluidTank.getFluid().isFluidEqual(itemFluid))) - { - return; - } - - ItemStack containerItem = inventory[0].getItem().getContainerItem(inventory[0]); - - boolean filled = false; - - if(containerItem != null) - { - if(inventory[1] == null || (ItemStack.areItemStacksEqual(inventory[1], containerItem) && inventory[1].stackSize+1 <= containerItem.getMaxStackSize())) - { - inventory[0] = null; - - if(inventory[1] == null) - { - inventory[1] = containerItem; - } - else { - inventory[1].stackSize++; - } - - filled = true; - } - } - else { - inventory[0].stackSize--; - - if(inventory[0].stackSize == 0) - { - inventory[0] = null; - } - - filled = true; - } - - if(filled) - { - fluidTank.fill(itemFluid, true); - markDirty(); - } - } + FluidContainerUtils.handleRegistryItemEmpty(this, fluidTank, 0, 1, FluidChecker.check(FluidRegistry.WATER)); } } } diff --git a/src/main/java/mekanism/common/tile/TileEntityDynamicTank.java b/src/main/java/mekanism/common/tile/TileEntityDynamicTank.java index 862bc34d8..39dcf32ae 100644 --- a/src/main/java/mekanism/common/tile/TileEntityDynamicTank.java +++ b/src/main/java/mekanism/common/tile/TileEntityDynamicTank.java @@ -8,6 +8,7 @@ import java.util.Set; import mekanism.api.Coord4D; import mekanism.api.Range4D; +import mekanism.api.util.StackUtils; import mekanism.common.Mekanism; import mekanism.common.base.IFluidContainerManager; import mekanism.common.block.BlockBasic; @@ -125,7 +126,7 @@ public class TileEntityDynamicTank extends TileEntityMultiblock= FluidContainerRegistry.BUCKET_VOLUME) - { - ItemStack filled = FluidContainerRegistry.fillFluidContainer(structure.fluidStored, structure.inventory[0]); - - if(filled != null) - { - if(structure.inventory[1] == null || (ItemStack.areItemStacksEqual(structure.inventory[1], filled) && structure.inventory[1].stackSize+1 <= filled.getMaxStackSize())) - { - structure.inventory[0].stackSize--; - - if(structure.inventory[0].stackSize <= 0) - { - structure.inventory[0] = null; - } - - if(structure.inventory[1] == null) - { - structure.inventory[1] = filled; - } - else { - structure.inventory[1].stackSize++; - } - - markDirty(); - - structure.fluidStored.amount -= FluidContainerRegistry.getFluidForFilledItem(filled).amount; - - if(structure.fluidStored.amount == 0) - { - structure.fluidStored = null; - } - - Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new ArrayList())), new Range4D(Coord4D.get(this))); - } - } - } + structure.fluidStored = FluidContainerUtils.handleRegistryItemFill(this, structure.inventory, structure.fluidStored, 0, 1); + + Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new ArrayList())), new Range4D(Coord4D.get(this))); } else if(FluidContainerRegistry.isFilledContainer(structure.inventory[0]) && (structure.editMode == ContainerEditMode.BOTH || structure.editMode == ContainerEditMode.EMPTY)) { - FluidStack itemFluid = FluidContainerRegistry.getFluidForFilledItem(structure.inventory[0]); - - if((structure.fluidStored == null && itemFluid.amount <= max) || structure.fluidStored.amount+itemFluid.amount <= max) - { - if(structure.fluidStored != null && !structure.fluidStored.isFluidEqual(itemFluid)) - { - return; - } - - ItemStack containerItem = structure.inventory[0].getItem().getContainerItem(structure.inventory[0]); - - boolean filled = false; - - if(containerItem != null) - { - if(structure.inventory[1] == null || (ItemStack.areItemStacksEqual(structure.inventory[1], containerItem) && structure.inventory[1].stackSize+1 <= containerItem.getMaxStackSize())) - { - structure.inventory[0] = null; - - if(structure.inventory[1] == null) - { - structure.inventory[1] = containerItem; - } - else { - structure.inventory[1].stackSize++; - } - - filled = true; - } - } - else { - structure.inventory[0].stackSize--; - - if(structure.inventory[0].stackSize == 0) - { - structure.inventory[0] = null; - } - - filled = true; - } - - if(filled) - { - if(structure.fluidStored == null) - { - structure.fluidStored = itemFluid.copy(); - } - else { - structure.fluidStored.amount += itemFluid.amount; - } - - markDirty(); - } - - Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new ArrayList())), new Range4D(Coord4D.get(this))); - } + structure.fluidStored = FluidContainerUtils.handleRegistryItemEmpty(this, structure.inventory, structure.fluidStored, needed, 0, 1, null); + + Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new ArrayList())), new Range4D(Coord4D.get(this))); } } } diff --git a/src/main/java/mekanism/common/tile/TileEntityElectricPump.java b/src/main/java/mekanism/common/tile/TileEntityElectricPump.java index b0a8ff4a0..898ff7f3d 100644 --- a/src/main/java/mekanism/common/tile/TileEntityElectricPump.java +++ b/src/main/java/mekanism/common/tile/TileEntityElectricPump.java @@ -91,63 +91,15 @@ public class TileEntityElectricPump extends TileEntityElectricBlock implements I { ChargeUtils.discharge(2, this); - if(inventory[0] != null) + if(inventory[0] != null && fluidTank.getFluid() != null) { - if(fluidTank.getFluid() != null && fluidTank.getFluid().amount >= FluidContainerRegistry.BUCKET_VOLUME) + if(inventory[0].getItem() instanceof IFluidContainerItem) { - if(inventory[0].getItem() instanceof IFluidContainerItem) - { - int prev = fluidTank.getFluidAmount(); - - fluidTank.drain(FluidContainerUtils.insertFluid(fluidTank, inventory[0]), true); - - if(prev == fluidTank.getFluidAmount() || fluidTank.getFluidAmount() == 0) - { - if(inventory[1] == null) - { - inventory[1] = inventory[0].copy(); - inventory[0] = null; - - markDirty(); - } - } - } - else if(FluidContainerRegistry.isEmptyContainer(inventory[0])) - { - ItemStack tempStack = FluidContainerRegistry.fillFluidContainer(fluidTank.getFluid(), inventory[0]); - - if(tempStack != null) - { - if(inventory[1] == null) - { - fluidTank.drain(FluidContainerRegistry.BUCKET_VOLUME, true); - - inventory[1] = tempStack; - inventory[0].stackSize--; - - if(inventory[0].stackSize <= 0) - { - inventory[0] = null; - } - - markDirty(); - } - else if(tempStack.isItemEqual(inventory[1]) && tempStack.getMaxStackSize() > inventory[1].stackSize) - { - fluidTank.drain(FluidContainerRegistry.BUCKET_VOLUME, true); - - inventory[1].stackSize++; - inventory[0].stackSize--; - - if(inventory[0].stackSize <= 0) - { - inventory[0] = null; - } - - markDirty(); - } - } - } + FluidContainerUtils.handleContainerItemFill(this, fluidTank, 0, 1); + } + else if(FluidContainerRegistry.isEmptyContainer(inventory[0])) + { + FluidContainerUtils.handleRegistryItemFill(this, fluidTank, 0, 1); } } } diff --git a/src/main/java/mekanism/common/tile/TileEntityFluidTank.java b/src/main/java/mekanism/common/tile/TileEntityFluidTank.java index 09ea04834..32db52831 100644 --- a/src/main/java/mekanism/common/tile/TileEntityFluidTank.java +++ b/src/main/java/mekanism/common/tile/TileEntityFluidTank.java @@ -171,121 +171,42 @@ public class TileEntityFluidTank extends TileEntityContainerBlock implements IAc { if(editMode == ContainerEditMode.FILL && fluidTank.getFluidAmount() > 0) { - int prev = fluidTank.getFluidAmount(); - - fluidTank.drain(FluidContainerUtils.insertFluid(fluidTank, inventory[0]), true); - - if(prev == fluidTank.getFluidAmount()) - { - if(inventory[1] == null) - { - inventory[1] = inventory[0].copy(); - inventory[0] = null; - - markDirty(); - } - } + FluidContainerUtils.handleContainerItemFill(this, fluidTank, 0, 1); } else if(editMode == ContainerEditMode.EMPTY) { - fluidTank.fill(FluidContainerUtils.extractFluid(fluidTank, inventory[0]), true); + FluidStack ret = FluidContainerUtils.handleContainerItemEmpty(this, inventory, fluidTank.getFluid(), getCurrentNeeded(), 0, 1, null); - if(((IFluidContainerItem)inventory[0].getItem()).getFluid(inventory[0]) == null || fluidTank.getFluidAmount() == fluidTank.getCapacity()) + if(ret != null) { - if(inventory[1] == null) + fluidTank.setFluid(new FluidStack(ret.getFluid(), Math.min(fluidTank.getCapacity(), ret.amount))); + + int rejects = Math.max(0, ret.amount - fluidTank.getCapacity()); + + if(rejects > 0) { - inventory[1] = inventory[0].copy(); - inventory[0] = null; - - markDirty(); + pushUp(new FluidStack(ret.getFluid(), rejects), true); } } } } else if(FluidContainerRegistry.isEmptyContainer(inventory[0]) && (editMode == ContainerEditMode.BOTH || editMode == ContainerEditMode.FILL)) { - if(fluidTank.getFluid() != null && fluidTank.getFluid().amount >= FluidContainerRegistry.BUCKET_VOLUME) - { - ItemStack filled = FluidContainerRegistry.fillFluidContainer(fluidTank.getFluid(), inventory[0]); - - if(filled != null) - { - if(inventory[1] == null || (ItemStack.areItemStacksEqual(inventory[1], filled) && inventory[1].stackSize+1 <= filled.getMaxStackSize())) - { - inventory[0].stackSize--; - - if(inventory[0].stackSize <= 0) - { - inventory[0] = null; - } - - if(inventory[1] == null) - { - inventory[1] = filled; - } - else { - inventory[1].stackSize++; - } - - fluidTank.drain(FluidContainerRegistry.getFluidForFilledItem(filled).amount, true); - } - } - } + FluidContainerUtils.handleRegistryItemFill(this, fluidTank, 0, 1); } else if(FluidContainerRegistry.isFilledContainer(inventory[0]) && (editMode == ContainerEditMode.BOTH || editMode == ContainerEditMode.EMPTY)) { - FluidStack itemFluid = FluidContainerRegistry.getFluidForFilledItem(inventory[0]); - int needed = getCurrentNeeded(); - - if((fluidTank.getFluid() == null && itemFluid.amount <= fluidTank.getCapacity()) || itemFluid.amount <= needed) + FluidStack ret = FluidContainerUtils.handleRegistryItemEmpty(this, inventory, fluidTank.getFluid(), getCurrentNeeded(), 0, 1, null); + + if(ret != null) { - if(fluidTank.getFluid() != null && !fluidTank.getFluid().isFluidEqual(itemFluid)) + fluidTank.setFluid(new FluidStack(ret.getFluid(), Math.min(fluidTank.getCapacity(), ret.amount))); + + int rejects = Math.max(0, ret.amount - fluidTank.getCapacity()); + + if(rejects > 0) { - return; - } - - ItemStack containerItem = inventory[0].getItem().getContainerItem(inventory[0]); - - boolean filled = false; - - if(containerItem != null) - { - if(inventory[1] == null || (ItemStack.areItemStacksEqual(inventory[1], containerItem) && inventory[1].stackSize+1 <= containerItem.getMaxStackSize())) - { - inventory[0] = null; - - if(inventory[1] == null) - { - inventory[1] = containerItem; - } - else { - inventory[1].stackSize++; - } - - filled = true; - } - } - else { - inventory[0].stackSize--; - - if(inventory[0].stackSize == 0) - { - inventory[0] = null; - } - - filled = true; - } - - if(filled) - { - int toFill = Math.min(needed, itemFluid.amount); - - fluidTank.fill(itemFluid, true); - - if(itemFluid.amount-toFill > 0) - { - pushUp(new FluidStack(itemFluid.getFluid(), itemFluid.amount-toFill), true); - } + pushUp(new FluidStack(ret.getFluid(), rejects), true); } } } @@ -383,6 +304,7 @@ public class TileEntityFluidTank extends TileEntityContainerBlock implements IAc if(nbtTags.hasKey("fluidTank")) { + fluidTank.setCapacity(tier.storage); fluidTank.readFromNBT(nbtTags.getCompoundTag("fluidTank")); } } @@ -393,6 +315,8 @@ public class TileEntityFluidTank extends TileEntityContainerBlock implements IAc super.handlePacketData(dataStream); tier = FluidTankTier.values()[dataStream.readInt()]; + fluidTank.setCapacity(tier.storage); + clientActive = dataStream.readBoolean(); valve = dataStream.readInt(); editMode = ContainerEditMode.values()[dataStream.readInt()]; diff --git a/src/main/java/mekanism/common/tile/TileEntityFluidicPlenisher.java b/src/main/java/mekanism/common/tile/TileEntityFluidicPlenisher.java index ba4f299aa..d8bf8ed82 100644 --- a/src/main/java/mekanism/common/tile/TileEntityFluidicPlenisher.java +++ b/src/main/java/mekanism/common/tile/TileEntityFluidicPlenisher.java @@ -82,73 +82,13 @@ public class TileEntityFluidicPlenisher extends TileEntityElectricBlock implemen if(inventory[0] != null) { - if(inventory[0].getItem() instanceof IFluidContainerItem && ((IFluidContainerItem)inventory[0].getItem()).getFluid(inventory[0]) != null) + if(inventory[0].getItem() instanceof IFluidContainerItem) { - if(((IFluidContainerItem)inventory[0].getItem()).getFluid(inventory[0]).getFluid().canBePlacedInWorld()) - { - fluidTank.fill(FluidContainerUtils.extractFluid(fluidTank, inventory[0]), true); - - if(((IFluidContainerItem) inventory[0].getItem()).getFluid(inventory[0]) == null || fluidTank.getFluidAmount() == fluidTank.getCapacity()) - { - if(inventory[1] == null) - { - inventory[1] = inventory[0].copy(); - inventory[0] = null; - - markDirty(); - } - } - } + FluidContainerUtils.handleContainerItemEmpty(this, fluidTank, 0, 1); } else if(FluidContainerRegistry.isFilledContainer(inventory[0])) { - FluidStack itemFluid = FluidContainerRegistry.getFluidForFilledItem(inventory[0]); - - if((fluidTank.getFluid() == null && itemFluid.amount <= fluidTank.getCapacity()) || fluidTank.getFluid().amount+itemFluid.amount <= fluidTank.getCapacity()) - { - if((fluidTank.getFluid() != null && !fluidTank.getFluid().isFluidEqual(itemFluid)) || !itemFluid.getFluid().canBePlacedInWorld()) - { - return; - } - - ItemStack containerItem = inventory[0].getItem().getContainerItem(inventory[0]); - - boolean filled = false; - - if(containerItem != null) - { - if(inventory[1] == null || (ItemStack.areItemStacksEqual(inventory[1], containerItem) && inventory[1].stackSize+1 <= containerItem.getMaxStackSize())) - { - inventory[0] = null; - - if(inventory[1] == null) - { - inventory[1] = containerItem; - } - else { - inventory[1].stackSize++; - } - - filled = true; - } - } - else { - inventory[0].stackSize--; - - if(inventory[0].stackSize == 0) - { - inventory[0] = null; - } - - filled = true; - } - - if(filled) - { - fluidTank.fill(itemFluid, true); - markDirty(); - } - } + FluidContainerUtils.handleRegistryItemEmpty(this, fluidTank, 0, 1); } } diff --git a/src/main/java/mekanism/common/tile/TileEntityRotaryCondensentrator.java b/src/main/java/mekanism/common/tile/TileEntityRotaryCondensentrator.java index f388c135f..f333a33f8 100644 --- a/src/main/java/mekanism/common/tile/TileEntityRotaryCondensentrator.java +++ b/src/main/java/mekanism/common/tile/TileEntityRotaryCondensentrator.java @@ -126,52 +126,11 @@ public class TileEntityRotaryCondensentrator extends TileEntityElectricBlock imp { if(inventory[2].getItem() instanceof IFluidContainerItem) { - int prev = fluidTank.getFluidAmount(); - - fluidTank.drain(FluidContainerUtils.insertFluid(fluidTank, inventory[2]), true); - - if(prev == fluidTank.getFluidAmount() || fluidTank.getFluidAmount() == 0) - { - if(inventory[3] == null) - { - inventory[3] = inventory[2].copy(); - inventory[2] = null; - - markDirty(); - } - } + FluidContainerUtils.handleContainerItemFill(this, fluidTank, 2, 3); } else if(FluidContainerRegistry.isEmptyContainer(inventory[2])) { - if(fluidTank.getFluid() != null && fluidTank.getFluid().amount >= FluidContainerRegistry.BUCKET_VOLUME) - { - ItemStack filled = FluidContainerRegistry.fillFluidContainer(fluidTank.getFluid(), inventory[2]); - - if(filled != null) - { - if(inventory[3] == null || (ItemStack.areItemStacksEqual(inventory[3], filled) && inventory[3].stackSize+1 <= filled.getMaxStackSize())) - { - inventory[2].stackSize--; - - if(inventory[2].stackSize <= 0) - { - inventory[2] = null; - } - - if(inventory[3] == null) - { - inventory[3] = filled; - } - else { - inventory[3].stackSize++; - } - - markDirty(); - - fluidTank.drain(FluidContainerRegistry.getFluidForFilledItem(filled).amount, true); - } - } - } + FluidContainerUtils.handleRegistryItemFill(this, fluidTank, 2, 3); } } @@ -219,68 +178,11 @@ public class TileEntityRotaryCondensentrator extends TileEntityElectricBlock imp { if(inventory[2].getItem() instanceof IFluidContainerItem) { - fluidTank.fill(FluidContainerUtils.extractFluid(fluidTank, inventory[2]), true); - - if(((IFluidContainerItem)inventory[2].getItem()).getFluid(inventory[2]) == null || fluidTank.getFluidAmount() == fluidTank.getCapacity()) - { - if(inventory[3] == null) - { - inventory[3] = inventory[2].copy(); - inventory[2] = null; - - markDirty(); - } - } + FluidContainerUtils.handleContainerItemEmpty(this, fluidTank, 2, 3); } else if(FluidContainerRegistry.isFilledContainer(inventory[2])) { - FluidStack itemFluid = FluidContainerRegistry.getFluidForFilledItem(inventory[2]); - - if((fluidTank.getFluid() == null && itemFluid.amount <= MAX_FLUID) || fluidTank.getFluid().amount+itemFluid.amount <= MAX_FLUID) - { - if(fluidTank.getFluid() != null && !fluidTank.getFluid().isFluidEqual(itemFluid)) - { - return; - } - - ItemStack containerItem = inventory[2].getItem().getContainerItem(inventory[2]); - - boolean filled = false; - - if(containerItem != null) - { - if(inventory[3] == null || (ItemStack.areItemStacksEqual(inventory[3], containerItem) && inventory[3].stackSize+1 <= containerItem.getMaxStackSize())) - { - inventory[2] = null; - - if(inventory[3] == null) - { - inventory[3] = containerItem; - } - else { - inventory[3].stackSize++; - } - - filled = true; - } - } - else { - inventory[2].stackSize--; - - if(inventory[2].stackSize == 0) - { - inventory[2] = null; - } - - filled = true; - } - - if(filled) - { - fluidTank.fill(itemFluid, true); - markDirty(); - } - } + FluidContainerUtils.handleRegistryItemEmpty(this, fluidTank, 2, 3); } } diff --git a/src/main/java/mekanism/common/tile/TileEntityThermalEvaporationController.java b/src/main/java/mekanism/common/tile/TileEntityThermalEvaporationController.java index 80829f7fd..7efa72303 100644 --- a/src/main/java/mekanism/common/tile/TileEntityThermalEvaporationController.java +++ b/src/main/java/mekanism/common/tile/TileEntityThermalEvaporationController.java @@ -10,6 +10,7 @@ import mekanism.api.Coord4D; import mekanism.api.ISalinationSolar; import mekanism.api.MekanismConfig.general; import mekanism.api.Range4D; +import mekanism.api.util.StackUtils; import mekanism.client.SparkleAnimation.INodeChecker; import mekanism.common.Mekanism; import mekanism.common.base.IActiveState; @@ -20,6 +21,8 @@ import mekanism.common.recipe.RecipeHandler; import mekanism.common.recipe.RecipeHandler.Recipe; import mekanism.common.recipe.inputs.FluidInput; import mekanism.common.recipe.machines.ThermalEvaporationRecipe; +import mekanism.common.util.FluidContainerUtils; +import mekanism.common.util.FluidContainerUtils.FluidChecker; import mekanism.common.util.MekanismUtils; import net.minecraft.block.Block; import net.minecraft.item.ItemStack; @@ -31,6 +34,7 @@ import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTank; +import net.minecraftforge.fluids.IFluidContainerItem; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -249,7 +253,7 @@ public class TileEntityThermalEvaporationController extends TileEntityThermalEva markDirty(); } - else if(ItemStack.areItemStacksEqual(tempStack, inventory[3]) && tempStack.getMaxStackSize() > inventory[3].stackSize) + else if(StackUtils.equalsWildcardWithNBT(tempStack, inventory[3]) && tempStack.getMaxStackSize() > inventory[3].stackSize) { outputTank.drain(FluidContainerRegistry.BUCKET_VOLUME, true); @@ -270,53 +274,27 @@ public class TileEntityThermalEvaporationController extends TileEntityThermalEva if(structured) { - if(FluidContainerRegistry.isFilledContainer(inventory[0])) + if(inventory[0] != null) { - FluidStack itemFluid = FluidContainerRegistry.getFluidForFilledItem(inventory[0]); - - if((inputTank.getFluid() == null && itemFluid.amount <= getMaxFluid()) || inputTank.getFluid().amount+itemFluid.amount <= getMaxFluid()) + if(inventory[0].getItem() instanceof IFluidContainerItem) { - if(!hasRecipe(itemFluid.getFluid()) || (inputTank.getFluid() != null && !inputTank.getFluid().isFluidEqual(itemFluid))) - { - return; - } - - ItemStack containerItem = inventory[0].getItem().getContainerItem(inventory[0]); - - boolean filled = false; - - if(containerItem != null) - { - if(inventory[1] == null || (ItemStack.areItemStacksEqual(inventory[1], containerItem) && inventory[1].stackSize+1 <= containerItem.getMaxStackSize())) + FluidContainerUtils.handleContainerItemEmpty(this, inputTank, 0, 1, new FluidChecker() { + @Override + public boolean isValid(Fluid f) { - inventory[0] = null; - - if(inventory[1] == null) - { - inventory[1] = containerItem; - } - else { - inventory[1].stackSize++; - } - - filled = true; + return hasRecipe(f); } - } - else { - inventory[0].stackSize--; - - if(inventory[0].stackSize == 0) + }); + } + else if(FluidContainerRegistry.isFilledContainer(inventory[0])) + { + FluidContainerUtils.handleRegistryItemEmpty(this, inputTank, 0, 1, new FluidChecker() { + @Override + public boolean isValid(Fluid f) { - inventory[0] = null; + return hasRecipe(f); } - - filled = true; - } - - if(filled) - { - inputTank.fill(itemFluid, true); - } + }); } } } diff --git a/src/main/java/mekanism/common/util/FluidContainerUtils.java b/src/main/java/mekanism/common/util/FluidContainerUtils.java index f2512f348..a46057381 100644 --- a/src/main/java/mekanism/common/util/FluidContainerUtils.java +++ b/src/main/java/mekanism/common/util/FluidContainerUtils.java @@ -1,7 +1,11 @@ package mekanism.common.util; +import mekanism.api.util.StackUtils; +import mekanism.common.tile.TileEntityContainerBlock; import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTank; import net.minecraftforge.fluids.IFluidContainerItem; @@ -10,15 +14,15 @@ public final class FluidContainerUtils { public static FluidStack extractFluid(FluidTank tileTank, ItemStack container) { - return extractFluid(tileTank, container, tileTank.getFluid() != null ? tileTank.getFluid().getFluid() : null); + return extractFluid(tileTank, container, FluidChecker.check(tileTank.getFluid())); } - public static FluidStack extractFluid(FluidTank tileTank, ItemStack container, Fluid fluid) + public static FluidStack extractFluid(FluidTank tileTank, ItemStack container, FluidChecker checker) { - return extractFluid(tileTank.getCapacity()-tileTank.getFluidAmount(), container, fluid); + return extractFluid(tileTank.getCapacity()-tileTank.getFluidAmount(), container, checker); } - public static FluidStack extractFluid(int needed, ItemStack container, Fluid fluid) + public static FluidStack extractFluid(int needed, ItemStack container, FluidChecker checker) { IFluidContainerItem item = (IFluidContainerItem)container.getItem(); @@ -27,7 +31,7 @@ public final class FluidContainerUtils return null; } - if(fluid != null && item.getFluid(container).getFluid() != fluid) + if(checker != null && !checker.isValid(item.getFluid(container).getFluid())) { return null; } @@ -52,6 +56,205 @@ public final class FluidContainerUtils return item.fill(container, fluid, true); } + public static void handleContainerItemFill(TileEntityContainerBlock tileEntity, FluidTank tank, int inSlot, int outSlot) + { + tank.setFluid(handleContainerItemFill(tileEntity, tileEntity.inventory, tank.getFluid(), inSlot, outSlot)); + } + + public static FluidStack handleContainerItemFill(TileEntity tileEntity, ItemStack[] inventory, FluidStack stack, int inSlot, int outSlot) + { + if(stack != null) + { + int prev = stack.amount; + + stack.amount -= insertFluid(stack, inventory[inSlot]); + + if(prev == stack.amount || stack.amount == 0) + { + if(inventory[outSlot] == null) + { + inventory[outSlot] = inventory[inSlot].copy(); + inventory[inSlot] = null; + } + } + + if(stack.amount == 0) + { + stack = null; + } + + tileEntity.markDirty(); + } + + return stack; + } + + public static void handleContainerItemEmpty(TileEntityContainerBlock tileEntity, FluidTank tank, int inSlot, int outSlot) + { + handleContainerItemEmpty(tileEntity, tank, inSlot, outSlot, null); + } + + public static void handleContainerItemEmpty(TileEntityContainerBlock tileEntity, FluidTank tank, int inSlot, int outSlot, FluidChecker checker) + { + tank.setFluid(handleContainerItemEmpty(tileEntity, tileEntity.inventory, tank.getFluid(), tank.getCapacity()-tank.getFluidAmount(), inSlot, outSlot, checker)); + } + + public static FluidStack handleContainerItemEmpty(TileEntity tileEntity, ItemStack[] inventory, FluidStack stored, int needed, int inSlot, int outSlot, final FluidChecker checker) + { + final Fluid storedFinal = stored != null ? stored.getFluid() : null; + + FluidStack ret = extractFluid(needed, inventory[inSlot], new FluidChecker() { + @Override + public boolean isValid(Fluid f) + { + return (checker == null || checker.isValid(f)) && (storedFinal == null || storedFinal == f); + } + }); + + if(ret != null) + { + if(stored == null) + { + stored = ret; + } + else { + stored.amount += ret.amount; + } + + needed -= ret.amount; + + tileEntity.markDirty(); + } + + if(((IFluidContainerItem)inventory[inSlot].getItem()).getFluid(inventory[inSlot]) == null || needed == 0) + { + if(inventory[outSlot] == null) + { + inventory[outSlot] = inventory[inSlot].copy(); + inventory[inSlot] = null; + + tileEntity.markDirty(); + } + } + + return stored; + } + + public static void handleRegistryItemFill(TileEntityContainerBlock tileEntity, FluidTank tank, int inSlot, int outSlot) + { + tank.setFluid(handleRegistryItemFill(tileEntity, tileEntity.inventory, tank.getFluid(), inSlot, outSlot)); + } + + public static FluidStack handleRegistryItemFill(TileEntity tileEntity, ItemStack[] inventory, FluidStack stack, int inSlot, int outSlot) + { + if(stack != null) + { + ItemStack filled = FluidContainerRegistry.fillFluidContainer(stack, inventory[inSlot]); + + if(filled != null) + { + if(inventory[outSlot] == null || (StackUtils.equalsWildcardWithNBT(inventory[outSlot], filled) && inventory[outSlot].stackSize+1 <= filled.getMaxStackSize())) + { + inventory[inSlot].stackSize--; + + if(inventory[inSlot].stackSize <= 0) + { + inventory[inSlot] = null; + } + + if(inventory[outSlot] == null) + { + inventory[outSlot] = filled; + } + else { + inventory[outSlot].stackSize++; + } + + stack.amount -= FluidContainerRegistry.getFluidForFilledItem(filled).amount; + + if(stack.amount == 0) + { + return null; + } + + tileEntity.markDirty(); + } + } + } + + return stack; + } + + public static void handleRegistryItemEmpty(TileEntityContainerBlock tileEntity, FluidTank tank, int inSlot, int outSlot) + { + handleRegistryItemEmpty(tileEntity, tank, inSlot, outSlot, null); + } + + public static void handleRegistryItemEmpty(TileEntityContainerBlock tileEntity, FluidTank tank, int inSlot, int outSlot, FluidChecker checker) + { + tank.setFluid(handleRegistryItemEmpty(tileEntity, tileEntity.inventory, tank.getFluid(), tank.getCapacity()-tank.getFluidAmount(), inSlot, outSlot, checker)); + } + + public static FluidStack handleRegistryItemEmpty(TileEntity tileEntity, ItemStack[] inventory, FluidStack stored, int needed, int inSlot, int outSlot, final FluidChecker checker) + { + FluidStack itemFluid = FluidContainerRegistry.getFluidForFilledItem(inventory[inSlot]); + + if(itemFluid != null && itemFluid.amount <= needed) + { + if((stored != null && !stored.isFluidEqual(itemFluid)) || (checker != null && !checker.isValid(itemFluid.getFluid()))) + { + return stored; + } + + ItemStack containerItem = inventory[inSlot].getItem().getContainerItem(inventory[inSlot]); + + boolean filled = false; + + if(containerItem != null) + { + if(inventory[outSlot] == null || (StackUtils.equalsWildcardWithNBT(inventory[outSlot], containerItem) && inventory[outSlot].stackSize+1 <= containerItem.getMaxStackSize())) + { + inventory[inSlot] = null; + + if(inventory[outSlot] == null) + { + inventory[outSlot] = containerItem; + } + else { + inventory[outSlot].stackSize++; + } + + filled = true; + } + } + else { + inventory[inSlot].stackSize--; + + if(inventory[inSlot].stackSize == 0) + { + inventory[inSlot] = null; + } + + filled = true; + } + + if(filled) + { + if(stored == null) + { + stored = itemFluid.copy(); + } + else { + stored.amount += itemFluid.amount; + } + + tileEntity.markDirty(); + } + } + + return stored; + } + public static enum ContainerEditMode { BOTH("fluidedit.both"), @@ -70,4 +273,36 @@ public final class FluidContainerUtils display = s; } } + + public static class FluidChecker + { + public boolean isValid(Fluid f) + { + return true; + } + + public static FluidChecker check(FluidStack fluid) + { + final Fluid type = fluid != null ? fluid.getFluid() : null; + + return new FluidChecker() { + @Override + public boolean isValid(Fluid f) + { + return type == null || type == f; + } + }; + } + + public static FluidChecker check(final Fluid type) + { + return new FluidChecker() { + @Override + public boolean isValid(Fluid f) + { + return type == null || type == f; + } + }; + } + } } diff --git a/src/main/java/mekanism/common/util/RecipeUtils.java b/src/main/java/mekanism/common/util/RecipeUtils.java index caf953c41..354ce1b1a 100644 --- a/src/main/java/mekanism/common/util/RecipeUtils.java +++ b/src/main/java/mekanism/common/util/RecipeUtils.java @@ -8,6 +8,7 @@ import java.util.Map; import mekanism.api.energy.IEnergizedItem; import mekanism.api.gas.GasStack; import mekanism.api.gas.IGasItem; +import mekanism.api.util.StackUtils; import mekanism.common.Upgrade; import mekanism.common.base.IEnergyCube; import mekanism.common.base.IFactory; @@ -253,7 +254,7 @@ public class RecipeUtils if(iterRecipe instanceof ShapedMekanismRecipe || iterRecipe instanceof ShapelessMekanismRecipe) { - if(ItemStack.areItemStacksEqual(stack, iterRecipe.getRecipeOutput())) + if(StackUtils.equalsWildcard(stack, iterRecipe.getRecipeOutput())) { iter.remove(); } diff --git a/src/main/java/mekanism/generators/common/tile/TileEntityHeatGenerator.java b/src/main/java/mekanism/generators/common/tile/TileEntityHeatGenerator.java index d3c05b785..25ef51cb8 100644 --- a/src/main/java/mekanism/generators/common/tile/TileEntityHeatGenerator.java +++ b/src/main/java/mekanism/generators/common/tile/TileEntityHeatGenerator.java @@ -10,6 +10,7 @@ import mekanism.api.MekanismConfig.generators; import mekanism.common.base.ISustainedData; import mekanism.common.util.ChargeUtils; import mekanism.common.util.FluidContainerUtils; +import mekanism.common.util.FluidContainerUtils.FluidChecker; import mekanism.common.util.HeatUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.PipeUtils; @@ -68,7 +69,7 @@ public class TileEntityHeatGenerator extends TileEntityGenerator implements IFlu if(inventory[0].getItem() instanceof IFluidContainerItem) { - lavaTank.fill(FluidContainerUtils.extractFluid(lavaTank, inventory[0], FluidRegistry.LAVA), true); + lavaTank.fill(FluidContainerUtils.extractFluid(lavaTank, inventory[0], FluidChecker.check(FluidRegistry.LAVA)), true); } else if(fluid != null) { From 34d55f72eab2cd22baa358af66e5dc52ade4cac2 Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Sun, 6 Mar 2016 02:57:32 -0500 Subject: [PATCH 36/52] More fluid container integration, removed dead code --- .../render/item/ItemRenderingHandler.java | 6 +-- .../mekanism/common/base/IElectricChest.java | 14 ----- .../mekanism/common/block/BlockMachine.java | 1 - .../inventory/InventoryElectricChest.java | 11 ---- .../common/item/ItemBlockMachine.java | 54 ------------------- .../common/tile/TileEntityFluidTank.java | 15 +++++- .../tile/TileEntityFluidicPlenisher.java | 17 +++++- ...ileEntityThermalEvaporationController.java | 46 +++------------- 8 files changed, 37 insertions(+), 127 deletions(-) diff --git a/src/main/java/mekanism/client/render/item/ItemRenderingHandler.java b/src/main/java/mekanism/client/render/item/ItemRenderingHandler.java index 075a5a830..f5bb19c39 100644 --- a/src/main/java/mekanism/client/render/item/ItemRenderingHandler.java +++ b/src/main/java/mekanism/client/render/item/ItemRenderingHandler.java @@ -9,7 +9,6 @@ import mekanism.client.model.ModelAtomicDisassembler; import mekanism.client.model.ModelEnergyCube; import mekanism.client.model.ModelEnergyCube.ModelEnergyCore; import mekanism.client.model.ModelFlamethrower; -import mekanism.client.model.ModelFluidTank; import mekanism.client.model.ModelFreeRunners; import mekanism.client.model.ModelGasMask; import mekanism.client.model.ModelGasTank; @@ -87,7 +86,6 @@ public class ItemRenderingHandler implements IItemRenderer public ModelScubaTank scubaTank = new ModelScubaTank(); public ModelFreeRunners freeRunners = new ModelFreeRunners(); public ModelAtomicDisassembler atomicDisassembler = new ModelAtomicDisassembler(); - public ModelFluidTank portableTank = new ModelFluidTank(); public ModelFlamethrower flamethrower = new ModelFlamethrower(); private final RenderBalloon balloonRenderer = new RenderBalloon(); @@ -515,11 +513,11 @@ public class ItemRenderingHandler implements IItemRenderer GL11.glPushMatrix(); GL11.glRotatef(270F, 0.0F, -1.0F, 0.0F); Minecraft.getMinecraft().renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "FluidTank.png")); - ItemBlockMachine itemMachine = (ItemBlockMachine)item.getItem(); + float targetScale = (float)(itemMachine.getFluidStack(item) != null ? itemMachine.getFluidStack(item).amount : 0)/itemMachine.getCapacity(item); FluidTankTier tier = FluidTankTier.values()[itemMachine.getBaseTier(item).ordinal()]; Fluid fluid = itemMachine.getFluidStack(item) != null ? itemMachine.getFluidStack(item).getFluid() : null; - portableTankRenderer.render(tier, fluid, itemMachine.getPrevScale(item), false, null, -0.5, -0.5, -0.5); + portableTankRenderer.render(tier, fluid, targetScale, false, null, -0.5, -0.5, -0.5); GL11.glPopMatrix(); } else { diff --git a/src/main/java/mekanism/common/base/IElectricChest.java b/src/main/java/mekanism/common/base/IElectricChest.java index 9448b41d7..f1861fb52 100644 --- a/src/main/java/mekanism/common/base/IElectricChest.java +++ b/src/main/java/mekanism/common/base/IElectricChest.java @@ -50,18 +50,4 @@ public interface IElectricChest * @return authenticated value */ public boolean getLocked(ItemStack itemStack); - - /** - * Sets the 'open' value of this electric chest to a new value. - * @param itemStack - electric chest ItemStack - * @param open - new value - */ - public void setOpen(ItemStack itemStack, boolean open); - - /** - * Retrieves the 'open' value of this electric chest. - * @param itemStack - electric chest ItemStack - * @return open value - */ - public boolean getOpen(ItemStack itemStack); } diff --git a/src/main/java/mekanism/common/block/BlockMachine.java b/src/main/java/mekanism/common/block/BlockMachine.java index a5bb7d046..434b4a499 100644 --- a/src/main/java/mekanism/common/block/BlockMachine.java +++ b/src/main/java/mekanism/common/block/BlockMachine.java @@ -543,7 +543,6 @@ public class BlockMachine extends BlockContainer implements ISpecialBounds, IBlo ItemStack filled = new ItemStack(item, 1, type.meta); itemMachine.setBaseTier(filled, BaseTier.ULTIMATE); itemMachine.setFluidStack(new FluidStack(f, itemMachine.getCapacity(filled)), filled); - itemMachine.setPrevScale(filled, 1); list.add(filled); } catch(Exception e) {} } diff --git a/src/main/java/mekanism/common/inventory/InventoryElectricChest.java b/src/main/java/mekanism/common/inventory/InventoryElectricChest.java index 5de410c4a..817c8530a 100644 --- a/src/main/java/mekanism/common/inventory/InventoryElectricChest.java +++ b/src/main/java/mekanism/common/inventory/InventoryElectricChest.java @@ -1,6 +1,5 @@ package mekanism.common.inventory; -import mekanism.common.base.IElectricChest; import mekanism.common.base.ISustainedInventory; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.InventoryBasic; @@ -46,22 +45,12 @@ public class InventoryElectricChest extends InventoryBasic public void openInventory() { read(); - - if(getStack() != null) - { - ((IElectricChest)getStack().getItem()).setOpen(getStack(), true); - } } @Override public void closeInventory() { write(); - - if(getStack() != null) - { - ((IElectricChest)getStack().getItem()).setOpen(getStack(), false); - } } public void write() diff --git a/src/main/java/mekanism/common/item/ItemBlockMachine.java b/src/main/java/mekanism/common/item/ItemBlockMachine.java index 0616b5eda..1b06970bd 100644 --- a/src/main/java/mekanism/common/item/ItemBlockMachine.java +++ b/src/main/java/mekanism/common/item/ItemBlockMachine.java @@ -456,18 +456,6 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec } } } - else if(type == MachineType.FLUID_TANK) - { - if(world != null && !world.isRemote) - { - float targetScale = (float)(getFluidStack(itemstack) != null ? getFluidStack(itemstack).amount : 0)/getCapacity(itemstack); - - if(Math.abs(getPrevScale(itemstack) - targetScale) > 0.01) - { - setPrevScale(itemstack, (9*getPrevScale(itemstack) + targetScale)/10); - } - } - } } @Override @@ -797,48 +785,6 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec return itemStack.stackTagCompound.getBoolean("locked"); } - - @Override - public void setOpen(ItemStack itemStack, boolean open) - { - if(itemStack.stackTagCompound == null) - { - itemStack.setTagCompound(new NBTTagCompound()); - } - - itemStack.stackTagCompound.setBoolean("open", open); - } - - @Override - public boolean getOpen(ItemStack itemStack) - { - if(itemStack.stackTagCompound == null) - { - return false; - } - - return itemStack.stackTagCompound.getBoolean("open"); - } - - public void setPrevScale(ItemStack itemStack, float prevLidAngle) - { - if(itemStack.stackTagCompound == null) - { - itemStack.setTagCompound(new NBTTagCompound()); - } - - itemStack.stackTagCompound.setFloat("prevScale", prevLidAngle); - } - - public float getPrevScale(ItemStack itemStack) - { - if(itemStack.stackTagCompound == null) - { - return 0.0F; - } - - return itemStack.stackTagCompound.getFloat("prevScale"); - } public void setBucketMode(ItemStack itemStack, boolean bucketMode) { diff --git a/src/main/java/mekanism/common/tile/TileEntityFluidTank.java b/src/main/java/mekanism/common/tile/TileEntityFluidTank.java index 32db52831..5bea75c3f 100644 --- a/src/main/java/mekanism/common/tile/TileEntityFluidTank.java +++ b/src/main/java/mekanism/common/tile/TileEntityFluidTank.java @@ -350,10 +350,21 @@ public class TileEntityFluidTank extends TileEntityContainerBlock implements IAc int needed = fluidTank.getCapacity()-fluidTank.getFluidAmount(); Coord4D top = Coord4D.get(this).getFromSide(ForgeDirection.UP); + TileEntity topTile = top.getTileEntity(worldObj); - if(top.getTileEntity(worldObj) instanceof TileEntityFluidTank) + if(topTile instanceof TileEntityFluidTank) { - needed += ((TileEntityFluidTank)top.getTileEntity(worldObj)).getCurrentNeeded(); + TileEntityFluidTank topTank = (TileEntityFluidTank)topTile; + + if(fluidTank.getFluid() != null && topTank.fluidTank.getFluid() != null) + { + if(fluidTank.getFluid().getFluid() != topTank.fluidTank.getFluid().getFluid()) + { + return needed; + } + } + + needed += topTank.getCurrentNeeded(); } return needed; diff --git a/src/main/java/mekanism/common/tile/TileEntityFluidicPlenisher.java b/src/main/java/mekanism/common/tile/TileEntityFluidicPlenisher.java index d8bf8ed82..077e60260 100644 --- a/src/main/java/mekanism/common/tile/TileEntityFluidicPlenisher.java +++ b/src/main/java/mekanism/common/tile/TileEntityFluidicPlenisher.java @@ -21,6 +21,7 @@ import mekanism.common.integration.IComputerIntegration; import mekanism.common.tile.component.TileComponentUpgrade; import mekanism.common.util.ChargeUtils; import mekanism.common.util.FluidContainerUtils; +import mekanism.common.util.FluidContainerUtils.FluidChecker; import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.PipeUtils; @@ -84,11 +85,23 @@ public class TileEntityFluidicPlenisher extends TileEntityElectricBlock implemen { if(inventory[0].getItem() instanceof IFluidContainerItem) { - FluidContainerUtils.handleContainerItemEmpty(this, fluidTank, 0, 1); + FluidContainerUtils.handleContainerItemEmpty(this, fluidTank, 0, 1, new FluidChecker() { + @Override + public boolean isValid(Fluid f) + { + return f.canBePlacedInWorld(); + } + }); } else if(FluidContainerRegistry.isFilledContainer(inventory[0])) { - FluidContainerUtils.handleRegistryItemEmpty(this, fluidTank, 0, 1); + FluidContainerUtils.handleRegistryItemEmpty(this, fluidTank, 0, 1, new FluidChecker() { + @Override + public boolean isValid(Fluid f) + { + return f.canBePlacedInWorld(); + } + }); } } diff --git a/src/main/java/mekanism/common/tile/TileEntityThermalEvaporationController.java b/src/main/java/mekanism/common/tile/TileEntityThermalEvaporationController.java index 7efa72303..9f424f021 100644 --- a/src/main/java/mekanism/common/tile/TileEntityThermalEvaporationController.java +++ b/src/main/java/mekanism/common/tile/TileEntityThermalEvaporationController.java @@ -10,7 +10,6 @@ import mekanism.api.Coord4D; import mekanism.api.ISalinationSolar; import mekanism.api.MekanismConfig.general; import mekanism.api.Range4D; -import mekanism.api.util.StackUtils; import mekanism.client.SparkleAnimation.INodeChecker; import mekanism.common.Mekanism; import mekanism.common.base.IActiveState; @@ -229,46 +228,15 @@ public class TileEntityThermalEvaporationController extends TileEntityThermalEva private void manageBuckets() { - if(inventory[2] != null) + if(inventory[2] != null && outputTank.getFluid() != null) { - if(outputTank.getFluid() != null && outputTank.getFluid().amount >= FluidContainerRegistry.BUCKET_VOLUME) + if(inventory[2].getItem() instanceof IFluidContainerItem) { - if(FluidContainerRegistry.isEmptyContainer(inventory[2])) - { - ItemStack tempStack = FluidContainerRegistry.fillFluidContainer(outputTank.getFluid(), inventory[2]); - - if(tempStack != null) - { - if(inventory[3] == null) - { - outputTank.drain(FluidContainerRegistry.BUCKET_VOLUME, true); - - inventory[3] = tempStack; - inventory[2].stackSize--; - - if(inventory[2].stackSize <= 0) - { - inventory[2] = null; - } - - markDirty(); - } - else if(StackUtils.equalsWildcardWithNBT(tempStack, inventory[3]) && tempStack.getMaxStackSize() > inventory[3].stackSize) - { - outputTank.drain(FluidContainerRegistry.BUCKET_VOLUME, true); - - inventory[3].stackSize++; - inventory[2].stackSize--; - - if(inventory[2].stackSize <= 0) - { - inventory[2] = null; - } - - markDirty(); - } - } - } + FluidContainerUtils.handleContainerItemFill(this, outputTank, 2, 3); + } + else if(FluidContainerRegistry.isEmptyContainer(inventory[2])) + { + FluidContainerUtils.handleRegistryItemFill(this, outputTank, 2, 3); } } From 1eff6ad6b8e16525180a6feb794c170c9320949c Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Sun, 6 Mar 2016 12:42:04 -0500 Subject: [PATCH 37/52] Ship with CoFH energy API (as well as a few item tidbits). It's about time --- src/{api => main}/java/cofh/api/CoFHAPIProps.java | 0 .../java/cofh/api/energy/EnergyStorage.java | 0 .../java/cofh/api/energy/IEnergyConnection.java | 0 .../java/cofh/api/energy/IEnergyContainerItem.java | 0 .../java/cofh/api/energy/IEnergyHandler.java | 0 .../java/cofh/api/energy/IEnergyProvider.java | 0 .../java/cofh/api/energy/IEnergyReceiver.java | 0 .../java/cofh/api/energy/IEnergyStorage.java | 0 .../java/cofh/api/energy/ItemEnergyContainer.java | 0 .../java/cofh/api/energy/TileEnergyHandler.java | 0 .../java/cofh/api/energy/package-info.java | 0 .../java/cofh/api/item/IEmpowerableItem.java | 0 .../java/cofh/api/item/IInventoryContainerItem.java | 0 .../java/cofh/api/item/IToolHammer.java | 0 .../java/cofh/api/item/package-info.java | 0 src/{api => main}/java/cofh/api/package-info.java | 0 .../mekanism/common/base/IAdvancedBoundingBlock.java | 3 +-- .../java/mekanism/common/base/IEnergyWrapper.java | 3 +-- .../mekanism/common/item/ItemBlockEnergyCube.java | 3 +-- .../java/mekanism/common/item/ItemBlockMachine.java | 3 +-- .../java/mekanism/common/item/ItemConfigurator.java | 3 +-- .../java/mekanism/common/item/ItemEnergized.java | 3 +-- .../java/mekanism/common/item/ItemFreeRunners.java | 3 +-- .../common/multipart/PartUniversalCable.java | 12 +----------- .../common/tile/TileEntityAdvancedBoundingBlock.java | 8 +------- .../common/tile/TileEntityElectricBlock.java | 5 ----- .../common/tile/TileEntityInductionPort.java | 8 +------- .../java/mekanism/common/util/MekanismUtils.java | 3 ++- .../generators/common/item/ItemBlockGenerator.java | 3 +-- .../common/tile/turbine/TileEntityTurbineValve.java | 8 +------- 30 files changed, 14 insertions(+), 54 deletions(-) rename src/{api => main}/java/cofh/api/CoFHAPIProps.java (100%) rename src/{api => main}/java/cofh/api/energy/EnergyStorage.java (100%) rename src/{api => main}/java/cofh/api/energy/IEnergyConnection.java (100%) rename src/{api => main}/java/cofh/api/energy/IEnergyContainerItem.java (100%) rename src/{api => main}/java/cofh/api/energy/IEnergyHandler.java (100%) rename src/{api => main}/java/cofh/api/energy/IEnergyProvider.java (100%) rename src/{api => main}/java/cofh/api/energy/IEnergyReceiver.java (100%) rename src/{api => main}/java/cofh/api/energy/IEnergyStorage.java (100%) rename src/{api => main}/java/cofh/api/energy/ItemEnergyContainer.java (100%) rename src/{api => main}/java/cofh/api/energy/TileEnergyHandler.java (100%) rename src/{api => main}/java/cofh/api/energy/package-info.java (100%) rename src/{api => main}/java/cofh/api/item/IEmpowerableItem.java (100%) rename src/{api => main}/java/cofh/api/item/IInventoryContainerItem.java (100%) rename src/{api => main}/java/cofh/api/item/IToolHammer.java (100%) rename src/{api => main}/java/cofh/api/item/package-info.java (100%) rename src/{api => main}/java/cofh/api/package-info.java (100%) diff --git a/src/api/java/cofh/api/CoFHAPIProps.java b/src/main/java/cofh/api/CoFHAPIProps.java similarity index 100% rename from src/api/java/cofh/api/CoFHAPIProps.java rename to src/main/java/cofh/api/CoFHAPIProps.java diff --git a/src/api/java/cofh/api/energy/EnergyStorage.java b/src/main/java/cofh/api/energy/EnergyStorage.java similarity index 100% rename from src/api/java/cofh/api/energy/EnergyStorage.java rename to src/main/java/cofh/api/energy/EnergyStorage.java diff --git a/src/api/java/cofh/api/energy/IEnergyConnection.java b/src/main/java/cofh/api/energy/IEnergyConnection.java similarity index 100% rename from src/api/java/cofh/api/energy/IEnergyConnection.java rename to src/main/java/cofh/api/energy/IEnergyConnection.java diff --git a/src/api/java/cofh/api/energy/IEnergyContainerItem.java b/src/main/java/cofh/api/energy/IEnergyContainerItem.java similarity index 100% rename from src/api/java/cofh/api/energy/IEnergyContainerItem.java rename to src/main/java/cofh/api/energy/IEnergyContainerItem.java diff --git a/src/api/java/cofh/api/energy/IEnergyHandler.java b/src/main/java/cofh/api/energy/IEnergyHandler.java similarity index 100% rename from src/api/java/cofh/api/energy/IEnergyHandler.java rename to src/main/java/cofh/api/energy/IEnergyHandler.java diff --git a/src/api/java/cofh/api/energy/IEnergyProvider.java b/src/main/java/cofh/api/energy/IEnergyProvider.java similarity index 100% rename from src/api/java/cofh/api/energy/IEnergyProvider.java rename to src/main/java/cofh/api/energy/IEnergyProvider.java diff --git a/src/api/java/cofh/api/energy/IEnergyReceiver.java b/src/main/java/cofh/api/energy/IEnergyReceiver.java similarity index 100% rename from src/api/java/cofh/api/energy/IEnergyReceiver.java rename to src/main/java/cofh/api/energy/IEnergyReceiver.java diff --git a/src/api/java/cofh/api/energy/IEnergyStorage.java b/src/main/java/cofh/api/energy/IEnergyStorage.java similarity index 100% rename from src/api/java/cofh/api/energy/IEnergyStorage.java rename to src/main/java/cofh/api/energy/IEnergyStorage.java diff --git a/src/api/java/cofh/api/energy/ItemEnergyContainer.java b/src/main/java/cofh/api/energy/ItemEnergyContainer.java similarity index 100% rename from src/api/java/cofh/api/energy/ItemEnergyContainer.java rename to src/main/java/cofh/api/energy/ItemEnergyContainer.java diff --git a/src/api/java/cofh/api/energy/TileEnergyHandler.java b/src/main/java/cofh/api/energy/TileEnergyHandler.java similarity index 100% rename from src/api/java/cofh/api/energy/TileEnergyHandler.java rename to src/main/java/cofh/api/energy/TileEnergyHandler.java diff --git a/src/api/java/cofh/api/energy/package-info.java b/src/main/java/cofh/api/energy/package-info.java similarity index 100% rename from src/api/java/cofh/api/energy/package-info.java rename to src/main/java/cofh/api/energy/package-info.java diff --git a/src/api/java/cofh/api/item/IEmpowerableItem.java b/src/main/java/cofh/api/item/IEmpowerableItem.java similarity index 100% rename from src/api/java/cofh/api/item/IEmpowerableItem.java rename to src/main/java/cofh/api/item/IEmpowerableItem.java diff --git a/src/api/java/cofh/api/item/IInventoryContainerItem.java b/src/main/java/cofh/api/item/IInventoryContainerItem.java similarity index 100% rename from src/api/java/cofh/api/item/IInventoryContainerItem.java rename to src/main/java/cofh/api/item/IInventoryContainerItem.java diff --git a/src/api/java/cofh/api/item/IToolHammer.java b/src/main/java/cofh/api/item/IToolHammer.java similarity index 100% rename from src/api/java/cofh/api/item/IToolHammer.java rename to src/main/java/cofh/api/item/IToolHammer.java diff --git a/src/api/java/cofh/api/item/package-info.java b/src/main/java/cofh/api/item/package-info.java similarity index 100% rename from src/api/java/cofh/api/item/package-info.java rename to src/main/java/cofh/api/item/package-info.java diff --git a/src/api/java/cofh/api/package-info.java b/src/main/java/cofh/api/package-info.java similarity index 100% rename from src/api/java/cofh/api/package-info.java rename to src/main/java/cofh/api/package-info.java diff --git a/src/main/java/mekanism/common/base/IAdvancedBoundingBlock.java b/src/main/java/mekanism/common/base/IAdvancedBoundingBlock.java index 7a53f2d31..bb95644f6 100644 --- a/src/main/java/mekanism/common/base/IAdvancedBoundingBlock.java +++ b/src/main/java/mekanism/common/base/IAdvancedBoundingBlock.java @@ -13,8 +13,7 @@ import cpw.mods.fml.common.Optional.Interface; import cpw.mods.fml.common.Optional.InterfaceList; @InterfaceList({ - @Interface(iface = "ic2.api.energy.tile.IEnergySink", modid = "IC2"), - @Interface(iface = "cofh.api.energy.IEnergyHandler", modid = "CoFHCore") + @Interface(iface = "ic2.api.energy.tile.IEnergySink", modid = "IC2"), }) public interface IAdvancedBoundingBlock extends IBoundingBlock, ISidedInventory, IEnergySink, IStrictEnergyAcceptor, IStrictEnergyStorage, IEnergyHandler, IComputerIntegration, ISpecialConfigData { diff --git a/src/main/java/mekanism/common/base/IEnergyWrapper.java b/src/main/java/mekanism/common/base/IEnergyWrapper.java index aae2cb34a..e1df80f7e 100644 --- a/src/main/java/mekanism/common/base/IEnergyWrapper.java +++ b/src/main/java/mekanism/common/base/IEnergyWrapper.java @@ -18,8 +18,7 @@ import cpw.mods.fml.common.Optional.InterfaceList; @InterfaceList({ @Interface(iface = "ic2.api.energy.tile.IEnergySink", modid = "IC2"), @Interface(iface = "ic2.api.energy.tile.IEnergySource", modid = "IC2"), - @Interface(iface = "ic2.api.tile.IEnergyStorage", modid = "IC2"), - @Interface(iface = "cofh.api.energy.IEnergyHandler", modid = "CoFHCore"), + @Interface(iface = "ic2.api.tile.IEnergyStorage", modid = "IC2") }) public interface IEnergyWrapper extends IStrictEnergyStorage, IEnergyHandler, IEnergySink, IEnergySource, IEnergyStorage, IStrictEnergyAcceptor, ICableOutputter, IInventory { diff --git a/src/main/java/mekanism/common/item/ItemBlockEnergyCube.java b/src/main/java/mekanism/common/item/ItemBlockEnergyCube.java index bc20b2670..ae1180361 100644 --- a/src/main/java/mekanism/common/item/ItemBlockEnergyCube.java +++ b/src/main/java/mekanism/common/item/ItemBlockEnergyCube.java @@ -40,8 +40,7 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @InterfaceList({ - @Interface(iface = "cofh.api.energy.IEnergyContainerItem", modid = "CoFHCore"), - @Interface(iface = "ic2.api.item.ISpecialElectricItem", modid = "IC2") + @Interface(iface = "ic2.api.item.ISpecialElectricItem", modid = "IC2") }) public class ItemBlockEnergyCube extends ItemBlock implements IEnergizedItem, IEnergyCube, ISpecialElectricItem, ISustainedInventory, IEnergyContainerItem { diff --git a/src/main/java/mekanism/common/item/ItemBlockMachine.java b/src/main/java/mekanism/common/item/ItemBlockMachine.java index 1b06970bd..842ff6bd4 100644 --- a/src/main/java/mekanism/common/item/ItemBlockMachine.java +++ b/src/main/java/mekanism/common/item/ItemBlockMachine.java @@ -113,8 +113,7 @@ import cpw.mods.fml.relauncher.SideOnly; * */ @InterfaceList({ - @Interface(iface = "cofh.api.energy.IEnergyContainerItem", modid = "CoFHCore"), - @Interface(iface = "ic2.api.item.ISpecialElectricItem", modid = "IC2") + @Interface(iface = "ic2.api.item.ISpecialElectricItem", modid = "IC2") }) public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpecialElectricItem, IFactory, ISustainedInventory, ISustainedTank, IElectricChest, IEnergyContainerItem, IFluidContainerItem, ITierItem { diff --git a/src/main/java/mekanism/common/item/ItemConfigurator.java b/src/main/java/mekanism/common/item/ItemConfigurator.java index a56c4bb16..b70a0c5fa 100644 --- a/src/main/java/mekanism/common/item/ItemConfigurator.java +++ b/src/main/java/mekanism/common/item/ItemConfigurator.java @@ -38,8 +38,7 @@ import cpw.mods.fml.common.Optional.InterfaceList; import cpw.mods.fml.common.Optional.Method; @InterfaceList({ - @Interface(iface = "buildcraft.api.tools.IToolWrench", modid = "BuildCraft"), - @Interface(iface = "cofh.api.item.IToolHammer", modid = "CoFHCore") + @Interface(iface = "buildcraft.api.tools.IToolWrench", modid = "BuildCraft") }) public class ItemConfigurator extends ItemEnergized implements IMekWrench, IToolWrench, IToolHammer { diff --git a/src/main/java/mekanism/common/item/ItemEnergized.java b/src/main/java/mekanism/common/item/ItemEnergized.java index 5ea199638..5b5570472 100644 --- a/src/main/java/mekanism/common/item/ItemEnergized.java +++ b/src/main/java/mekanism/common/item/ItemEnergized.java @@ -23,8 +23,7 @@ import cpw.mods.fml.common.Optional.InterfaceList; import cpw.mods.fml.common.Optional.Method; @InterfaceList({ - @Interface(iface = "cofh.api.energy.IEnergyContainerItem", modid = "CoFHCore"), - @Interface(iface = "ic2.api.item.ISpecialElectricItem", modid = "IC2") + @Interface(iface = "ic2.api.item.ISpecialElectricItem", modid = "IC2") }) public class ItemEnergized extends ItemMekanism implements IEnergizedItem, ISpecialElectricItem, IEnergyContainerItem { diff --git a/src/main/java/mekanism/common/item/ItemFreeRunners.java b/src/main/java/mekanism/common/item/ItemFreeRunners.java index 991fbb27a..638d53aaf 100644 --- a/src/main/java/mekanism/common/item/ItemFreeRunners.java +++ b/src/main/java/mekanism/common/item/ItemFreeRunners.java @@ -36,8 +36,7 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @InterfaceList({ - @Interface(iface = "cofh.api.energy.IEnergyContainerItem", modid = "CoFHCore"), - @Interface(iface = "ic2.api.item.ISpecialElectricItem", modid = "IC2") + @Interface(iface = "ic2.api.item.ISpecialElectricItem", modid = "IC2") }) public class ItemFreeRunners extends ItemArmor implements IEnergizedItem, ISpecialElectricItem, IEnergyContainerItem { diff --git a/src/main/java/mekanism/common/multipart/PartUniversalCable.java b/src/main/java/mekanism/common/multipart/PartUniversalCable.java index 09d8f893b..5bf420d16 100644 --- a/src/main/java/mekanism/common/multipart/PartUniversalCable.java +++ b/src/main/java/mekanism/common/multipart/PartUniversalCable.java @@ -30,15 +30,9 @@ import codechicken.lib.data.MCDataOutput; import codechicken.lib.vec.Vector3; import cofh.api.energy.IEnergyHandler; import cofh.api.energy.IEnergyProvider; -import cpw.mods.fml.common.Optional.Interface; -import cpw.mods.fml.common.Optional.InterfaceList; -import cpw.mods.fml.common.Optional.Method; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -@InterfaceList({ - @Interface(iface = "cofh.api.energy.IEnergyHandler", modid = "CoFHCore"), -}) public class PartUniversalCable extends PartTransmitter implements IStrictEnergyAcceptor, IEnergyHandler { public Tier.CableTier tier; @@ -177,6 +171,7 @@ public class PartUniversalCable extends PartTransmitter Date: Sun, 6 Mar 2016 13:51:11 -0500 Subject: [PATCH 38/52] EnergyNetwork now only distributes demanded energy to acceptors instead of forcing transfer, should fix interaction issues --- src/main/java/mekanism/common/EnergyNetwork.java | 1 + .../java/mekanism/common/base/EnergyAcceptorWrapper.java | 9 ++++++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/main/java/mekanism/common/EnergyNetwork.java b/src/main/java/mekanism/common/EnergyNetwork.java index ec7fca8af..e9679d2ae 100644 --- a/src/main/java/mekanism/common/EnergyNetwork.java +++ b/src/main/java/mekanism/common/EnergyNetwork.java @@ -128,6 +128,7 @@ public class EnergyNetwork extends DynamicNetwork 0 || acceptor.receiveEnergy(side, 1, true) > 0; + return acceptor.receiveEnergy(side, 1, true) > 0; } public int toRF(double joules) @@ -161,7 +164,7 @@ public abstract class EnergyAcceptorWrapper implements IStrictEnergyAcceptor @Override public double transferEnergyToAcceptor(ForgeDirection side, double amount) { - return amount - fromEU(acceptor.injectEnergy(side, toEU(amount), 0)); + return amount - fromEU(acceptor.injectEnergy(side, Math.min(acceptor.getDemandedEnergy(), toEU(amount)), 0)); } @Override From a247a80d5368d083d3e14880669f013a2385894b Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Sun, 6 Mar 2016 17:53:16 -0500 Subject: [PATCH 39/52] Work on Formulaic Assemblicator, got a lot more of the core logic done than I was expecting to --- .../java/mekanism/api/MekanismConfig.java | 1 + .../mekanism/common/block/BlockMachine.java | 8 +- .../content/assemblicator/RecipeFormula.java | 104 ++++ .../common/item/ItemControlCircuit.java | 2 - .../common/item/ItemRecipeFormula.java | 17 + .../TileEntityFormulaicAssemblicator.java | 454 ++++++++++++++++++ .../tile/TileEntityLaserTractorBeam.java | 3 +- .../tile/TileEntityResistiveHeater.java | 6 + .../mekanism/common/util/MekanismUtils.java | 16 +- .../mekanism/common/util/RecipeUtils.java | 14 + .../gui/GuiFormulaicAssemblicator.png | Bin 0 -> 6824 bytes .../mekanism/gui/GuiUpgradeManagement.png | Bin 5248 -> 5277 bytes .../resources/assets/mekanism/lang/en_US.lang | 1 + 13 files changed, 619 insertions(+), 7 deletions(-) create mode 100644 src/main/java/mekanism/common/content/assemblicator/RecipeFormula.java create mode 100644 src/main/java/mekanism/common/item/ItemRecipeFormula.java create mode 100644 src/main/java/mekanism/common/tile/TileEntityFormulaicAssemblicator.java create mode 100644 src/main/resources/assets/mekanism/gui/GuiFormulaicAssemblicator.png diff --git a/src/main/java/mekanism/api/MekanismConfig.java b/src/main/java/mekanism/api/MekanismConfig.java index fe85beeb3..dae1fc598 100644 --- a/src/main/java/mekanism/api/MekanismConfig.java +++ b/src/main/java/mekanism/api/MekanismConfig.java @@ -122,6 +122,7 @@ public class MekanismConfig public static double laserUsage; public static double gasCentrifugeUsage; public static double heavyWaterElectrolysisUsage; + public static double formulaicAssemblicatorUsage; } public static class generators diff --git a/src/main/java/mekanism/common/block/BlockMachine.java b/src/main/java/mekanism/common/block/BlockMachine.java index 434b4a499..004c12e76 100644 --- a/src/main/java/mekanism/common/block/BlockMachine.java +++ b/src/main/java/mekanism/common/block/BlockMachine.java @@ -66,6 +66,7 @@ import mekanism.common.tile.TileEntityEnrichmentChamber; import mekanism.common.tile.TileEntityFactory; import mekanism.common.tile.TileEntityFluidTank; import mekanism.common.tile.TileEntityFluidicPlenisher; +import mekanism.common.tile.TileEntityFormulaicAssemblicator; import mekanism.common.tile.TileEntityLaser; import mekanism.common.tile.TileEntityLaserAmplifier; import mekanism.common.tile.TileEntityLaserTractorBeam; @@ -1172,7 +1173,8 @@ public class BlockMachine extends BlockContainer implements ISpecialBounds, IBlo SOLAR_NEUTRON_ACTIVATOR(MachineBlock.MACHINE_BLOCK_3, 1, "SolarNeutronActivator", 47, TileEntitySolarNeutronActivator.class, false, true, false), AMBIENT_ACCUMULATOR(MachineBlock.MACHINE_BLOCK_3, 2, "AmbientAccumulator", 48, TileEntityAmbientAccumulator.class, true, false, false), OREDICTIONIFICATOR(MachineBlock.MACHINE_BLOCK_3, 3, "Oredictionificator", 52, TileEntityOredictionificator.class, false, false, false), - RESISTIVE_HEATER(MachineBlock.MACHINE_BLOCK_3, 4, "ResistiveHeater", 53, TileEntityResistiveHeater.class, true, false, false); + RESISTIVE_HEATER(MachineBlock.MACHINE_BLOCK_3, 4, "ResistiveHeater", 53, TileEntityResistiveHeater.class, true, false, false), + FORMULAIC_ASSEMBLICATOR(MachineBlock.MACHINE_BLOCK_3, 5, "FormulaicAssemblicator", 56, TileEntityFormulaicAssemblicator.class, true, false, true); public MachineBlock typeBlock; public int meta; @@ -1223,7 +1225,7 @@ public class BlockMachine extends BlockContainer implements ISpecialBounds, IBlo for(MachineType type : MachineType.values()) { - if(type != AMBIENT_ACCUMULATOR) + if(type != AMBIENT_ACCUMULATOR && type != FORMULAIC_ASSEMBLICATOR) { ret.add(type); } @@ -1343,6 +1345,8 @@ public class BlockMachine extends BlockContainer implements ISpecialBounds, IBlo return 0; case RESISTIVE_HEATER: return 100; + case FORMULAIC_ASSEMBLICATOR: + return usage.formulaicAssemblicatorUsage; default: return 0; } diff --git a/src/main/java/mekanism/common/content/assemblicator/RecipeFormula.java b/src/main/java/mekanism/common/content/assemblicator/RecipeFormula.java new file mode 100644 index 000000000..84ea25418 --- /dev/null +++ b/src/main/java/mekanism/common/content/assemblicator/RecipeFormula.java @@ -0,0 +1,104 @@ +package mekanism.common.content.assemblicator; + +import mekanism.api.util.StackUtils; +import mekanism.common.util.MekanismUtils; +import mekanism.common.util.RecipeUtils; +import net.minecraft.inventory.InventoryCrafting; +import net.minecraft.item.ItemStack; +import net.minecraft.item.crafting.IRecipe; +import net.minecraft.world.World; + +public class RecipeFormula +{ + public InventoryCrafting dummy = MekanismUtils.getDummyCraftingInv(); + + public ItemStack[] input = new ItemStack[9]; + + public RecipeFormula(ItemStack[] inv) + { + this(inv, 0); + } + + public RecipeFormula(ItemStack[] inv, int start) + { + for(int i = 0; i < 9; i++) + { + input[i] = StackUtils.size(inv[start+i], 1); + } + } + + private void resetToRecipe() + { + for(int i = 0; i < 9; i++) + { + dummy.setInventorySlotContents(i, input[i]); + } + } + + public boolean matches(World world, ItemStack[] input, int start) + { + resetToRecipe(); + + IRecipe origRecipe = RecipeUtils.getRecipeFromGrid(dummy, world); + + for(int i = 0; i < 9; i++) + { + dummy.setInventorySlotContents(i, input[start+i]); + } + + IRecipe newRecipe = RecipeUtils.getRecipeFromGrid(dummy, world); + + return origRecipe == newRecipe; + } + + public boolean isIngredientInPos(World world, ItemStack stack, int i) + { + resetToRecipe(); + + IRecipe origRecipe = RecipeUtils.getRecipeFromGrid(dummy, world); + dummy.setInventorySlotContents(i, stack); + IRecipe newRecipe = RecipeUtils.getRecipeFromGrid(dummy, world); + + return origRecipe == newRecipe; + } + + public boolean isIngredient(World world, ItemStack stack) + { + resetToRecipe(); + + IRecipe origRecipe = RecipeUtils.getRecipeFromGrid(dummy, world); + + for(int i = 0; i < 9; i++) + { + dummy.setInventorySlotContents(i, stack); + + IRecipe newRecipe = RecipeUtils.getRecipeFromGrid(dummy, world); + + if(origRecipe == newRecipe) + { + return true; + } + + dummy.setInventorySlotContents(i, input[i]); + } + + return false; + } + + public boolean isValidFormula(World world) + { + return getRecipe(world) != null; + } + + public IRecipe getRecipe(World world) + { + resetToRecipe(); + + return RecipeUtils.getRecipeFromGrid(dummy, world); + } + + public boolean isFormulaEqual(World world, RecipeFormula formula) + { + return formula.getRecipe(world) == getRecipe(world); + } +} diff --git a/src/main/java/mekanism/common/item/ItemControlCircuit.java b/src/main/java/mekanism/common/item/ItemControlCircuit.java index 5d8d94c08..40f14426a 100644 --- a/src/main/java/mekanism/common/item/ItemControlCircuit.java +++ b/src/main/java/mekanism/common/item/ItemControlCircuit.java @@ -2,7 +2,6 @@ package mekanism.common.item; import java.util.List; -import mekanism.common.Mekanism; import mekanism.common.Tier.BaseTier; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; @@ -18,7 +17,6 @@ public class ItemControlCircuit extends ItemMekanism { super(); setHasSubtypes(true); - setCreativeTab(Mekanism.tabMekanism); } @Override diff --git a/src/main/java/mekanism/common/item/ItemRecipeFormula.java b/src/main/java/mekanism/common/item/ItemRecipeFormula.java new file mode 100644 index 000000000..624e875ad --- /dev/null +++ b/src/main/java/mekanism/common/item/ItemRecipeFormula.java @@ -0,0 +1,17 @@ +package mekanism.common.item; + +import net.minecraft.item.ItemStack; + +public class ItemRecipeFormula extends ItemMekanism +{ + public ItemRecipeFormula() + { + super(); + } + + @Override + public int getItemStackLimit(ItemStack stack) + { + return 1; + } +} diff --git a/src/main/java/mekanism/common/tile/TileEntityFormulaicAssemblicator.java b/src/main/java/mekanism/common/tile/TileEntityFormulaicAssemblicator.java new file mode 100644 index 000000000..4e50cf3a0 --- /dev/null +++ b/src/main/java/mekanism/common/tile/TileEntityFormulaicAssemblicator.java @@ -0,0 +1,454 @@ +package mekanism.common.tile; + +import io.netty.buffer.ByteBuf; + +import java.util.ArrayList; + +import mekanism.api.EnumColor; +import mekanism.api.IConfigCardAccess; +import mekanism.api.MekanismConfig.usage; +import mekanism.api.transmitters.TransmissionType; +import mekanism.api.util.StackUtils; +import mekanism.common.SideData; +import mekanism.common.Upgrade; +import mekanism.common.base.IRedstoneControl; +import mekanism.common.base.ISideConfiguration; +import mekanism.common.base.IUpgradeTile; +import mekanism.common.block.BlockMachine.MachineType; +import mekanism.common.content.assemblicator.RecipeFormula; +import mekanism.common.item.ItemRecipeFormula; +import mekanism.common.tile.component.TileComponentConfig; +import mekanism.common.tile.component.TileComponentEjector; +import mekanism.common.tile.component.TileComponentUpgrade; +import mekanism.common.util.ChargeUtils; +import mekanism.common.util.InventoryUtils; +import mekanism.common.util.MekanismUtils; +import net.minecraft.inventory.InventoryCrafting; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; + +public class TileEntityFormulaicAssemblicator extends TileEntityElectricBlock implements ISideConfiguration, IUpgradeTile, IRedstoneControl, IConfigCardAccess +{ + public InventoryCrafting dummyInv = MekanismUtils.getDummyCraftingInv(); + + public double BASE_ENERGY_PER_TICK = usage.metallurgicInfuserUsage; + + public double energyPerTick = BASE_ENERGY_PER_TICK; + + public int BASE_TICKS_REQUIRED = 100; + + public int ticksRequired = BASE_TICKS_REQUIRED; + + public int operatingTicks; + + public boolean autoMode = false; + + public RecipeFormula formula; + + public RedstoneControl controlType = RedstoneControl.DISABLED; + + public TileComponentUpgrade upgradeComponent; + public TileComponentEjector ejectorComponent; + public TileComponentConfig configComponent; + + public TileEntityFormulaicAssemblicator() + { + super("FormulaicAssemblicator", MachineType.FORMULAIC_ASSEMBLICATOR.baseEnergy); + + configComponent = new TileComponentConfig(this, TransmissionType.ITEM, TransmissionType.ENERGY); + + configComponent.addOutput(TransmissionType.ITEM, new SideData("None", EnumColor.GREY, InventoryUtils.EMPTY)); + configComponent.addOutput(TransmissionType.ITEM, new SideData("Input", EnumColor.DARK_RED, + new int[] {3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20})); + configComponent.addOutput(TransmissionType.ITEM, new SideData("Output", EnumColor.DARK_BLUE, new int[] {21, 22, 23, 24, 25, 26})); + configComponent.addOutput(TransmissionType.ITEM, new SideData("Energy", EnumColor.DARK_GREEN, new int[] {1})); + + configComponent.setConfig(TransmissionType.ITEM, new byte[] {0, 0, 0, 3, 1, 2}); + configComponent.setInputConfig(TransmissionType.ENERGY); + + inventory = new ItemStack[35]; + + upgradeComponent = new TileComponentUpgrade(this, 0); + + ejectorComponent = new TileComponentEjector(this); + ejectorComponent.setOutputData(TransmissionType.ITEM, configComponent.getOutputs(TransmissionType.ITEM).get(2)); + } + + @Override + public void onUpdate() + { + super.onUpdate(); + + if(!worldObj.isRemote) + { + ChargeUtils.discharge(1, this); + + if(inventory[2] != null && inventory[2].getItem() instanceof ItemRecipeFormula) + { + + } + else { + formula = null; + } + + if(autoMode && formula != null) + { + boolean canOperate = true; + + if(!formula.matches(worldObj, inventory, 27)) + { + canOperate = moveItemsToGrid(); + } + + if(canOperate) + { + if(operatingTicks == ticksRequired) + { + if(MekanismUtils.canFunction(this)) + { + doSingleCraft(); + } + } + else { + if(getEnergy() >= energyPerTick) + { + operatingTicks++; + setEnergy(getEnergy() - energyPerTick); + } + } + } + else { + operatingTicks = 0; + } + } + else { + operatingTicks = 0; + } + } + } + + private boolean doSingleCraft() + { + for(int i = 0; i < 9; i++) + { + dummyInv.setInventorySlotContents(i, inventory[27+i]); + } + + ItemStack output = MekanismUtils.findMatchingRecipe(dummyInv, worldObj); + + if(output != null && tryMoveToOutput(output, false)) + { + tryMoveToOutput(output, true); + + for(int i = 27; i <= 35; i++) + { + inventory[i].stackSize--; + + if(inventory[i].stackSize == 0) + { + inventory[i] = null; + } + } + + return true; + } + + return false; + } + + private boolean craftSingle() + { + if(formula != null) + { + boolean canOperate = false; + + if(!formula.matches(worldObj, inventory, 27)) + { + canOperate = moveItemsToGrid(); + } + + if(canOperate) + { + doSingleCraft(); + } + } + else { + doSingleCraft(); + } + + return false; + } + + private boolean moveItemsToGrid() + { + for(int i = 27; i <= 35; i++) + { + if(formula.isIngredientInPos(worldObj, inventory[i], i-27)) + { + continue; + } + + if(inventory[i] != null) + { + inventory[i] = tryMoveToInput(inventory[i]); + + if(inventory[i] != null) + { + return false; + } + } + else { + boolean found = false; + + for(int j = 3; j <= 20; j++) + { + if(inventory[j] != null && formula.isIngredientInPos(worldObj, inventory[j], i-27)) + { + inventory[i] = StackUtils.size(inventory[j], 1); + inventory[j].stackSize--; + + if(inventory[j].stackSize == 0) + { + inventory[j] = null; + } + + found = true; + + break; + } + } + + if(!found) + { + return false; + } + } + } + + return true; + } + + private void craftAll() + { + while(craftSingle()); + } + + private void toggleAutoMode() + { + if(autoMode) + { + operatingTicks = 0; + autoMode = false; + } + else { + for(int i = 27; i <= 35; i++) + { + inventory[i] = tryMoveToInput(inventory[i]); + } + + autoMode = true; + } + } + + private ItemStack tryMoveToInput(ItemStack stack) + { + stack = stack.copy(); + + for(int i = 3; i <= 20; i++) + { + if(inventory[i] == null) + { + inventory[i] = stack; + + return null; + } + else if(InventoryUtils.areItemsStackable(stack, inventory[i]) && inventory[i].stackSize < inventory[i].getMaxStackSize()) + { + int toUse = Math.min(stack.stackSize, inventory[i].getMaxStackSize()-inventory[i].stackSize); + + inventory[i].stackSize += toUse; + stack.stackSize -= toUse; + + if(stack.stackSize == 0) + { + return null; + } + } + } + + return stack; + } + + private boolean tryMoveToOutput(ItemStack stack, boolean doMove) + { + stack = stack.copy(); + + for(int i = 21; i <= 26; i++) + { + if(inventory[i] == null) + { + if(doMove) + { + inventory[i] = stack; + } + + return true; + } + else if(InventoryUtils.areItemsStackable(stack, inventory[i]) && inventory[i].stackSize < inventory[i].getMaxStackSize()) + { + int toUse = Math.min(stack.stackSize, inventory[i].getMaxStackSize()-inventory[i].stackSize); + + if(doMove) + { + inventory[i].stackSize += toUse; + } + + stack.stackSize -= toUse; + + if(stack.stackSize == 0) + { + return true; + } + } + } + + return false; + } + + private void encodeFormula() + { + + } + + @Override + public boolean canSetFacing(int side) + { + return side != 0 && side != 1; + } + + @Override + public void readFromNBT(NBTTagCompound nbtTags) + { + super.readFromNBT(nbtTags); + + autoMode = nbtTags.getBoolean("autoMode"); + operatingTicks = nbtTags.getInteger("operatingTicks"); + controlType = RedstoneControl.values()[nbtTags.getInteger("controlType")]; + } + + @Override + public void writeToNBT(NBTTagCompound nbtTags) + { + super.writeToNBT(nbtTags); + + nbtTags.setBoolean("autoMode", autoMode); + nbtTags.setInteger("operatingTicks", operatingTicks); + nbtTags.setInteger("controlType", controlType.ordinal()); + } + + @Override + public void handlePacketData(ByteBuf dataStream) + { + if(!worldObj.isRemote) + { + int type = dataStream.readInt(); + + if(type == 0) + { + toggleAutoMode(); + } + else if(type == 1) + { + encodeFormula(); + } + else if(type == 2) + { + craftSingle(); + } + else if(type == 3) + { + craftAll(); + } + + return; + } + + super.handlePacketData(dataStream); + + autoMode = dataStream.readBoolean(); + operatingTicks = dataStream.readInt(); + controlType = RedstoneControl.values()[dataStream.readInt()]; + } + + @Override + public ArrayList getNetworkedData(ArrayList data) + { + super.getNetworkedData(data); + + data.add(autoMode); + data.add(operatingTicks); + data.add(controlType.ordinal()); + + return data; + } + + @Override + public RedstoneControl getControlType() + { + return controlType; + } + + @Override + public void setControlType(RedstoneControl type) + { + controlType = type; + MekanismUtils.saveChunk(this); + } + + @Override + public boolean canPulse() + { + return true; + } + + @Override + public TileComponentConfig getConfig() + { + return configComponent; + } + + @Override + public int getOrientation() + { + return facing; + } + + @Override + public TileComponentUpgrade getComponent() + { + return upgradeComponent; + } + + @Override + public TileComponentEjector getEjector() + { + return ejectorComponent; + } + + @Override + public void recalculateUpgradables(Upgrade upgrade) + { + super.recalculateUpgradables(upgrade); + + switch(upgrade) + { + case SPEED: + ticksRequired = MekanismUtils.getTicks(this, BASE_TICKS_REQUIRED); + case ENERGY: + energyPerTick = MekanismUtils.getEnergyPerTick(this, BASE_ENERGY_PER_TICK); + maxEnergy = MekanismUtils.getMaxEnergy(this, BASE_MAX_ENERGY); + default: + break; + } + } +} diff --git a/src/main/java/mekanism/common/tile/TileEntityLaserTractorBeam.java b/src/main/java/mekanism/common/tile/TileEntityLaserTractorBeam.java index 48d0599d9..574439892 100644 --- a/src/main/java/mekanism/common/tile/TileEntityLaserTractorBeam.java +++ b/src/main/java/mekanism/common/tile/TileEntityLaserTractorBeam.java @@ -86,8 +86,7 @@ public class TileEntityLaserTractorBeam extends TileEntityContainerBlock impleme } } - else - { + else { if(collectedEnergy > 0) { double firing = collectedEnergy; diff --git a/src/main/java/mekanism/common/tile/TileEntityResistiveHeater.java b/src/main/java/mekanism/common/tile/TileEntityResistiveHeater.java index e01795d1c..3442c4785 100644 --- a/src/main/java/mekanism/common/tile/TileEntityResistiveHeater.java +++ b/src/main/java/mekanism/common/tile/TileEntityResistiveHeater.java @@ -115,6 +115,12 @@ public class TileEntityResistiveHeater extends TileEntityNoisyElectricBlock impl } } + @Override + public boolean canSetFacing(int side) + { + return side != 0 && side != 1; + } + @Override public float getVolume() { diff --git a/src/main/java/mekanism/common/util/MekanismUtils.java b/src/main/java/mekanism/common/util/MekanismUtils.java index a34668dbc..0ddea9d88 100644 --- a/src/main/java/mekanism/common/util/MekanismUtils.java +++ b/src/main/java/mekanism/common/util/MekanismUtils.java @@ -62,6 +62,7 @@ import net.minecraft.client.gui.FontRenderer; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.init.Blocks; +import net.minecraft.inventory.Container; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.Item; @@ -1355,9 +1356,22 @@ public final class MekanismUtils return tank; } + + public static InventoryCrafting getDummyCraftingInv() + { + Container tempContainer = new Container() { + @Override + public boolean canInteractWith(EntityPlayer player) + { + return false; + } + }; + + return new InventoryCrafting(tempContainer, 3, 3); + } /** - * Finds the output of a defined InventoryCrafting grid. Taken from CofhCore. + * Finds the output of a defined InventoryCrafting grid. * @param inv - InventoryCrafting to check * @param world - world reference * @return output ItemStack diff --git a/src/main/java/mekanism/common/util/RecipeUtils.java b/src/main/java/mekanism/common/util/RecipeUtils.java index 354ce1b1a..a0ba89c51 100644 --- a/src/main/java/mekanism/common/util/RecipeUtils.java +++ b/src/main/java/mekanism/common/util/RecipeUtils.java @@ -23,6 +23,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.CraftingManager; import net.minecraft.item.crafting.IRecipe; import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.world.World; import net.minecraftforge.oredict.OreDictionary; public class RecipeUtils @@ -263,4 +264,17 @@ public class RecipeUtils return false; } + + public static IRecipe getRecipeFromGrid(InventoryCrafting inv, World world) + { + for(IRecipe recipe : (List)CraftingManager.getInstance().getRecipeList()) + { + if(recipe.matches(inv, world)) + { + return recipe; + } + } + + return null; + } } diff --git a/src/main/resources/assets/mekanism/gui/GuiFormulaicAssemblicator.png b/src/main/resources/assets/mekanism/gui/GuiFormulaicAssemblicator.png new file mode 100644 index 0000000000000000000000000000000000000000..ccf63f296e3ebd3d9b565e6ed8c8ac3f9ebbe6fb GIT binary patch literal 6824 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 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/mekanism/gui/GuiUpgradeManagement.png b/src/main/resources/assets/mekanism/gui/GuiUpgradeManagement.png index 35aee32c44af9b995e6e12081475d8fcf8cc89da..3a899bdfa9497ae34a9d88f3b20509847cdac538 100644 GIT binary patch delta 1067 zcmV+`1l0S0DV-^hBYy-9X+uL$Nkc;*P;zf(X>4Tx062|}Rb6NtRTMtEb7vzY&QokO zg>Hg1+lHrgWSWcKdPn90sKGrRqvPeo9CG3uKX#J{(IASm?@ z+di}}l?o-=)F3E6wD^Ni=!>T7nL9I?X}YoAW$t|Qo$sD|?ti&w?*-_&s#unh6af~R zt}Pcb;&X?Oh&?NigomIP2BB9`9V=a_OaeAf3wO0!-$TNCU)j~&{-3S4MjaI(aUWu{ z=BNvZj{)$fRm*k(dis$cKk8Z@_G0L_F+jvGdbr_Z*TZu@evN5nWtO z;Zej(s*;~Z{0QP}ZGE;J;MNT3ndwE3s`n-8a z_I+}nIqm6u=<|e@EeHIimz0AQ#Dj=`p+-UW=i>gc+)5Aw8EP8kNq;VqqYhgy<6Uj0 z=+8?G7dO-&OBU<;fl{FVM6-)>fUj8wt5J-NPueZH>g)MY#m*OepL~TjtAT&M4YLUa zD3~yZy?+W#SOXDcC_o0^7T9R1gAN8V6s;5)ieI5-7aQlmJn}lUna#nz!j%5V$X|o` zxX!dHWQRV27P1=rj;t2bW$~+pTw@bIek?ZvKPDL<64`^#UNTAck#RBsB6*5DP4<%< zvJ+(Q`q)ZrMP58N*8RMUGg79TMcp~HyP#nIGk+>fTvOMqEDpAYBg-lK1zo-T#$T~q z=`1%wHmU-|3&GWIL{YNX(Qxa>rWCyRuBf>}*(bcU2l~2ICg+(V4}G z#U1l;@#I$zMt+vbndh(cT|8NDE)GVlmj(K2`BoWDjYO>UgY<{AEWIavDE-F0&3(#! z&3}E)eZgG6#@QDHLj zCkzNR&Px>zCja= zBtvA3lr~iNxL5O`B9%|&QfUxVJ5v*>v47M-4~Mg+cA#wn`}`f%scy1T>e6H0eF9n2 zI&SL?%@ub`(vxBuuQn={n(F9?s2GOGOpa(%huUpg8wKy)^pEtLGP@5GTP{bO`wYOo zKk@AQF5-@~0G1qpfyX0m7|+TF-UT@Ggxa#(!5xuEd<)>z_w4q+`Z9Qa{nY8)#2<64 l=PiJ>H#?ob-|uwRK0yDg0B4PV0id6JRZw95Z?hc)V-R=-8n*xd delta 1038 zcmV+p1o8WwDS#=EBYy+%X+uL$Nkc;*P;zf(X>4Tx062|}Ro!pfR1`mnZ(O7nKcKOW z4i$^9Ra0BJ8yc;~21%2p=|UR0&DbiW$#rfTQ`a`O(`{9s_5yDV_yd5l2Of}kLK+Oj z_Ok5(v`JGz71bo9J#^YYXp{DWs&KBaQ@dTpxRI}aIp=pi?|;!XK*v{_pO}_ARv`(`K_~P;r>1*Ox?C;-F2;pN*27;R!QM9q+Ux&wbylgT10KeMtdQo=mnqksdx=&F5&oys0TJd`E>GI|#kK((J)n0eU)DVBJ zYq?3pFC)I@_!%aD74f~sTqTWoFF^8{ntPr?L_-if$s_=TxZzG%&qCb(^K zdCoqnhMa4x{ z6hi)zV+ON`xsmg3L#>3I8=9NTb3f!hwJM>{)UK+QWxX9ld>D=;G@xL^4DLEuumLit zkcSMu9e;39Qv(A`lu*=Clo*MpVGd>OdF6n^am1Jntk;<}MrqIC5$=Q>n{*R}?8oOI zDUw5En2dl--Xw34!z7E+5pr%d2c?H4INKjdmEV*< zl@;X+<-BrtTbJ8*N%&OwR`^l)PWWE<8D!y-a9Q|CxFUQbT#TL7ym&1JoWQ-+)%LMCuYy_wP6ZWs zL5D3kvu*xEYtl=GNMYO54zpQqF~pph71JP#d&LoPNE~Olm7ll=btAavwoIM=mAd9q7A z>MqdgAh7QszoH+g!S^k(^Lixn-v&7J7v5PnBH45U;A;<{`?W~chj-$$p8;Grpf}uw z@Xk*pegW`m`}gsGT^YQaZZ(?^@V@H!1YqOiX7iurW^?09^uGph$@~{t0C9K{wF2RW IvpNK05K89@W&i*H diff --git a/src/main/resources/assets/mekanism/lang/en_US.lang b/src/main/resources/assets/mekanism/lang/en_US.lang index 4182d402e..e517a08c0 100644 --- a/src/main/resources/assets/mekanism/lang/en_US.lang +++ b/src/main/resources/assets/mekanism/lang/en_US.lang @@ -151,6 +151,7 @@ tile.MachineBlock3.QuantumEntangloporter.name=Quantum Entangloporter tile.MachineBlock3.SolarNeutronActivator.name=Solar Neutron Activator tile.MachineBlock3.Oredictionificator.name=Oredictionificator tile.MachineBlock3.ResistiveHeater.name=Resistive Heater +tile.MachineBlock3.FormulaicAssemblicator.name=Formulaic Assemblicator //Plastic tile.PlasticBlock.name=Plastic Block From f31e32fcf2e9f430d5f2d955538d6963128b76f7 Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Sun, 6 Mar 2016 19:05:34 -0500 Subject: [PATCH 40/52] More Assemblicator work, added Crafting Formula item --- .../java/mekanism/common/MekanismItems.java | 5 +- .../mekanism/common/block/BlockMachine.java | 4 +- .../common/item/ItemBlockMachine.java | 1 + .../common/item/ItemCraftingFormula.java | 172 ++++++++++++++++++ .../common/item/ItemGaugeDropper.java | 12 +- .../common/item/ItemRecipeFormula.java | 17 -- .../TileEntityFormulaicAssemblicator.java | 73 +++++++- .../resources/assets/mekanism/lang/en_US.lang | 5 + 8 files changed, 261 insertions(+), 28 deletions(-) create mode 100644 src/main/java/mekanism/common/item/ItemCraftingFormula.java delete mode 100644 src/main/java/mekanism/common/item/ItemRecipeFormula.java diff --git a/src/main/java/mekanism/common/MekanismItems.java b/src/main/java/mekanism/common/MekanismItems.java index 8abd9d5c9..b9f9c2094 100644 --- a/src/main/java/mekanism/common/MekanismItems.java +++ b/src/main/java/mekanism/common/MekanismItems.java @@ -4,8 +4,10 @@ import mekanism.common.item.ItemAlloy; import mekanism.common.item.ItemAtomicDisassembler; import mekanism.common.item.ItemBalloon; import mekanism.common.item.ItemClump; +import mekanism.common.item.ItemConfigurationCard; import mekanism.common.item.ItemConfigurator; import mekanism.common.item.ItemControlCircuit; +import mekanism.common.item.ItemCraftingFormula; import mekanism.common.item.ItemCrystal; import mekanism.common.item.ItemDictionary; import mekanism.common.item.ItemDirtyDust; @@ -13,7 +15,6 @@ import mekanism.common.item.ItemDust; import mekanism.common.item.ItemElectricBow; import mekanism.common.item.ItemEnergized; import mekanism.common.item.ItemFactoryInstaller; -import mekanism.common.item.ItemConfigurationCard; import mekanism.common.item.ItemFlamethrower; import mekanism.common.item.ItemFreeRunners; import mekanism.common.item.ItemGasMask; @@ -82,6 +83,7 @@ public class MekanismItems public static final Item Dictionary = new ItemDictionary().setUnlocalizedName("Dictionary"); public static final ItemGaugeDropper GaugeDropper = (ItemGaugeDropper)new ItemGaugeDropper().setUnlocalizedName("GaugeDropper"); public static final Item ConfigurationCard = new ItemConfigurationCard().setUnlocalizedName("ConfigurationCard"); + public static final Item CraftingFormula = new ItemCraftingFormula().setUnlocalizedName("CraftingFormula"); public static final Item PartTransmitter = new ItemPartTransmitter().setUnlocalizedName("MultipartTransmitter"); public static final Item GlowPanel = new ItemGlowPanel().setUnlocalizedName("GlowPanel"); public static final ItemScubaTank ScubaTank = (ItemScubaTank)new ItemScubaTank().setUnlocalizedName("ScubaTank"); @@ -153,6 +155,7 @@ public class MekanismItems GameRegistry.registerItem(FreeRunners, "FreeRunners"); GameRegistry.registerItem(ArmoredJetpack, "ArmoredJetpack"); GameRegistry.registerItem(ConfigurationCard, "ConfigurationCard"); + GameRegistry.registerItem(CraftingFormula, "CraftingFormula"); GameRegistry.registerItem(SeismicReader, "SeismicReader"); GameRegistry.registerItem(Substrate, "Substrate"); GameRegistry.registerItem(Polyethene, "Polyethene"); diff --git a/src/main/java/mekanism/common/block/BlockMachine.java b/src/main/java/mekanism/common/block/BlockMachine.java index 004c12e76..0e23da4f2 100644 --- a/src/main/java/mekanism/common/block/BlockMachine.java +++ b/src/main/java/mekanism/common/block/BlockMachine.java @@ -155,6 +155,7 @@ import cpw.mods.fml.relauncher.SideOnly; * 2:2: Ambient Accumulator * 2:3: Oredictionificator * 2:4: Resistive Heater + * 2:5: Formulaic Assemblicator * * @author AidanBrady * @@ -227,6 +228,7 @@ public class BlockMachine extends BlockContainer implements ISpecialBounds, IBlo icons[0][0] = BASE_ICON; icons[2][0] = BASE_ICON; icons[4][0] = BASE_ICON; + icons[5][0] = BASE_ICON; MekanismRenderer.loadDynamicTextures(register, MachineType.OREDICTIONIFICATOR.name, icons[3], DefIcon.getAll(register.registerIcon("mekanism:OredictionificatorSide"))); break; } @@ -1225,7 +1227,7 @@ public class BlockMachine extends BlockContainer implements ISpecialBounds, IBlo for(MachineType type : MachineType.values()) { - if(type != AMBIENT_ACCUMULATOR && type != FORMULAIC_ASSEMBLICATOR) + if(type != AMBIENT_ACCUMULATOR) { ret.add(type); } diff --git a/src/main/java/mekanism/common/item/ItemBlockMachine.java b/src/main/java/mekanism/common/item/ItemBlockMachine.java index 842ff6bd4..98f05721a 100644 --- a/src/main/java/mekanism/common/item/ItemBlockMachine.java +++ b/src/main/java/mekanism/common/item/ItemBlockMachine.java @@ -109,6 +109,7 @@ import cpw.mods.fml.relauncher.SideOnly; * 2:2: Ambient Accumulator * 2:3: Oredictionificator * 2:4: Resistive Heater + * 2:5: Formulaic Assemblicator * @author AidanBrady * */ diff --git a/src/main/java/mekanism/common/item/ItemCraftingFormula.java b/src/main/java/mekanism/common/item/ItemCraftingFormula.java new file mode 100644 index 000000000..e03ef517e --- /dev/null +++ b/src/main/java/mekanism/common/item/ItemCraftingFormula.java @@ -0,0 +1,172 @@ +package mekanism.common.item; + +import java.util.ArrayList; +import java.util.List; + +import mekanism.api.EnumColor; +import mekanism.common.util.LangUtils; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.NBTTagList; +import net.minecraft.world.World; +import net.minecraftforge.common.util.Constants.NBT; +import codechicken.lib.inventory.InventoryUtils; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + +public class ItemCraftingFormula extends ItemMekanism +{ + public ItemCraftingFormula() + { + super(); + } + + @Override + @SideOnly(Side.CLIENT) + public void addInformation(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) + { + ItemStack[] inv = getInventory(itemstack); + + if(inv != null) + { + addIngredientDetails(inv, list); + } + } + + private void addIngredientDetails(ItemStack[] inv, List list) + { + List stacks = new ArrayList(); + + for(ItemStack stack : inv) + { + if(stack != null) + { + boolean found = false; + + for(ItemStack iterStack : stacks) + { + if(InventoryUtils.canStack(stack, iterStack)) + { + iterStack.stackSize += stack.stackSize; + found = true; + } + } + + if(!found) + { + stacks.add(stack); + } + } + } + + list.add(EnumColor.GREY + LangUtils.localize("tooltip.ingredients") + ":"); + + for(ItemStack stack : stacks) + { + list.add(EnumColor.GREY + " - " + stack.getDisplayName() + " (" + stack.stackSize + ")"); + } + } + + @Override + public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player) + { + if(player.isSneaking() && !world.isRemote) + { + setInventory(stack, null); + setInvalid(stack, false); + + ((EntityPlayerMP)player).sendContainerAndContentsToPlayer(player.openContainer, player.openContainer.getInventory()); + + return stack; + } + + return stack; + } + + @Override + public int getItemStackLimit(ItemStack stack) + { + return getInventory(stack) != null ? 1 : 64; + } + + @Override + public String getItemStackDisplayName(ItemStack stack) + { + if(getInventory(stack) == null) + { + return super.getItemStackDisplayName(stack); + } + + return super.getItemStackDisplayName(stack) + " " + (isInvalid(stack) ? EnumColor.DARK_RED + "(" + LangUtils.localize("tooltip.invalid") + : EnumColor.DARK_GREEN + "(" + LangUtils.localize("tooltip.encoded")) + ")"; + } + + public boolean isInvalid(ItemStack stack) + { + if(stack.stackTagCompound == null) + { + return false; + } + + return stack.stackTagCompound.getBoolean("invalid"); + } + + public void setInvalid(ItemStack stack, boolean invalid) + { + if(stack.stackTagCompound == null) + { + stack.setTagCompound(new NBTTagCompound()); + } + + stack.stackTagCompound.setBoolean("invalid", invalid); + } + + public ItemStack[] getInventory(ItemStack stack) + { + if(stack.stackTagCompound == null) + { + return null; + } + + NBTTagList tagList = stack.stackTagCompound.getTagList("Items", NBT.TAG_COMPOUND); + ItemStack[] inventory = new ItemStack[9]; + + for(int tagCount = 0; tagCount < tagList.tagCount(); tagCount++) + { + NBTTagCompound tagCompound = tagList.getCompoundTagAt(tagCount); + byte slotID = tagCompound.getByte("Slot"); + + if(slotID >= 0 && slotID < 9) + { + inventory[slotID] = ItemStack.loadItemStackFromNBT(tagCompound); + } + } + + return inventory; + } + + public void setInventory(ItemStack stack, ItemStack[] inv) + { + if(stack.stackTagCompound == null) + { + stack.setTagCompound(new NBTTagCompound()); + } + + NBTTagList tagList = new NBTTagList(); + + for(int slotCount = 0; slotCount < 9; slotCount++) + { + if(inv[slotCount] != null) + { + NBTTagCompound tagCompound = new NBTTagCompound(); + tagCompound.setByte("Slot", (byte)slotCount); + inv[slotCount].writeToNBT(tagCompound); + tagList.appendTag(tagCompound); + } + } + + stack.stackTagCompound.setTag("Items", tagList); + } +} diff --git a/src/main/java/mekanism/common/item/ItemGaugeDropper.java b/src/main/java/mekanism/common/item/ItemGaugeDropper.java index 71b5ac265..3a0cd7d5e 100644 --- a/src/main/java/mekanism/common/item/ItemGaugeDropper.java +++ b/src/main/java/mekanism/common/item/ItemGaugeDropper.java @@ -9,6 +9,7 @@ import mekanism.common.Mekanism; import mekanism.common.util.LangUtils; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -16,6 +17,8 @@ import net.minecraft.world.World; import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.IFluidContainerItem; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class ItemGaugeDropper extends ItemMekanism implements IGasItem, IFluidContainerItem { @@ -67,20 +70,23 @@ public class ItemGaugeDropper extends ItemMekanism implements IGasItem, IFluidCo } @Override - public boolean onItemUseFirst(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ) + public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player) { if(player.isSneaking() && !world.isRemote) { setGas(stack, null); setFluid(stack, null); + + ((EntityPlayerMP)player).sendContainerAndContentsToPlayer(player.openContainer, player.openContainer.getInventory()); - return true; + return stack; } - return false; + return stack; } @Override + @SideOnly(Side.CLIENT) public void addInformation(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { GasStack gasStack = getGas(itemstack); diff --git a/src/main/java/mekanism/common/item/ItemRecipeFormula.java b/src/main/java/mekanism/common/item/ItemRecipeFormula.java deleted file mode 100644 index 624e875ad..000000000 --- a/src/main/java/mekanism/common/item/ItemRecipeFormula.java +++ /dev/null @@ -1,17 +0,0 @@ -package mekanism.common.item; - -import net.minecraft.item.ItemStack; - -public class ItemRecipeFormula extends ItemMekanism -{ - public ItemRecipeFormula() - { - super(); - } - - @Override - public int getItemStackLimit(ItemStack stack) - { - return 1; - } -} diff --git a/src/main/java/mekanism/common/tile/TileEntityFormulaicAssemblicator.java b/src/main/java/mekanism/common/tile/TileEntityFormulaicAssemblicator.java index 4e50cf3a0..3f4db766e 100644 --- a/src/main/java/mekanism/common/tile/TileEntityFormulaicAssemblicator.java +++ b/src/main/java/mekanism/common/tile/TileEntityFormulaicAssemblicator.java @@ -16,7 +16,7 @@ import mekanism.common.base.ISideConfiguration; import mekanism.common.base.IUpgradeTile; import mekanism.common.block.BlockMachine.MachineType; import mekanism.common.content.assemblicator.RecipeFormula; -import mekanism.common.item.ItemRecipeFormula; +import mekanism.common.item.ItemCraftingFormula; import mekanism.common.tile.component.TileComponentConfig; import mekanism.common.tile.component.TileComponentEjector; import mekanism.common.tile.component.TileComponentUpgrade; @@ -43,6 +43,8 @@ public class TileEntityFormulaicAssemblicator extends TileEntityElectricBlock im public boolean autoMode = false; + public int pulseOperations; + public RecipeFormula formula; public RedstoneControl controlType = RedstoneControl.DISABLED; @@ -83,15 +85,49 @@ public class TileEntityFormulaicAssemblicator extends TileEntityElectricBlock im { ChargeUtils.discharge(1, this); - if(inventory[2] != null && inventory[2].getItem() instanceof ItemRecipeFormula) + if(controlType != RedstoneControl.PULSE) { + pulseOperations = 0; + } + else if(MekanismUtils.canFunction(this)) + { + pulseOperations++; + } + + if(inventory[2] != null && inventory[2].getItem() instanceof ItemCraftingFormula) + { + ItemCraftingFormula item = (ItemCraftingFormula)inventory[2].getItem(); + if(item.getInventory(inventory[2]) != null && !item.isInvalid(inventory[2])) + { + RecipeFormula itemFormula = new RecipeFormula(item.getInventory(inventory[2])); + + if(itemFormula.isValidFormula(worldObj)) + { + if(formula != null && !formula.isFormulaEqual(worldObj, itemFormula)) + { + itemFormula = formula; + operatingTicks = 0; + } + else if(formula == null) + { + formula = itemFormula; + } + } + else { + formula = null; + item.setInvalid(inventory[2], true); + } + } + else { + formula = null; + } } else { formula = null; } - if(autoMode && formula != null) + if(autoMode && formula != null && ((controlType == RedstoneControl.PULSE && pulseOperations > 0) || MekanismUtils.canFunction(this))) { boolean canOperate = true; @@ -104,9 +140,14 @@ public class TileEntityFormulaicAssemblicator extends TileEntityElectricBlock im { if(operatingTicks == ticksRequired) { - if(MekanismUtils.canFunction(this)) + if(doSingleCraft()) { - doSingleCraft(); + operatingTicks = 0; + + if(pulseOperations > 0) + { + pulseOperations--; + } } } else { @@ -150,6 +191,8 @@ public class TileEntityFormulaicAssemblicator extends TileEntityElectricBlock im } } + markDirty(); + return true; } @@ -191,6 +234,7 @@ public class TileEntityFormulaicAssemblicator extends TileEntityElectricBlock im if(inventory[i] != null) { inventory[i] = tryMoveToInput(inventory[i]); + markDirty(); if(inventory[i] != null) { @@ -212,6 +256,7 @@ public class TileEntityFormulaicAssemblicator extends TileEntityElectricBlock im inventory[j] = null; } + markDirty(); found = true; break; @@ -246,6 +291,7 @@ public class TileEntityFormulaicAssemblicator extends TileEntityElectricBlock im inventory[i] = tryMoveToInput(inventory[i]); } + markDirty(); autoMode = true; } } @@ -317,7 +363,20 @@ public class TileEntityFormulaicAssemblicator extends TileEntityElectricBlock im private void encodeFormula() { - + if(inventory[2] != null && inventory[2].getItem() instanceof ItemCraftingFormula) + { + ItemCraftingFormula item = (ItemCraftingFormula)inventory[2].getItem(); + + if(item.getInventory(inventory[2]) == null) + { + RecipeFormula formula = new RecipeFormula(inventory, 27); + + if(formula.isValidFormula(worldObj)) + { + item.setInventory(inventory[2], formula.input); + } + } + } } @Override @@ -334,6 +393,7 @@ public class TileEntityFormulaicAssemblicator extends TileEntityElectricBlock im autoMode = nbtTags.getBoolean("autoMode"); operatingTicks = nbtTags.getInteger("operatingTicks"); controlType = RedstoneControl.values()[nbtTags.getInteger("controlType")]; + pulseOperations = nbtTags.getInteger("pulseOperations"); } @Override @@ -344,6 +404,7 @@ public class TileEntityFormulaicAssemblicator extends TileEntityElectricBlock im nbtTags.setBoolean("autoMode", autoMode); nbtTags.setInteger("operatingTicks", operatingTicks); nbtTags.setInteger("controlType", controlType.ordinal()); + nbtTags.setInteger("pulseOperations", pulseOperations); } @Override diff --git a/src/main/resources/assets/mekanism/lang/en_US.lang b/src/main/resources/assets/mekanism/lang/en_US.lang index e517a08c0..300bf04fd 100644 --- a/src/main/resources/assets/mekanism/lang/en_US.lang +++ b/src/main/resources/assets/mekanism/lang/en_US.lang @@ -48,6 +48,7 @@ item.Substrate.name=Substrate item.Flamethrower.name=Flamethrower item.GaugeDropper.name=Gauge Dropper item.BioFuel.name=Bio Fuel +item.CraftingFormula.name=Crafting Formula //Control Circuits item.BasicControlCircuit.name=Basic Control Circuit @@ -719,6 +720,9 @@ tooltip.speed=Speed tooltip.and=and tooltip.heat=Heat tooltip.itemAmount=Item amount +tooltip.invalid=Invalid +tooltip.encoded=Encoded +tooltip.ingredients=Ingredients tooltip.portableTank.bucketMode=Bucket Mode @@ -797,6 +801,7 @@ tooltip.SolarNeutronActivator=A machine that directs the neutron radiation of th tooltip.Oredictionificator=A machine used to unify and translate between various items and blocks using the Ore Dictionary. tooltip.Factory=A machine that serves as an upgrade to regular machinery, allowing for multiple processing operations to occur at once. tooltip.ResistiveHeater=A condensed, coiled resistor capable of converting electrical energy directly into heat energy. +tooltip.FormulaicAssemblicator=A machine that uses energy to rapidly craft items and blocks from Recipe Formulas. Doubles as an advanced crafting bench. tooltip.HeatGenerator=A generator that uses the heat of lava or other burnable resources to produce energy. tooltip.SolarGenerator=A generator that uses the power of the sun to produce energy. From 6f4e73d15ecbd1697d06096f7673bc677dea1ecd Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Sat, 12 Mar 2016 11:43:44 -0500 Subject: [PATCH 41/52] Work on Formulaic Assemblicator, many fixes --- .../client/gui/GuiFormulaicAssemblicator.java | 9 + .../container/ContainerDigitalMiner.java | 12 +- .../ContainerFormulaicAssemblicator.java | 175 ++++++++++++++++++ .../mekanism/common/item/ItemBlockBasic.java | 10 +- .../common/item/ItemCraftingFormula.java | 20 ++ .../java/mekanism/common/item/ItemProxy.java | 15 +- .../mekanism/common/recipe/BinRecipe.java | 6 +- .../TileEntityFormulaicAssemblicator.java | 74 ++++++++ .../common/tile/TileEntityGasTank.java | 4 +- .../textures/items/CraftingFormula.png | Bin 0 -> 1296 bytes .../textures/items/CraftingFormulaEncoded.png | Bin 0 -> 1299 bytes .../textures/items/CraftingFormulaInvalid.png | Bin 0 -> 1299 bytes 12 files changed, 302 insertions(+), 23 deletions(-) create mode 100644 src/main/java/mekanism/client/gui/GuiFormulaicAssemblicator.java create mode 100644 src/main/java/mekanism/common/inventory/container/ContainerFormulaicAssemblicator.java create mode 100644 src/main/resources/assets/mekanism/textures/items/CraftingFormula.png create mode 100644 src/main/resources/assets/mekanism/textures/items/CraftingFormulaEncoded.png create mode 100644 src/main/resources/assets/mekanism/textures/items/CraftingFormulaInvalid.png diff --git a/src/main/java/mekanism/client/gui/GuiFormulaicAssemblicator.java b/src/main/java/mekanism/client/gui/GuiFormulaicAssemblicator.java new file mode 100644 index 000000000..bafd57b1a --- /dev/null +++ b/src/main/java/mekanism/client/gui/GuiFormulaicAssemblicator.java @@ -0,0 +1,9 @@ +package mekanism.client.gui; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + +@SideOnly(Side.CLIENT) +public class GuiFormulaicAssemblicator { + +} diff --git a/src/main/java/mekanism/common/inventory/container/ContainerDigitalMiner.java b/src/main/java/mekanism/common/inventory/container/ContainerDigitalMiner.java index b6866973f..9b366169a 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerDigitalMiner.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerDigitalMiner.java @@ -27,19 +27,19 @@ public class ContainerDigitalMiner extends Container addSlotToContainer(new SlotDischarge(tentity, 27, 152, 6)); - int slotX; + int slotY; - for(slotX = 0; slotX < 3; slotX++) + for(slotY = 0; slotY < 3; slotY++) { - for(int slotY = 0; slotY < 9; slotY++) + for(int slotX = 0; slotX < 9; slotX++) { - addSlotToContainer(new Slot(inventory, slotY + slotX * 9 + 9, 8 + slotY * 18, 148 + slotX * 18)); + addSlotToContainer(new Slot(inventory, slotX + slotY * 9 + 9, 8 + slotX * 18, 148 + slotY * 18)); } } - for(slotX = 0; slotX < 9; slotX++) + for(slotY = 0; slotY < 9; slotY++) { - addSlotToContainer(new Slot(inventory, slotX, 8 + slotX * 18, 206)); + addSlotToContainer(new Slot(inventory, slotY, 8 + slotY * 18, 206)); } tileEntity.open(inventory.player); diff --git a/src/main/java/mekanism/common/inventory/container/ContainerFormulaicAssemblicator.java b/src/main/java/mekanism/common/inventory/container/ContainerFormulaicAssemblicator.java new file mode 100644 index 000000000..2f3d337d2 --- /dev/null +++ b/src/main/java/mekanism/common/inventory/container/ContainerFormulaicAssemblicator.java @@ -0,0 +1,175 @@ +package mekanism.common.inventory.container; + +import mekanism.common.inventory.slot.SlotEnergy.SlotDischarge; +import mekanism.common.inventory.slot.SlotSpecific; +import mekanism.common.item.ItemCraftingFormula; +import mekanism.common.tile.TileEntityFormulaicAssemblicator; +import mekanism.common.util.ChargeUtils; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.inventory.Container; +import net.minecraft.inventory.Slot; +import net.minecraft.item.ItemStack; +import net.minecraftforge.fluids.FluidContainerRegistry; + +public class ContainerFormulaicAssemblicator extends Container +{ + private TileEntityFormulaicAssemblicator tileEntity; + + public ContainerFormulaicAssemblicator(InventoryPlayer inventory, TileEntityFormulaicAssemblicator tentity) + { + tileEntity = tentity; + addSlotToContainer(new SlotDischarge(tentity, 1, 155, 76)); + addSlotToContainer(new SlotSpecific(tentity, 2, 6, 26, ItemCraftingFormula.class)); + + int slotY; + + for(slotY = 0; slotY < 2; slotY++) + { + for(int slotX = 0; slotX < 9; slotX++) + { + addSlotToContainer(new Slot(tentity, slotX + slotY * 9 + 3, 8 + slotX * 18, 98 + slotY * 18)); + } + } + + for(slotY = 0; slotY < 3; slotY++) + { + for(int slotX = 0; slotX < 3; slotX++) + { + addSlotToContainer(new Slot(tentity, slotX + slotY * 9 + 27, 26 + slotX * 18, 17 + slotY * 18)); + } + } + + for(slotY = 0; slotY < 3; slotY++) + { + for(int slotX = 0; slotX < 2; slotX++) + { + addSlotToContainer(new Slot(tentity, slotX + slotY * 9 + 21, 116 + slotX * 18, 17 + slotY * 18)); + } + } + + for(slotY = 0; slotY < 3; slotY++) + { + for(int slotX = 0; slotX < 9; slotX++) + { + addSlotToContainer(new Slot(inventory, slotX + slotY * 9 + 9, 8 + slotX * 18, 148 + slotY * 18)); + } + } + + for(slotY = 0; slotY < 9; slotY++) + { + addSlotToContainer(new Slot(inventory, slotY, 8 + slotY * 18, 206)); + } + + tileEntity.open(inventory.player); + tileEntity.openInventory(); + } + + @Override + public void onContainerClosed(EntityPlayer entityplayer) + { + super.onContainerClosed(entityplayer); + + tileEntity.close(entityplayer); + tileEntity.closeInventory(); + } + + @Override + public boolean canInteractWith(EntityPlayer entityplayer) + { + return tileEntity.isUseableByPlayer(entityplayer); + } + + @Override + public ItemStack transferStackInSlot(EntityPlayer player, int slotID) + { + ItemStack stack = null; + Slot currentSlot = (Slot)inventorySlots.get(slotID); + + if(currentSlot != null && currentSlot.getHasStack()) + { + ItemStack slotStack = currentSlot.getStack(); + stack = slotStack.copy(); + + if(ChargeUtils.canBeDischarged(slotStack)) + { + if(slotID != 2) + { + if(!mergeItemStack(slotStack, 2, 3, false)) + { + return null; + } + } + else { + if(!mergeItemStack(slotStack, 3, inventorySlots.size(), true)) + { + return null; + } + } + } + else if(FluidContainerRegistry.isEmptyContainer(slotStack)) + { + if(slotID != 0) + { + if(!mergeItemStack(slotStack, 0, 1, false)) + { + return null; + } + } + else if(slotID == 0) + { + if(!mergeItemStack(slotStack, 3, inventorySlots.size(), true)) + { + return null; + } + } + } + else if(slotID == 1) + { + if(!mergeItemStack(slotStack, 3, inventorySlots.size(), true)) + { + return null; + } + } + else { + if(slotID >= 3 && slotID <= 29) + { + if(!mergeItemStack(slotStack, 30, inventorySlots.size(), false)) + { + return null; + } + } + else if(slotID > 29) + { + if(!mergeItemStack(slotStack, 3, 29, false)) + { + return null; + } + } + else { + if(!mergeItemStack(slotStack, 3, inventorySlots.size(), true)) + { + return null; + } + } + } + + if(slotStack.stackSize == 0) + { + currentSlot.putStack((ItemStack)null); + } + else { + currentSlot.onSlotChanged(); + } + + if(slotStack.stackSize == stack.stackSize) + { + return null; + } + + currentSlot.onPickupFromSlot(player, slotStack); + } + + return stack; + } +} diff --git a/src/main/java/mekanism/common/item/ItemBlockBasic.java b/src/main/java/mekanism/common/item/ItemBlockBasic.java index 82e2ca70b..09359d002 100644 --- a/src/main/java/mekanism/common/item/ItemBlockBasic.java +++ b/src/main/java/mekanism/common/item/ItemBlockBasic.java @@ -202,11 +202,6 @@ public class ItemBlockBasic extends ItemBlock implements IEnergizedItem, ITierIt return true; } - if(stack.stackTagCompound == null || !stack.stackTagCompound.hasKey("newCount")) - { - return true; - } - return false; } @@ -219,9 +214,12 @@ public class ItemBlockBasic extends ItemBlock implements IEnergizedItem, ITierIt { return null; } + + int newCount = stack.stackTagCompound.getInteger("newCount"); + stack.stackTagCompound.removeTag("newCount"); ItemStack ret = stack.copy(); - ret.stackTagCompound.setInteger("itemCount", stack.stackTagCompound.getInteger("newCount")); + ret.stackTagCompound.setInteger("itemCount", newCount); return ret; } diff --git a/src/main/java/mekanism/common/item/ItemCraftingFormula.java b/src/main/java/mekanism/common/item/ItemCraftingFormula.java index e03ef517e..0bfdff07b 100644 --- a/src/main/java/mekanism/common/item/ItemCraftingFormula.java +++ b/src/main/java/mekanism/common/item/ItemCraftingFormula.java @@ -5,11 +5,13 @@ import java.util.List; import mekanism.api.EnumColor; import mekanism.common.util.LangUtils; +import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; +import net.minecraft.util.IIcon; import net.minecraft.world.World; import net.minecraftforge.common.util.Constants.NBT; import codechicken.lib.inventory.InventoryUtils; @@ -18,11 +20,29 @@ import cpw.mods.fml.relauncher.SideOnly; public class ItemCraftingFormula extends ItemMekanism { + public IIcon[] icons = new IIcon[3]; + public ItemCraftingFormula() { super(); } + @Override + @SideOnly(Side.CLIENT) + public void registerIcons(IIconRegister register) + { + icons[0] = register.registerIcon("mekanism:CraftingFormula"); + icons[1] = register.registerIcon("mekanism:CraftingFormulaInvalid"); + icons[2] = register.registerIcon("mekanism:CraftingFormulaEncoded"); + } + + @Override + @SideOnly(Side.CLIENT) + public IIcon getIcon(ItemStack stack, int pass) + { + return getInventory(stack) == null ? icons[0] : (isInvalid(stack) ? icons[1] : icons[2]); + } + @Override @SideOnly(Side.CLIENT) public void addInformation(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) diff --git a/src/main/java/mekanism/common/item/ItemProxy.java b/src/main/java/mekanism/common/item/ItemProxy.java index afa8dbda8..92eaf210d 100644 --- a/src/main/java/mekanism/common/item/ItemProxy.java +++ b/src/main/java/mekanism/common/item/ItemProxy.java @@ -71,15 +71,18 @@ public class ItemProxy extends Item public void registerIcons(IIconRegister register) {} @Override - public void onUpdate(ItemStack par1ItemStack, World par2World, Entity par3Entity, int par4, boolean par5) + public void onUpdate(ItemStack stacks, World world, Entity entity, int j, boolean flag) { - if (par3Entity instanceof EntityPlayer) + if(entity instanceof EntityPlayer) { - EntityPlayer player = (EntityPlayer) par3Entity; - for (int i = 0; i < player.inventory.mainInventory.length; i++) + EntityPlayer player = (EntityPlayer)entity; + + for(int i = 0; i < player.inventory.mainInventory.length; i++) { - if (player.inventory.mainInventory[i] != null && player.inventory.mainInventory[i].getItem() == this) - player.inventory.mainInventory[i] = null; + if(player.inventory.mainInventory[i] != null && player.inventory.mainInventory[i].getItem() == this) + { + player.inventory.mainInventory[i] = null; + } } } } diff --git a/src/main/java/mekanism/common/recipe/BinRecipe.java b/src/main/java/mekanism/common/recipe/BinRecipe.java index d4268595c..08cf6969d 100644 --- a/src/main/java/mekanism/common/recipe/BinRecipe.java +++ b/src/main/java/mekanism/common/recipe/BinRecipe.java @@ -1,8 +1,8 @@ package mekanism.common.recipe; import mekanism.common.MekanismItems; +import mekanism.common.block.BlockBasic.BasicType; import mekanism.common.inventory.InventoryBin; -import mekanism.common.item.ItemBlockBasic; import mekanism.common.item.ItemProxy; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.InventoryCrafting; @@ -39,7 +39,7 @@ public class BinRecipe implements IRecipe return false; } - return itemStack.getItem() instanceof ItemBlockBasic && itemStack.getItemDamage() == 6 && itemStack.stackSize == 1; + return BasicType.get(itemStack) == BasicType.BIN && itemStack.stackSize <= 1; } @Override @@ -99,7 +99,7 @@ public class BinRecipe implements IRecipe } binInv.add(addStack); - + return bin; } else { diff --git a/src/main/java/mekanism/common/tile/TileEntityFormulaicAssemblicator.java b/src/main/java/mekanism/common/tile/TileEntityFormulaicAssemblicator.java index 3f4db766e..08e20f50a 100644 --- a/src/main/java/mekanism/common/tile/TileEntityFormulaicAssemblicator.java +++ b/src/main/java/mekanism/common/tile/TileEntityFormulaicAssemblicator.java @@ -9,6 +9,7 @@ import mekanism.api.IConfigCardAccess; import mekanism.api.MekanismConfig.usage; import mekanism.api.transmitters.TransmissionType; import mekanism.api.util.StackUtils; +import mekanism.common.PacketHandler; import mekanism.common.SideData; import mekanism.common.Upgrade; import mekanism.common.base.IRedstoneControl; @@ -17,6 +18,9 @@ import mekanism.common.base.IUpgradeTile; import mekanism.common.block.BlockMachine.MachineType; import mekanism.common.content.assemblicator.RecipeFormula; import mekanism.common.item.ItemCraftingFormula; +import mekanism.common.recipe.RecipeHandler; +import mekanism.common.recipe.RecipeHandler.Recipe; +import mekanism.common.recipe.inputs.InfusionInput; import mekanism.common.tile.component.TileComponentConfig; import mekanism.common.tile.component.TileComponentEjector; import mekanism.common.tile.component.TileComponentUpgrade; @@ -384,6 +388,48 @@ public class TileEntityFormulaicAssemblicator extends TileEntityElectricBlock im { return side != 0 && side != 1; } + + @Override + public int[] getAccessibleSlotsFromSide(int side) + { + return configComponent.getOutput(TransmissionType.ITEM, side, facing).availableSlots; + } + + @Override + public boolean canExtractItem(int slotID, ItemStack itemstack, int side) + { + if(slotID == 1) + { + return ChargeUtils.canBeOutputted(itemstack, false); + } + else if(slotID >= 21 && slotID <= 26) + { + return true; + } + + return false; + } + + @Override + public boolean isItemValidForSlot(int slotID, ItemStack itemstack) + { + if(slotID >= 3 && slotID <= 20) + { + if(formula == null) + { + return true; + } + else { + return formula.isIngredient(worldObj, itemstack); + } + } + else if(slotID == 1) + { + return ChargeUtils.canBeDischarged(itemstack); + } + + return false; + } @Override public void readFromNBT(NBTTagCompound nbtTags) @@ -439,6 +485,21 @@ public class TileEntityFormulaicAssemblicator extends TileEntityElectricBlock im autoMode = dataStream.readBoolean(); operatingTicks = dataStream.readInt(); controlType = RedstoneControl.values()[dataStream.readInt()]; + + if(dataStream.readBoolean()) + { + ItemStack[] inv = new ItemStack[9]; + + for(int i = 0; i < 9; i++) + { + inv[i] = PacketHandler.readStack(dataStream); + } + + formula = new RecipeFormula(inv); + } + else { + formula = null; + } } @Override @@ -450,6 +511,19 @@ public class TileEntityFormulaicAssemblicator extends TileEntityElectricBlock im data.add(operatingTicks); data.add(controlType.ordinal()); + if(formula != null) + { + data.add(true); + + for(int i = 0; i < 9; i++) + { + data.add(formula.input[i]); + } + } + else { + data.add(false); + } + return data; } diff --git a/src/main/java/mekanism/common/tile/TileEntityGasTank.java b/src/main/java/mekanism/common/tile/TileEntityGasTank.java index 4eb51c047..a830c620d 100644 --- a/src/main/java/mekanism/common/tile/TileEntityGasTank.java +++ b/src/main/java/mekanism/common/tile/TileEntityGasTank.java @@ -38,8 +38,8 @@ public class TileEntityGasTank extends TileEntityContainerBlock implements IGasH public enum GasMode { IDLE, - DUMPING, - DUMPING_EXCESS + DUMPING_EXCESS, + DUMPING } /** The type of gas stored in this tank. */ diff --git a/src/main/resources/assets/mekanism/textures/items/CraftingFormula.png b/src/main/resources/assets/mekanism/textures/items/CraftingFormula.png new file mode 100644 index 0000000000000000000000000000000000000000..779e0d2e0fc7be584817776b5c0ac4ec8711588d GIT binary patch literal 1296 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 JPDHLkV1m`Ka0UPX literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/mekanism/textures/items/CraftingFormulaInvalid.png b/src/main/resources/assets/mekanism/textures/items/CraftingFormulaInvalid.png new file mode 100644 index 0000000000000000000000000000000000000000..ae37f53d8296f7552e24c41d07220dc4798424d8 GIT binary patch literal 1299 zcmV+u1?>8XP)4Tx062|}Rb6NtRTMtEb7vzY&QokOg>Hg1+lHrgWS zWcKdPn90sKGrRqvPeo9CG3uKX#J{(IASm?@+di}}l?o-=)F3E6wD^Ni=!>T7nL9I? zX}YoAW$t|Qo$sD|?zw001?ah|SeB6#0T!CBEf+H4bBB+JJu8rehoBb*p;u8ID_yBf z0ya+zcePvJL&AGs+11_tpRKn>9TgyPA7ZoSs0)aX0r00)%XR^J`jH<$>RKN5V(7Oq zK*TS4xZz{h!*f1C3ECFkK$#7nA@pGN!$;%jYvwjAKwmYb0gKL(K8 z-kPtb5${A?tlI~wzMrJ6wTdBr=Y%%%EaEMQ&o}4FQ^DA)s*}Z>!FI&AHCpoWI|RUq zx?7s@$8!5^Q=anY%X@i5{QA6kNcMelpE>R6eCYFpmMsVTrI(b06~u#xf1yS} z_UGdMvD``!0~u->P=lA4?YN`hilQ|3tHka)7T{2CGqw zjZfMwx$5irQN_*|e4l)UHmiYuz74Yp1t^#>hrJ3-SOXDcC_o0^7T9R1gAN8V6s;5) zieI5-7aQlmJn}lUna#nz!j%5V$X|o`xX!dHWQRV27P1=rj;t2bW$~+pTw@bIek?Zv zKPDL<64`^#UNTAck#RBsB6*5DP4<%UA_FqU$I>2EH_cM;u)Q~SI+rg`Rn{L_AC5qq~L$#SMj%U z$6Cz0vP{G5Y*=%5RT^yu;}-DInZ=349rJPVM6C3K^oO)8y(fJr{l>k`ead~!ea?NsT>_Ci%bnxC;Vy6=b6>{xYV#Ue-+LB$ z7`JEXmTRm^AtP)R9u{)KHsMiWGV&)32xCG~*nyU<>-!d;FP=Re4r3qYr~6#KE>;1F z`>_J_P5xC?ROxV(DIHdCO*p$HRQI@7^PwV@Pvuf+5K}u-6REM(K@W$s zrgorh0{i?O)v0c>QtHxU-hBdD(>iYJ4b2sIOVX2K8m~4gmYVA5h^QEb$V`rCQ-|7Z zS{nuL-t>?3n=-o(6I(7vocj#GzCZEo`!3>+v;dYIfPu#&ZWzzX2i^rZ^Mu;6+rb@? zNPG+6)c5T6zxpzGe*M(x+{AON=PiJ>H#?ob-|uwRK0yDg0B4PV0id6JRZw95ZvX%Q z!AV3xR9FdPU>F4>Jp>pD1%R=U@qa>U@X4P&cNVW5cqKuWzkB}BFO>77)Yv` z(KImNQ84NNf{75+9wer1M{4SasmI$Y1}UO-vmEA-QF`Qt005atO^xC&koW)q002ov JPDHLkV1kUwZuI~F literal 0 HcmV?d00001 From a87b088be67b8e542825005a75b9b98f43295128 Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Mon, 14 Mar 2016 23:57:37 -0400 Subject: [PATCH 42/52] Work on Formulaic Assemblicator, also added some new fancy models from @CyanideX! --- .../java/mekanism/client/ClientProxy.java | 4 + .../client/gui/GuiFormulaicAssemblicator.java | 66 +- .../client/model/ModelDigitalMiner.java | 766 +++++++++++------- .../render/block/MachineRenderingHandler.java | 6 +- .../render/tileentity/RenderDigitalMiner.java | 20 +- .../java/mekanism/common/CommonProxy.java | 5 + .../content/assemblicator/RecipeFormula.java | 2 +- .../ContainerFormulaicAssemblicator.java | 117 ++- .../common/network/PacketConfigSync.java | 2 + .../client/BlockRenderingHandler.java | 10 +- .../client/GeneratorsClientProxy.java | 4 +- .../model/ModelAdvancedSolarGenerator.java | 421 ++++------ .../client/model/ModelSolarGenerator.java | 106 ++- .../client/model/ModelWindGenerator.java | 214 +++++ .../client/model/ModelWindTurbine.java | 151 ---- .../render/RenderAdvancedSolarGenerator.java | 8 +- ...dTurbine.java => RenderWindGenerator.java} | 8 +- .../common/block/BlockGenerator.java | 4 +- .../render/AdvancedSolarGenerator.png | Bin 8666 -> 17165 bytes .../assets/mekanism/render/DigitalMiner.png | Bin 33801 -> 21703 bytes .../assets/mekanism/render/DigitalMinerOn.png | Bin 33842 -> 61493 bytes .../assets/mekanism/render/SolarGenerator.png | Bin 3332 -> 3791 bytes .../assets/mekanism/render/WindGenerator.png | Bin 0 -> 9146 bytes .../assets/mekanism/render/WindTurbine.png | Bin 4736 -> 0 bytes 24 files changed, 1072 insertions(+), 842 deletions(-) create mode 100644 src/main/java/mekanism/generators/client/model/ModelWindGenerator.java delete mode 100644 src/main/java/mekanism/generators/client/model/ModelWindTurbine.java rename src/main/java/mekanism/generators/client/render/{RenderWindTurbine.java => RenderWindGenerator.java} (87%) create mode 100644 src/main/resources/assets/mekanism/render/WindGenerator.png delete mode 100644 src/main/resources/assets/mekanism/render/WindTurbine.png diff --git a/src/main/java/mekanism/client/ClientProxy.java b/src/main/java/mekanism/client/ClientProxy.java index 482cb167e..0cc0e382f 100644 --- a/src/main/java/mekanism/client/ClientProxy.java +++ b/src/main/java/mekanism/client/ClientProxy.java @@ -31,6 +31,7 @@ import mekanism.client.gui.GuiEnrichmentChamber; import mekanism.client.gui.GuiFactory; import mekanism.client.gui.GuiFluidTank; import mekanism.client.gui.GuiFluidicPlenisher; +import mekanism.client.gui.GuiFormulaicAssemblicator; import mekanism.client.gui.GuiGasTank; import mekanism.client.gui.GuiInductionMatrix; import mekanism.client.gui.GuiLaserAmplifier; @@ -151,6 +152,7 @@ import mekanism.common.tile.TileEntityEnrichmentChamber; import mekanism.common.tile.TileEntityFactory; import mekanism.common.tile.TileEntityFluidTank; import mekanism.common.tile.TileEntityFluidicPlenisher; +import mekanism.common.tile.TileEntityFormulaicAssemblicator; import mekanism.common.tile.TileEntityGasTank; import mekanism.common.tile.TileEntityInductionCasing; import mekanism.common.tile.TileEntityInductionCell; @@ -529,6 +531,8 @@ public class ClientProxy extends CommonProxy return new GuiThermoelectricBoiler(player.inventory, (TileEntityBoilerCasing)tileEntity); case 55: return new GuiBoilerStats(player.inventory, (TileEntityBoilerCasing)tileEntity); + case 56: + return new GuiFormulaicAssemblicator(player.inventory, (TileEntityFormulaicAssemblicator)tileEntity); } return null; diff --git a/src/main/java/mekanism/client/gui/GuiFormulaicAssemblicator.java b/src/main/java/mekanism/client/gui/GuiFormulaicAssemblicator.java index bafd57b1a..c4fa8aedc 100644 --- a/src/main/java/mekanism/client/gui/GuiFormulaicAssemblicator.java +++ b/src/main/java/mekanism/client/gui/GuiFormulaicAssemblicator.java @@ -1,9 +1,73 @@ package mekanism.client.gui; +import java.util.List; + +import mekanism.api.util.ListUtils; +import mekanism.client.gui.element.GuiElement.IInfoHandler; +import mekanism.client.gui.element.GuiEnergyInfo; +import mekanism.client.gui.element.GuiPowerBar; +import mekanism.client.gui.element.GuiRedstoneControl; +import mekanism.client.gui.element.GuiSideConfigurationTab; +import mekanism.client.gui.element.GuiSlot; +import mekanism.client.gui.element.GuiSlot.SlotOverlay; +import mekanism.client.gui.element.GuiSlot.SlotType; +import mekanism.client.gui.element.GuiTransporterConfigTab; +import mekanism.common.inventory.container.ContainerFormulaicAssemblicator; +import mekanism.common.tile.TileEntityFormulaicAssemblicator; +import mekanism.common.util.LangUtils; +import mekanism.common.util.MekanismUtils; +import mekanism.common.util.MekanismUtils.ResourceType; +import net.minecraft.entity.player.InventoryPlayer; + +import org.lwjgl.opengl.GL11; + import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) -public class GuiFormulaicAssemblicator { +public class GuiFormulaicAssemblicator extends GuiMekanism +{ + public TileEntityFormulaicAssemblicator tileEntity; + public GuiFormulaicAssemblicator(InventoryPlayer inventory, TileEntityFormulaicAssemblicator tentity) + { + super(tentity, new ContainerFormulaicAssemblicator(inventory, tentity)); + tileEntity = tentity; + guiElements.add(new GuiRedstoneControl(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiFormulaicAssemblicator.png"))); + guiElements.add(new GuiSideConfigurationTab(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiFormulaicAssemblicator.png"))); + guiElements.add(new GuiTransporterConfigTab(this, 34, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiFormulaicAssemblicator.png"))); + guiElements.add(new GuiPowerBar(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiFormulaicAssemblicator.png"), 159, 16)); + guiElements.add(new GuiEnergyInfo(new IInfoHandler() { + @Override + public List getInfo() + { + String multiplier = MekanismUtils.getEnergyDisplay(tileEntity.energyPerTick); + return ListUtils.asList(LangUtils.localize("gui.using") + ": " + multiplier + "/t", LangUtils.localize("gui.needed") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getMaxEnergy()-tileEntity.getEnergy())); + } + }, this, MekanismUtils.getResource(ResourceType.GUI, "GuiFormulaicAssemblicator.png"))); + guiElements.add(new GuiSlot(SlotType.POWER, this, MekanismUtils.getResource(ResourceType.GUI, "GuiFormulaicAssemblicator.png"), 154, 75).with(SlotOverlay.POWER)); + + ySize+=64; + } + + @Override + protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) + { + fontRendererObj.drawString(tileEntity.getInventoryName(), (xSize/2)-(fontRendererObj.getStringWidth(tileEntity.getInventoryName())/2), 6, 0x404040); + fontRendererObj.drawString(LangUtils.localize("container.inventory"), 8, (ySize - 96) + 2, 0x404040); + + super.drawGuiContainerForegroundLayer(mouseX, mouseY); + } + + @Override + protected void drawGuiContainerBackgroundLayer(float partialTick, int mouseX, int mouseY) + { + mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.GUI, "GuiFormulaicAssemblicator.png")); + GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + int guiWidth = (width - xSize) / 2; + int guiHeight = (height - ySize) / 2; + drawTexturedModalRect(guiWidth, guiHeight, 0, 0, xSize, ySize); + + super.drawGuiContainerBackgroundLayer(partialTick, mouseX, mouseY); + } } diff --git a/src/main/java/mekanism/client/model/ModelDigitalMiner.java b/src/main/java/mekanism/client/model/ModelDigitalMiner.java index b54698b10..7218fef36 100644 --- a/src/main/java/mekanism/client/model/ModelDigitalMiner.java +++ b/src/main/java/mekanism/client/model/ModelDigitalMiner.java @@ -7,329 +7,485 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) -public class ModelDigitalMiner extends ModelBase +public class ModelDigitalMiner extends ModelBase { - ModelRenderer Base; - ModelRenderer Back; - ModelRenderer Panel; - ModelRenderer PanelStem; - ModelRenderer KeyboardStem; - ModelRenderer Keyboard; - ModelRenderer LaserBase; - ModelRenderer LegRight; - ModelRenderer UpperLegRight; - ModelRenderer ToeTopRight1; - ModelRenderer ToeTopRight2; - ModelRenderer ToeRight1; - ModelRenderer LegHoldRight1; - ModelRenderer LegHoldRight2; - ModelRenderer FootBaseRight; - ModelRenderer ToeRight2; - ModelRenderer FootBaseLeft; - ModelRenderer UpperLegLeft; - ModelRenderer LegHoldLeft1; - ModelRenderer ToeTopLeft2; - ModelRenderer ToeTopLeft1; - ModelRenderer LegHoldLeft2; - ModelRenderer ToeLeft1; - ModelRenderer ToeLeft2; - ModelRenderer LegLeft; - ModelRenderer RightAxil; - ModelRenderer RightBackUpperLeg; - ModelRenderer RightBackLowerLeg; - ModelRenderer RightBackFoot; - ModelRenderer LeftAxil; - ModelRenderer LeftBackUpperLeg; - ModelRenderer LeftBackLowerLeg; - ModelRenderer LeftBackFoot; - ModelRenderer Laser1; - ModelRenderer Laser2; - ModelRenderer Laser3; - ModelRenderer Laser4; + ModelRenderer keyboard; + ModelRenderer keyboardBottom; + ModelRenderer keyboardSupportExt1; + ModelRenderer keyboardSupportExt2; + ModelRenderer keyboardSupport1; + ModelRenderer keyboardSupport2; + ModelRenderer monitor1back; + ModelRenderer monitor2back; + ModelRenderer monitor3back; + ModelRenderer monitorBar1; + ModelRenderer monitorBar2; + ModelRenderer led1; + ModelRenderer led2; + ModelRenderer led3; + ModelRenderer monitorMount1; + ModelRenderer monitorMount2; + ModelRenderer frame1; + ModelRenderer frame3; + ModelRenderer plate5; + ModelRenderer bracket1; + ModelRenderer bracket2; + ModelRenderer bracket3; + ModelRenderer bracket4; + ModelRenderer bracket5; + ModelRenderer bracket6; + ModelRenderer bracket7; + ModelRenderer bracket8; + ModelRenderer bracketPlate1; + ModelRenderer bracketPlate2; + ModelRenderer bracketPlate3; + ModelRenderer bracketPlate4; + ModelRenderer supportBeam1; + ModelRenderer supportBeam2; + ModelRenderer supportBeam3; + ModelRenderer supportBeam4; + ModelRenderer foot1; + ModelRenderer foot2; + ModelRenderer foot3; + ModelRenderer foot4; + ModelRenderer core; + ModelRenderer powerCable1a; + ModelRenderer powerCable1b; + ModelRenderer powerCable2; + ModelRenderer powerCable3; + ModelRenderer powerConnector1; + ModelRenderer powerConnector2a; + ModelRenderer powerConnector2b; + ModelRenderer powerCpnnector3a; + ModelRenderer powerConnector3b; + ModelRenderer frame2a; + ModelRenderer frame2b; + ModelRenderer frame2c; + ModelRenderer frame2d; + ModelRenderer monitor1; + ModelRenderer monitor2; + ModelRenderer monitor3; - public ModelDigitalMiner() + public ModelDigitalMiner() { textureWidth = 256; - textureHeight = 256; + textureHeight = 128; - Base = new ModelRenderer(this, 0, 0); - Base.addBox(0F, 0F, 0F, 18, 22, 20); - Base.setRotationPoint(-8F, -8F, -10F); - Base.setTextureSize(256, 256); - Base.mirror = true; - setRotation(Base, 0F, 0F, 0F); - Back = new ModelRenderer(this, 77, 0); - Back.addBox(0F, 0F, 0F, 17, 20, 18); - Back.setRotationPoint(7F, -7F, -9F); - Back.setTextureSize(256, 256); - Back.mirror = true; - setRotation(Back, 0F, 0F, 0F); - Panel = new ModelRenderer(this, 0, 43); - Panel.addBox(-2F, -8F, -7.5F, 2, 12, 15); - Panel.setRotationPoint(-13F, 2F, 0F); - Panel.setTextureSize(256, 256); - Panel.mirror = true; - setRotation(Panel, 0F, 0F, -0.2478574F); - PanelStem = new ModelRenderer(this, 0, 71); - PanelStem.addBox(-7F, 0F, 0F, 7, 4, 4); - PanelStem.setRotationPoint(-7F, -2F, -2F); - PanelStem.setTextureSize(256, 256); - PanelStem.mirror = true; - setRotation(PanelStem, 0F, 0F, -0.2230717F); - KeyboardStem = new ModelRenderer(this, 0, 80); - KeyboardStem.addBox(-7F, 0F, -2F, 7, 1, 4); - KeyboardStem.setRotationPoint(-7F, 8F, 0F); - KeyboardStem.setTextureSize(256, 256); - KeyboardStem.mirror = true; - setRotation(KeyboardStem, 0F, 0F, -0.3965719F); - Keyboard = new ModelRenderer(this, 0, 86); - Keyboard.addBox(-5F, 0F, -5F, 5, 1, 10); - Keyboard.setRotationPoint(-12F, 10.5F, 0F); - Keyboard.setTextureSize(256, 256); - Keyboard.mirror = true; - setRotation(Keyboard, 0F, 0F, -0.2230717F); - LaserBase = new ModelRenderer(this, 0, 98); - LaserBase.addBox(0F, 0F, 0F, 10, 5, 10); - LaserBase.setRotationPoint(-5F, 12F, -5F); - LaserBase.setTextureSize(256, 256); - LaserBase.mirror = true; - setRotation(LaserBase, 0F, 0F, 0F); - LegRight = new ModelRenderer(this, 0, 114); - LegRight.addBox(0F, 0F, 0F, 6, 26, 4); - LegRight.setRotationPoint(-3F, -4F, -23F); - LegRight.setTextureSize(256, 256); - LegRight.mirror = true; - setRotation(LegRight, 0F, 0F, 0F); - UpperLegRight = new ModelRenderer(this, 21, 114); - UpperLegRight.addBox(0F, 0F, 0F, 4, 5, 13); - UpperLegRight.setRotationPoint(-2F, 0F, -22F); - UpperLegRight.setTextureSize(256, 256); - UpperLegRight.mirror = true; - setRotation(UpperLegRight, 0F, 0F, 0F); - ToeTopRight1 = new ModelRenderer(this, 21, 134); - ToeTopRight1.addBox(0F, 0F, 0F, 3, 1, 3); - ToeTopRight1.setRotationPoint(-4F, 19F, -20.5F); - ToeTopRight1.setTextureSize(256, 256); - ToeTopRight1.mirror = true; - setRotation(ToeTopRight1, 0F, 0F, 0F); - ToeTopRight2 = new ModelRenderer(this, 21, 134); - ToeTopRight2.addBox(0F, 0F, 0F, 3, 1, 3); - ToeTopRight2.setRotationPoint(1.5F, 19F, -20.5F); - ToeTopRight2.setTextureSize(256, 256); - ToeTopRight2.mirror = true; - setRotation(ToeTopRight2, 0F, 0F, 0F); - ToeRight1 = new ModelRenderer(this, 35, 134); - ToeRight1.addBox(0F, 0F, 0F, 3, 6, 3); - ToeRight1.setRotationPoint(1.5F, 22F, -20.5F); - ToeRight1.setTextureSize(256, 256); - ToeRight1.mirror = true; - setRotation(ToeRight1, 1.047198F, 0.3490659F, 0F); - LegHoldRight1 = new ModelRenderer(this, 0, 146); - LegHoldRight1.addBox(0F, 0F, 0F, 2, 3, 12); - LegHoldRight1.setRotationPoint(2F, 2F, -18F); - LegHoldRight1.setTextureSize(256, 256); - LegHoldRight1.mirror = true; - setRotation(LegHoldRight1, 0.6543436F, 0F, 0F); - LegHoldRight2 = new ModelRenderer(this, 0, 146); - LegHoldRight2.addBox(0F, 0F, 0F, 2, 3, 12); - LegHoldRight2.setRotationPoint(-4F, 2F, -18F); - LegHoldRight2.setTextureSize(256, 256); - LegHoldRight2.mirror = true; - setRotation(LegHoldRight2, 0.6543436F, 0F, 0F); - FootBaseRight = new ModelRenderer(this, 0, 162); - FootBaseRight.addBox(0F, 0F, 0F, 8, 2, 7); - FootBaseRight.setRotationPoint(-4F, 22F, -24F); - FootBaseRight.setTextureSize(256, 256); - FootBaseRight.mirror = true; - setRotation(FootBaseRight, 0F, 0F, 0F); - ToeRight2 = new ModelRenderer(this, 35, 134); - ToeRight2.addBox(0F, 0F, 0F, 3, 6, 3); - ToeRight2.setRotationPoint(-4.5F, 22F, -20.5F); - ToeRight2.setTextureSize(256, 256); - ToeRight2.mirror = true; - setRotation(ToeRight2, 1.047198F, -0.3490659F, 0F); - FootBaseLeft = new ModelRenderer(this, 0, 178); - FootBaseLeft.addBox(0F, 0F, 0F, 8, 2, 7); - FootBaseLeft.setRotationPoint(-4F, 22F, 17F); - FootBaseLeft.setTextureSize(256, 256); - FootBaseLeft.mirror = true; - setRotation(FootBaseLeft, 0F, 0F, 0F); - UpperLegLeft = new ModelRenderer(this, 0, 189); - UpperLegLeft.addBox(0F, 0F, 0F, 4, 5, 13); - UpperLegLeft.setRotationPoint(-2F, 0F, 9F); - UpperLegLeft.setTextureSize(256, 256); - UpperLegLeft.mirror = true; - setRotation(UpperLegLeft, 0F, 0F, 0F); - LegHoldLeft1 = new ModelRenderer(this, 0, 208); - LegHoldLeft1.addBox(0F, 0F, -12F, 2, 3, 12); - LegHoldLeft1.setRotationPoint(2F, 2F, 18F); - LegHoldLeft1.setTextureSize(256, 256); - LegHoldLeft1.mirror = true; - setRotation(LegHoldLeft1, -0.6543414F, 0F, 0F); - ToeTopLeft2 = new ModelRenderer(this, 31, 178); - ToeTopLeft2.addBox(0F, 0F, 0F, 3, 1, 3); - ToeTopLeft2.setRotationPoint(1.5F, 19F, 17.5F); - ToeTopLeft2.setTextureSize(256, 256); - ToeTopLeft2.mirror = true; - setRotation(ToeTopLeft2, 0F, 0F, 0F); - ToeTopLeft1 = new ModelRenderer(this, 31, 178); - ToeTopLeft1.addBox(0F, 0F, 0F, 3, 1, 3); - ToeTopLeft1.setRotationPoint(-4F, 19F, 17.5F); - ToeTopLeft1.setTextureSize(256, 256); - ToeTopLeft1.mirror = true; - setRotation(ToeTopLeft1, 0F, 0F, 0F); - LegHoldLeft2 = new ModelRenderer(this, 0, 208); - LegHoldLeft2.addBox(0F, 0F, -12F, 2, 3, 12); - LegHoldLeft2.setRotationPoint(-4F, 2F, 18F); - LegHoldLeft2.setTextureSize(256, 256); - LegHoldLeft2.mirror = true; - setRotation(LegHoldLeft2, -0.6543414F, 0F, 0F); - ToeLeft1 = new ModelRenderer(this, 44, 178); - ToeLeft1.addBox(0F, 0F, -3F, 3, 6, 3); - ToeLeft1.setRotationPoint(1.5F, 22F, 20.5F); - ToeLeft1.setTextureSize(256, 256); - ToeLeft1.mirror = true; - setRotation(ToeLeft1, -1.047198F, -0.3490659F, 0F); - ToeLeft2 = new ModelRenderer(this, 44, 178); - ToeLeft2.addBox(0F, 0F, -3F, 3, 6, 3); - ToeLeft2.setRotationPoint(-4.5F, 22F, 20.5F); - ToeLeft2.setTextureSize(256, 256); - ToeLeft2.mirror = true; - setRotation(ToeLeft2, -1.047198F, 0.3490659F, 0F); - LegLeft = new ModelRenderer(this, 35, 189); - LegLeft.addBox(0F, 0F, 0F, 6, 26, 4); - LegLeft.setRotationPoint(-3F, -4F, 19F); - LegLeft.setTextureSize(256, 256); - LegLeft.mirror = true; - setRotation(LegLeft, 0F, 0F, 0F); - RightAxil = new ModelRenderer(this, 78, 43); - RightAxil.addBox(0F, 0F, 0F, 4, 4, 6); - RightAxil.setRotationPoint(17F, 7F, -15F); - RightAxil.setTextureSize(256, 256); - RightAxil.mirror = true; - setRotation(RightAxil, 0F, 0F, 0F); - RightBackUpperLeg = new ModelRenderer(this, 78, 54); - RightBackUpperLeg.addBox(-2.5F, -3F, 0F, 5, 12, 1); - RightBackUpperLeg.setRotationPoint(19F, 9F, -15.95556F); - RightBackUpperLeg.setTextureSize(256, 256); - RightBackUpperLeg.mirror = true; - setRotation(RightBackUpperLeg, 0F, 0F, 0F); - RightBackLowerLeg = new ModelRenderer(this, 78, 68); - RightBackLowerLeg.addBox(-2F, 7F, -0.5F, 4, 6, 2); - RightBackLowerLeg.setRotationPoint(19F, 9F, -16F); - RightBackLowerLeg.setTextureSize(256, 256); - RightBackLowerLeg.mirror = true; - setRotation(RightBackLowerLeg, 0F, 0F, 0F); - RightBackFoot = new ModelRenderer(this, 99, 43); - RightBackFoot.addBox(-3F, 0F, -2.5F, 8, 2, 5); - RightBackFoot.setRotationPoint(19F, 22F, -15.5F); - RightBackFoot.setTextureSize(256, 256); - RightBackFoot.mirror = true; - setRotation(RightBackFoot, 0F, 0F, 0F); - LeftAxil = new ModelRenderer(this, 78, 80); - LeftAxil.addBox(0F, 0F, 0F, 4, 4, 6); - LeftAxil.setRotationPoint(17F, 7F, 9F); - LeftAxil.setTextureSize(256, 256); - LeftAxil.mirror = true; - setRotation(LeftAxil, 0F, 0F, 0F); - LeftBackUpperLeg = new ModelRenderer(this, 78, 91); - LeftBackUpperLeg.addBox(-2.5F, -3F, 0F, 5, 12, 1); - LeftBackUpperLeg.setRotationPoint(19F, 9F, 15.04444F); - LeftBackUpperLeg.setTextureSize(256, 256); - LeftBackUpperLeg.mirror = true; - setRotation(LeftBackUpperLeg, 0F, 0F, 0F); - LeftBackLowerLeg = new ModelRenderer(this, 78, 105); - LeftBackLowerLeg.addBox(-2F, 7F, -0.5F, 4, 6, 2); - LeftBackLowerLeg.setRotationPoint(19F, 9F, 15F); - LeftBackLowerLeg.setTextureSize(256, 256); - LeftBackLowerLeg.mirror = true; - setRotation(LeftBackLowerLeg, 0F, 0F, 0F); - LeftBackFoot = new ModelRenderer(this, 99, 80); - LeftBackFoot.addBox(-3F, 0F, -2.5F, 8, 2, 5); - LeftBackFoot.setRotationPoint(19F, 22F, 15.5F); - LeftBackFoot.setTextureSize(256, 256); - LeftBackFoot.mirror = true; - setRotation(LeftBackFoot, 0F, 0F, 0F); - Laser1 = new ModelRenderer(this, 35, 43); - Laser1.addBox(0F, 0F, 0F, 2, 4, 2); - Laser1.setRotationPoint(2.5F, 17F, 2.5F); - Laser1.setTextureSize(256, 256); - Laser1.mirror = true; - setRotation(Laser1, 0F, 0F, 0F); - Laser2 = new ModelRenderer(this, 35, 43); - Laser2.addBox(0F, 0F, 0F, 2, 4, 2); - Laser2.setRotationPoint(2.5F, 17F, -4.5F); - Laser2.setTextureSize(256, 256); - Laser2.mirror = true; - setRotation(Laser2, 0F, 0F, 0F); - Laser3 = new ModelRenderer(this, 35, 43); - Laser3.addBox(0F, 0F, 0F, 2, 4, 2); - Laser3.setRotationPoint(-4.5F, 17F, 2.5F); - Laser3.setTextureSize(256, 256); - Laser3.mirror = true; - setRotation(Laser3, 0F, 0F, 0F); - Laser4 = new ModelRenderer(this, 35, 43); - Laser4.addBox(0F, 0F, 0F, 2, 4, 2); - Laser4.setRotationPoint(-4.5F, 17F, -4.5F); - Laser4.setTextureSize(256, 256); - Laser4.mirror = true; - setRotation(Laser4, 0F, 0F, 0F); + keyboard = new ModelRenderer(this, 120, 20); + keyboard.addBox(0F, -3F, -1F, 10, 5, 1); + keyboard.setRotationPoint(-5F, 14F, -5F); + keyboard.setTextureSize(256, 128); + keyboard.mirror = true; + setRotation(keyboard, -1.082104F, 0.0174533F, 0F); + keyboardBottom = new ModelRenderer(this, 120, 26); + keyboardBottom.addBox(0F, -2.5F, -0.5F, 8, 4, 1); + keyboardBottom.setRotationPoint(-4F, 14F, -5F); + keyboardBottom.setTextureSize(256, 128); + keyboardBottom.mirror = true; + setRotation(keyboardBottom, -0.9075712F, 0F, 0F); + keyboardSupportExt1 = new ModelRenderer(this, 138, 26); + keyboardSupportExt1.addBox(0F, 0F, -1F, 1, 1, 1); + keyboardSupportExt1.setRotationPoint(2F, 14F, -5F); + keyboardSupportExt1.setTextureSize(256, 128); + keyboardSupportExt1.mirror = true; + setRotation(keyboardSupportExt1, 0F, 0F, 0F); + keyboardSupportExt2 = new ModelRenderer(this, 138, 26); + keyboardSupportExt2.addBox(0F, 0F, -1F, 1, 1, 1); + keyboardSupportExt2.setRotationPoint(-3F, 14F, -5F); + keyboardSupportExt2.setTextureSize(256, 128); + keyboardSupportExt2.mirror = true; + setRotation(keyboardSupportExt2, 0F, 0F, 0F); + keyboardSupport1 = new ModelRenderer(this, 142, 20); + keyboardSupport1.addBox(0F, -1F, 0F, 1, 2, 4); + keyboardSupport1.setRotationPoint(-3F, 14F, -5F); + keyboardSupport1.setTextureSize(256, 128); + keyboardSupport1.mirror = true; + setRotation(keyboardSupport1, 0F, 0F, 0F); + keyboardSupport2 = new ModelRenderer(this, 142, 20); + keyboardSupport2.addBox(0F, -1F, 0F, 1, 2, 4); + keyboardSupport2.setRotationPoint(2F, 14F, -5F); + keyboardSupport2.setTextureSize(256, 128); + keyboardSupport2.mirror = true; + setRotation(keyboardSupport2, 0F, 0F, 0F); + monitor1back = new ModelRenderer(this, 88, 32); + monitor1back.addBox(-13F, -3F, 0F, 12, 6, 1); + monitor1back.setRotationPoint(-8F, 3F, -3F); + monitor1back.setTextureSize(256, 128); + monitor1back.mirror = true; + setRotation(monitor1back, 0.0872665F, -0.2094395F, 0F); + monitor2back = new ModelRenderer(this, 88, 32); + monitor2back.addBox(0F, -4F, 0F, 12, 6, 1); + monitor2back.setRotationPoint(-6F, 4F, -3F); + monitor2back.setTextureSize(256, 128); + monitor2back.mirror = true; + setRotation(monitor2back, 0.0872665F, 0F, 0F); + monitor3back = new ModelRenderer(this, 88, 32); + monitor3back.addBox(1F, -3F, 0F, 12, 6, 1); + monitor3back.setRotationPoint(8F, 3F, -3F); + monitor3back.setTextureSize(256, 128); + monitor3back.mirror = true; + setRotation(monitor3back, 0.0872665F, 0.2094395F, 0F); + monitorBar1 = new ModelRenderer(this, 114, 36); + monitorBar1.addBox(-3.5F, -2F, -0.2F, 4, 2, 1); + monitorBar1.setRotationPoint(-6F, 4F, -3F); + monitorBar1.setTextureSize(256, 128); + monitorBar1.mirror = true; + setRotation(monitorBar1, 0.0872665F, -0.0523599F, 0F); + monitorBar2 = new ModelRenderer(this, 114, 36); + monitorBar2.addBox(0.5F, -2F, -0.2F, 4, 2, 1); + monitorBar2.setRotationPoint(5F, 4F, -3F); + monitorBar2.setTextureSize(256, 128); + monitorBar2.mirror = true; + setRotation(monitorBar2, 0.0872665F, 0.0523599F, 0F); + led1 = new ModelRenderer(this, 0, 0); + led1.addBox(-2F, 4.5F, -1.9F, 1, 1, 1); + led1.setRotationPoint(-8F, 3F, -3F); + led1.setTextureSize(256, 128); + led1.mirror = true; + setRotation(led1, 0.0872665F, -0.2094395F, 0F); + led2 = new ModelRenderer(this, 0, 0); + led2.addBox(12F, 4.466667F, -1.9F, 1, 1, 1); + led2.setRotationPoint(-7F, 3F, -3F); + led2.setTextureSize(256, 128); + led2.mirror = true; + setRotation(led2, 0.0872665F, 0F, 0F); + led3 = new ModelRenderer(this, 0, 0); + led3.addBox(12F, 4.5F, -1.9F, 1, 1, 1); + led3.setRotationPoint(8F, 3F, -3F); + led3.setTextureSize(256, 128); + led3.mirror = true; + setRotation(led3, 0.0872665F, 0.2094395F, 0F); + monitorMount1 = new ModelRenderer(this, 114, 32); + monitorMount1.addBox(0F, -1F, 0F, 2, 2, 2); + monitorMount1.setRotationPoint(-4F, 3F, -3F); + monitorMount1.setTextureSize(256, 128); + monitorMount1.mirror = true; + setRotation(monitorMount1, 0F, 0F, 0F); + monitorMount2 = new ModelRenderer(this, 114, 32); + monitorMount2.addBox(0F, -1F, 0F, 2, 2, 2); + monitorMount2.setRotationPoint(2F, 3F, -3F); + monitorMount2.setTextureSize(256, 128); + monitorMount2.mirror = true; + setRotation(monitorMount2, 0F, 0F, 0F); + frame1 = new ModelRenderer(this, 0, 0); + frame1.addBox(0F, 0F, 0F, 32, 29, 12); + frame1.setRotationPoint(-16F, -8F, -1F); + frame1.setTextureSize(256, 128); + frame1.mirror = true; + setRotation(frame1, 0F, 0F, 0F); + frame3 = new ModelRenderer(this, 0, 0); + frame3.addBox(0F, 0F, 0F, 32, 29, 12); + frame3.setRotationPoint(-16F, -8F, 28F); + frame3.setTextureSize(256, 128); + frame3.mirror = true; + setRotation(frame3, 0F, 0F, 0F); + plate5 = new ModelRenderer(this, 88, 90); + plate5.addBox(0F, 0F, 0F, 32, 5, 15); + plate5.setRotationPoint(-16F, 16F, 12F); + plate5.setTextureSize(256, 128); + plate5.mirror = true; + setRotation(plate5, 0F, 0F, 0F); + bracket1 = new ModelRenderer(this, 16, 85); + bracket1.addBox(0F, 0F, 0F, 5, 5, 2); + bracket1.setRotationPoint(-21F, -5F, 0F); + bracket1.setTextureSize(256, 128); + bracket1.mirror = true; + setRotation(bracket1, 0F, 0F, 0F); + bracket2 = new ModelRenderer(this, 16, 85); + bracket2.addBox(0F, 0F, 0F, 5, 5, 2); + bracket2.setRotationPoint(-21F, -5F, 8F); + bracket2.setTextureSize(256, 128); + bracket2.mirror = true; + setRotation(bracket2, 0F, 0F, 0F); + bracket3 = new ModelRenderer(this, 16, 85); + bracket3.addBox(0F, 0F, 0F, 5, 5, 2); + bracket3.setRotationPoint(-21F, -5F, 29F); + bracket3.setTextureSize(256, 128); + bracket3.mirror = true; + setRotation(bracket3, 0F, 0F, 0F); + bracket4 = new ModelRenderer(this, 16, 85); + bracket4.addBox(0F, 0F, 0F, 5, 5, 2); + bracket4.setRotationPoint(-21F, -5F, 37F); + bracket4.setTextureSize(256, 128); + bracket4.mirror = true; + setRotation(bracket4, 0F, 0F, 0F); + bracket5 = new ModelRenderer(this, 16, 85); + bracket5.addBox(0F, 0F, 0F, 5, 5, 2); + bracket5.setRotationPoint(16F, -5F, 0F); + bracket5.setTextureSize(256, 128); + bracket5.mirror = true; + setRotation(bracket5, 0F, 0F, 0F); + bracket5.mirror = false; + bracket6 = new ModelRenderer(this, 16, 85); + bracket6.addBox(0F, 0F, 0F, 5, 5, 2); + bracket6.setRotationPoint(16F, -5F, 8F); + bracket6.setTextureSize(256, 128); + bracket6.mirror = true; + setRotation(bracket6, 0F, 0F, 0F); + bracket7 = new ModelRenderer(this, 16, 85); + bracket7.addBox(0F, 0F, 0F, 5, 5, 2); + bracket7.setRotationPoint(16F, -5F, 29F); + bracket7.setTextureSize(256, 128); + bracket7.mirror = true; + setRotation(bracket7, 0F, 0F, 0F); + bracket8 = new ModelRenderer(this, 16, 85); + bracket8.addBox(0F, 0F, 0F, 5, 5, 2); + bracket8.setRotationPoint(16F, -5F, 37F); + bracket8.setTextureSize(256, 128); + bracket8.mirror = true; + setRotation(bracket8, 0F, 0F, 0F); + bracket8.mirror = false; + bracketPlate1 = new ModelRenderer(this, 30, 85); + bracketPlate1.addBox(0F, 0F, 0F, 1, 5, 6); + bracketPlate1.setRotationPoint(-17F, -5F, 2F); + bracketPlate1.setTextureSize(256, 128); + bracketPlate1.mirror = true; + setRotation(bracketPlate1, 0F, 0F, 0F); + bracketPlate2 = new ModelRenderer(this, 30, 85); + bracketPlate2.addBox(0F, 0F, 0F, 1, 5, 6); + bracketPlate2.setRotationPoint(-17F, -5F, 31F); + bracketPlate2.setTextureSize(256, 128); + bracketPlate2.mirror = true; + setRotation(bracketPlate2, 0F, 0F, 0F); + bracketPlate3 = new ModelRenderer(this, 30, 85); + bracketPlate3.addBox(0F, 0F, 0F, 1, 5, 6); + bracketPlate3.setRotationPoint(16F, -5F, 2F); + bracketPlate3.setTextureSize(256, 128); + bracketPlate3.mirror = true; + setRotation(bracketPlate3, 0F, 0F, 0F); + bracketPlate4 = new ModelRenderer(this, 30, 85); + bracketPlate4.addBox(0F, 0F, 0F, 1, 5, 6); + bracketPlate4.setRotationPoint(16F, -5F, 31F); + bracketPlate4.setTextureSize(256, 128); + bracketPlate4.mirror = true; + setRotation(bracketPlate4, 0F, 0F, 0F); + supportBeam1 = new ModelRenderer(this, 0, 85); + supportBeam1.addBox(0F, 0F, 0F, 4, 28, 8); + supportBeam1.setRotationPoint(-22F, -6F, 1F); + supportBeam1.setTextureSize(256, 128); + supportBeam1.mirror = true; + setRotation(supportBeam1, 0F, 0F, 0F); + supportBeam2 = new ModelRenderer(this, 0, 85); + supportBeam2.addBox(0F, 0F, 0F, 4, 28, 8); + supportBeam2.setRotationPoint(-22F, -6F, 30F); + supportBeam2.setTextureSize(256, 128); + supportBeam2.mirror = true; + setRotation(supportBeam2, 0F, 0F, 0F); + supportBeam3 = new ModelRenderer(this, 0, 85); + supportBeam3.addBox(0F, 0F, 0F, 4, 28, 8); + supportBeam3.setRotationPoint(18F, -6F, 1F); + supportBeam3.setTextureSize(256, 128); + supportBeam3.mirror = true; + setRotation(supportBeam3, 0F, 0F, 0F); + supportBeam4 = new ModelRenderer(this, 0, 85); + supportBeam4.addBox(0F, 0F, 0F, 4, 28, 8); + supportBeam4.setRotationPoint(18F, -6F, 30F); + supportBeam4.setTextureSize(256, 128); + supportBeam4.mirror = true; + setRotation(supportBeam4, 0F, 0F, 0F); + supportBeam4.mirror = false; + foot1 = new ModelRenderer(this, 44, 85); + foot1.addBox(0F, 0F, 0F, 7, 2, 10); + foot1.setRotationPoint(-23F, 22F, 0F); + foot1.setTextureSize(256, 128); + foot1.mirror = true; + setRotation(foot1, 0F, 0F, 0F); + foot2 = new ModelRenderer(this, 44, 85); + foot2.addBox(0F, 0F, 0F, 7, 2, 10); + foot2.setRotationPoint(-23F, 22F, 29F); + foot2.setTextureSize(256, 128); + foot2.mirror = true; + setRotation(foot2, 0F, 0F, 0F); + foot3 = new ModelRenderer(this, 44, 85); + foot3.addBox(0F, 0F, 0F, 7, 2, 10); + foot3.setRotationPoint(16F, 22F, 29F); + foot3.setTextureSize(256, 128); + foot3.mirror = true; + setRotation(foot3, 0F, 0F, 0F); + foot4 = new ModelRenderer(this, 44, 85); + foot4.addBox(0F, 0F, 0F, 7, 2, 10); + foot4.setRotationPoint(16F, 22F, 0F); + foot4.setTextureSize(256, 128); + foot4.mirror = true; + setRotation(foot4, 0F, 0F, 0F); + core = new ModelRenderer(this, 0, 41); + core.addBox(0F, 0F, 0F, 30, 27, 17); + core.setRotationPoint(-15F, -7F, 11F); + core.setTextureSize(256, 128); + core.mirror = true; + setRotation(core, 0F, 0F, 0F); + powerCable1a = new ModelRenderer(this, 88, 39); + powerCable1a.addBox(0F, 0F, 0F, 6, 2, 11); + powerCable1a.setRotationPoint(-3F, 20F, 2F); + powerCable1a.setTextureSize(256, 128); + powerCable1a.mirror = true; + setRotation(powerCable1a, 0F, 0F, 0F); + powerCable1b = new ModelRenderer(this, 94, 52); + powerCable1b.addBox(0F, 0F, 0F, 6, 3, 6); + powerCable1b.setRotationPoint(-3F, 20F, 13F); + powerCable1b.setTextureSize(256, 128); + powerCable1b.mirror = true; + setRotation(powerCable1b, 0F, 0F, 0F); + powerCable2 = new ModelRenderer(this, 42, 109); + powerCable2.addBox(0F, 0F, 0F, 9, 6, 6); + powerCable2.setRotationPoint(14F, 13F, 13F); + powerCable2.setTextureSize(256, 128); + powerCable2.mirror = true; + setRotation(powerCable2, 0F, 0F, 0F); + powerCable3 = new ModelRenderer(this, 42, 109); + powerCable3.addBox(0F, 0F, 0F, 9, 6, 6); + powerCable3.setRotationPoint(-23F, 13F, 13F); + powerCable3.setTextureSize(256, 128); + powerCable3.mirror = true; + setRotation(powerCable3, 0F, 0F, 0F); + powerConnector1 = new ModelRenderer(this, 94, 61); + powerConnector1.addBox(0F, 0F, 0F, 8, 1, 8); + powerConnector1.setRotationPoint(-4F, 23F, 12F); + powerConnector1.setTextureSize(256, 128); + powerConnector1.mirror = true; + setRotation(powerConnector1, 0F, 0F, 0F); + powerConnector2a = new ModelRenderer(this, 24, 105); + powerConnector2a.addBox(0F, 0F, 0F, 1, 8, 8); + powerConnector2a.setRotationPoint(23F, 12F, 12F); + powerConnector2a.setTextureSize(256, 128); + powerConnector2a.mirror = true; + setRotation(powerConnector2a, 0F, 0F, 0F); + powerConnector2b = new ModelRenderer(this, 24, 105); + powerConnector2b.addBox(0F, 0F, 0F, 1, 8, 8); + powerConnector2b.setRotationPoint(16F, 12F, 12F); + powerConnector2b.setTextureSize(256, 128); + powerConnector2b.mirror = true; + setRotation(powerConnector2b, 0F, 0F, 0F); + powerCpnnector3a = new ModelRenderer(this, 24, 105); + powerCpnnector3a.addBox(0F, 0F, 0F, 1, 8, 8); + powerCpnnector3a.setRotationPoint(-24F, 12F, 12F); + powerCpnnector3a.setTextureSize(256, 128); + powerCpnnector3a.mirror = true; + setRotation(powerCpnnector3a, 0F, 0F, 0F); + powerConnector3b = new ModelRenderer(this, 24, 105); + powerConnector3b.addBox(0F, 0F, 0F, 1, 8, 8); + powerConnector3b.setRotationPoint(-17F, 12F, 12F); + powerConnector3b.setTextureSize(256, 128); + powerConnector3b.mirror = true; + setRotation(powerConnector3b, 0F, 0F, 0F); + frame2a = new ModelRenderer(this, 88, 0); + frame2a.addBox(0F, 0F, 0F, 32, 5, 15); + frame2a.setRotationPoint(-16F, -8F, 12F); + frame2a.setTextureSize(256, 128); + frame2a.mirror = true; + setRotation(frame2a, 0F, 0F, 0F); + frame2b = new ModelRenderer(this, 126, 50); + frame2b.addBox(0F, 0F, 0F, 32, 5, 15); + frame2b.setRotationPoint(-16F, -2F, 12F); + frame2b.setTextureSize(256, 128); + frame2b.mirror = true; + setRotation(frame2b, 0F, 0F, 0F); + frame2c = new ModelRenderer(this, 126, 50); + frame2c.addBox(0F, 0F, 0F, 32, 5, 15); + frame2c.setRotationPoint(-16F, 4F, 12F); + frame2c.setTextureSize(256, 128); + frame2c.mirror = true; + setRotation(frame2c, 0F, 0F, 0F); + frame2d = new ModelRenderer(this, 88, 70); + frame2d.addBox(0F, 0F, 0F, 32, 5, 15); + frame2d.setRotationPoint(-16F, 10F, 12F); + frame2d.setTextureSize(256, 128); + frame2d.mirror = true; + setRotation(frame2d, 0F, 0F, 0F); + monitor1 = new ModelRenderer(this, 88, 20); + monitor1.addBox(-14F, -5F, -2F, 14, 10, 2); + monitor1.setRotationPoint(-8F, 3F, -3F); + monitor1.setTextureSize(256, 128); + monitor1.mirror = true; + setRotation(monitor1, 0.0872665F, -0.2094395F, 0F); + monitor2 = new ModelRenderer(this, 88, 20); + monitor2.addBox(0F, -5F, -2F, 14, 10, 2); + monitor2.setRotationPoint(-7F, 3F, -3F); + monitor2.setTextureSize(256, 128); + monitor2.mirror = true; + setRotation(monitor2, 0.0872665F, 0F, 0F); + monitor3 = new ModelRenderer(this, 88, 20); + monitor3.addBox(0F, -5F, -2F, 14, 10, 2); + monitor3.setRotationPoint(8F, 3F, -3F); + monitor3.setTextureSize(256, 128); + monitor3.mirror = true; + setRotation(monitor3, 0.0872665F, 0.2094395F, 0F); } - public void render(float size, boolean on) + public void render(float size, boolean on) { - Base.render(size); - Back.render(size); - + keyboard.render(size); + keyboardBottom.render(size); + keyboardSupportExt1.render(size); + keyboardSupportExt2.render(size); + keyboardSupport1.render(size); + keyboardSupport2.render(size); + monitor1back.render(size); + monitor2back.render(size); + monitor3back.render(size); + monitorBar1.render(size); + monitorBar2.render(size); + if(on) { MekanismRenderer.glowOn(); } - - Panel.render(size); - + + led1.render(size); + led2.render(size); + led3.render(size); + + monitor1.render(size); + monitor2.render(size); + monitor3.render(size); + if(on) { MekanismRenderer.glowOff(); } - - PanelStem.render(size); - KeyboardStem.render(size); - Keyboard.render(size); - LaserBase.render(size); - LegRight.render(size); - UpperLegRight.render(size); - ToeTopRight1.render(size); - ToeTopRight2.render(size); - ToeRight1.render(size); - LegHoldRight1.render(size); - LegHoldRight2.render(size); - FootBaseRight.render(size); - ToeRight2.render(size); - FootBaseLeft.render(size); - UpperLegLeft.render(size); - LegHoldLeft1.render(size); - ToeTopLeft2.render(size); - ToeTopLeft1.render(size); - LegHoldLeft2.render(size); - ToeLeft1.render(size); - ToeLeft2.render(size); - LegLeft.render(size); - RightAxil.render(size); - RightBackUpperLeg.render(size); - RightBackLowerLeg.render(size); - RightBackFoot.render(size); - LeftAxil.render(size); - LeftBackUpperLeg.render(size); - LeftBackLowerLeg.render(size); - LeftBackFoot.render(size); - Laser1.render(size); - Laser2.render(size); - Laser3.render(size); - Laser4.render(size); + + monitorMount1.render(size); + monitorMount2.render(size); + frame1.render(size); + frame3.render(size); + plate5.render(size); + bracket1.render(size); + bracket2.render(size); + bracket3.render(size); + bracket4.render(size); + bracket5.render(size); + bracket6.render(size); + bracket7.render(size); + bracket8.render(size); + bracketPlate1.render(size); + bracketPlate2.render(size); + bracketPlate3.render(size); + bracketPlate4.render(size); + supportBeam1.render(size); + supportBeam2.render(size); + supportBeam3.render(size); + supportBeam4.render(size); + foot1.render(size); + foot2.render(size); + foot3.render(size); + foot4.render(size); + core.render(size); + powerCable1a.render(size); + powerCable1b.render(size); + powerCable2.render(size); + powerCable3.render(size); + powerConnector1.render(size); + powerConnector2a.render(size); + powerConnector2b.render(size); + powerCpnnector3a.render(size); + powerConnector3b.render(size); + frame2a.render(size); + frame2b.render(size); + frame2c.render(size); + frame2d.render(size); } - private void setRotation(ModelRenderer model, float x, float y, float z) + private void setRotation(ModelRenderer model, float x, float y, float z) { model.rotateAngleX = x; model.rotateAngleY = y; diff --git a/src/main/java/mekanism/client/render/block/MachineRenderingHandler.java b/src/main/java/mekanism/client/render/block/MachineRenderingHandler.java index f9f79e2b9..05aef6522 100644 --- a/src/main/java/mekanism/client/render/block/MachineRenderingHandler.java +++ b/src/main/java/mekanism/client/render/block/MachineRenderingHandler.java @@ -106,10 +106,10 @@ public class MachineRenderingHandler implements ISimpleBlockRenderingHandler else if(type == MachineType.DIGITAL_MINER) { GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); - GL11.glRotatef(90F, 0.0F, 1.0F, 0.0F); - GL11.glTranslatef(-0.2F, -0.3F, 0.0F); + GL11.glRotatef(-180F, 0.0F, 1.0F, 0.0F); + GL11.glTranslatef(0.35F, 0.1F, 0.0F); Minecraft.getMinecraft().renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "DigitalMiner.png")); - digitalMiner.render(0.03125F, false); + digitalMiner.render(0.022F, false); } else if(type == MachineType.ROTARY_CONDENSENTRATOR) { diff --git a/src/main/java/mekanism/client/render/tileentity/RenderDigitalMiner.java b/src/main/java/mekanism/client/render/tileentity/RenderDigitalMiner.java index 0d1375db4..a4eec471c 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderDigitalMiner.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderDigitalMiner.java @@ -33,10 +33,22 @@ public class RenderDigitalMiner extends TileEntitySpecialRenderer switch(tileEntity.facing) { - case 2: GL11.glRotatef(90, 0.0F, 1.0F, 0.0F); break; - case 3: GL11.glRotatef(270, 0.0F, 1.0F, 0.0F); break; - case 4: GL11.glRotatef(180, 0.0F, 1.0F, 0.0F); break; - case 5: GL11.glRotatef(0, 0.0F, 1.0F, 0.0F); break; + case 2: + GL11.glRotatef(0, 0.0F, 1.0F, 0.0F); + GL11.glTranslatef(0.0F, 0.0F, -1.0F); + break; + case 3: + GL11.glRotatef(180, 0.0F, 1.0F, 0.0F); + GL11.glTranslatef(0.0F, 0.0F, -1.0F); + break; + case 4: + GL11.glRotatef(90, 0.0F, 1.0F, 0.0F); + GL11.glTranslatef(0.0F, 0.0F, -1.0F); + break; + case 5: + GL11.glRotatef(270, 0.0F, 1.0F, 0.0F); + GL11.glTranslatef(0.0F, 0.0F, -1.0F); + break; } GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); diff --git a/src/main/java/mekanism/common/CommonProxy.java b/src/main/java/mekanism/common/CommonProxy.java index c6ebe7984..1715ab418 100644 --- a/src/main/java/mekanism/common/CommonProxy.java +++ b/src/main/java/mekanism/common/CommonProxy.java @@ -34,6 +34,7 @@ import mekanism.common.inventory.container.ContainerFactory; import mekanism.common.inventory.container.ContainerFilter; import mekanism.common.inventory.container.ContainerFluidTank; import mekanism.common.inventory.container.ContainerFluidicPlenisher; +import mekanism.common.inventory.container.ContainerFormulaicAssemblicator; import mekanism.common.inventory.container.ContainerGasTank; import mekanism.common.inventory.container.ContainerInductionMatrix; import mekanism.common.inventory.container.ContainerLaserAmplifier; @@ -88,6 +89,7 @@ import mekanism.common.tile.TileEntityEnrichmentChamber; import mekanism.common.tile.TileEntityFactory; import mekanism.common.tile.TileEntityFluidTank; import mekanism.common.tile.TileEntityFluidicPlenisher; +import mekanism.common.tile.TileEntityFormulaicAssemblicator; import mekanism.common.tile.TileEntityGasTank; import mekanism.common.tile.TileEntityInductionCasing; import mekanism.common.tile.TileEntityInductionCell; @@ -372,6 +374,7 @@ public class CommonProxy implements IGuiProvider usage.laserUsage = Mekanism.configuration.get("usage", "LaserUsage", 5000D).getDouble(); usage.gasCentrifugeUsage = Mekanism.configuration.get("usage", "GasCentrifugeUsage", 100D).getDouble(); usage.heavyWaterElectrolysisUsage = Mekanism.configuration.get("usage", "HeavyWaterElectrolysisUsage", 800D).getDouble(); + usage.formulaicAssemblicatorUsage = Mekanism.configuration.get("usage", "FormulaicAssemblicatorUsage", 100D).getDouble(); Tier.loadConfig(); @@ -549,6 +552,8 @@ public class CommonProxy implements IGuiProvider return new ContainerFilter(player.inventory, (TileEntityContainerBlock)tileEntity); case 55: return new ContainerNull(player, (TileEntityContainerBlock)tileEntity); + case 56: + return new ContainerFormulaicAssemblicator(player.inventory, (TileEntityFormulaicAssemblicator)tileEntity); } return null; diff --git a/src/main/java/mekanism/common/content/assemblicator/RecipeFormula.java b/src/main/java/mekanism/common/content/assemblicator/RecipeFormula.java index 84ea25418..79b4a5278 100644 --- a/src/main/java/mekanism/common/content/assemblicator/RecipeFormula.java +++ b/src/main/java/mekanism/common/content/assemblicator/RecipeFormula.java @@ -10,7 +10,7 @@ import net.minecraft.world.World; public class RecipeFormula { - public InventoryCrafting dummy = MekanismUtils.getDummyCraftingInv(); + private InventoryCrafting dummy = MekanismUtils.getDummyCraftingInv(); public ItemStack[] input = new ItemStack[9]; diff --git a/src/main/java/mekanism/common/inventory/container/ContainerFormulaicAssemblicator.java b/src/main/java/mekanism/common/inventory/container/ContainerFormulaicAssemblicator.java index 2f3d337d2..0961058bd 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerFormulaicAssemblicator.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerFormulaicAssemblicator.java @@ -1,6 +1,7 @@ package mekanism.common.inventory.container; import mekanism.common.inventory.slot.SlotEnergy.SlotDischarge; +import mekanism.common.inventory.slot.SlotOutput; import mekanism.common.inventory.slot.SlotSpecific; import mekanism.common.item.ItemCraftingFormula; import mekanism.common.tile.TileEntityFormulaicAssemblicator; @@ -10,7 +11,12 @@ import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; -import net.minecraftforge.fluids.FluidContainerRegistry; +import net.minecraft.util.IIcon; + +import org.lwjgl.opengl.GL11; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class ContainerFormulaicAssemblicator extends Container { @@ -36,7 +42,34 @@ public class ContainerFormulaicAssemblicator extends Container { for(int slotX = 0; slotX < 3; slotX++) { - addSlotToContainer(new Slot(tentity, slotX + slotY * 9 + 27, 26 + slotX * 18, 17 + slotY * 18)); + addSlotToContainer(new Slot(tentity, slotX + slotY * 9 + 27, 26 + slotX * 18, 17 + slotY * 18) { + @Override + public boolean isItemValid(ItemStack stack) + { + return !tileEntity.autoMode; + } + + @SideOnly(Side.CLIENT) + public boolean func_111238_b() + { + return !tileEntity.autoMode; + } + + @Override + @SideOnly(Side.CLIENT) + public IIcon getBackgroundIconIndex() + { + if(tileEntity.formula != null) + { + ItemStack stack = tileEntity.formula.input[getSlotIndex()-27]; + GL11.glColor4f(1, 1, 1, 0.4F); + + return stack != null ? stack.getIconIndex() : null; + } + + return null; + } + }); } } @@ -44,7 +77,7 @@ public class ContainerFormulaicAssemblicator extends Container { for(int slotX = 0; slotX < 2; slotX++) { - addSlotToContainer(new Slot(tentity, slotX + slotY * 9 + 21, 116 + slotX * 18, 17 + slotY * 18)); + addSlotToContainer(new SlotOutput(tentity, slotX + slotY * 9 + 21, 116 + slotX * 18, 17 + slotY * 18)); } } @@ -92,22 +125,6 @@ public class ContainerFormulaicAssemblicator extends Container stack = slotStack.copy(); if(ChargeUtils.canBeDischarged(slotStack)) - { - if(slotID != 2) - { - if(!mergeItemStack(slotStack, 2, 3, false)) - { - return null; - } - } - else { - if(!mergeItemStack(slotStack, 3, inventorySlots.size(), true)) - { - return null; - } - } - } - else if(FluidContainerRegistry.isEmptyContainer(slotStack)) { if(slotID != 0) { @@ -116,38 +133,60 @@ public class ContainerFormulaicAssemblicator extends Container return null; } } - else if(slotID == 0) - { - if(!mergeItemStack(slotStack, 3, inventorySlots.size(), true)) + else { + if(!mergeItemStack(slotStack, 34, inventorySlots.size(), true)) { return null; } } } - else if(slotID == 1) + else if(slotStack.getItem() instanceof ItemCraftingFormula) { - if(!mergeItemStack(slotStack, 3, inventorySlots.size(), true)) + if(slotID != 1) { - return null; - } - } - else { - if(slotID >= 3 && slotID <= 29) - { - if(!mergeItemStack(slotStack, 30, inventorySlots.size(), false)) - { - return null; - } - } - else if(slotID > 29) - { - if(!mergeItemStack(slotStack, 3, 29, false)) + if(!mergeItemStack(slotStack, 1, 2, false)) { return null; } } else { - if(!mergeItemStack(slotStack, 3, inventorySlots.size(), true)) + if(!mergeItemStack(slotStack, 34, inventorySlots.size(), true)) + { + return null; + } + } + } + else if(slotID >= 2 && slotID <= 19) + { + if(!mergeItemStack(slotStack, 34, inventorySlots.size(), true)) + { + return null; + } + } + else if(tileEntity.formula == null || tileEntity.formula.isIngredient(tileEntity.getWorldObj(), slotStack)) + { + if(!mergeItemStack(slotStack, 2, 20, false)) + { + return null; + } + } + else { + if(slotID >= 34 && slotID <= 60) + { + if(!mergeItemStack(slotStack, 61, inventorySlots.size(), false)) + { + return null; + } + } + else if(slotID > 60) + { + if(!mergeItemStack(slotStack, 34, 60, false)) + { + return null; + } + } + else { + if(!mergeItemStack(slotStack, 34, inventorySlots.size(), true)) { return null; } diff --git a/src/main/java/mekanism/common/network/PacketConfigSync.java b/src/main/java/mekanism/common/network/PacketConfigSync.java index a24cfc57d..d1ac7fc69 100644 --- a/src/main/java/mekanism/common/network/PacketConfigSync.java +++ b/src/main/java/mekanism/common/network/PacketConfigSync.java @@ -99,6 +99,7 @@ public class PacketConfigSync implements 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 diff --git a/src/main/resources/assets/mekanism/render/DigitalMiner.png b/src/main/resources/assets/mekanism/render/DigitalMiner.png index a5f4bd998b2d798b27d52c1e63fc5b5d6111e5eb..b9eefd9908af8c1a6721ee13c4333ad44f5d7c94 100644 GIT binary patch literal 21703 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 literal 33801 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 wMYR2tJ^`=)-;e)Yn*RSd^nZ#&1z_G9@Gt<8 diff --git a/src/main/resources/assets/mekanism/render/DigitalMinerOn.png b/src/main/resources/assets/mekanism/render/DigitalMinerOn.png index 078b3bd4dab1b7695b9b19c9c661f265b7bdd520..5c51874139376300e219c137a0459d7556dec3f5 100644 GIT binary patch literal 61493 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 UQDjyV1pI>^vO8FC!2SCF0@Ig?7XSbN diff --git a/src/main/resources/assets/mekanism/render/SolarGenerator.png b/src/main/resources/assets/mekanism/render/SolarGenerator.png index 40a589f4ea092176cd7db55876998efcb8965236..1dcf1a0cf34a38d780f88a9205e71a87a6a0a84a 100644 GIT binary patch literal 3791 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 literal 3332 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 k&^^89W>QL=SNoi_@% diff --git a/src/main/resources/assets/mekanism/render/WindGenerator.png b/src/main/resources/assets/mekanism/render/WindGenerator.png new file mode 100644 index 0000000000000000000000000000000000000000..a964ae0d51811eaac57ef7a95705e6701bdc7f9c GIT binary patch literal 9146 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 T8GQXu4#3v>j8*9g&&&S<>V<)t literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/mekanism/render/WindTurbine.png b/src/main/resources/assets/mekanism/render/WindTurbine.png deleted file mode 100644 index fd876cec7c641410b847e27aa75330d815ac5650..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4736 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 From 1dfc35c6ddaff5ccd42b2c922a47756d62e745c3 Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Tue, 15 Mar 2016 00:15:19 -0400 Subject: [PATCH 43/52] Fixed a small Digital Miner issue, fixed Adv. Solar Gen model --- .../mekanism/common/tile/TileEntityDigitalMiner.java | 12 +++++++++--- .../client/model/ModelAdvancedSolarGenerator.java | 10 +++++----- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java b/src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java index f6cf82941..d7dafa669 100644 --- a/src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java +++ b/src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java @@ -792,7 +792,7 @@ public class TileEntityDigitalMiner extends TileEntityElectricBlock implements I maxY = dataStream.readInt(); doEject = dataStream.readBoolean(); doPull = dataStream.readBoolean(); - isActive = dataStream.readBoolean(); + clientActive = dataStream.readBoolean(); running = dataStream.readBoolean(); silkTouch = dataStream.readBoolean(); numPowering = dataStream.readInt(); @@ -825,7 +825,7 @@ public class TileEntityDigitalMiner extends TileEntityElectricBlock implements I maxY = dataStream.readInt(); doEject = dataStream.readBoolean(); doPull = dataStream.readBoolean(); - isActive = dataStream.readBoolean(); + clientActive = dataStream.readBoolean(); running = dataStream.readBoolean(); silkTouch = dataStream.readBoolean(); numPowering = dataStream.readInt(); @@ -855,7 +855,7 @@ public class TileEntityDigitalMiner extends TileEntityElectricBlock implements I } else if(type == 3) { - isActive = dataStream.readBoolean(); + clientActive = dataStream.readBoolean(); running = dataStream.readBoolean(); clientToMine = dataStream.readInt(); @@ -867,6 +867,12 @@ public class TileEntityDigitalMiner extends TileEntityElectricBlock implements I missingStack = null; } } + + if(clientActive != isActive) + { + isActive = clientActive; + MekanismUtils.updateBlock(worldObj, xCoord, yCoord, zCoord); + } } @Override diff --git a/src/main/java/mekanism/generators/client/model/ModelAdvancedSolarGenerator.java b/src/main/java/mekanism/generators/client/model/ModelAdvancedSolarGenerator.java index 1075ea95b..f6c4d7496 100644 --- a/src/main/java/mekanism/generators/client/model/ModelAdvancedSolarGenerator.java +++ b/src/main/java/mekanism/generators/client/model/ModelAdvancedSolarGenerator.java @@ -35,19 +35,19 @@ public class ModelAdvancedSolarGenerator extends ModelBase Shape1.setRotationPoint(-20F, -17F, 0F); Shape1.setTextureSize(256, 256); Shape1.mirror = true; - setRotation(Shape1, 0.3490659F, 0F, 0F); + setRotation(Shape1, 0F, 0F, 0F); //rotates Shape2 = new ModelRenderer(this, 0, 49); Shape2.addBox(0F, -1F, -23F, 16, 1, 45); Shape2.setRotationPoint(7F, -17F, 0F); Shape2.setTextureSize(256, 256); Shape2.mirror = true; - setRotation(Shape2, 0.3490659F, 0F, 0F); + setRotation(Shape2, 0F, 0F, 0F); //rotates Shape3 = new ModelRenderer(this, 0, 0); Shape3.addBox(0F, -2F, -24F, 18, 1, 48); Shape3.setRotationPoint(6F, -17F, 0F); Shape3.setTextureSize(256, 256); Shape3.mirror = true; - setRotation(Shape3, 0.3490659F, 0F, 0F); + setRotation(Shape3, 0F, 0F, 0F); //rotates Shape4 = new ModelRenderer(this, 86, 21); Shape4.addBox(0F, 0F, 0F, 6, 6, 10); Shape4.setRotationPoint(-3F, 13F, -7F); @@ -95,13 +95,13 @@ public class ModelAdvancedSolarGenerator extends ModelBase Shape11.setRotationPoint(-24F, -17F, 0F); Shape11.setTextureSize(256, 256); Shape11.mirror = true; - setRotation(Shape11, 0.3490659F, 0F, 0F); + setRotation(Shape11, 0F, 0F, 0F); //rotates Shape12 = new ModelRenderer(this, 0, 49); Shape12.addBox(0F, -1F, -23F, 16, 1, 45); Shape12.setRotationPoint(-23F, -17F, 0F); Shape12.setTextureSize(256, 256); Shape12.mirror = true; - setRotation(Shape12, 0.3490659F, 0F, 0F); + setRotation(Shape12, 0F, 0F, 0F); //rotates Shape13 = new ModelRenderer(this, 78, 50); Shape13.addBox(0F, 0F, 0F, 16, 2, 16); Shape13.setRotationPoint(-8F, 22F, -8F); From 779c2c49e7fbb455951407f706b6ebe1986ebdcc Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Tue, 15 Mar 2016 17:34:17 -0400 Subject: [PATCH 44/52] Lots of work on Formulaic Assemblicators, still need to do a good bit of polishing --- .../client/gui/GuiFormulaicAssemblicator.java | 138 +++++++++++++++++- src/main/java/mekanism/common/Mekanism.java | 7 +- .../ContainerFormulaicAssemblicator.java | 12 +- .../common/item/ItemCraftingFormula.java | 15 +- .../TileEntityFormulaicAssemblicator.java | 107 ++++++++++---- .../gui/GuiFormulaicAssemblicator.png | Bin 6824 -> 6885 bytes 6 files changed, 246 insertions(+), 33 deletions(-) diff --git a/src/main/java/mekanism/client/gui/GuiFormulaicAssemblicator.java b/src/main/java/mekanism/client/gui/GuiFormulaicAssemblicator.java index c4fa8aedc..28ab40490 100644 --- a/src/main/java/mekanism/client/gui/GuiFormulaicAssemblicator.java +++ b/src/main/java/mekanism/client/gui/GuiFormulaicAssemblicator.java @@ -1,7 +1,9 @@ package mekanism.client.gui; +import java.util.ArrayList; import java.util.List; +import mekanism.api.Coord4D; import mekanism.api.util.ListUtils; import mekanism.client.gui.element.GuiElement.IInfoHandler; import mekanism.client.gui.element.GuiEnergyInfo; @@ -12,7 +14,9 @@ import mekanism.client.gui.element.GuiSlot; import mekanism.client.gui.element.GuiSlot.SlotOverlay; import mekanism.client.gui.element.GuiSlot.SlotType; import mekanism.client.gui.element.GuiTransporterConfigTab; +import mekanism.common.Mekanism; import mekanism.common.inventory.container.ContainerFormulaicAssemblicator; +import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.tile.TileEntityFormulaicAssemblicator; import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; @@ -36,7 +40,7 @@ public class GuiFormulaicAssemblicator extends GuiMekanism guiElements.add(new GuiRedstoneControl(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiFormulaicAssemblicator.png"))); guiElements.add(new GuiSideConfigurationTab(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiFormulaicAssemblicator.png"))); guiElements.add(new GuiTransporterConfigTab(this, 34, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiFormulaicAssemblicator.png"))); - guiElements.add(new GuiPowerBar(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiFormulaicAssemblicator.png"), 159, 16)); + guiElements.add(new GuiPowerBar(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiFormulaicAssemblicator.png"), 159, 15)); guiElements.add(new GuiEnergyInfo(new IInfoHandler() { @Override public List getInfo() @@ -45,7 +49,7 @@ public class GuiFormulaicAssemblicator extends GuiMekanism return ListUtils.asList(LangUtils.localize("gui.using") + ": " + multiplier + "/t", LangUtils.localize("gui.needed") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getMaxEnergy()-tileEntity.getEnergy())); } }, this, MekanismUtils.getResource(ResourceType.GUI, "GuiFormulaicAssemblicator.png"))); - guiElements.add(new GuiSlot(SlotType.POWER, this, MekanismUtils.getResource(ResourceType.GUI, "GuiFormulaicAssemblicator.png"), 154, 75).with(SlotOverlay.POWER)); + guiElements.add(new GuiSlot(SlotType.POWER, this, MekanismUtils.getResource(ResourceType.GUI, "GuiFormulaicAssemblicator.png"), 151, 75).with(SlotOverlay.POWER)); ySize+=64; } @@ -53,9 +57,38 @@ public class GuiFormulaicAssemblicator extends GuiMekanism @Override protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) { + int xAxis = (mouseX - (width - xSize) / 2); + int yAxis = (mouseY - (height - ySize) / 2); + fontRendererObj.drawString(tileEntity.getInventoryName(), (xSize/2)-(fontRendererObj.getStringWidth(tileEntity.getInventoryName())/2), 6, 0x404040); fontRendererObj.drawString(LangUtils.localize("container.inventory"), 8, (ySize - 96) + 2, 0x404040); - + + if(!tileEntity.autoMode) + { + /*if(xAxis >= 7 && xAxis <= 21 && yAxis >= 45 && yAxis <= 59) + { + drawTexturedModalRect(guiWidth + 7, guiHeight + 45, 176, 0, 14, 14); + } + + if(xAxis >= 71 && xAxis <= 87 && yAxis >= 75 && yAxis <= 91) + { + drawTexturedModalRect(guiWidth + 71, guiHeight + 75, 176 + 14, 0, 16, 16); + } + + if(xAxis >= 89 && xAxis <= 105 && yAxis >= 75 && yAxis <= 91) + { + drawTexturedModalRect(guiWidth + 89, guiHeight + 75, 176 + 30, 0, 16, 16); + }*/ + } + + if(tileEntity.formula != null) + { + if(xAxis >= 107 && xAxis <= 123 && yAxis >= 75 && yAxis <= 91) + { + + } + } + super.drawGuiContainerForegroundLayer(mouseX, mouseY); } @@ -67,7 +100,106 @@ public class GuiFormulaicAssemblicator extends GuiMekanism int guiWidth = (width - xSize) / 2; int guiHeight = (height - ySize) / 2; drawTexturedModalRect(guiWidth, guiHeight, 0, 0, xSize, ySize); + + int xAxis = mouseX - guiWidth; + int yAxis = mouseY - guiHeight; + + if(!tileEntity.autoMode) + { + if(xAxis >= 7 && xAxis <= 21 && yAxis >= 45 && yAxis <= 59) + { + drawTexturedModalRect(guiWidth + 7, guiHeight + 45, 176, 0, 14, 14); + } + else { + drawTexturedModalRect(guiWidth + 7, guiHeight + 45, 176, 14, 14, 14); + } + + if(xAxis >= 71 && xAxis <= 87 && yAxis >= 75 && yAxis <= 91) + { + drawTexturedModalRect(guiWidth + 71, guiHeight + 75, 176 + 14, 0, 16, 16); + } + else { + drawTexturedModalRect(guiWidth + 71, guiHeight + 75, 176 + 14, 16, 16, 16); + } + + if(xAxis >= 89 && xAxis <= 105 && yAxis >= 75 && yAxis <= 91) + { + drawTexturedModalRect(guiWidth + 89, guiHeight + 75, 176 + 30, 0, 16, 16); + } + else { + drawTexturedModalRect(guiWidth + 89, guiHeight + 75, 176 + 30, 16, 16, 16); + } + } + else { + drawTexturedModalRect(guiWidth + 7, guiHeight + 45, 176, 28, 14, 14); + drawTexturedModalRect(guiWidth + 71, guiHeight + 75, 176 + 14, 32, 16, 16); + drawTexturedModalRect(guiWidth + 89, guiHeight + 75, 176 + 30, 32, 16, 16); + } + + if(tileEntity.formula != null) + { + if(xAxis >= 107 && xAxis <= 123 && yAxis >= 75 && yAxis <= 91) + { + drawTexturedModalRect(guiWidth + 107, guiHeight + 75, 176 + 46, 0, 16, 16); + } + else { + drawTexturedModalRect(guiWidth + 107, guiHeight + 75, 176 + 46, 16, 16, 16); + } + } + else { + drawTexturedModalRect(guiWidth + 107, guiHeight + 75, 176 + 46, 32, 16, 16); + } super.drawGuiContainerBackgroundLayer(partialTick, mouseX, mouseY); } + + @Override + protected void mouseClicked(int mouseX, int mouseY, int button) + { + super.mouseClicked(mouseX, mouseY, button); + + if(button == 0) + { + int xAxis = (mouseX - (width - xSize) / 2); + int yAxis = (mouseY - (height - ySize) / 2); + + if(!tileEntity.autoMode) + { + if(xAxis >= 7 && xAxis <= 21 && yAxis >= 45 && yAxis <= 59) + { + ArrayList data = new ArrayList(); + data.add(1); + + Mekanism.packetHandler.sendToServer(new TileEntityMessage(Coord4D.get(tileEntity), data)); + } + + if(xAxis >= 71 && xAxis <= 87 && yAxis >= 75 && yAxis <= 91) + { + ArrayList data = new ArrayList(); + data.add(2); + + Mekanism.packetHandler.sendToServer(new TileEntityMessage(Coord4D.get(tileEntity), data)); + } + + if(xAxis >= 89 && xAxis <= 105 && yAxis >= 75 && yAxis <= 91) + { + ArrayList data = new ArrayList(); + data.add(3); + + Mekanism.packetHandler.sendToServer(new TileEntityMessage(Coord4D.get(tileEntity), data)); + } + } + + if(tileEntity.formula != null) + { + if(xAxis >= 107 && xAxis <= 123 && yAxis >= 75 && yAxis <= 91) + { + ArrayList data = new ArrayList(); + data.add(0); + + Mekanism.packetHandler.sendToServer(new TileEntityMessage(Coord4D.get(tileEntity), data)); + } + } + } + } } diff --git a/src/main/java/mekanism/common/Mekanism.java b/src/main/java/mekanism/common/Mekanism.java index b2256dbe5..15b58abdb 100644 --- a/src/main/java/mekanism/common/Mekanism.java +++ b/src/main/java/mekanism/common/Mekanism.java @@ -76,6 +76,7 @@ import mekanism.common.tile.TileEntityAdvancedBoundingBlock; import mekanism.common.tile.TileEntityBoundingBlock; import mekanism.common.tile.TileEntityCardboardBox; import mekanism.common.tile.TileEntityElectricBlock; +import mekanism.common.tile.TileEntityFormulaicAssemblicator; import mekanism.common.tile.TileEntityPressureDisperser; import mekanism.common.tile.TileEntityQuantumEntangloporter; import mekanism.common.tile.TileEntitySuperheatingElement; @@ -518,6 +519,9 @@ public class Mekanism MachineType.QUANTUM_ENTANGLOPORTER.addRecipe(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.MachineBlock3, 1, 0), new Object[] { "OCO", "ATA", "OCO", Character.valueOf('O'), "ingotRefinedObsidian", Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.ULTIMATE), Character.valueOf('A'), "alloyUltimate", Character.valueOf('T'), MekanismItems.TeleportationCore })); + MachineType.FORMULAIC_ASSEMBLICATOR.addRecipe(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.MachineBlock3, 1, 5), new Object[] { + "STS", "BIB", "SCS", Character.valueOf('S'), "ingotSteel", Character.valueOf('T'), Blocks.crafting_table, Character.valueOf('B'), MekanismUtils.getControlCircuit(BaseTier.BASIC), Character.valueOf('I'), new ItemStack(MekanismBlocks.MachineBlock, 1, 8), Character.valueOf('C'), Blocks.chest + })); //Energy Cube recipes CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(MekanismUtils.getEnergyCube(EnergyCubeTier.BASIC), new Object[] { @@ -1118,9 +1122,10 @@ public class Mekanism GameRegistry.registerTileEntity(TileEntityCardboardBox.class, "CardboardBox"); GameRegistry.registerTileEntity(TileEntityThermalEvaporationValve.class, "SalinationValve"); //TODO rename GameRegistry.registerTileEntity(TileEntityThermalEvaporationBlock.class, "SalinationTank"); //TODO rename - GameRegistry.registerTileEntity(TileEntityQuantumEntangloporter.class, "EntangledBlock"); + GameRegistry.registerTileEntity(TileEntityQuantumEntangloporter.class, "QuantumEntangloporter"); GameRegistry.registerTileEntity(TileEntityPressureDisperser.class, "PressureDisperser"); GameRegistry.registerTileEntity(TileEntitySuperheatingElement.class, "SuperheatingElement"); + GameRegistry.registerTileEntity(TileEntityFormulaicAssemblicator.class, "FormulaicAssemblicator"); //Load tile entities that have special renderers. proxy.registerSpecialTileEntities(); diff --git a/src/main/java/mekanism/common/inventory/container/ContainerFormulaicAssemblicator.java b/src/main/java/mekanism/common/inventory/container/ContainerFormulaicAssemblicator.java index 0961058bd..14415b18e 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerFormulaicAssemblicator.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerFormulaicAssemblicator.java @@ -25,7 +25,7 @@ public class ContainerFormulaicAssemblicator extends Container public ContainerFormulaicAssemblicator(InventoryPlayer inventory, TileEntityFormulaicAssemblicator tentity) { tileEntity = tentity; - addSlotToContainer(new SlotDischarge(tentity, 1, 155, 76)); + addSlotToContainer(new SlotDischarge(tentity, 1, 152, 76)); addSlotToContainer(new SlotSpecific(tentity, 2, 6, 26, ItemCraftingFormula.class)); int slotY; @@ -42,13 +42,19 @@ public class ContainerFormulaicAssemblicator extends Container { for(int slotX = 0; slotX < 3; slotX++) { - addSlotToContainer(new Slot(tentity, slotX + slotY * 9 + 27, 26 + slotX * 18, 17 + slotY * 18) { + addSlotToContainer(new Slot(tentity, slotX + slotY * 3 + 27, 26 + slotX * 18, 17 + slotY * 18) { @Override public boolean isItemValid(ItemStack stack) { return !tileEntity.autoMode; } + @Override + public boolean canTakeStack(EntityPlayer player) + { + return !tileEntity.autoMode; + } + @SideOnly(Side.CLIENT) public boolean func_111238_b() { @@ -77,7 +83,7 @@ public class ContainerFormulaicAssemblicator extends Container { for(int slotX = 0; slotX < 2; slotX++) { - addSlotToContainer(new SlotOutput(tentity, slotX + slotY * 9 + 21, 116 + slotX * 18, 17 + slotY * 18)); + addSlotToContainer(new SlotOutput(tentity, slotX + slotY * 2 + 21, 116 + slotX * 18, 17 + slotY * 18)); } } diff --git a/src/main/java/mekanism/common/item/ItemCraftingFormula.java b/src/main/java/mekanism/common/item/ItemCraftingFormula.java index 0bfdff07b..846aaafef 100644 --- a/src/main/java/mekanism/common/item/ItemCraftingFormula.java +++ b/src/main/java/mekanism/common/item/ItemCraftingFormula.java @@ -43,6 +43,13 @@ public class ItemCraftingFormula extends ItemMekanism return getInventory(stack) == null ? icons[0] : (isInvalid(stack) ? icons[1] : icons[2]); } + @Override + @SideOnly(Side.CLIENT) + public boolean requiresMultipleRenderPasses() + { + return true; + } + @Override @SideOnly(Side.CLIENT) public void addInformation(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) @@ -145,7 +152,7 @@ public class ItemCraftingFormula extends ItemMekanism public ItemStack[] getInventory(ItemStack stack) { - if(stack.stackTagCompound == null) + if(stack.stackTagCompound == null || !stack.stackTagCompound.hasKey("Items")) { return null; } @@ -174,6 +181,12 @@ public class ItemCraftingFormula extends ItemMekanism stack.setTagCompound(new NBTTagCompound()); } + if(inv == null) + { + stack.stackTagCompound.removeTag("Items"); + return; + } + NBTTagList tagList = new NBTTagList(); for(int slotCount = 0; slotCount < 9; slotCount++) diff --git a/src/main/java/mekanism/common/tile/TileEntityFormulaicAssemblicator.java b/src/main/java/mekanism/common/tile/TileEntityFormulaicAssemblicator.java index 08e20f50a..884ac2ba5 100644 --- a/src/main/java/mekanism/common/tile/TileEntityFormulaicAssemblicator.java +++ b/src/main/java/mekanism/common/tile/TileEntityFormulaicAssemblicator.java @@ -18,9 +18,6 @@ import mekanism.common.base.IUpgradeTile; import mekanism.common.block.BlockMachine.MachineType; import mekanism.common.content.assemblicator.RecipeFormula; import mekanism.common.item.ItemCraftingFormula; -import mekanism.common.recipe.RecipeHandler; -import mekanism.common.recipe.RecipeHandler.Recipe; -import mekanism.common.recipe.inputs.InfusionInput; import mekanism.common.tile.component.TileComponentConfig; import mekanism.common.tile.component.TileComponentEjector; import mekanism.common.tile.component.TileComponentUpgrade; @@ -47,6 +44,8 @@ public class TileEntityFormulaicAssemblicator extends TileEntityElectricBlock im public boolean autoMode = false; + public boolean isRecipe = false; + public int pulseOperations; public RecipeFormula formula; @@ -72,7 +71,7 @@ public class TileEntityFormulaicAssemblicator extends TileEntityElectricBlock im configComponent.setConfig(TransmissionType.ITEM, new byte[] {0, 0, 0, 3, 1, 2}); configComponent.setInputConfig(TransmissionType.ENERGY); - inventory = new ItemStack[35]; + inventory = new ItemStack[36]; upgradeComponent = new TileComponentUpgrade(this, 0); @@ -131,16 +130,20 @@ public class TileEntityFormulaicAssemblicator extends TileEntityElectricBlock im formula = null; } + if(autoMode && formula == null) + { + toggleAutoMode(); + } + else if(formula != null) + { + moveItemsToGrid(); + } + if(autoMode && formula != null && ((controlType == RedstoneControl.PULSE && pulseOperations > 0) || MekanismUtils.canFunction(this))) { boolean canOperate = true; - if(!formula.matches(worldObj, inventory, 27)) - { - canOperate = moveItemsToGrid(); - } - - if(canOperate) + if(formula.matches(worldObj, inventory, 27)) { if(operatingTicks == ticksRequired) { @@ -187,11 +190,44 @@ public class TileEntityFormulaicAssemblicator extends TileEntityElectricBlock im for(int i = 27; i <= 35; i++) { - inventory[i].stackSize--; - - if(inventory[i].stackSize == 0) + if(inventory[i] != null) { - inventory[i] = null; + ItemStack stack = inventory[i]; + + inventory[i].stackSize--; + + if(inventory[i].stackSize == 0) + { + inventory[i] = null; + } + + if(stack.stackSize == 0 && stack.getItem().hasContainerItem(stack)) + { + ItemStack container = stack.getItem().getContainerItem(stack); + + if(container != null && container.isItemStackDamageable() && container.getItemDamage() > container.getMaxDamage()) + { + container = null; + } + + if(container != null && !stack.getItem().doesContainerItemLeaveCraftingGrid(stack)) + { + if(!stack.getItem().doesContainerItemLeaveCraftingGrid(stack)) + { + inventory[i] = container.copy(); + } + else { + boolean move = tryMoveToOutput(container.copy(), false); + + if(move) + { + tryMoveToOutput(container.copy(), true); + } + + inventory[i] = move ? null : container.copy(); + } + } + } } } @@ -216,11 +252,11 @@ public class TileEntityFormulaicAssemblicator extends TileEntityElectricBlock im if(canOperate) { - doSingleCraft(); + return doSingleCraft(); } } else { - doSingleCraft(); + return doSingleCraft(); } return false; @@ -282,6 +318,17 @@ public class TileEntityFormulaicAssemblicator extends TileEntityElectricBlock im while(craftSingle()); } + private void moveItemsToInput() + { + for(int i = 27; i <= 35; i++) + { + if(inventory[i] != null && formula != null && !formula.isIngredientInPos(worldObj, inventory[i], i-27)) + { + inventory[i] = tryMoveToInput(inventory[i]); + } + } + } + private void toggleAutoMode() { if(autoMode) @@ -289,15 +336,13 @@ public class TileEntityFormulaicAssemblicator extends TileEntityElectricBlock im operatingTicks = 0; autoMode = false; } - else { - for(int i = 27; i <= 35; i++) - { - inventory[i] = tryMoveToInput(inventory[i]); - } - - markDirty(); + else if(formula != null) + { + moveItemsToInput(); autoMode = true; } + + markDirty(); } private ItemStack tryMoveToInput(ItemStack stack) @@ -485,6 +530,7 @@ public class TileEntityFormulaicAssemblicator extends TileEntityElectricBlock im autoMode = dataStream.readBoolean(); operatingTicks = dataStream.readInt(); controlType = RedstoneControl.values()[dataStream.readInt()]; + isRecipe = dataStream.readBoolean(); if(dataStream.readBoolean()) { @@ -492,7 +538,10 @@ public class TileEntityFormulaicAssemblicator extends TileEntityElectricBlock im for(int i = 0; i < 9; i++) { - inv[i] = PacketHandler.readStack(dataStream); + if(dataStream.readBoolean()) + { + inv[i] = PacketHandler.readStack(dataStream); + } } formula = new RecipeFormula(inv); @@ -510,6 +559,7 @@ public class TileEntityFormulaicAssemblicator extends TileEntityElectricBlock im data.add(autoMode); data.add(operatingTicks); data.add(controlType.ordinal()); + data.add(isRecipe); if(formula != null) { @@ -517,7 +567,14 @@ public class TileEntityFormulaicAssemblicator extends TileEntityElectricBlock im for(int i = 0; i < 9; i++) { - data.add(formula.input[i]); + if(formula.input[i] != null) + { + data.add(true); + data.add(formula.input[i]); + } + else { + data.add(false); + } } } else { diff --git a/src/main/resources/assets/mekanism/gui/GuiFormulaicAssemblicator.png b/src/main/resources/assets/mekanism/gui/GuiFormulaicAssemblicator.png index ccf63f296e3ebd3d9b565e6ed8c8ac3f9ebbe6fb..e9e58907d6ee546140a0dfdd8bdc309c844a5045 100644 GIT binary patch delta 5355 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 From 9c8e3926383cd8bce72c319267530689b82dd1b8 Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Tue, 15 Mar 2016 19:07:22 -0400 Subject: [PATCH 45/52] Loads more work on Formulaic Assemblicators. Seem to be about polished! --- .../client/gui/GuiFormulaicAssemblicator.java | 107 ++++++++++++------ src/main/java/mekanism/common/Mekanism.java | 3 + .../ContainerFormulaicAssemblicator.java | 19 ---- .../TileEntityFormulaicAssemblicator.java | 36 +++++- .../mekanism/common/util/RecipeUtils.java | 7 +- .../gui/GuiFormulaicAssemblicator.png | Bin 6885 -> 6978 bytes .../resources/assets/mekanism/lang/en_US.lang | 4 + 7 files changed, 119 insertions(+), 57 deletions(-) diff --git a/src/main/java/mekanism/client/gui/GuiFormulaicAssemblicator.java b/src/main/java/mekanism/client/gui/GuiFormulaicAssemblicator.java index 28ab40490..2b91bfd9c 100644 --- a/src/main/java/mekanism/client/gui/GuiFormulaicAssemblicator.java +++ b/src/main/java/mekanism/client/gui/GuiFormulaicAssemblicator.java @@ -14,14 +14,18 @@ import mekanism.client.gui.element.GuiSlot; import mekanism.client.gui.element.GuiSlot.SlotOverlay; import mekanism.client.gui.element.GuiSlot.SlotType; import mekanism.client.gui.element.GuiTransporterConfigTab; +import mekanism.client.render.MekanismRenderer; import mekanism.common.Mekanism; import mekanism.common.inventory.container.ContainerFormulaicAssemblicator; +import mekanism.common.item.ItemCraftingFormula; import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.tile.TileEntityFormulaicAssemblicator; import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.inventory.Slot; +import net.minecraft.item.ItemStack; import org.lwjgl.opengl.GL11; @@ -63,30 +67,24 @@ public class GuiFormulaicAssemblicator extends GuiMekanism fontRendererObj.drawString(tileEntity.getInventoryName(), (xSize/2)-(fontRendererObj.getStringWidth(tileEntity.getInventoryName())/2), 6, 0x404040); fontRendererObj.drawString(LangUtils.localize("container.inventory"), 8, (ySize - 96) + 2, 0x404040); - if(!tileEntity.autoMode) + if(xAxis >= 7 && xAxis <= 21 && yAxis >= 45 && yAxis <= 59) { - /*if(xAxis >= 7 && xAxis <= 21 && yAxis >= 45 && yAxis <= 59) - { - drawTexturedModalRect(guiWidth + 7, guiHeight + 45, 176, 0, 14, 14); - } - - if(xAxis >= 71 && xAxis <= 87 && yAxis >= 75 && yAxis <= 91) - { - drawTexturedModalRect(guiWidth + 71, guiHeight + 75, 176 + 14, 0, 16, 16); - } - - if(xAxis >= 89 && xAxis <= 105 && yAxis >= 75 && yAxis <= 91) - { - drawTexturedModalRect(guiWidth + 89, guiHeight + 75, 176 + 30, 0, 16, 16); - }*/ + drawCreativeTabHoveringText(LangUtils.localize("gui.encodeFormula"), xAxis, yAxis); } - if(tileEntity.formula != null) + if(xAxis >= 71 && xAxis <= 87 && yAxis >= 75 && yAxis <= 91) { - if(xAxis >= 107 && xAxis <= 123 && yAxis >= 75 && yAxis <= 91) - { - - } + drawCreativeTabHoveringText(LangUtils.localize("gui.craftSingle"), xAxis, yAxis); + } + + if(xAxis >= 89 && xAxis <= 105 && yAxis >= 75 && yAxis <= 91) + { + drawCreativeTabHoveringText(LangUtils.localize("gui.craftAvailable"), xAxis, yAxis); + } + + if(xAxis >= 107 && xAxis <= 123 && yAxis >= 75 && yAxis <= 91) + { + drawCreativeTabHoveringText(LangUtils.localize("gui.autoModeToggle") + " " + LangUtils.transOnOff(!tileEntity.autoMode), xAxis, yAxis); } super.drawGuiContainerForegroundLayer(mouseX, mouseY); @@ -104,14 +102,17 @@ public class GuiFormulaicAssemblicator extends GuiMekanism int xAxis = mouseX - guiWidth; int yAxis = mouseY - guiHeight; - if(!tileEntity.autoMode) + if(!tileEntity.autoMode && tileEntity.isRecipe) { - if(xAxis >= 7 && xAxis <= 21 && yAxis >= 45 && yAxis <= 59) + if(canEncode()) { - drawTexturedModalRect(guiWidth + 7, guiHeight + 45, 176, 0, 14, 14); - } - else { - drawTexturedModalRect(guiWidth + 7, guiHeight + 45, 176, 14, 14, 14); + if(xAxis >= 7 && xAxis <= 21 && yAxis >= 45 && yAxis <= 59) + { + drawTexturedModalRect(guiWidth + 7, guiHeight + 45, 176, 0, 14, 14); + } + else { + drawTexturedModalRect(guiWidth + 7, guiHeight + 45, 176, 14, 14, 14); + } } if(xAxis >= 71 && xAxis <= 87 && yAxis >= 75 && yAxis <= 91) @@ -149,10 +150,49 @@ public class GuiFormulaicAssemblicator extends GuiMekanism else { drawTexturedModalRect(guiWidth + 107, guiHeight + 75, 176 + 46, 32, 16, 16); } + + if(tileEntity.operatingTicks > 0) + { + int display = (int)((double)tileEntity.operatingTicks*22/(double)tileEntity.ticksRequired); + drawTexturedModalRect(guiWidth + 86, guiHeight + 43, 176, 48, display, 16); + } + + if(tileEntity.isRecipe) + { + mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.GUI_ELEMENT, "GuiSlot.png")); + drawTexturedModalRect(guiWidth + 90, guiHeight + 25, 2, 39, 14, 12); + } + + if(tileEntity.formula != null) + { + for(int i = 0; i < 9; i++) + { + ItemStack stack = tileEntity.formula.input[i]; + + if(stack != null) + { + Slot slot = (Slot)inventorySlots.inventorySlots.get(i+20); + + GL11.glPushMatrix(); + GL11.glEnable(GL11.GL_LIGHTING); + MekanismRenderer.blendOn(); + itemRender.renderItemAndEffectIntoGUI(fontRendererObj, mc.getTextureManager(), stack, guiWidth + slot.xDisplayPosition, guiHeight + slot.yDisplayPosition); + MekanismRenderer.blendOff(); + GL11.glDisable(GL11.GL_LIGHTING); + GL11.glPopMatrix(); + } + } + } super.drawGuiContainerBackgroundLayer(partialTick, mouseX, mouseY); } + private boolean canEncode() + { + return tileEntity.formula == null && tileEntity.inventory[2] != null && tileEntity.inventory[2].getItem() instanceof ItemCraftingFormula && + ((ItemCraftingFormula)tileEntity.inventory[2].getItem()).getInventory(tileEntity.inventory[2]) == null; + } + @Override protected void mouseClicked(int mouseX, int mouseY, int button) { @@ -163,14 +203,17 @@ public class GuiFormulaicAssemblicator extends GuiMekanism int xAxis = (mouseX - (width - xSize) / 2); int yAxis = (mouseY - (height - ySize) / 2); - if(!tileEntity.autoMode) + if(!tileEntity.autoMode && tileEntity.isRecipe) { - if(xAxis >= 7 && xAxis <= 21 && yAxis >= 45 && yAxis <= 59) + if(canEncode()) { - ArrayList data = new ArrayList(); - data.add(1); - - Mekanism.packetHandler.sendToServer(new TileEntityMessage(Coord4D.get(tileEntity), data)); + if(xAxis >= 7 && xAxis <= 21 && yAxis >= 45 && yAxis <= 59) + { + ArrayList data = new ArrayList(); + data.add(1); + + Mekanism.packetHandler.sendToServer(new TileEntityMessage(Coord4D.get(tileEntity), data)); + } } if(xAxis >= 71 && xAxis <= 87 && yAxis >= 75 && yAxis <= 91) diff --git a/src/main/java/mekanism/common/Mekanism.java b/src/main/java/mekanism/common/Mekanism.java index 15b58abdb..567acc64b 100644 --- a/src/main/java/mekanism/common/Mekanism.java +++ b/src/main/java/mekanism/common/Mekanism.java @@ -522,6 +522,9 @@ public class Mekanism MachineType.FORMULAIC_ASSEMBLICATOR.addRecipe(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.MachineBlock3, 1, 5), new Object[] { "STS", "BIB", "SCS", Character.valueOf('S'), "ingotSteel", Character.valueOf('T'), Blocks.crafting_table, Character.valueOf('B'), MekanismUtils.getControlCircuit(BaseTier.BASIC), Character.valueOf('I'), new ItemStack(MekanismBlocks.MachineBlock, 1, 8), Character.valueOf('C'), Blocks.chest })); + CraftingManager.getInstance().getRecipeList().add(new ShapelessMekanismRecipe(new ItemStack(MekanismItems.CraftingFormula), new Object[] { + Items.paper, MekanismUtils.getControlCircuit(BaseTier.BASIC) + })); //Energy Cube recipes CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(MekanismUtils.getEnergyCube(EnergyCubeTier.BASIC), new Object[] { diff --git a/src/main/java/mekanism/common/inventory/container/ContainerFormulaicAssemblicator.java b/src/main/java/mekanism/common/inventory/container/ContainerFormulaicAssemblicator.java index 14415b18e..f9e4c74a0 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerFormulaicAssemblicator.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerFormulaicAssemblicator.java @@ -11,10 +11,6 @@ import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; -import net.minecraft.util.IIcon; - -import org.lwjgl.opengl.GL11; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -60,21 +56,6 @@ public class ContainerFormulaicAssemblicator extends Container { return !tileEntity.autoMode; } - - @Override - @SideOnly(Side.CLIENT) - public IIcon getBackgroundIconIndex() - { - if(tileEntity.formula != null) - { - ItemStack stack = tileEntity.formula.input[getSlotIndex()-27]; - GL11.glColor4f(1, 1, 1, 0.4F); - - return stack != null ? stack.getIconIndex() : null; - } - - return null; - } }); } } diff --git a/src/main/java/mekanism/common/tile/TileEntityFormulaicAssemblicator.java b/src/main/java/mekanism/common/tile/TileEntityFormulaicAssemblicator.java index 884ac2ba5..f39623c3c 100644 --- a/src/main/java/mekanism/common/tile/TileEntityFormulaicAssemblicator.java +++ b/src/main/java/mekanism/common/tile/TileEntityFormulaicAssemblicator.java @@ -36,7 +36,7 @@ public class TileEntityFormulaicAssemblicator extends TileEntityElectricBlock im public double energyPerTick = BASE_ENERGY_PER_TICK; - public int BASE_TICKS_REQUIRED = 100; + public int BASE_TICKS_REQUIRED = 40; public int ticksRequired = BASE_TICKS_REQUIRED; @@ -134,17 +134,38 @@ public class TileEntityFormulaicAssemblicator extends TileEntityElectricBlock im { toggleAutoMode(); } - else if(formula != null) + + if(formula == null) { - moveItemsToGrid(); + if(autoMode) + { + toggleAutoMode(); + } + + for(int i = 0; i < 9; i++) + { + dummyInv.setInventorySlotContents(i, inventory[27+i]); + } + + isRecipe = MekanismUtils.findMatchingRecipe(dummyInv, worldObj) != null; + } + else { + isRecipe = formula.matches(worldObj, inventory, 27); } if(autoMode && formula != null && ((controlType == RedstoneControl.PULSE && pulseOperations > 0) || MekanismUtils.canFunction(this))) { boolean canOperate = true; - if(formula.matches(worldObj, inventory, 27)) + if(!formula.matches(worldObj, inventory, 27)) { + canOperate = moveItemsToGrid(); + } + + if(canOperate) + { + isRecipe = true; + if(operatingTicks == ticksRequired) { if(doSingleCraft()) @@ -231,6 +252,11 @@ public class TileEntityFormulaicAssemblicator extends TileEntityElectricBlock im } } + if(formula != null) + { + moveItemsToGrid(); + } + markDirty(); return true; @@ -243,7 +269,7 @@ public class TileEntityFormulaicAssemblicator extends TileEntityElectricBlock im { if(formula != null) { - boolean canOperate = false; + boolean canOperate = true; if(!formula.matches(worldObj, inventory, 27)) { diff --git a/src/main/java/mekanism/common/util/RecipeUtils.java b/src/main/java/mekanism/common/util/RecipeUtils.java index a0ba89c51..c73b8c3e4 100644 --- a/src/main/java/mekanism/common/util/RecipeUtils.java +++ b/src/main/java/mekanism/common/util/RecipeUtils.java @@ -1,5 +1,6 @@ package mekanism.common.util; +import java.util.ArrayList; import java.util.HashMap; import java.util.Iterator; import java.util.List; @@ -267,8 +268,12 @@ public class RecipeUtils public static IRecipe getRecipeFromGrid(InventoryCrafting inv, World world) { - for(IRecipe recipe : (List)CraftingManager.getInstance().getRecipeList()) + List list = new ArrayList(CraftingManager.getInstance().getRecipeList()); + + for(Iterator iter = list.iterator(); iter.hasNext();) { + IRecipe recipe = iter.next(); + if(recipe.matches(inv, world)) { return recipe; diff --git a/src/main/resources/assets/mekanism/gui/GuiFormulaicAssemblicator.png b/src/main/resources/assets/mekanism/gui/GuiFormulaicAssemblicator.png index e9e58907d6ee546140a0dfdd8bdc309c844a5045..0bb436c0f23872b3d97904de4e58fa256c96aad1 100644 GIT binary patch delta 5811 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 delta 5719 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 Date: Tue, 15 Mar 2016 19:30:16 -0400 Subject: [PATCH 46/52] Formulaic Assemblicators are cool! --- .../client/gui/GuiFormulaicAssemblicator.java | 84 +++++++++++++----- src/main/java/mekanism/common/Mekanism.java | 2 +- .../TileEntityFormulaicAssemblicator.java | 16 +++- .../gui/GuiFormulaicAssemblicator.png | Bin 6978 -> 7291 bytes .../resources/assets/mekanism/lang/en_US.lang | 1 + 5 files changed, 79 insertions(+), 24 deletions(-) diff --git a/src/main/java/mekanism/client/gui/GuiFormulaicAssemblicator.java b/src/main/java/mekanism/client/gui/GuiFormulaicAssemblicator.java index 2b91bfd9c..c6ffa935f 100644 --- a/src/main/java/mekanism/client/gui/GuiFormulaicAssemblicator.java +++ b/src/main/java/mekanism/client/gui/GuiFormulaicAssemblicator.java @@ -15,6 +15,7 @@ import mekanism.client.gui.element.GuiSlot.SlotOverlay; import mekanism.client.gui.element.GuiSlot.SlotType; import mekanism.client.gui.element.GuiTransporterConfigTab; import mekanism.client.render.MekanismRenderer; +import mekanism.client.sound.SoundHandler; import mekanism.common.Mekanism; import mekanism.common.inventory.container.ContainerFormulaicAssemblicator; import mekanism.common.item.ItemCraftingFormula; @@ -67,6 +68,11 @@ public class GuiFormulaicAssemblicator extends GuiMekanism fontRendererObj.drawString(tileEntity.getInventoryName(), (xSize/2)-(fontRendererObj.getStringWidth(tileEntity.getInventoryName())/2), 6, 0x404040); fontRendererObj.drawString(LangUtils.localize("container.inventory"), 8, (ySize - 96) + 2, 0x404040); + if(xAxis >= 44 && xAxis <= 60 && yAxis >= 75 && yAxis <= 91) + { + drawCreativeTabHoveringText(LangUtils.localize("gui.fillEmpty"), xAxis, yAxis); + } + if(xAxis >= 7 && xAxis <= 21 && yAxis >= 45 && yAxis <= 59) { drawCreativeTabHoveringText(LangUtils.localize("gui.encodeFormula"), xAxis, yAxis); @@ -102,6 +108,20 @@ public class GuiFormulaicAssemblicator extends GuiMekanism int xAxis = mouseX - guiWidth; int yAxis = mouseY - guiHeight; + if(!tileEntity.autoMode) + { + if(xAxis >= 44 && xAxis <= 60 && yAxis >= 75 && yAxis <= 91) + { + drawTexturedModalRect(guiWidth + 44, guiHeight + 75, 176 + 62, 0, 16, 16); + } + else { + drawTexturedModalRect(guiWidth + 44, guiHeight + 75, 176 + 62, 16, 16, 16); + } + } + else { + drawTexturedModalRect(guiWidth + 44, guiHeight + 75, 176 + 62, 32, 16, 16); + } + if(!tileEntity.autoMode && tileEntity.isRecipe) { if(canEncode()) @@ -114,6 +134,9 @@ public class GuiFormulaicAssemblicator extends GuiMekanism drawTexturedModalRect(guiWidth + 7, guiHeight + 45, 176, 14, 14, 14); } } + else { + drawTexturedModalRect(guiWidth + 7, guiHeight + 45, 176, 28, 14, 14); + } if(xAxis >= 71 && xAxis <= 87 && yAxis >= 75 && yAxis <= 91) { @@ -203,33 +226,52 @@ public class GuiFormulaicAssemblicator extends GuiMekanism int xAxis = (mouseX - (width - xSize) / 2); int yAxis = (mouseY - (height - ySize) / 2); - if(!tileEntity.autoMode && tileEntity.isRecipe) + if(!tileEntity.autoMode) { - if(canEncode()) + if(xAxis >= 44 && xAxis <= 60 && yAxis >= 75 && yAxis <= 91) { - if(xAxis >= 7 && xAxis <= 21 && yAxis >= 45 && yAxis <= 59) + SoundHandler.playSound("gui.button.press"); + + ArrayList data = new ArrayList(); + data.add(4); + + Mekanism.packetHandler.sendToServer(new TileEntityMessage(Coord4D.get(tileEntity), data)); + } + + if(tileEntity.isRecipe) + { + if(canEncode()) { + if(xAxis >= 7 && xAxis <= 21 && yAxis >= 45 && yAxis <= 59) + { + SoundHandler.playSound("gui.button.press"); + + ArrayList data = new ArrayList(); + data.add(1); + + Mekanism.packetHandler.sendToServer(new TileEntityMessage(Coord4D.get(tileEntity), data)); + } + } + + if(xAxis >= 71 && xAxis <= 87 && yAxis >= 75 && yAxis <= 91) + { + SoundHandler.playSound("gui.button.press"); + ArrayList data = new ArrayList(); - data.add(1); + data.add(2); + + Mekanism.packetHandler.sendToServer(new TileEntityMessage(Coord4D.get(tileEntity), data)); + } + + if(xAxis >= 89 && xAxis <= 105 && yAxis >= 75 && yAxis <= 91) + { + SoundHandler.playSound("gui.button.press"); + + ArrayList data = new ArrayList(); + data.add(3); Mekanism.packetHandler.sendToServer(new TileEntityMessage(Coord4D.get(tileEntity), data)); } - } - - if(xAxis >= 71 && xAxis <= 87 && yAxis >= 75 && yAxis <= 91) - { - ArrayList data = new ArrayList(); - data.add(2); - - Mekanism.packetHandler.sendToServer(new TileEntityMessage(Coord4D.get(tileEntity), data)); - } - - if(xAxis >= 89 && xAxis <= 105 && yAxis >= 75 && yAxis <= 91) - { - ArrayList data = new ArrayList(); - data.add(3); - - Mekanism.packetHandler.sendToServer(new TileEntityMessage(Coord4D.get(tileEntity), data)); } } @@ -237,6 +279,8 @@ public class GuiFormulaicAssemblicator extends GuiMekanism { if(xAxis >= 107 && xAxis <= 123 && yAxis >= 75 && yAxis <= 91) { + SoundHandler.playSound("gui.button.press"); + ArrayList data = new ArrayList(); data.add(0); diff --git a/src/main/java/mekanism/common/Mekanism.java b/src/main/java/mekanism/common/Mekanism.java index 567acc64b..2bdbb49bb 100644 --- a/src/main/java/mekanism/common/Mekanism.java +++ b/src/main/java/mekanism/common/Mekanism.java @@ -520,7 +520,7 @@ public class Mekanism "OCO", "ATA", "OCO", Character.valueOf('O'), "ingotRefinedObsidian", Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.ULTIMATE), Character.valueOf('A'), "alloyUltimate", Character.valueOf('T'), MekanismItems.TeleportationCore })); MachineType.FORMULAIC_ASSEMBLICATOR.addRecipe(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.MachineBlock3, 1, 5), new Object[] { - "STS", "BIB", "SCS", Character.valueOf('S'), "ingotSteel", Character.valueOf('T'), Blocks.crafting_table, Character.valueOf('B'), MekanismUtils.getControlCircuit(BaseTier.BASIC), Character.valueOf('I'), new ItemStack(MekanismBlocks.MachineBlock, 1, 8), Character.valueOf('C'), Blocks.chest + "STS", "BIB", "SCS", Character.valueOf('S'), "ingotSteel", Character.valueOf('T'), Blocks.crafting_table, Character.valueOf('B'), MekanismUtils.getControlCircuit(BaseTier.BASIC), Character.valueOf('I'), new ItemStack(MekanismBlocks.BasicBlock, 1, 8), Character.valueOf('C'), Blocks.chest })); CraftingManager.getInstance().getRecipeList().add(new ShapelessMekanismRecipe(new ItemStack(MekanismItems.CraftingFormula), new Object[] { Items.paper, MekanismUtils.getControlCircuit(BaseTier.BASIC) diff --git a/src/main/java/mekanism/common/tile/TileEntityFormulaicAssemblicator.java b/src/main/java/mekanism/common/tile/TileEntityFormulaicAssemblicator.java index f39623c3c..f80abd209 100644 --- a/src/main/java/mekanism/common/tile/TileEntityFormulaicAssemblicator.java +++ b/src/main/java/mekanism/common/tile/TileEntityFormulaicAssemblicator.java @@ -344,11 +344,11 @@ public class TileEntityFormulaicAssemblicator extends TileEntityElectricBlock im while(craftSingle()); } - private void moveItemsToInput() + private void moveItemsToInput(boolean forcePush) { for(int i = 27; i <= 35; i++) { - if(inventory[i] != null && formula != null && !formula.isIngredientInPos(worldObj, inventory[i], i-27)) + if(inventory[i] != null && (forcePush || (formula != null && !formula.isIngredientInPos(worldObj, inventory[i], i-27)))) { inventory[i] = tryMoveToInput(inventory[i]); } @@ -364,7 +364,7 @@ public class TileEntityFormulaicAssemblicator extends TileEntityElectricBlock im } else if(formula != null) { - moveItemsToInput(); + moveItemsToInput(false); autoMode = true; } @@ -547,6 +547,16 @@ public class TileEntityFormulaicAssemblicator extends TileEntityElectricBlock im { craftAll(); } + else if(type == 4) + { + if(formula != null) + { + moveItemsToGrid(); + } + else { + moveItemsToInput(true); + } + } return; } diff --git a/src/main/resources/assets/mekanism/gui/GuiFormulaicAssemblicator.png b/src/main/resources/assets/mekanism/gui/GuiFormulaicAssemblicator.png index 0bb436c0f23872b3d97904de4e58fa256c96aad1..12b4246bb645fa74832b89150cd88edcb23f45e1 100644 GIT binary patch delta 6129 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 YAc_~ei`0_W1)z`NB@^9Z9hb;|1CefcVgLXD delta 5817 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 diff --git a/src/main/resources/assets/mekanism/lang/en_US.lang b/src/main/resources/assets/mekanism/lang/en_US.lang index 7e30c7eb5..59ed5d2db 100644 --- a/src/main/resources/assets/mekanism/lang/en_US.lang +++ b/src/main/resources/assets/mekanism/lang/en_US.lang @@ -536,6 +536,7 @@ gui.encodeFormula=Encode Formula gui.autoModeToggle=Turn Auto-Mode gui.craftSingle=Craft Single Item gui.craftAvailable=Craft Available Items +gui.fillEmpty=Fill/Empty Grid gui.reactor.injectionRate=Injection Rate From 6b73b4153c5c2983b083ad66aac50fd95ee056ce Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Tue, 15 Mar 2016 19:44:16 -0400 Subject: [PATCH 47/52] Fixed misbehaving collision boxes --- src/main/java/mekanism/common/block/BlockMachine.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/java/mekanism/common/block/BlockMachine.java b/src/main/java/mekanism/common/block/BlockMachine.java index 0e23da4f2..7c963f87c 100644 --- a/src/main/java/mekanism/common/block/BlockMachine.java +++ b/src/main/java/mekanism/common/block/BlockMachine.java @@ -1090,6 +1090,8 @@ public class BlockMachine extends BlockContainer implements ISpecialBounds, IBlo @Override public AxisAlignedBB getCollisionBoundingBoxFromPool(World world, int x, int y, int z) { + setBlockBoundsBasedOnState(world, x, y, z); + if(world.getTileEntity(x, y, z) instanceof TileEntityChargepad) { return null; From a5c5a093fa30c178d6a76c5d5399f0bd7ae4793c Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Tue, 15 Mar 2016 20:06:35 -0400 Subject: [PATCH 48/52] Cleanup --- .../content/entangloporter/InventoryFrequency.java | 7 ------- .../common/content/transporter/StackSearcher.java | 10 ++++------ 2 files changed, 4 insertions(+), 13 deletions(-) diff --git a/src/main/java/mekanism/common/content/entangloporter/InventoryFrequency.java b/src/main/java/mekanism/common/content/entangloporter/InventoryFrequency.java index 4a09b5344..1d98fa17a 100644 --- a/src/main/java/mekanism/common/content/entangloporter/InventoryFrequency.java +++ b/src/main/java/mekanism/common/content/entangloporter/InventoryFrequency.java @@ -152,11 +152,4 @@ public class InventoryFrequency extends Frequency temperature = dataStream.readDouble(); } - - public static enum TransferType - { - RECEIVE, - SEND, - BOTH; - } } diff --git a/src/main/java/mekanism/common/content/transporter/StackSearcher.java b/src/main/java/mekanism/common/content/transporter/StackSearcher.java index 3a0e684e4..3ed763b85 100644 --- a/src/main/java/mekanism/common/content/transporter/StackSearcher.java +++ b/src/main/java/mekanism/common/content/transporter/StackSearcher.java @@ -18,13 +18,14 @@ public class StackSearcher { theInventory = InventoryUtils.checkChestInv(inventory); side = direction; + if(!(theInventory instanceof ISidedInventory)) { i = inventory.getSizeInventory(); - } - else - { + } + else { slots = ((ISidedInventory)theInventory).getAccessibleSlotsFromSide(side.getOpposite().ordinal()); + if(slots != null) { i = slots.length; @@ -148,7 +149,4 @@ public class StackSearcher return null; } - - - } From 38a68541c4c12e3fab8e0a3a41af7ce8329c8985 Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Wed, 16 Mar 2016 21:41:55 -0400 Subject: [PATCH 49/52] Tiered Bins, better tier management! --- .../render/item/ItemRenderingHandler.java | 13 +- src/main/java/mekanism/common/Mekanism.java | 21 +- src/main/java/mekanism/common/Tier.java | 521 ++++++++---------- .../mekanism/common/block/BlockBasic.java | 35 +- .../common/inventory/InventoryBin.java | 21 +- .../mekanism/common/item/ItemBlockBasic.java | 5 +- .../mekanism/common/tile/TileEntityBin.java | 23 +- .../mekanism/common/util/MekanismUtils.java | 14 + .../mekanism/common/util/RecipeUtils.java | 72 +++ .../resources/assets/mekanism/lang/en_US.lang | 7 +- .../textures/blocks/BinAdvancedFront.png | Bin 0 -> 1762 bytes .../textures/blocks/BinAdvancedFrontOn.png | Bin 0 -> 1765 bytes .../textures/blocks/BinAdvancedSide.png | Bin 0 -> 1834 bytes .../textures/blocks/BinAdvancedTop.png | Bin 0 -> 1770 bytes .../textures/blocks/BinAdvancedTopOn.png | Bin 0 -> 1777 bytes .../textures/blocks/BinBasicFront.png | Bin 0 -> 1776 bytes .../textures/blocks/BinBasicFrontOn.png | Bin 0 -> 1777 bytes .../mekanism/textures/blocks/BinBasicSide.png | Bin 0 -> 1847 bytes .../mekanism/textures/blocks/BinBasicTop.png | Bin 0 -> 1783 bytes .../textures/blocks/BinBasicTopOn.png | Bin 0 -> 1786 bytes .../textures/blocks/BinEliteFront.png | Bin 0 -> 1767 bytes .../textures/blocks/BinEliteFrontOn.png | Bin 0 -> 1767 bytes .../mekanism/textures/blocks/BinEliteSide.png | Bin 0 -> 1836 bytes .../mekanism/textures/blocks/BinEliteTop.png | Bin 0 -> 1765 bytes .../textures/blocks/BinEliteTopOn.png | Bin 0 -> 1772 bytes .../mekanism/textures/blocks/BinFront.png | Bin 1770 -> 0 bytes .../mekanism/textures/blocks/BinFrontOn.png | Bin 1772 -> 0 bytes .../mekanism/textures/blocks/BinSide.png | Bin 1856 -> 0 bytes .../mekanism/textures/blocks/BinTop.png | Bin 1785 -> 0 bytes .../mekanism/textures/blocks/BinTopOn.png | Bin 1792 -> 0 bytes .../textures/blocks/BinUltimateFront.png | Bin 0 -> 1779 bytes .../textures/blocks/BinUltimateFrontOn.png | Bin 0 -> 1783 bytes .../textures/blocks/BinUltimateSide.png | Bin 0 -> 1849 bytes .../textures/blocks/BinUltimateTop.png | Bin 0 -> 1772 bytes .../textures/blocks/BinUltimateTopOn.png | Bin 0 -> 1790 bytes 35 files changed, 409 insertions(+), 323 deletions(-) create mode 100644 src/main/resources/assets/mekanism/textures/blocks/BinAdvancedFront.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/BinAdvancedFrontOn.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/BinAdvancedSide.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/BinAdvancedTop.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/BinAdvancedTopOn.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/BinBasicFront.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/BinBasicFrontOn.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/BinBasicSide.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/BinBasicTop.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/BinBasicTopOn.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/BinEliteFront.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/BinEliteFrontOn.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/BinEliteSide.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/BinEliteTop.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/BinEliteTopOn.png delete mode 100644 src/main/resources/assets/mekanism/textures/blocks/BinFront.png delete mode 100644 src/main/resources/assets/mekanism/textures/blocks/BinFrontOn.png delete mode 100644 src/main/resources/assets/mekanism/textures/blocks/BinSide.png delete mode 100644 src/main/resources/assets/mekanism/textures/blocks/BinTop.png delete mode 100644 src/main/resources/assets/mekanism/textures/blocks/BinTopOn.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/BinUltimateFront.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/BinUltimateFrontOn.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/BinUltimateSide.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/BinUltimateTop.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/BinUltimateTopOn.png diff --git a/src/main/java/mekanism/client/render/item/ItemRenderingHandler.java b/src/main/java/mekanism/client/render/item/ItemRenderingHandler.java index f5bb19c39..04dac937a 100644 --- a/src/main/java/mekanism/client/render/item/ItemRenderingHandler.java +++ b/src/main/java/mekanism/client/render/item/ItemRenderingHandler.java @@ -28,6 +28,7 @@ import mekanism.common.Tier.BaseTier; import mekanism.common.Tier.EnergyCubeTier; import mekanism.common.Tier.FluidTankTier; import mekanism.common.base.IEnergyCube; +import mekanism.common.block.BlockBasic.BasicType; import mekanism.common.block.BlockMachine.MachineType; import mekanism.common.inventory.InventoryBin; import mekanism.common.item.ItemAtomicDisassembler; @@ -162,18 +163,16 @@ public class ItemRenderingHandler implements IItemRenderer GL11.glPopMatrix(); } - else if(Block.getBlockFromItem(item.getItem()) == MekanismBlocks.BasicBlock2 && item.getItemDamage() == 3) + else if(BasicType.get(item) == BasicType.INDUCTION_CELL || BasicType.get(item) == BasicType.INDUCTION_PROVIDER) { MekanismRenderer.renderCustomItem((RenderBlocks)data[0], item); } - else if(Block.getBlockFromItem(item.getItem()) == MekanismBlocks.BasicBlock2 && item.getItemDamage() == 4) + else if(BasicType.get(item) == BasicType.BIN) { + GL11.glRotatef(270, 0.0F, 1.0F, 0.0F); MekanismRenderer.renderCustomItem((RenderBlocks)data[0], item); - } - else if(Block.getBlockFromItem(item.getItem()) == MekanismBlocks.BasicBlock && item.getItemDamage() == 6) - { - RenderingRegistry.instance().renderInventoryBlock((RenderBlocks)data[0], MekanismBlocks.BasicBlock, item.getItemDamage(), ClientProxy.BASIC_RENDER_ID); - + GL11.glRotatef(-270, 0.0F, 1.0F, 0.0F); + if(binRenderer == null || binRenderer.func_147498_b()/*getFontRenderer()*/ == null) { return; diff --git a/src/main/java/mekanism/common/Mekanism.java b/src/main/java/mekanism/common/Mekanism.java index 2bdbb49bb..da863a21e 100644 --- a/src/main/java/mekanism/common/Mekanism.java +++ b/src/main/java/mekanism/common/Mekanism.java @@ -32,6 +32,7 @@ import mekanism.client.ClientTickHandler; import mekanism.common.EnergyNetwork.EnergyTransferEvent; import mekanism.common.FluidNetwork.FluidTransferEvent; import mekanism.common.Tier.BaseTier; +import mekanism.common.Tier.BinTier; import mekanism.common.Tier.EnergyCubeTier; import mekanism.common.Tier.FactoryTier; import mekanism.common.Tier.FluidTankTier; @@ -375,9 +376,6 @@ public class Mekanism MachineType.LOGISTICAL_SORTER.addRecipe(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.MachineBlock, 1, 15), new Object[] { "IPI", "ICI", "III", Character.valueOf('I'), "ingotIron", Character.valueOf('P'), Blocks.piston, Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.BASIC) })); - CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.BasicBlock, 1, 6), new Object[] { - "SSS", "SCS", "SSS", Character.valueOf('S'), Blocks.cobblestone, Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.BASIC) - })); MachineType.DIGITAL_MINER.addRecipe(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.MachineBlock, 1, 4), new Object[] { "ACA", "SES", "TIT", Character.valueOf('A'), MekanismItems.AtomicAlloy, Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.BASIC), Character.valueOf('S'), new ItemStack(MekanismBlocks.MachineBlock, 1, 15), Character.valueOf('E'), MekanismItems.Robit.getUnchargedItem(), Character.valueOf('I'), new ItemStack(MekanismBlocks.BasicBlock, 1, 8), Character.valueOf('T'), MekanismItems.TeleportationCore @@ -568,6 +566,20 @@ public class Mekanism "AIA", "ITI", "AIA", Character.valueOf('I'), "ingotIron", Character.valueOf('A'), "alloyUltimate", Character.valueOf('T'), MekanismUtils.getEmptyFluidTank(FluidTankTier.ELITE) })); + //Bin recipes + CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(MekanismUtils.getBin(BinTier.BASIC), new Object[] { + "SCS", "A A", "SSS", Character.valueOf('S'), Blocks.cobblestone, Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.BASIC), Character.valueOf('A'), "alloyBasic" + })); + CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(MekanismUtils.getBin(BinTier.ADVANCED), new Object[] { + "SCS", "ABA", "SSS", Character.valueOf('S'), Blocks.cobblestone, Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.ADVANCED), Character.valueOf('A'), "alloyAdvanced", Character.valueOf('B'), MekanismUtils.getBin(BinTier.BASIC) + })); + CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(MekanismUtils.getBin(BinTier.ELITE), new Object[] { + "SCS", "ABA", "SSS", Character.valueOf('S'), Blocks.cobblestone, Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.ELITE), Character.valueOf('A'), "alloyElite", Character.valueOf('B'), MekanismUtils.getBin(BinTier.ADVANCED) + })); + CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(MekanismUtils.getBin(BinTier.ULTIMATE), new Object[] { + "SCS", "ABA", "SSS", Character.valueOf('S'), Blocks.cobblestone, Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.ULTIMATE), Character.valueOf('A'), "alloyUltimate", Character.valueOf('B'), MekanismUtils.getBin(BinTier.ELITE) + })); + //Induction Cell recipes CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(MekanismUtils.getInductionCell(InductionCellTier.BASIC), new Object[] { "LTL", "TET", "LTL", Character.valueOf('T'), MekanismItems.EnergyTablet.getUnchargedItem(), Character.valueOf('E'), MekanismUtils.getEnergyCube(EnergyCubeTier.BASIC), Character.valueOf('L'), "dustLithium" @@ -1188,6 +1200,9 @@ public class Mekanism @EventHandler public void preInit(FMLPreInitializationEvent event) { + //Register tier information + Tier.init(); + File config = event.getSuggestedConfigurationFile(); //Set the mod's configuration diff --git a/src/main/java/mekanism/common/Tier.java b/src/main/java/mekanism/common/Tier.java index c3a3fd104..49416a7b5 100644 --- a/src/main/java/mekanism/common/Tier.java +++ b/src/main/java/mekanism/common/Tier.java @@ -1,6 +1,10 @@ package mekanism.common; import io.netty.buffer.ByteBuf; + +import java.util.ArrayList; +import java.util.List; + import mekanism.api.EnumColor; import mekanism.common.multipart.TransmitterType; import mekanism.common.util.LangUtils; @@ -14,6 +18,10 @@ import codechicken.lib.colour.ColourRGBA; */ public final class Tier { + private static List tierTypes = new ArrayList(); + + private static boolean initiated = false; + /** The default tiers used in Mekanism. * @author aidancbrady */ @@ -55,12 +63,7 @@ public final class Tier } } - /** - * The tiers used by the Energy Cube and their corresponding values. - * @author aidancbrady - * - */ - public static enum EnergyCubeTier + public static enum EnergyCubeTier implements ITier { BASIC(2000000, 800), ADVANCED(8000000, 3200), @@ -73,6 +76,12 @@ public final class Tier public double output; private double baseOutput; + + private EnergyCubeTier(double max, double out) + { + baseMaxEnergy = maxEnergy = max; + baseOutput = output = out; + } public static EnergyCubeTier getFromName(String tierName) { @@ -87,7 +96,8 @@ public final class Tier return BASIC; } - protected void loadConfig() + @Override + public void loadConfig() { if(this != CREATIVE) { @@ -96,7 +106,8 @@ public final class Tier } } - protected void readConfig(ByteBuf dataStream) + @Override + public void readConfig(ByteBuf dataStream) { if(this != CREATIVE) { @@ -105,7 +116,8 @@ public final class Tier } } - protected void writeConfig(ByteBuf dataStream) + @Override + public void writeConfig(ByteBuf dataStream) { if(this != CREATIVE) { @@ -114,19 +126,14 @@ public final class Tier } } + @Override public BaseTier getBaseTier() { return BaseTier.values()[ordinal()]; } - - private EnergyCubeTier(double max, double out) - { - baseMaxEnergy = maxEnergy = max; - baseOutput = output = out; - } } - public static enum InductionCellTier + public static enum InductionCellTier implements ITier { BASIC(1E9D), ADVANCED(8E9D), @@ -136,33 +143,37 @@ public final class Tier public double maxEnergy; private double baseMaxEnergy; + private InductionCellTier(double max) + { + baseMaxEnergy = maxEnergy = max; + } + + @Override public BaseTier getBaseTier() { return BaseTier.values()[ordinal()]; } - protected void loadConfig() + @Override + public void loadConfig() { maxEnergy = Mekanism.configuration.get("tier", getBaseTier().getName() + "InductionCellMaxEnergy", baseMaxEnergy).getDouble(); } - protected void readConfig(ByteBuf dataStream) + @Override + public void readConfig(ByteBuf dataStream) { maxEnergy = dataStream.readDouble(); } - protected void writeConfig(ByteBuf dataStream) + @Override + public void writeConfig(ByteBuf dataStream) { dataStream.writeDouble(maxEnergy); } - - private InductionCellTier(double max) - { - baseMaxEnergy = maxEnergy = max; - } } - public static enum InductionProviderTier + public static enum InductionProviderTier implements ITier { BASIC(64000), ADVANCED(512000), @@ -172,37 +183,36 @@ public final class Tier public double output; private double baseOutput; + private InductionProviderTier(double out) + { + baseOutput = output = out; + } + + @Override public BaseTier getBaseTier() { return BaseTier.values()[ordinal()]; } - protected void loadConfig() + @Override + public void loadConfig() { output = Mekanism.configuration.get("tier", getBaseTier().getName() + "InductionProviderOutput", baseOutput).getDouble(); } - protected void readConfig(ByteBuf dataStream) + @Override + public void readConfig(ByteBuf dataStream) { output = dataStream.readDouble(); } - protected void writeConfig(ByteBuf dataStream) + @Override + public void writeConfig(ByteBuf dataStream) { dataStream.writeDouble(output); } - - private InductionProviderTier(double out) - { - baseOutput = output = out; - } } - /** - * The tiers used by the Factory and their corresponding values. - * @author aidancbrady - * - */ public static enum FactoryTier { BASIC(3, new ResourceLocation("mekanism", "gui/factory/GuiBasicFactory.png")), @@ -238,22 +248,12 @@ public final class Tier } } - /** - * The tiers used by Universal Cables and their corresponding values. - * @author aidancbrady - * - */ - public static enum CableTier + public static enum CableTier implements ITier { BASIC(3200, TransmitterType.UNIVERSAL_CABLE_BASIC), ADVANCED(12800, TransmitterType.UNIVERSAL_CABLE_ADVANCED), ELITE(64000, TransmitterType.UNIVERSAL_CABLE_ELITE), ULTIMATE(320000, TransmitterType.UNIVERSAL_CABLE_ULTIMATE); - - public BaseTier getBaseTier() - { - return BaseTier.values()[ordinal()]; - } public int cableCapacity; private int baseCapacity; @@ -267,17 +267,26 @@ public final class Tier type = transmitterType; } - protected void loadConfig() + @Override + public BaseTier getBaseTier() + { + return BaseTier.values()[ordinal()]; + } + + @Override + public void loadConfig() { cableCapacity = Mekanism.configuration.get("tier", getBaseTier().getName() + "CableCapacity", baseCapacity).getInt(); } - - protected void readConfig(ByteBuf dataStream) + + @Override + public void readConfig(ByteBuf dataStream) { cableCapacity = dataStream.readInt(); } - - protected void writeConfig(ByteBuf dataStream) + + @Override + public void writeConfig(ByteBuf dataStream) { dataStream.writeInt(cableCapacity); } @@ -296,22 +305,12 @@ public final class Tier } } - /** - * The tiers used by Mechanical Pipes and their corresponding values. - * @author unpairedbracket - * - */ - public static enum PipeTier + public static enum PipeTier implements ITier { BASIC(1000, 100, TransmitterType.MECHANICAL_PIPE_BASIC), ADVANCED(4000, 400, TransmitterType.MECHANICAL_PIPE_ADVANCED), ELITE(16000, 1600, TransmitterType.MECHANICAL_PIPE_ELITE), ULTIMATE(64000, 6400, TransmitterType.MECHANICAL_PIPE_ULTIMATE); - - public BaseTier getBaseTier() - { - return BaseTier.values()[ordinal()]; - } public int pipeCapacity; private int baseCapacity; @@ -328,20 +327,29 @@ public final class Tier type = transmitterType; } - - protected void loadConfig() + + @Override + public BaseTier getBaseTier() + { + return BaseTier.values()[ordinal()]; + } + + @Override + public void loadConfig() { pipeCapacity = Mekanism.configuration.get("tier", getBaseTier().getName() + "PipeCapacity", baseCapacity).getInt(); pipePullAmount = Mekanism.configuration.get("tier", getBaseTier().getName() + "PipePullAmount", basePull).getInt(); } - - protected void readConfig(ByteBuf dataStream) + + @Override + public void readConfig(ByteBuf dataStream) { pipeCapacity = dataStream.readInt(); pipePullAmount = dataStream.readInt(); } - - protected void writeConfig(ByteBuf dataStream) + + @Override + public void writeConfig(ByteBuf dataStream) { dataStream.writeInt(pipeCapacity); dataStream.writeInt(pipePullAmount); @@ -360,23 +368,13 @@ public final class Tier return BASIC; } } - - /** - * The tiers used by Pressurized Tubes and their corresponding values. - * @author AidanBrady - * - */ - public static enum TubeTier + + public static enum TubeTier implements ITier { BASIC(256, 64, TransmitterType.PRESSURIZED_TUBE_BASIC), ADVANCED(1024, 256, TransmitterType.PRESSURIZED_TUBE_ADVANCED), ELITE(4096, 1024, TransmitterType.PRESSURIZED_TUBE_ELITE), ULTIMATE(16384, 4096, TransmitterType.PRESSURIZED_TUBE_ULTIMATE); - - public BaseTier getBaseTier() - { - return BaseTier.values()[ordinal()]; - } public int tubeCapacity; private int baseCapacity; @@ -393,20 +391,29 @@ public final class Tier type = transmitterType; } - - protected void loadConfig() + + @Override + public BaseTier getBaseTier() + { + return BaseTier.values()[ordinal()]; + } + + @Override + public void loadConfig() { tubeCapacity = Mekanism.configuration.get("tier", getBaseTier().getName() + "TubeCapacity", baseCapacity).getInt(); tubePullAmount = Mekanism.configuration.get("tier", getBaseTier().getName() + "TubePullAmount", basePull).getInt(); } - - protected void readConfig(ByteBuf dataStream) + + @Override + public void readConfig(ByteBuf dataStream) { tubeCapacity = dataStream.readInt(); tubePullAmount = dataStream.readInt(); } - - protected void writeConfig(ByteBuf dataStream) + + @Override + public void writeConfig(ByteBuf dataStream) { dataStream.writeInt(tubeCapacity); dataStream.writeInt(tubePullAmount); @@ -426,22 +433,12 @@ public final class Tier } } - /** - * The tiers used by Logistical Transporters and their corresponding values. - * @author AidanBrady - * - */ - public static enum TransporterTier + public static enum TransporterTier implements ITier { BASIC(1, 5, TransmitterType.LOGISTICAL_TRANSPORTER_BASIC), ADVANCED(16, 10, TransmitterType.LOGISTICAL_TRANSPORTER_ADVANCED), ELITE(32, 20, TransmitterType.LOGISTICAL_TRANSPORTER_ELITE), ULTIMATE(64, 50, TransmitterType.LOGISTICAL_TRANSPORTER_ULTIMATE); - - public BaseTier getBaseTier() - { - return BaseTier.values()[ordinal()]; - } public int pullAmount; private int basePull; @@ -458,20 +455,29 @@ public final class Tier type = transmitterType; } - - protected void loadConfig() + + @Override + public BaseTier getBaseTier() + { + return BaseTier.values()[ordinal()]; + } + + @Override + public void loadConfig() { pullAmount = Mekanism.configuration.get("tier", getBaseTier().getName() + "TransporterPullAmount", basePull).getInt(); speed = Mekanism.configuration.get("tier", getBaseTier().getName() + "TransporterSpeed", baseSpeed).getInt(); } - - protected void readConfig(ByteBuf dataStream) + + @Override + public void readConfig(ByteBuf dataStream) { pullAmount = dataStream.readInt(); speed = dataStream.readInt(); } - - protected void writeConfig(ByteBuf dataStream) + + @Override + public void writeConfig(ByteBuf dataStream) { dataStream.writeInt(pullAmount); dataStream.writeInt(speed); @@ -491,17 +497,12 @@ public final class Tier } } - public static enum ConductorTier + public static enum ConductorTier implements ITier { BASIC(5, 1, 10, new ColourRGBA(0.2, 0.2, 0.2, 1), TransmitterType.THERMODYNAMIC_CONDUCTOR_BASIC), ADVANCED(5, 1, 400, new ColourRGBA(0.2, 0.2, 0.2, 1), TransmitterType.THERMODYNAMIC_CONDUCTOR_ADVANCED), ELITE(5, 1, 8000, new ColourRGBA(0.2, 0.2, 0.2, 1), TransmitterType.THERMODYNAMIC_CONDUCTOR_ELITE), ULTIMATE(5, 1, 100000, new ColourRGBA(0.2, 0.2, 0.2, 1), TransmitterType.THERMODYNAMIC_CONDUCTOR_ULTIMATE); - - public BaseTier getBaseTier() - { - return BaseTier.values()[ordinal()]; - } public double inverseConduction; private double baseConduction; @@ -526,22 +527,31 @@ public final class Tier type = transmitterType; } - - protected void loadConfig() + + @Override + public BaseTier getBaseTier() + { + return BaseTier.values()[ordinal()]; + } + + @Override + public void loadConfig() { inverseConduction = Mekanism.configuration.get("tier", getBaseTier().getName() + "ConductorInverseConduction", baseConduction).getDouble(); inverseHeatCapacity = Mekanism.configuration.get("tier", getBaseTier().getName() + "ConductorHeatCapacity", baseHeatCapacity).getDouble(); inverseConductionInsulation = Mekanism.configuration.get("tier", getBaseTier().getName() + "ConductorConductionInsulation", baseConductionInsulation).getDouble(); } - - protected void readConfig(ByteBuf dataStream) + + @Override + public void readConfig(ByteBuf dataStream) { inverseConduction = dataStream.readDouble(); inverseHeatCapacity = dataStream.readDouble(); inverseConductionInsulation = dataStream.readDouble(); } - - protected void writeConfig(ByteBuf dataStream) + + @Override + public void writeConfig(ByteBuf dataStream) { dataStream.writeDouble(inverseConduction); dataStream.writeDouble(inverseHeatCapacity); @@ -562,17 +572,12 @@ public final class Tier } } - public static enum FluidTankTier + public static enum FluidTankTier implements ITier { BASIC(14000, 400), ADVANCED(28000, 800), ELITE(56000, 1600), ULTIMATE(112000, 3200); - - public BaseTier getBaseTier() - { - return BaseTier.values()[ordinal()]; - } public int storage; private int baseStorage; @@ -586,41 +591,40 @@ public final class Tier baseOutput = output = o; } - protected void loadConfig() + @Override + public BaseTier getBaseTier() + { + return BaseTier.values()[ordinal()]; + } + + @Override + public void loadConfig() { storage = Mekanism.configuration.get("tier", getBaseTier().getName() + "FluidTankStorage", baseStorage).getInt(); output = Mekanism.configuration.get("tier", getBaseTier().getName() + "FluidTankOutput", baseOutput).getInt(); } - - protected void readConfig(ByteBuf dataStream) + + @Override + public void readConfig(ByteBuf dataStream) { storage = dataStream.readInt(); output = dataStream.readInt(); } - - protected void writeConfig(ByteBuf dataStream) + + @Override + public void writeConfig(ByteBuf dataStream) { dataStream.writeInt(storage); dataStream.writeInt(output); } } - /** - * The tiers used by Logistical Transporters and their corresponding values. - * @author AidanBrady - * - */ - public static enum GasTankTier + public static enum GasTankTier implements ITier { BASIC(64000, 256), ADVANCED(128000, 512), ELITE(256000, 1028), ULTIMATE(512000, 2056); - - public BaseTier getBaseTier() - { - return BaseTier.values()[ordinal()]; - } public int storage; private int baseStorage; @@ -634,73 +638,105 @@ public final class Tier baseOutput = output = o; } - protected void loadConfig() + @Override + public BaseTier getBaseTier() + { + return BaseTier.values()[ordinal()]; + } + + @Override + public void loadConfig() { storage = Mekanism.configuration.get("tier", getBaseTier().getName() + "GasTankStorage", baseStorage).getInt(); output = Mekanism.configuration.get("tier", getBaseTier().getName() + "GasTankOutput", baseOutput).getInt(); } - - protected void readConfig(ByteBuf dataStream) + + @Override + public void readConfig(ByteBuf dataStream) { storage = dataStream.readInt(); output = dataStream.readInt(); } - protected void writeConfig(ByteBuf dataStream) + @Override + public void writeConfig(ByteBuf dataStream) { dataStream.writeInt(storage); dataStream.writeInt(output); } } + public static enum BinTier implements ITier + { + BASIC(4096), + ADVANCED(8192), + ELITE(32768), + ULTIMATE(262144); + + public int storage; + private int baseStorage; + + private BinTier(int s) + { + baseStorage = storage = s; + } + + @Override + public BaseTier getBaseTier() + { + return BaseTier.values()[ordinal()]; + } + + @Override + public void loadConfig() + { + storage = Mekanism.configuration.get("tier", getBaseTier().getName() + "BinStorage", baseStorage).getInt(); + } + + @Override + public void readConfig(ByteBuf dataStream) + { + storage = dataStream.readInt(); + } + + @Override + public void writeConfig(ByteBuf dataStream) + { + dataStream.writeInt(storage); + } + } + + public static void init() + { + if(initiated) + { + return; + } + + for(Class c : Tier.class.getDeclaredClasses()) + { + if(c.isEnum()) + { + try { + for(Object obj : c.getEnumConstants()) + { + if(obj instanceof ITier) + { + tierTypes.add((ITier)obj); + } + } + } catch (Exception e) { + e.printStackTrace(); + } + } + } + + initiated = true; + } + public static void loadConfig() { - for(CableTier tier : CableTier.values()) - { - tier.loadConfig(); - } - - for(InductionCellTier tier : InductionCellTier.values()) - { - tier.loadConfig(); - } - - for(InductionProviderTier tier : InductionProviderTier.values()) - { - tier.loadConfig(); - } - - for(EnergyCubeTier tier : EnergyCubeTier.values()) - { - tier.loadConfig(); - } - - for(PipeTier tier : PipeTier.values()) - { - tier.loadConfig(); - } - - for(TubeTier tier : TubeTier.values()) - { - tier.loadConfig(); - } - - for(TransporterTier tier : TransporterTier.values()) - { - tier.loadConfig(); - } - - for(ConductorTier tier : ConductorTier.values()) - { - tier.loadConfig(); - } - - for(FluidTankTier tier : FluidTankTier.values()) - { - tier.loadConfig(); - } - - for(GasTankTier tier : GasTankTier.values()) + for(ITier tier : tierTypes) { tier.loadConfig(); } @@ -708,52 +744,7 @@ public final class Tier public static void readConfig(ByteBuf dataStream) { - for(CableTier tier : CableTier.values()) - { - tier.readConfig(dataStream); - } - - for(InductionCellTier tier : InductionCellTier.values()) - { - tier.readConfig(dataStream); - } - - for(InductionProviderTier tier : InductionProviderTier.values()) - { - tier.readConfig(dataStream); - } - - for(EnergyCubeTier tier : EnergyCubeTier.values()) - { - tier.readConfig(dataStream); - } - - for(PipeTier tier : PipeTier.values()) - { - tier.readConfig(dataStream); - } - - for(TubeTier tier : TubeTier.values()) - { - tier.readConfig(dataStream); - } - - for(TransporterTier tier : TransporterTier.values()) - { - tier.readConfig(dataStream); - } - - for(ConductorTier tier : ConductorTier.values()) - { - tier.readConfig(dataStream); - } - - for(FluidTankTier tier : FluidTankTier.values()) - { - tier.readConfig(dataStream); - } - - for(GasTankTier tier : GasTankTier.values()) + for(ITier tier : tierTypes) { tier.readConfig(dataStream); } @@ -761,54 +752,20 @@ public final class Tier public static void writeConfig(ByteBuf dataStream) { - for(CableTier tier : CableTier.values()) - { - tier.writeConfig(dataStream); - } - - for(InductionCellTier tier : InductionCellTier.values()) - { - tier.writeConfig(dataStream); - } - - for(InductionProviderTier tier : InductionProviderTier.values()) - { - tier.writeConfig(dataStream); - } - - for(EnergyCubeTier tier : EnergyCubeTier.values()) - { - tier.writeConfig(dataStream); - } - - for(PipeTier tier : PipeTier.values()) - { - tier.writeConfig(dataStream); - } - - for(TubeTier tier : TubeTier.values()) - { - tier.writeConfig(dataStream); - } - - for(TransporterTier tier : TransporterTier.values()) - { - tier.writeConfig(dataStream); - } - - for(ConductorTier tier : ConductorTier.values()) - { - tier.writeConfig(dataStream); - } - - for(FluidTankTier tier : FluidTankTier.values()) - { - tier.writeConfig(dataStream); - } - - for(GasTankTier tier : GasTankTier.values()) + for(ITier tier : tierTypes) { tier.writeConfig(dataStream); } } + + public static interface ITier + { + public BaseTier getBaseTier(); + + public void loadConfig(); + + public void readConfig(ByteBuf dataStream); + + public void writeConfig(ByteBuf dataStream); + } } diff --git a/src/main/java/mekanism/common/block/BlockBasic.java b/src/main/java/mekanism/common/block/BlockBasic.java index 803160c55..eec036bd8 100644 --- a/src/main/java/mekanism/common/block/BlockBasic.java +++ b/src/main/java/mekanism/common/block/BlockBasic.java @@ -17,6 +17,7 @@ import mekanism.common.Tier.BaseTier; import mekanism.common.base.IActiveState; import mekanism.common.base.IBlockCTM; import mekanism.common.base.IBoundingBlock; +import mekanism.common.base.ITierItem; import mekanism.common.content.tank.TankUpdateProtocol; import mekanism.common.inventory.InventoryBin; import mekanism.common.item.ItemBlockBasic; @@ -99,6 +100,7 @@ import cpw.mods.fml.relauncher.SideOnly; public class BlockBasic extends Block implements IBlockCTM, ICustomBlockIcon { public IIcon[][] icons = new IIcon[16][16]; + public IIcon[][] binIcons = new IIcon[16][16]; public CTMData[][] ctms = new CTMData[16][4]; @@ -118,11 +120,15 @@ public class BlockBasic extends Block implements IBlockCTM, ICustomBlockIcon @Override public IIcon getIcon(ItemStack stack, int side) { - if(getBlockFromItem(stack.getItem()) == MekanismBlocks.BasicBlock2 && stack.getItemDamage() == 3) + if(BasicType.get(stack) == BasicType.BIN) + { + return binIcons[((ItemBlockBasic)stack.getItem()).getBaseTier(stack).ordinal()][side]; + } + else if(BasicType.get(stack) == BasicType.INDUCTION_CELL) { return icons[3][((ItemBlockBasic)stack.getItem()).getBaseTier(stack).ordinal()]; } - else if(getBlockFromItem(stack.getItem()) == MekanismBlocks.BasicBlock2 && stack.getItemDamage() == 4) + else if(BasicType.get(stack) == BasicType.INDUCTION_PROVIDER) { return icons[4][((ItemBlockBasic)stack.getItem()).getBaseTier(stack).ordinal()]; } @@ -176,9 +182,16 @@ public class BlockBasic extends Block implements IBlockCTM, ICustomBlockIcon icons[3][0] = register.registerIcon("mekanism:CoalBlock"); icons[4][0] = register.registerIcon("mekanism:RefinedGlowstone"); icons[5][0] = register.registerIcon("mekanism:SteelBlock"); + icons[6][0] = register.registerIcon(ICON_BASE); - MekanismRenderer.loadDynamicTextures(register, "Bin", icons[6], DefIcon.getActivePair(register.registerIcon("mekanism:BinSide"), 3, 4, 5), - new DefIcon(register.registerIcon("mekanism:BinTop"), 0), new DefIcon(register.registerIcon("mekanism:BinTopOn"), 6)); + MekanismRenderer.loadDynamicTextures(register, "BinBasic", binIcons[0], DefIcon.getActivePair(register.registerIcon("mekanism:BinBasicSide"), 3, 4, 5), + new DefIcon(register.registerIcon("mekanism:BinBasicTop"), 0), new DefIcon(register.registerIcon("mekanism:BinBasicTopOn"), 6)); + MekanismRenderer.loadDynamicTextures(register, "BinAdvanced", binIcons[1], DefIcon.getActivePair(register.registerIcon("mekanism:BinAdvancedSide"), 3, 4, 5), + new DefIcon(register.registerIcon("mekanism:BinAdvancedTop"), 0), new DefIcon(register.registerIcon("mekanism:BinAdvancedTopOn"), 6)); + MekanismRenderer.loadDynamicTextures(register, "BinElite", binIcons[2], DefIcon.getActivePair(register.registerIcon("mekanism:BinEliteSide"), 3, 4, 5), + new DefIcon(register.registerIcon("mekanism:BinEliteTop"), 0), new DefIcon(register.registerIcon("mekanism:BinEliteTopOn"), 6)); + MekanismRenderer.loadDynamicTextures(register, "BinUltimate", binIcons[3], DefIcon.getActivePair(register.registerIcon("mekanism:BinUltimateSide"), 3, 4, 5), + new DefIcon(register.registerIcon("mekanism:BinUltimateTop"), 0), new DefIcon(register.registerIcon("mekanism:BinUltimateTopOn"), 6)); icons[7][0] = ctms[7][0].mainTextureData.icon; icons[8][0] = register.registerIcon("mekanism:SteelCasing"); @@ -243,10 +256,10 @@ public class BlockBasic extends Block implements IBlockCTM, ICustomBlockIcon switch(meta) { case 6: - TileEntityBasicBlock tileEntity = (TileEntityBasicBlock)world.getTileEntity(x, y, z); + TileEntityBin tileEntity = (TileEntityBin)world.getTileEntity(x, y, z); boolean active = MekanismUtils.isActive(world, x, y, z); - return icons[meta][MekanismUtils.getBaseOrientation(side, tileEntity.facing)+(active ? 6 : 0)]; + return binIcons[tileEntity.tier.ordinal()][MekanismUtils.getBaseOrientation(side, tileEntity.facing)+(active ? 6 : 0)]; case 14: TileEntityThermalEvaporationController tileEntity1 = (TileEntityThermalEvaporationController)world.getTileEntity(x, y, z); @@ -289,8 +302,6 @@ public class BlockBasic extends Block implements IBlockCTM, ICustomBlockIcon case BASIC_BLOCK_1: switch(meta) { - case 6: - return icons[meta][side]; case 14: if(side == 2) { @@ -327,6 +338,7 @@ public class BlockBasic extends Block implements IBlockCTM, ICustomBlockIcon { case INDUCTION_CELL: case INDUCTION_PROVIDER: + case BIN: for(BaseTier tier : BaseTier.values()) { if(tier.isObtainable()) @@ -492,7 +504,7 @@ public class BlockBasic extends Block implements IBlockCTM, ICustomBlockIcon return true; } - if(bin.getItemCount() < bin.MAX_STORAGE) + if(bin.getItemCount() < bin.tier.storage) { if(bin.addTicks == 0 && entityplayer.getCurrentEquippedItem() != null) { @@ -509,7 +521,7 @@ public class BlockBasic extends Block implements IBlockCTM, ICustomBlockIcon for(int i = 0; i < inv.length; i++) { - if(bin.getItemCount() == bin.MAX_STORAGE) + if(bin.getItemCount() == bin.tier.storage) { break; } @@ -821,8 +833,9 @@ public class BlockBasic extends Block implements IBlockCTM, ICustomBlockIcon TileEntityBin tileEntity = (TileEntityBin)world.getTileEntity(x, y, z); InventoryBin inv = new InventoryBin(ret); + ((ITierItem)ret.getItem()).setBaseTier(ret, tileEntity.tier.getBaseTier()); inv.setItemCount(tileEntity.getItemCount()); - + if(tileEntity.getItemCount() > 0) { inv.setItemType(tileEntity.itemType); diff --git a/src/main/java/mekanism/common/inventory/InventoryBin.java b/src/main/java/mekanism/common/inventory/InventoryBin.java index 1ce4c1e39..a843aad30 100644 --- a/src/main/java/mekanism/common/inventory/InventoryBin.java +++ b/src/main/java/mekanism/common/inventory/InventoryBin.java @@ -1,14 +1,14 @@ package mekanism.common.inventory; import mekanism.api.util.StackUtils; -import mekanism.common.item.ItemBlockBasic; +import mekanism.common.Tier.BinTier; +import mekanism.common.base.ITierItem; +import mekanism.common.block.BlockBasic.BasicType; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; public class InventoryBin { - public final int MAX_STORAGE = 4096; - public ItemStack bin; public InventoryBin(ItemStack stack) @@ -44,23 +44,23 @@ public class InventoryBin public ItemStack add(ItemStack stack) { - if(isValid(stack) && getItemCount() != MAX_STORAGE) + if(isValid(stack) && getItemCount() != getMaxStorage()) { if(getItemType() == null) { setItemType(stack); } - if(getItemCount() + stack.stackSize <= MAX_STORAGE) + if(getItemCount() + stack.stackSize <= getMaxStorage()) { setItemCount(getItemCount() + stack.stackSize); return null; } else { ItemStack rejects = getItemType().copy(); - rejects.stackSize = (getItemCount()+stack.stackSize) - MAX_STORAGE; + rejects.stackSize = (getItemCount()+stack.stackSize) - getMaxStorage(); - setItemCount(MAX_STORAGE); + setItemCount(getMaxStorage()); return rejects; } @@ -76,7 +76,7 @@ public class InventoryBin return false; } - if(stack.getItem() instanceof ItemBlockBasic && stack.getItemDamage() == 6) + if(BasicType.get(stack) == BasicType.BIN) { return false; } @@ -93,6 +93,11 @@ public class InventoryBin return true; } + + public int getMaxStorage() + { + return BinTier.values()[((ITierItem)bin.getItem()).getBaseTier(bin).ordinal()].storage; + } public int getItemCount() { diff --git a/src/main/java/mekanism/common/item/ItemBlockBasic.java b/src/main/java/mekanism/common/item/ItemBlockBasic.java index 09359d002..283b6dd4a 100644 --- a/src/main/java/mekanism/common/item/ItemBlockBasic.java +++ b/src/main/java/mekanism/common/item/ItemBlockBasic.java @@ -13,6 +13,7 @@ import mekanism.client.MekanismKeyHandler; import mekanism.common.Mekanism; import mekanism.common.MekanismBlocks; import mekanism.common.Tier.BaseTier; +import mekanism.common.Tier.BinTier; import mekanism.common.Tier.InductionCellTier; import mekanism.common.Tier.InductionProviderTier; import mekanism.common.base.ITierItem; @@ -240,6 +241,8 @@ public class ItemBlockBasic extends ItemBlock implements IEnergizedItem, ITierIt { TileEntityBin tileEntity = (TileEntityBin)world.getTileEntity(x, y, z); InventoryBin inv = new InventoryBin(stack); + + tileEntity.tier = BinTier.values()[getBaseTier(stack).ordinal()]; if(inv.getItemType() != null) { @@ -289,7 +292,7 @@ public class ItemBlockBasic extends ItemBlock implements IEnergizedItem, ITierIt { String name = getUnlocalizedName() + "." + BasicType.get(itemstack).name; - if(type == BasicType.INDUCTION_CELL || type == BasicType.INDUCTION_PROVIDER) + if(type == BasicType.BIN || type == BasicType.INDUCTION_CELL || type == BasicType.INDUCTION_PROVIDER) { name += getBaseTier(itemstack).getName(); } diff --git a/src/main/java/mekanism/common/tile/TileEntityBin.java b/src/main/java/mekanism/common/tile/TileEntityBin.java index 938731d09..135b9228e 100644 --- a/src/main/java/mekanism/common/tile/TileEntityBin.java +++ b/src/main/java/mekanism/common/tile/TileEntityBin.java @@ -10,6 +10,7 @@ import mekanism.api.Range4D; import mekanism.api.util.StackUtils; import mekanism.common.Mekanism; import mekanism.common.PacketHandler; +import mekanism.common.Tier.BinTier; import mekanism.common.base.IActiveState; import mekanism.common.base.ILogisticalTransporter; import mekanism.common.base.ITransporterTile; @@ -44,8 +45,8 @@ public class TileEntityBin extends TileEntityBasicBlock implements ISidedInvento public int delayTicks; public int cacheCount; - - public final int MAX_STORAGE = 4096; + + public BinTier tier = BinTier.BASIC; public ItemStack itemType; @@ -69,7 +70,7 @@ public class TileEntityBin extends TileEntityBasicBlock implements ISidedInvento } int count = getItemCount(); - int remain = MAX_STORAGE-count; + int remain = tier.storage-count; if(remain >= itemType.getMaxStackSize()) { @@ -117,23 +118,23 @@ public class TileEntityBin extends TileEntityBasicBlock implements ISidedInvento public ItemStack add(ItemStack stack) { - if(isValid(stack) && getItemCount() != MAX_STORAGE) + if(isValid(stack) && getItemCount() != tier.storage) { if(itemType == null) { setItemType(stack); } - if(getItemCount() + stack.stackSize <= MAX_STORAGE) + if(getItemCount() + stack.stackSize <= tier.storage) { setItemCount(getItemCount() + stack.stackSize); return null; } else { ItemStack rejects = itemType.copy(); - rejects.stackSize = (getItemCount()+stack.stackSize) - MAX_STORAGE; + rejects.stackSize = (getItemCount()+stack.stackSize) - tier.storage; - setItemCount(MAX_STORAGE); + setItemCount(tier.storage); return rejects; } @@ -226,6 +227,7 @@ public class TileEntityBin extends TileEntityBasicBlock implements ISidedInvento nbtTags.setBoolean("isActive", isActive); nbtTags.setInteger("itemCount", cacheCount); + nbtTags.setInteger("tier", tier.ordinal()); if(bottomStack != null) { @@ -250,6 +252,7 @@ public class TileEntityBin extends TileEntityBasicBlock implements ISidedInvento isActive = nbtTags.getBoolean("isActive"); cacheCount = nbtTags.getInteger("itemCount"); + tier = BinTier.values()[nbtTags.getInteger("tier")]; bottomStack = ItemStack.loadItemStackFromNBT(nbtTags.getCompoundTag("bottomStack")); topStack = ItemStack.loadItemStackFromNBT(nbtTags.getCompoundTag("topStack")); @@ -267,6 +270,7 @@ public class TileEntityBin extends TileEntityBasicBlock implements ISidedInvento data.add(isActive); data.add(getItemCount()); + data.add(tier.ordinal()); if(getItemCount() > 0) { @@ -283,6 +287,7 @@ public class TileEntityBin extends TileEntityBasicBlock implements ISidedInvento isActive = dataStream.readBoolean(); clientAmount = dataStream.readInt(); + tier = BinTier.values()[dataStream.readInt()]; if(clientAmount > 0) { @@ -424,7 +429,7 @@ public class TileEntityBin extends TileEntityBasicBlock implements ISidedInvento @Override public String getInventoryName() { - return LangUtils.localize("tile.BasicBlock.Bin.name"); + return LangUtils.localize(getBlockType().getUnlocalizedName() + ".Bin" + tier.getBaseTier().getName() + ".name"); } @Override @@ -558,7 +563,7 @@ public class TileEntityBin extends TileEntityBasicBlock implements ISidedInvento @Override public int getMaxStoredCount() { - return MAX_STORAGE; + return tier.storage; } @Override diff --git a/src/main/java/mekanism/common/util/MekanismUtils.java b/src/main/java/mekanism/common/util/MekanismUtils.java index 0ddea9d88..3a659b18b 100644 --- a/src/main/java/mekanism/common/util/MekanismUtils.java +++ b/src/main/java/mekanism/common/util/MekanismUtils.java @@ -32,6 +32,7 @@ import mekanism.common.MekanismBlocks; import mekanism.common.MekanismItems; import mekanism.common.OreDictCache; import mekanism.common.Tier.BaseTier; +import mekanism.common.Tier.BinTier; import mekanism.common.Tier.EnergyCubeTier; import mekanism.common.Tier.FactoryTier; import mekanism.common.Tier.FluidTankTier; @@ -367,6 +368,19 @@ public final class MekanismUtils { return ((ItemBlockBasic)new ItemStack(MekanismBlocks.BasicBlock2, 1, 4).getItem()).getUnchargedProvider(tier); } + + /** + * Retrieves an Bin with a defined tier. + * @param tier - tier to add to the Bin + * @return Bin with defined tier + */ + public static ItemStack getBin(BinTier tier) + { + ItemStack ret = new ItemStack(MekanismBlocks.BasicBlock, 1, 6); + ((ItemBlockBasic)ret.getItem()).setBaseTier(ret, tier.getBaseTier()); + + return ret; + } /** * Retrieves an empty Gas Tank. diff --git a/src/main/java/mekanism/common/util/RecipeUtils.java b/src/main/java/mekanism/common/util/RecipeUtils.java index c73b8c3e4..4f3e5c857 100644 --- a/src/main/java/mekanism/common/util/RecipeUtils.java +++ b/src/main/java/mekanism/common/util/RecipeUtils.java @@ -14,7 +14,9 @@ import mekanism.common.Upgrade; import mekanism.common.base.IEnergyCube; import mekanism.common.base.IFactory; import mekanism.common.base.ITierItem; +import mekanism.common.block.BlockBasic.BasicType; import mekanism.common.block.BlockMachine.MachineType; +import mekanism.common.inventory.InventoryBin; import mekanism.common.recipe.ShapedMekanismRecipe; import mekanism.common.recipe.ShapelessMekanismRecipe; import net.minecraft.block.Block; @@ -25,6 +27,8 @@ import net.minecraft.item.crafting.CraftingManager; import net.minecraft.item.crafting.IRecipe; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.IFluidContainerItem; import net.minecraftforge.oredict.OreDictionary; public class RecipeUtils @@ -169,6 +173,74 @@ public class RecipeUtils ((IGasItem)toReturn.getItem()).setGas(toReturn, gasFound); } } + + if(toReturn.getItem() instanceof IFluidContainerItem) + { + FluidStack fluidFound = null; + + for(int i = 0; i < 9; i++) + { + ItemStack itemstack = inv.getStackInSlot(i); + + if(itemstack != null && itemstack.getItem() instanceof IFluidContainerItem) + { + FluidStack stored = ((IFluidContainerItem)itemstack.getItem()).getFluid(itemstack); + + if(stored != null) + { + if(((IFluidContainerItem)toReturn.getItem()).fill(toReturn, stored, false) == 0) + { + return null; + } + + if(fluidFound == null) + { + fluidFound = stored; + } + else { + if(fluidFound.getFluid() != stored.getFluid()) + { + return null; + } + + fluidFound.amount += stored.amount; + } + } + } + } + + if(fluidFound != null) + { + fluidFound.amount = Math.min(((IFluidContainerItem)toReturn.getItem()).getCapacity(toReturn), fluidFound.amount); + ((IFluidContainerItem)toReturn.getItem()).fill(toReturn, fluidFound, true); + } + } + + if(BasicType.get(toReturn) == BasicType.BIN) + { + int foundCount = 0; + ItemStack foundType = null; + + for(int i = 0; i < 9; i++) + { + ItemStack itemstack = inv.getStackInSlot(i); + + if(BasicType.get(itemstack) == BasicType.BIN) + { + InventoryBin binInv = new InventoryBin(itemstack); + + foundCount = binInv.getItemCount(); + foundType = binInv.getItemType(); + } + } + + if(foundCount > 0 && foundType != null) + { + InventoryBin binInv = new InventoryBin(toReturn); + binInv.setItemCount(foundCount); + binInv.setItemType(foundType); + } + } if(MachineType.get(toReturn) != null && MachineType.get(toReturn).supportsUpgrades) { diff --git a/src/main/resources/assets/mekanism/lang/en_US.lang b/src/main/resources/assets/mekanism/lang/en_US.lang index 59ed5d2db..f9066ecfb 100644 --- a/src/main/resources/assets/mekanism/lang/en_US.lang +++ b/src/main/resources/assets/mekanism/lang/en_US.lang @@ -84,7 +84,10 @@ tile.BasicBlock.RefinedObsidian.name=Refined Obsidian tile.BasicBlock.CharcoalBlock.name=Charcoal Block tile.BasicBlock.RefinedGlowstone.name=Refined Glowstone tile.BasicBlock.SteelBlock.name=Steel Block -tile.BasicBlock.Bin.name=Bin +tile.BasicBlock.BinBasic.name=Basic Bin +tile.BasicBlock.BinAdvanced.name=Advanced Bin +tile.BasicBlock.BinElite.name=Elite Bin +tile.BasicBlock.BinUltimate.name=Ultimate Bin tile.BasicBlock.TeleporterFrame.name=Teleporter Frame tile.BasicBlock.SteelCasing.name=Steel Casing tile.BasicBlock.DynamicTank.name=Dynamic Tank @@ -806,7 +809,7 @@ tooltip.SolarNeutronActivator=A machine that directs the neutron radiation of th tooltip.Oredictionificator=A machine used to unify and translate between various items and blocks using the Ore Dictionary. tooltip.Factory=A machine that serves as an upgrade to regular machinery, allowing for multiple processing operations to occur at once. tooltip.ResistiveHeater=A condensed, coiled resistor capable of converting electrical energy directly into heat energy. -tooltip.FormulaicAssemblicator=A machine that uses energy to rapidly craft items and blocks from Recipe Formulas. Doubles as an advanced crafting bench. +tooltip.FormulaicAssemblicator=A machine that uses energy to rapidly craft items and blocks from Crafting Formulas. Doubles as an advanced crafting bench. tooltip.HeatGenerator=A generator that uses the heat of lava or other burnable resources to produce energy. tooltip.SolarGenerator=A generator that uses the power of the sun to produce energy. diff --git a/src/main/resources/assets/mekanism/textures/blocks/BinAdvancedFront.png b/src/main/resources/assets/mekanism/textures/blocks/BinAdvancedFront.png new file mode 100644 index 0000000000000000000000000000000000000000..1d37f514ce7c5e9b9c7a94799a5b4400948071ef GIT binary patch literal 1762 zcmV<81|9i{P)4Tx062|}Rb6NtRTMtEb7vzY&QokOg>Hg1+lHrgWS zWcKdPn90sKGrRqvPeo9CG3uKX#J{(IASm?@+di}}l?o-=)F3E6wD^Ni=!>T7nL9I? zX}YoAW$t|Qo$sD|?zw001?ah|SeB6#0T!CBEf+H4bBB+JJu8rehoBb*p;u8ID_yBf z0ya+zcePvJL&AGs+11_tpRKn>9TgyPA7ZoSs0)aX0r00)%XR^J`jH<$>RKN5V(7Oq zK*TS4xZz{h!*f1C3ECFkK$#7nA@pGN!$;%jYvwjAKwmYb0gKL(K8 z-kPtb5${A?tlI~wzMrJ6wTdBr=Y%%%EaEMQ&o}4FQ^DA)s*}Z>!FI&AHCpoWI|RUq zx?7s@$8!5^Q=anY%X@i5{QA6kNcMelpE>R6eCYFpmMsVTrI(b06~u#xf1yS} z_UGdMvD``!0~u->P=lA4?YN`hilQ|3tHka)7T{2CGqw zjZfMwx$5irQN_*|e4l)UHmiYuz74Yp1t^#>hrJ3-SOXDcC_o0^7T9R1gAN8V6s;5) zieI5-7aQlmJn}lUna#nz!j%5V$X|o`xX!dHWQRV27P1=rj;t2bW$~+pTw@bIek?Zv zKPDL<64`^#UNTAck#RBsB6*5DP4<%UA_FqU$I>2EH_cM;u)Q~SI+rg`Rn{L_AC5qq~L$#SMj%U z$6Cz0vP{G5Y*=%5RT^yu;}-DInZ=349rJPVM6C3K^oO)8y(fJr{l>k`ead~!ea?NsT>_Ci%bnxC;Vy6=b6>{xYV#Ue-+LB$ z7`JEXmTRm^AtP)R9u{)KHsMiWGV&)32xCG~*nyU<>-!d;FP=Re4r3qYr~6#KE>;1F z`>_J_P5xC?ROxV(DIHdCO*p$HRQI@7^PwV@Pvuf+5K}u-6REM(K@W$s zrgorh0{i?O)v0c>QtHxU-hBdD(>iYJ4b2sIOVX2K8m~4gmYVA5h^QEb$V`rCQ-|7Z zS{nuL-t>?3n=-o(6I(7vocj#GzCZEo`!3>+v;dYIfPu#&ZWzzX2i^rZ^Mu;6+rb@? zNPG+6)c5T6zxpzGe*M(x+{AON=PiJ>H#?ob-|uwRK0yDg0B4PV0id6JRZw95ZvX%S zkV!;AR9FesS4)dpF%-_#>jNEp))pT{5fxlpHx6_oxGRHX9C7*ltnGjv*%?lc9;-U5d^{eX)DtzD-73(o?DcwR;PH5F#(>FWVos+M zc8Li(9jfmEQLooyWWit%Nb+;kLHW#tGq7APp-rc2wZC`NXJD~dU}TSj0Wcg61BnR; zS0?=S>vp@aQmIscANDrYXFwEpCz0-GK@hH-@6+ad-Ti()Dv0szLmRUC4AA+fUD|H% zM#gvUt%6RcW7TR^#=zUVyO+U$v;@Q9knza98js`?ZoxvM(O{Fw1d-c4v@H$b79Cw; zLnOa#u~^VP5C{OtM_gi5*@oLrBoZht6biuL{$^C40h%eDhQaq0`=D2`viux56bi9&xhzvHl}eCb zj5pM9Z^$F}hU5_sha8K=4#oe<^V?4uqR}Yhk^i80{O2j~`FzTDSIMXB3G_Fdr9Yt) z`oYlKjrPE?pHb`8|BQ$Mx(SJE`sE%&(xdnNtNk7S0R+w*jsTI%bN~PV07*qoM6N<$ Ef=In>82|tP literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/mekanism/textures/blocks/BinAdvancedFrontOn.png b/src/main/resources/assets/mekanism/textures/blocks/BinAdvancedFrontOn.png new file mode 100644 index 0000000000000000000000000000000000000000..a776eab8b29aa84411599653e444d44334c2cbf7 GIT binary patch literal 1765 zcmV4Tx062|}Rb6NtRTMtEb7vzY&QokOg>Hg1+lHrgWS zWcKdPn90sKGrRqvPeo9CG3uKX#J{(IASm?@+di}}l?o-=)F3E6wD^Ni=!>T7nL9I? zX}YoAW$t|Qo$sD|?zw001?ah|SeB6#0T!CBEf+H4bBB+JJu8rehoBb*p;u8ID_yBf z0ya+zcePvJL&AGs+11_tpRKn>9TgyPA7ZoSs0)aX0r00)%XR^J`jH<$>RKN5V(7Oq zK*TS4xZz{h!*f1C3ECFkK$#7nA@pGN!$;%jYvwjAKwmYb0gKL(K8 z-kPtb5${A?tlI~wzMrJ6wTdBr=Y%%%EaEMQ&o}4FQ^DA)s*}Z>!FI&AHCpoWI|RUq zx?7s@$8!5^Q=anY%X@i5{QA6kNcMelpE>R6eCYFpmMsVTrI(b06~u#xf1yS} z_UGdMvD``!0~u->P=lA4?YN`hilQ|3tHka)7T{2CGqw zjZfMwx$5irQN_*|e4l)UHmiYuz74Yp1t^#>hrJ3-SOXDcC_o0^7T9R1gAN8V6s;5) zieI5-7aQlmJn}lUna#nz!j%5V$X|o`xX!dHWQRV27P1=rj;t2bW$~+pTw@bIek?Zv zKPDL<64`^#UNTAck#RBsB6*5DP4<%UA_FqU$I>2EH_cM;u)Q~SI+rg`Rn{L_AC5qq~L$#SMj%U z$6Cz0vP{G5Y*=%5RT^yu;}-DInZ=349rJPVM6C3K^oO)8y(fJr{l>k`ead~!ea?NsT>_Ci%bnxC;Vy6=b6>{xYV#Ue-+LB$ z7`JEXmTRm^AtP)R9u{)KHsMiWGV&)32xCG~*nyU<>-!d;FP=Re4r3qYr~6#KE>;1F z`>_J_P5xC?ROxV(DIHdCO*p$HRQI@7^PwV@Pvuf+5K}u-6REM(K@W$s zrgorh0{i?O)v0c>QtHxU-hBdD(>iYJ4b2sIOVX2K8m~4gmYVA5h^QEb$V`rCQ-|7Z zS{nuL-t>?3n=-o(6I(7vocj#GzCZEo`!3>+v;dYIfPu#&ZWzzX2i^rZ^Mu;6+rb@? zNPG+6)c5T6zxpzGe*M(x+{AON=PiJ>H#?ob-|uwRK0yDg0B4PV0id6JRZw95ZvX%S zlSxEDR9FesSIvrAF%-_#>km5kJ5Ets6j8xNSB@JC-3abVrOzOA*JaD1l65;D>--i7S>-Cz06gC?a zvtvk#%jFVTv)K$JeX>XOtJMniMxzl(^%_VjCL;Cy`_o5chr=PzU@!oCy&lkJvjM$c zFOZU7%_g!gmkX%XYJoK4>2wO2?Aq;i$Zx*?0IJS_@a6gy7Q6fY9Yz!mhk@;Oo7HMH z)X1fZsE4$q;8hAV&#TYP| zOw8$Y!Y(mEr$hBUAnNscj4Tic07-s~Iw+r+a0V8O1+?jOEqC{h`V7qHbByf1-v@?5 zAs{gU;lhO9ew|JSR?6iv@OEcYeFj8vdlKo676jqK`95sU*WKsyp@JCS+_fO9&j6i& z+NG`5c4U0#Diw4(9jjC-2MpX?T|Ey5q$L;(28>7U)p#VIpacu`dYz5OV?=Iu-?lUW zB|3VF4Uzn|#bQBwzuyleAMq5U@;2OdJRV1JKA#5$b~mH?4A4yJH1u~jBE4*s@(I;y z6*HH6!;|lUR4OI0Nyn3@oJ=ODo6TmD4$siQN#Egc9MsE&2i`E3%N^(>lS!7zWTdie zHY?>H%cRq3Rwxt>)DnpV4Tx062|}Rb6NtRTMtEb7vzY&QokOg>Hg1+lHrgWS zWcKdPn90sKGrRqvPeo9CG3uKX#J{(IASm?@+di}}l?o-=)F3E6wD^Ni=!>T7nL9I? zX}YoAW$t|Qo$sD|?zw001?ah|SeB6#0T!CBEf+H4bBB+JJu8rehoBb*p;u8ID_yBf z0ya+zcePvJL&AGs+11_tpRKn>9TgyPA7ZoSs0)aX0r00)%XR^J`jH<$>RKN5V(7Oq zK*TS4xZz{h!*f1C3ECFkK$#7nA@pGN!$;%jYvwjAKwmYb0gKL(K8 z-kPtb5${A?tlI~wzMrJ6wTdBr=Y%%%EaEMQ&o}4FQ^DA)s*}Z>!FI&AHCpoWI|RUq zx?7s@$8!5^Q=anY%X@i5{QA6kNcMelpE>R6eCYFpmMsVTrI(b06~u#xf1yS} z_UGdMvD``!0~u->P=lA4?YN`hilQ|3tHka)7T{2CGqw zjZfMwx$5irQN_*|e4l)UHmiYuz74Yp1t^#>hrJ3-SOXDcC_o0^7T9R1gAN8V6s;5) zieI5-7aQlmJn}lUna#nz!j%5V$X|o`xX!dHWQRV27P1=rj;t2bW$~+pTw@bIek?Zv zKPDL<64`^#UNTAck#RBsB6*5DP4<%UA_FqU$I>2EH_cM;u)Q~SI+rg`Rn{L_AC5qq~L$#SMj%U z$6Cz0vP{G5Y*=%5RT^yu;}-DInZ=349rJPVM6C3K^oO)8y(fJr{l>k`ead~!ea?NsT>_Ci%bnxC;Vy6=b6>{xYV#Ue-+LB$ z7`JEXmTRm^AtP)R9u{)KHsMiWGV&)32xCG~*nyU<>-!d;FP=Re4r3qYr~6#KE>;1F z`>_J_P5xC?ROxV(DIHdCO*p$HRQI@7^PwV@Pvuf+5K}u-6REM(K@W$s zrgorh0{i?O)v0c>QtHxU-hBdD(>iYJ4b2sIOVX2K8m~4gmYVA5h^QEb$V`rCQ-|7Z zS{nuL-t>?3n=-o(6I(7vocj#GzCZEo`!3>+v;dYIfPu#&ZWzzX2i^rZ^Mu;6+rb@? zNPG+6)c5T6zxpzGe*M(x+{AON=PiJ>H#?ob-|uwRK0yDg0B4PV0id6JRZw95ZvX%S z*hxe|R9Fe+m&;CCQ5c0qPziWJ&=REtMZA!J6C^PtJVTQ{Oy7+OlO~-sR)P^lArK-$ zkgFPnfKt0SUsDH;4@nv9b=KbdZ2tSdkLBCvzh5@kH;g#Vq}N;7MP!(mt?_UPzdk!dg9N|&%(8}HQ~d2si3zf6WYit=Eif1iBw?dg6YlQr3b911)e^_2XhNPJ92{t!p=O+e zrc}O4rJ^mFOh$NQykNcsY_>@;L{f{zf-*wt1kt{-vZ8sifmk3$i1u!`t9@7^5D184 z@o~N&ZoUP`e|%dgOeAwS9FmZzCd#jj+D|1UR&u$V_7fYSP)HohX0uswEbwV@QQUkB zNQ}3kUa#vh5{U@W*z5I*pPZZs=jP^whlhtkEO&o@FHYCvJTzvVo-+RVOZ&~Y06wFl zZEbB$Br|%%_4TzlK99%a;`w}Dh_9*bWC__r79dk!KGPk!D{>wc_M4Tx062|}Rb6NtRTMtEb7vzY&QokOg>Hg1+lHrgWS zWcKdPn90sKGrRqvPeo9CG3uKX#J{(IASm?@+di}}l?o-=)F3E6wD^Ni=!>T7nL9I? zX}YoAW$t|Qo$sD|?zw001?ah|SeB6#0T!CBEf+H4bBB+JJu8rehoBb*p;u8ID_yBf z0ya+zcePvJL&AGs+11_tpRKn>9TgyPA7ZoSs0)aX0r00)%XR^J`jH<$>RKN5V(7Oq zK*TS4xZz{h!*f1C3ECFkK$#7nA@pGN!$;%jYvwjAKwmYb0gKL(K8 z-kPtb5${A?tlI~wzMrJ6wTdBr=Y%%%EaEMQ&o}4FQ^DA)s*}Z>!FI&AHCpoWI|RUq zx?7s@$8!5^Q=anY%X@i5{QA6kNcMelpE>R6eCYFpmMsVTrI(b06~u#xf1yS} z_UGdMvD``!0~u->P=lA4?YN`hilQ|3tHka)7T{2CGqw zjZfMwx$5irQN_*|e4l)UHmiYuz74Yp1t^#>hrJ3-SOXDcC_o0^7T9R1gAN8V6s;5) zieI5-7aQlmJn}lUna#nz!j%5V$X|o`xX!dHWQRV27P1=rj;t2bW$~+pTw@bIek?Zv zKPDL<64`^#UNTAck#RBsB6*5DP4<%UA_FqU$I>2EH_cM;u)Q~SI+rg`Rn{L_AC5qq~L$#SMj%U z$6Cz0vP{G5Y*=%5RT^yu;}-DInZ=349rJPVM6C3K^oO)8y(fJr{l>k`ead~!ea?NsT>_Ci%bnxC;Vy6=b6>{xYV#Ue-+LB$ z7`JEXmTRm^AtP)R9u{)KHsMiWGV&)32xCG~*nyU<>-!d;FP=Re4r3qYr~6#KE>;1F z`>_J_P5xC?ROxV(DIHdCO*p$HRQI@7^PwV@Pvuf+5K}u-6REM(K@W$s zrgorh0{i?O)v0c>QtHxU-hBdD(>iYJ4b2sIOVX2K8m~4gmYVA5h^QEb$V`rCQ-|7Z zS{nuL-t>?3n=-o(6I(7vocj#GzCZEo`!3>+v;dYIfPu#&ZWzzX2i^rZ^Mu;6+rb@? zNPG+6)c5T6zxpzGe*M(x+{AON=PiJ>H#?ob-|uwRK0yDg0B4PV0id6JRZw95ZvX%S zm`OxIR9Fe+mr0A7K@f(=UEFZN;1Y2|LC})}ir^uTdmw)#xBM_~Uc3b2ArM7zi71LY zqX;U9;+FXOy~8MoI&=62;-R0eUdrnFx~sY+-#@zd5C49<-R^+r-+qtghfCzZ&1QqD zR;vX$p8D9o-EPsZR;xkwOCgC^$ob#PuU}A|OeUa8r2_l?K4>%=L8sFRvS`(6s9LR7 zP$rXsT=8PDfK0t6lL@lx$4^jv4=k5USi+SCgF(oRMg!!EBasMX7NgM!RlD5|j>ls# z8jXVM^%`uoS|{z*Y85i~iufLoN{=>hS9ZHySm-BftE@nk}GSvubbc8?RH}#J-+`_hb+Dac>cLd>-D2$8ja?@rCu1V zP$y=rpugE{g7io-nS{*SF;~uc)WbXG`^knp z?|j=a4)7(zZ+!kT;(4wKFQfT<4i8WtBkZM@ky&^nioORV|NZOuFST7T1Xt6?FaQ7m M07*qoM6N<$g3K^+I{*Lx literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/mekanism/textures/blocks/BinAdvancedTopOn.png b/src/main/resources/assets/mekanism/textures/blocks/BinAdvancedTopOn.png new file mode 100644 index 0000000000000000000000000000000000000000..3cd450e728c20b2e78ec825d9fc210061208d2b6 GIT binary patch literal 1777 zcmV4Tx062|}Rb6NtRTMtEb7vzY&QokOg>Hg1+lHrgWS zWcKdPn90sKGrRqvPeo9CG3uKX#J{(IASm?@+di}}l?o-=)F3E6wD^Ni=!>T7nL9I? zX}YoAW$t|Qo$sD|?zw001?ah|SeB6#0T!CBEf+H4bBB+JJu8rehoBb*p;u8ID_yBf z0ya+zcePvJL&AGs+11_tpRKn>9TgyPA7ZoSs0)aX0r00)%XR^J`jH<$>RKN5V(7Oq zK*TS4xZz{h!*f1C3ECFkK$#7nA@pGN!$;%jYvwjAKwmYb0gKL(K8 z-kPtb5${A?tlI~wzMrJ6wTdBr=Y%%%EaEMQ&o}4FQ^DA)s*}Z>!FI&AHCpoWI|RUq zx?7s@$8!5^Q=anY%X@i5{QA6kNcMelpE>R6eCYFpmMsVTrI(b06~u#xf1yS} z_UGdMvD``!0~u->P=lA4?YN`hilQ|3tHka)7T{2CGqw zjZfMwx$5irQN_*|e4l)UHmiYuz74Yp1t^#>hrJ3-SOXDcC_o0^7T9R1gAN8V6s;5) zieI5-7aQlmJn}lUna#nz!j%5V$X|o`xX!dHWQRV27P1=rj;t2bW$~+pTw@bIek?Zv zKPDL<64`^#UNTAck#RBsB6*5DP4<%UA_FqU$I>2EH_cM;u)Q~SI+rg`Rn{L_AC5qq~L$#SMj%U z$6Cz0vP{G5Y*=%5RT^yu;}-DInZ=349rJPVM6C3K^oO)8y(fJr{l>k`ead~!ea?NsT>_Ci%bnxC;Vy6=b6>{xYV#Ue-+LB$ z7`JEXmTRm^AtP)R9u{)KHsMiWGV&)32xCG~*nyU<>-!d;FP=Re4r3qYr~6#KE>;1F z`>_J_P5xC?ROxV(DIHdCO*p$HRQI@7^PwV@Pvuf+5K}u-6REM(K@W$s zrgorh0{i?O)v0c>QtHxU-hBdD(>iYJ4b2sIOVX2K8m~4gmYVA5h^QEb$V`rCQ-|7Z zS{nuL-t>?3n=-o(6I(7vocj#GzCZEo`!3>+v;dYIfPu#&ZWzzX2i^rZ^Mu;6+rb@? zNPG+6)c5T6zxpzGe*M(x+{AON=PiJ>H#?ob-|uwRK0yDg0B4PV0id6JRZw95ZvX%S zpGibPR9Fe+m&uA+K@^6)&N$I3hNuxI6a-z_pa?Dk*$46pd4TM)%2T-rxN#H6CM1gD z5K$CoS`kzb#VPUk{!J^i+;lH)L++x!IyK!>r>f4W5y?mXOw|1M>ce|vr_(8@)9Jv$U;y6S+<sb{NO?A!LC$0{Ad_yl%j_AsCmt5g z=W|6Okw6jm1W(si^gH**@L|Wx{Le36FN-9}wvVUfyVh8}UawJqHynbYPza|-w@oA^eQeGdr#{pE+T literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/mekanism/textures/blocks/BinBasicFront.png b/src/main/resources/assets/mekanism/textures/blocks/BinBasicFront.png new file mode 100644 index 0000000000000000000000000000000000000000..19b8520b7df0db69f3d0e8f612c558ce389e3475 GIT binary patch literal 1776 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 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/mekanism/textures/blocks/BinBasicTop.png b/src/main/resources/assets/mekanism/textures/blocks/BinBasicTop.png new file mode 100644 index 0000000000000000000000000000000000000000..dc5a1fffd113cbf39ca4bc5cdade6aa04efb0f31 GIT binary patch literal 1783 zcmV4Tx062|}Rb6NtRTMtEb7vzY&QokOg>Hg1+lHrgWS zWcKdPn90sKGrRqvPeo9CG3uKX#J{(IASm?@+di}}l?o-=)F3E6wD^Ni=!>T7nL9I? zX}YoAW$t|Qo$sD|?zw001?ah|SeB6#0T!CBEf+H4bBB+JJu8rehoBb*p;u8ID_yBf z0ya+zcePvJL&AGs+11_tpRKn>9TgyPA7ZoSs0)aX0r00)%XR^J`jH<$>RKN5V(7Oq zK*TS4xZz{h!*f1C3ECFkK$#7nA@pGN!$;%jYvwjAKwmYb0gKL(K8 z-kPtb5${A?tlI~wzMrJ6wTdBr=Y%%%EaEMQ&o}4FQ^DA)s*}Z>!FI&AHCpoWI|RUq zx?7s@$8!5^Q=anY%X@i5{QA6kNcMelpE>R6eCYFpmMsVTrI(b06~u#xf1yS} z_UGdMvD``!0~u->P=lA4?YN`hilQ|3tHka)7T{2CGqw zjZfMwx$5irQN_*|e4l)UHmiYuz74Yp1t^#>hrJ3-SOXDcC_o0^7T9R1gAN8V6s;5) zieI5-7aQlmJn}lUna#nz!j%5V$X|o`xX!dHWQRV27P1=rj;t2bW$~+pTw@bIek?Zv zKPDL<64`^#UNTAck#RBsB6*5DP4<%UA_FqU$I>2EH_cM;u)Q~SI+rg`Rn{L_AC5qq~L$#SMj%U z$6Cz0vP{G5Y*=%5RT^yu;}-DInZ=349rJPVM6C3K^oO)8y(fJr{l>k`ead~!ea?NsT>_Ci%bnxC;Vy6=b6>{xYV#Ue-+LB$ z7`JEXmTRm^AtP)R9u{)KHsMiWGV&)32xCG~*nyU<>-!d;FP=Re4r3qYr~6#KE>;1F z`>_J_P5xC?ROxV(DIHdCO*p$HRQI@7^PwV@Pvuf+5K}u-6REM(K@W$s zrgorh0{i?O)v0c>QtHxU-hBdD(>iYJ4b2sIOVX2K8m~4gmYVA5h^QEb$V`rCQ-|7Z zS{nuL-t>?3n=-o(6I(7vocj#GzCZEo`!3>+v;dYIfPu#&ZWzzX2i^rZ^Mu;6+rb@? zNPG+6)c5T6zxpzGe*M(x+{AON=PiJ>H#?ob-|uwRK0yDg0B4PV0id6JRZw95ZvX%S zrAb6VR9Fe+SILT6K@{~lfS2p^~cCY@#kBw*IRh}HXAf64j~1X%O$Et zqY+4X>SOmo?6r6f(HXC@!RshQHf!S;ZOFBQrOs}r4z-zS{kTZ@(qu?z1{XVKLmkT%; z41lp%47gY!UpcjR;vXI-EKGV`uZA}&1QjqzaMBen}O|i z8|d+PfW=}FNWB(|1>E6q0O_&v{IiflDPy75YPI-%AP@kOk47W#+uPe6^P0`(4kzKB zAm8G6JXYM?+@Ohjf~RZ!OT?YWWBBjD{dy*o*>5_DUtC-ql~d2>a|m^Rbb+Bz2uM#H z)o?_Bk+0EcKr)xhi4kD|@}B~=TC4&sl_crNoX+d!ntQ!o45Y_Dt-pfH?*X2F?$Z1F zdst>L7|xsO0cnj!gPwdo52Oc7E)%%?9-!g9UJunsBm!g(V5FnmxmYTdFk~AOwjXoK zm&qNt{2pN5X3X~ae8RH7IRfMv1@$Hp31~^BQozM4kuBx-0J9cPL$@m;B5yX&nEcMr zLP6YsUVb*@osGM8XBtl+!C(-h7+)9}PtJy0Lr%$RPp}O`r0|Cj9sqBqZ%@+Ubc)-r z$s{5fZ_T`0#^Z75A>a38I-N%U_wYBM{HI_)8`|x5SjKq3*v+*om&@p{*XuxfB$-Tt z^LEUca~$>Xj`?!3AKt96L^677-0{+jPy3~MwERINdNuo Z_&44(E_Dk_X+Hn}002ovPDHLkV1oR)aH0SJ literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/mekanism/textures/blocks/BinBasicTopOn.png b/src/main/resources/assets/mekanism/textures/blocks/BinBasicTopOn.png new file mode 100644 index 0000000000000000000000000000000000000000..f105955553cb37fe129f1669bce88c5f8603542c GIT binary patch literal 1786 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 JPDHLkV1lBnVR8Tf literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/mekanism/textures/blocks/BinEliteSide.png b/src/main/resources/assets/mekanism/textures/blocks/BinEliteSide.png new file mode 100644 index 0000000000000000000000000000000000000000..5faafe1a9dce792e4c5e9c15a8a74cf585255ce8 GIT binary patch literal 1836 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 M07*qoM6N<$f&->nBLDyZ diff --git a/src/main/resources/assets/mekanism/textures/blocks/BinFrontOn.png b/src/main/resources/assets/mekanism/textures/blocks/BinFrontOn.png deleted file mode 100644 index 4278df44ed05db4c52f224fb86c7f3f30612ec6d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1772 zcmV4Tx05}naRo`#hR1`jmZ&IWdKOk5~hl<6oRa0BJ8yc;~21%2p?MfD<>DVeH z9(p*dx19w`~g7O0}n_%Aq@s%d)fBDv`JHkDym6Hd+5XuAtvnwRpGmK zVkc9?T=n|PIo~X-eVh__(Z?q}P9Z-Dj?gOW6|D%o20XmjW-qs4UjrD(li^iv8@eK9k+ZFm zVRFymFOPAzG5-%Pn|1W;U4vNroTa&AxDScmEA~{ri9gr1^c?U@uwSpaNnw8l_>cP1 zd;)kMQS_;jeRSUEM_*s96y65j1$)tOrwdK{YIQMt92l|D^(E_=$Rjw{b!QT@q!)ni zR`|5oW9X5n$Wv+HVc@|^eX5yXnsHX8PF3UX~a6)MwxDE0HaPjyrlI!;jX{6Kvuh*8ej?;85ekN$?5uuCiS zBTvvVG+XTxAO{m@bvM#Jr)z6J><&E22D|vq?Y?Vkbo_DijopiF$2PET#mZ8eu=y$(ArYkv7@Ex`GL?QCc!_*KFrd&;n1r7 zqW-CFs9&fT)ZaU5gc&=gBz-DaCw(vdOp0__x+47~U6sC(E(JNe@4cTT*n6*E zVH4eoU1-&7pEV~_PRe`a7v+@vy!^5}8?Y3)UmlaER0007mNklEE0R*?MbSH|Uq97tFvk+AL|Hgbn6kT>Vl?AFfbGY7FetK$Xu~c^*=$B8!C(;h_Vxz+j5;_y*>MJr z$0NMy>mply23D&TGMi4Pz;HMWBqm_I*cpvRHX4l(rCzT~qN&dSy%U}#Z-O95GE~Cg zbNKy!gxc@-z)Gb8RG$IbvuRb*9?e&-QcbVdvqqzVaKr#rPt_R^6PV3rj0>-7T&N}} z!9u&;X3OOg!sBw`YmJMTfD#k^OAH;IR4f(?o(}{9K#fMZ+<5GCI*qvHav8W@um8-0 zUd8T1HKZMpPBu!_gl4mezjA zk~n6wSym_%#Ia(rDC(an`Fx(yjz_+kOa?0LJF+Y7*Uu*7qEvenPe)YJyT6~5PQ~}* z&)A_*h}CK}iEFi5mDsWjNId?tq2ZN^3$KP$5#P@li^blXf2H%?@4oTVHy3`>;v)MM zeEaeJ{<)XzNAU!@8^+^tOhPvpIw#N?__{YEVt~#C#5LU$X#C6Gj(-F3(i+GifU~y% O000098^C5 diff --git a/src/main/resources/assets/mekanism/textures/blocks/BinSide.png b/src/main/resources/assets/mekanism/textures/blocks/BinSide.png deleted file mode 100644 index 286ea845de6536b9fdfe3203fbe9f56a3e3f93bf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1856 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 V7}D#4RoMUl002ovPDHLkV1mhFX}tgd literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/mekanism/textures/blocks/BinUltimateFrontOn.png b/src/main/resources/assets/mekanism/textures/blocks/BinUltimateFrontOn.png new file mode 100644 index 0000000000000000000000000000000000000000..1a2584411487f20bb5afa9c0ee6e627d1ecc7c33 GIT binary patch literal 1783 zcmV4Tx062|}Rb6NtRTMtEb7vzY&QokOg>Hg1+lHrgWS zWcKdPn90sKGrRqvPeo9CG3uKX#J{(IASm?@+di}}l?o-=)F3E6wD^Ni=!>T7nL9I? zX}YoAW$t|Qo$sD|?zw001?ah|SeB6#0T!CBEf+H4bBB+JJu8rehoBb*p;u8ID_yBf z0ya+zcePvJL&AGs+11_tpRKn>9TgyPA7ZoSs0)aX0r00)%XR^J`jH<$>RKN5V(7Oq zK*TS4xZz{h!*f1C3ECFkK$#7nA@pGN!$;%jYvwjAKwmYb0gKL(K8 z-kPtb5${A?tlI~wzMrJ6wTdBr=Y%%%EaEMQ&o}4FQ^DA)s*}Z>!FI&AHCpoWI|RUq zx?7s@$8!5^Q=anY%X@i5{QA6kNcMelpE>R6eCYFpmMsVTrI(b06~u#xf1yS} z_UGdMvD``!0~u->P=lA4?YN`hilQ|3tHka)7T{2CGqw zjZfMwx$5irQN_*|e4l)UHmiYuz74Yp1t^#>hrJ3-SOXDcC_o0^7T9R1gAN8V6s;5) zieI5-7aQlmJn}lUna#nz!j%5V$X|o`xX!dHWQRV27P1=rj;t2bW$~+pTw@bIek?Zv zKPDL<64`^#UNTAck#RBsB6*5DP4<%UA_FqU$I>2EH_cM;u)Q~SI+rg`Rn{L_AC5qq~L$#SMj%U z$6Cz0vP{G5Y*=%5RT^yu;}-DInZ=349rJPVM6C3K^oO)8y(fJr{l>k`ead~!ea?NsT>_Ci%bnxC;Vy6=b6>{xYV#Ue-+LB$ z7`JEXmTRm^AtP)R9u{)KHsMiWGV&)32xCG~*nyU<>-!d;FP=Re4r3qYr~6#KE>;1F z`>_J_P5xC?ROxV(DIHdCO*p$HRQI@7^PwV@Pvuf+5K}u-6REM(K@W$s zrgorh0{i?O)v0c>QtHxU-hBdD(>iYJ4b2sIOVX2K8m~4gmYVA5h^QEb$V`rCQ-|7Z zS{nuL-t>?3n=-o(6I(7vocj#GzCZEo`!3>+v;dYIfPu#&ZWzzX2i^rZ^Mu;6+rb@? zNPG+6)c5T6zxpzGe*M(x+{AON=PiJ>H#?ob-|uwRK0yDg0B4PV0id6JRZw95ZvX%S zrAb6VR9FesSIvqVK@e_r{6R%mT|-oeA}SaN1jLKSxOmDza?DxC)A#^+1s_20>Pc@# zQN&dUB5HCFRM3cj+5U!_IFr>iIxwc8`|Ikisj2z8yJ}kZ@$Kh5dn&u#j)PS8dknK< zNQ#@y23?!Y1|)s5NAuh57V{R11xWLHNE$W*y*vDHkM3kL0h-Nb;BYtu-rd~+1AzdL znog&K?!DIpG#Cs(`r^f60eLc+0&OlMaQ;mP)SLm`L--RG+wmR_u~;mIPOsNv&1O>^ zys}Lulg#Jy!AiT`2L5V^j7dvy>>W<0^Vrl`AIabuv)F)*=RHZ zMx#+6F#+MqhDX1CzYi<5S`BDruYua{0YMN?BE@K(PK;1jezfdyzV5+b5M#vn_mLQJ zwP%2KBkj^|w+m1C&Q+@zjYd|l*JTXY?RLnTGaxxI9*-HXUauFGa)KHxv|24To6S(U z-9y`w18ThJ5*q^LZHL2w=R=_okaEN&MwQQS+o@Cv!=+LQxL%79SbGNOODP*tM5I3( zwQ@qE(ZH80v*F4AfowJ_u}R01sGQH|m|HHFk`C{XuT`DU`Ao@YZ|c{Zesc<6E>kvJ6psn4UIvc%(Y#w));@%rp3c=hF-^0}+z zQ}%RpHw=9ckISVuBc4Nep<_r9_Rq~o%>OQz3wpP6Ga?4)T*AGlhHkmXko4&G``_M< Ze*-*)7$%XsM9TmG002ovPDHLkV1lLvatQzc literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/mekanism/textures/blocks/BinUltimateSide.png b/src/main/resources/assets/mekanism/textures/blocks/BinUltimateSide.png new file mode 100644 index 0000000000000000000000000000000000000000..19b58516f820cf8abe762159a6d907eb6ce58add GIT binary patch literal 1849 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 g_Gqa5?_bA10sCbw&2`wTw*UYD07*qoM6N<$f- Date: Thu, 17 Mar 2016 09:28:45 -0400 Subject: [PATCH 50/52] Better Factory energy usage display, added new reactor LUA commands --- src/main/java/mekanism/client/gui/GuiFactory.java | 2 +- .../mekanism/common/tile/TileEntityFactory.java | 7 +++++++ .../reactor/TileEntityReactorLogicAdapter.java | 15 ++++++++++++++- 3 files changed, 22 insertions(+), 2 deletions(-) diff --git a/src/main/java/mekanism/client/gui/GuiFactory.java b/src/main/java/mekanism/client/gui/GuiFactory.java index cde719a3a..09455277f 100644 --- a/src/main/java/mekanism/client/gui/GuiFactory.java +++ b/src/main/java/mekanism/client/gui/GuiFactory.java @@ -56,7 +56,7 @@ public class GuiFactory extends GuiMekanism @Override public List getInfo() { - String multiplier = MekanismUtils.getEnergyDisplay(tileEntity.energyPerTick*tileEntity.tier.processes); + String multiplier = MekanismUtils.getEnergyDisplay(tileEntity.lastUsage); return ListUtils.asList(LangUtils.localize("gui.using") + ": " + multiplier + "/t", LangUtils.localize("gui.needed") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getMaxEnergy()-tileEntity.getEnergy())); } }, this, tileEntity.tier.guiLocation)); diff --git a/src/main/java/mekanism/common/tile/TileEntityFactory.java b/src/main/java/mekanism/common/tile/TileEntityFactory.java index f182bf985..c2325b6fb 100644 --- a/src/main/java/mekanism/common/tile/TileEntityFactory.java +++ b/src/main/java/mekanism/common/tile/TileEntityFactory.java @@ -118,6 +118,8 @@ public class TileEntityFactory extends TileEntityNoisyElectricBlock implements I public boolean sorting; public boolean upgraded; + + public double lastUsage; @SideOnly(Side.CLIENT) public SoundWrapper[] sounds; @@ -332,6 +334,8 @@ public class TileEntityFactory extends TileEntityNoisyElectricBlock implements I else { recipeTicks = 0; } + + double prev = getEnergy(); secondaryEnergyThisTick = recipeType.fuelEnergyUpgrades() ? StatUtils.inversePoisson(secondaryEnergyPerTick) : (int)Math.ceil(secondaryEnergyPerTick); @@ -392,6 +396,7 @@ public class TileEntityFactory extends TileEntityNoisyElectricBlock implements I infuseStored.type = null; } + lastUsage = prev-getEnergy(); prevEnergy = getEnergy(); } } @@ -778,6 +783,7 @@ public class TileEntityFactory extends TileEntityNoisyElectricBlock implements I controlType = RedstoneControl.values()[dataStream.readInt()]; sorting = dataStream.readBoolean(); upgraded = dataStream.readBoolean(); + lastUsage = dataStream.readDouble(); infuseStored.amount = dataStream.readInt(); infuseStored.type = InfuseRegistry.get(PacketHandler.readString(dataStream)); @@ -877,6 +883,7 @@ public class TileEntityFactory extends TileEntityNoisyElectricBlock implements I data.add(controlType.ordinal()); data.add(sorting); data.add(upgraded); + data.add(lastUsage); data.add(infuseStored.amount); if(infuseStored.type != null) diff --git a/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorLogicAdapter.java b/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorLogicAdapter.java index 9052f335c..ec97de5fd 100644 --- a/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorLogicAdapter.java +++ b/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorLogicAdapter.java @@ -133,7 +133,8 @@ public class TileEntityReactorLogicAdapter extends TileEntityReactorBlock implem return data; } - private static final String[] methods = new String[] {"isIgnited", "canIgnite", "getPlasmaHeat", "getMaxPlasmaHeat", "getCaseHeat", "getMaxCaseHeat", "getInjectionRate", "setInjectionRate", "hasFuel", "getProducing"}; + private static final String[] methods = new String[] {"isIgnited", "canIgnite", "getPlasmaHeat", "getMaxPlasmaHeat", "getCaseHeat", "getMaxCaseHeat", "getInjectionRate", "setInjectionRate", "hasFuel", "getProducing", "getIgnitionTemp", + "getEnergy", "getMaxEnergy", "getWater", "getSteam", "getFuel"}; @Override public String[] getMethods() @@ -179,6 +180,18 @@ public class TileEntityReactorLogicAdapter extends TileEntityReactorBlock implem (getReactor().getTritiumTank().getStored() >= getReactor().getInjectionRate()/2)}; case 9: return new Object[] {getReactor().getPassiveGeneration(false, true)}; + case 10: + return new Object[] {getReactor().getIgnitionTemperature(activeCooled)}; + case 11: + return new Object[] {getReactor().getBufferedEnergy()}; + case 12: + return new Object[] {getReactor().getBufferSize()}; + case 13: + return new Object[] {getReactor().getWaterTank().getFluidAmount()}; + case 14: + return new Object[] {getReactor().getSteamTank().getFluidAmount()}; + case 15: + return new Object[] {getReactor().getFuelTank().getStored()}; default: return new Object[] {"Unknown command."}; } From 650b725567f97d236864b98fcc79aac8518b5d7e Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Thu, 17 Mar 2016 14:23:53 -0400 Subject: [PATCH 51/52] Use handy Forge methods for damage display instead of setting item damage in gas/energy/fluid indicators --- .../mekanism/api/energy/IEnergizedItem.java | 6 -- src/main/java/mekanism/api/gas/IGasItem.java | 6 -- .../mekanism/common/item/ItemBlockBasic.java | 6 -- .../common/item/ItemBlockEnergyCube.java | 16 ++--- .../common/item/ItemBlockGasTank.java | 28 +++------ .../common/item/ItemBlockMachine.java | 6 -- .../mekanism/common/item/ItemEnergized.java | 31 +++++----- .../common/item/ItemFlamethrower.java | 28 +++------ .../mekanism/common/item/ItemFreeRunners.java | 23 +++---- .../common/item/ItemGaugeDropper.java | 49 +++++---------- .../mekanism/common/item/ItemJetpack.java | 6 -- .../mekanism/common/item/ItemScubaTank.java | 6 -- .../mekanism/common/util/RecipeUtils.java | 62 ++++++------------- .../common/item/ItemBlockGenerator.java | 6 -- .../generators/common/item/ItemHohlraum.java | 29 +++------ 15 files changed, 95 insertions(+), 213 deletions(-) diff --git a/src/main/java/mekanism/api/energy/IEnergizedItem.java b/src/main/java/mekanism/api/energy/IEnergizedItem.java index b67254597..bcfb5ca29 100644 --- a/src/main/java/mekanism/api/energy/IEnergizedItem.java +++ b/src/main/java/mekanism/api/energy/IEnergizedItem.java @@ -50,10 +50,4 @@ public interface IEnergizedItem * @return if the item can send energy */ public boolean canSend(ItemStack itemStack); - - /** - * Returns whether or not this item contains metadata-specific subtypes instead of using metadata for damage display. - * @return if the item contains metadata-specific subtypes - */ - public boolean isMetadataSpecific(ItemStack itemStack); } diff --git a/src/main/java/mekanism/api/gas/IGasItem.java b/src/main/java/mekanism/api/gas/IGasItem.java index 9c7d33230..04231cd81 100644 --- a/src/main/java/mekanism/api/gas/IGasItem.java +++ b/src/main/java/mekanism/api/gas/IGasItem.java @@ -72,10 +72,4 @@ public interface IGasItem * @return maximum gas */ public int getMaxGas(ItemStack itemstack); - - /** - * Returns whether or not this item contains metadata-specific subtypes instead of using metadata for damage display. - * @return if the item contains metadata-specific subtypes - */ - public boolean isMetadataSpecific(ItemStack itemstack); } diff --git a/src/main/java/mekanism/common/item/ItemBlockBasic.java b/src/main/java/mekanism/common/item/ItemBlockBasic.java index 283b6dd4a..103ed3e1e 100644 --- a/src/main/java/mekanism/common/item/ItemBlockBasic.java +++ b/src/main/java/mekanism/common/item/ItemBlockBasic.java @@ -361,10 +361,4 @@ public class ItemBlockBasic extends ItemBlock implements IEnergizedItem, ITierIt { return false; } - - @Override - public boolean isMetadataSpecific(ItemStack itemStack) - { - return true; - } } diff --git a/src/main/java/mekanism/common/item/ItemBlockEnergyCube.java b/src/main/java/mekanism/common/item/ItemBlockEnergyCube.java index ae1180361..90ed0c961 100644 --- a/src/main/java/mekanism/common/item/ItemBlockEnergyCube.java +++ b/src/main/java/mekanism/common/item/ItemBlockEnergyCube.java @@ -204,10 +204,7 @@ public class ItemBlockEnergyCube extends ItemBlock implements IEnergizedItem, IE return 0; } - double electricityStored = itemStack.stackTagCompound.getDouble("electricity"); - itemStack.setItemDamage((int)Math.max(1, (Math.abs(((electricityStored/getMaxEnergy(itemStack))*100)-100)))); - - return electricityStored; + return itemStack.stackTagCompound.getDouble("electricity"); } @Override @@ -225,7 +222,6 @@ public class ItemBlockEnergyCube extends ItemBlock implements IEnergizedItem, IE double electricityStored = Math.max(Math.min(amount, getMaxEnergy(itemStack)), 0); itemStack.stackTagCompound.setDouble("electricity", electricityStored); - itemStack.setItemDamage((int)Math.max(1, (Math.abs(((electricityStored/getMaxEnergy(itemStack))*100)-100)))); } @Override @@ -303,9 +299,15 @@ public class ItemBlockEnergyCube extends ItemBlock implements IEnergizedItem, IE } @Override - public boolean isMetadataSpecific(ItemStack itemStack) + public boolean showDurabilityBar(ItemStack stack) { - return false; + return true; + } + + @Override + public double getDurabilityForDisplay(ItemStack stack) + { + return 1D-(getEnergy(stack)/getMaxEnergy(stack)); } @Override diff --git a/src/main/java/mekanism/common/item/ItemBlockGasTank.java b/src/main/java/mekanism/common/item/ItemBlockGasTank.java index d67b42e12..12e60416b 100644 --- a/src/main/java/mekanism/common/item/ItemBlockGasTank.java +++ b/src/main/java/mekanism/common/item/ItemBlockGasTank.java @@ -49,8 +49,6 @@ public class ItemBlockGasTank extends ItemBlock implements IGasItem, ISustainedI metaBlock = block; setHasSubtypes(true); setMaxStackSize(1); - setMaxDamage(100); - setNoRepair(); setCreativeTab(Mekanism.tabMekanism); } @@ -125,17 +123,7 @@ public class ItemBlockGasTank extends ItemBlock implements IGasItem, ISustainedI return null; } - GasStack stored = GasStack.readFromNBT(itemstack.stackTagCompound.getCompoundTag("stored")); - - if(stored == null) - { - itemstack.setItemDamage(100); - } - else { - itemstack.setItemDamage((int)Math.max(1, (Math.abs((((float)stored.amount/getMaxGas(itemstack))*100)-100)))); - } - - return stored; + return GasStack.readFromNBT(itemstack.stackTagCompound.getCompoundTag("stored")); } @Override @@ -148,14 +136,12 @@ public class ItemBlockGasTank extends ItemBlock implements IGasItem, ISustainedI if(stack == null || stack.amount == 0) { - itemstack.setItemDamage(100); itemstack.stackTagCompound.removeTag("stored"); } else { int amount = Math.max(0, Math.min(stack.amount, getMaxGas(itemstack))); GasStack gasStack = new GasStack(stack.getGas(), amount); - itemstack.setItemDamage((int)Math.max(1, (Math.abs((((float)amount/getMaxGas(itemstack))*100)-100)))); itemstack.stackTagCompound.setTag("stored", gasStack.write(new NBTTagCompound())); } } @@ -165,7 +151,6 @@ public class ItemBlockGasTank extends ItemBlock implements IGasItem, ISustainedI ItemStack empty = new ItemStack(this); setBaseTier(empty, tier.getBaseTier()); setGas(empty, null); - empty.setItemDamage(100); return empty; } @@ -178,7 +163,6 @@ public class ItemBlockGasTank extends ItemBlock implements IGasItem, ISustainedI ItemStack empty = new ItemStack(this); setBaseTier(empty, tier.getBaseTier()); setGas(empty, null); - empty.setItemDamage(100); list.add(empty); } @@ -310,8 +294,14 @@ public class ItemBlockGasTank extends ItemBlock implements IGasItem, ISustainedI } @Override - public boolean isMetadataSpecific(ItemStack itemStack) + public boolean showDurabilityBar(ItemStack stack) { - return false; + return true; + } + + @Override + public double getDurabilityForDisplay(ItemStack stack) + { + return 1D-((getGas(stack) != null ? (double)getGas(stack).amount : 0D)/(double)getMaxGas(stack)); } } diff --git a/src/main/java/mekanism/common/item/ItemBlockMachine.java b/src/main/java/mekanism/common/item/ItemBlockMachine.java index 98f05721a..bc72e0ae6 100644 --- a/src/main/java/mekanism/common/item/ItemBlockMachine.java +++ b/src/main/java/mekanism/common/item/ItemBlockMachine.java @@ -908,12 +908,6 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec return (int)(getMaxEnergy(theItem) * general.TO_TE); } - @Override - public boolean isMetadataSpecific(ItemStack itemStack) - { - return true; - } - @Override @Method(modid = "IC2") public IElectricItemManager getManager(ItemStack itemStack) diff --git a/src/main/java/mekanism/common/item/ItemEnergized.java b/src/main/java/mekanism/common/item/ItemEnergized.java index 5b5570472..4400a3ef5 100644 --- a/src/main/java/mekanism/common/item/ItemEnergized.java +++ b/src/main/java/mekanism/common/item/ItemEnergized.java @@ -35,10 +35,20 @@ public class ItemEnergized extends ItemMekanism implements IEnergizedItem, ISpec super(); MAX_ELECTRICITY = maxElectricity; setMaxStackSize(1); - setMaxDamage(100); - setNoRepair(); setCreativeTab(Mekanism.tabMekanism); } + + @Override + public boolean showDurabilityBar(ItemStack stack) + { + return true; + } + + @Override + public double getDurabilityForDisplay(ItemStack stack) + { + return 1D-(getEnergy(stack)/getMaxEnergy(stack)); + } @Override public void addInformation(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) @@ -48,16 +58,13 @@ public class ItemEnergized extends ItemMekanism implements IEnergizedItem, ISpec public ItemStack getUnchargedItem() { - ItemStack stack = new ItemStack(this); - stack.setItemDamage(100); - return stack; + return new ItemStack(this); } @Override public void getSubItems(Item item, CreativeTabs tabs, List list) { ItemStack discharged = new ItemStack(this); - discharged.setItemDamage(100); list.add(discharged); ItemStack charged = new ItemStack(this); setEnergy(charged, ((IEnergizedItem)charged.getItem()).getMaxEnergy(charged)); @@ -114,10 +121,7 @@ public class ItemEnergized extends ItemMekanism implements IEnergizedItem, ISpec return 0; } - double electricityStored = itemStack.stackTagCompound.getDouble("electricity"); - itemStack.setItemDamage((int)Math.max(1, (Math.abs(((electricityStored/getMaxEnergy(itemStack))*100)-100)))); - - return electricityStored; + return itemStack.stackTagCompound.getDouble("electricity"); } @Override @@ -130,7 +134,6 @@ public class ItemEnergized extends ItemMekanism implements IEnergizedItem, ISpec double electricityStored = Math.max(Math.min(amount, getMaxEnergy(itemStack)), 0); itemStack.stackTagCompound.setDouble("electricity", electricityStored); - itemStack.setItemDamage((int)Math.max(1, (Math.abs(((electricityStored/getMaxEnergy(itemStack))*100)-100)))); } @Override @@ -207,12 +210,6 @@ public class ItemEnergized extends ItemMekanism implements IEnergizedItem, ISpec return (int)Math.round(getMaxEnergy(theItem)* general.TO_TE); } - @Override - public boolean isMetadataSpecific(ItemStack itemStack) - { - return false; - } - @Override @Method(modid = "IC2") public IElectricItemManager getManager(ItemStack itemStack) diff --git a/src/main/java/mekanism/common/item/ItemFlamethrower.java b/src/main/java/mekanism/common/item/ItemFlamethrower.java index 4b59bb13f..ab0c9a337 100644 --- a/src/main/java/mekanism/common/item/ItemFlamethrower.java +++ b/src/main/java/mekanism/common/item/ItemFlamethrower.java @@ -26,8 +26,6 @@ public class ItemFlamethrower extends ItemMekanism implements IGasItem { super(); setMaxStackSize(1); - setMaxDamage(100); - setNoRepair(); } @Override @@ -117,23 +115,19 @@ public class ItemFlamethrower extends ItemMekanism implements IGasItem return null; } - GasStack stored = GasStack.readFromNBT(itemstack.stackTagCompound.getCompoundTag("stored")); - - if(stored == null) - { - itemstack.setItemDamage(100); - } - else { - itemstack.setItemDamage((int)Math.max(1, (Math.abs((((float)stored.amount/getMaxGas(itemstack))*100)-100)))); - } - - return stored; + return GasStack.readFromNBT(itemstack.stackTagCompound.getCompoundTag("stored")); } @Override - public boolean isMetadataSpecific(ItemStack itemStack) + public boolean showDurabilityBar(ItemStack stack) { - return false; + return true; + } + + @Override + public double getDurabilityForDisplay(ItemStack stack) + { + return 1D-((getGas(stack) != null ? (double)getGas(stack).amount : 0D)/(double)getMaxGas(stack)); } @Override @@ -146,14 +140,12 @@ public class ItemFlamethrower extends ItemMekanism implements IGasItem if(stack == null || stack.amount == 0) { - itemstack.setItemDamage(100); itemstack.stackTagCompound.removeTag("stored"); } else { int amount = Math.max(0, Math.min(stack.amount, getMaxGas(itemstack))); GasStack gasStack = new GasStack(stack.getGas(), amount); - itemstack.setItemDamage((int)Math.max(1, (Math.abs((((float)amount/getMaxGas(itemstack))*100)-100)))); itemstack.stackTagCompound.setTag("stored", gasStack.write(new NBTTagCompound())); } } @@ -162,7 +154,6 @@ public class ItemFlamethrower extends ItemMekanism implements IGasItem { ItemStack empty = new ItemStack(this); setGas(empty, null); - empty.setItemDamage(100); return empty; } @@ -171,7 +162,6 @@ public class ItemFlamethrower extends ItemMekanism implements IGasItem { ItemStack empty = new ItemStack(this); setGas(empty, null); - empty.setItemDamage(100); list.add(empty); ItemStack filled = new ItemStack(this); diff --git a/src/main/java/mekanism/common/item/ItemFreeRunners.java b/src/main/java/mekanism/common/item/ItemFreeRunners.java index 638d53aaf..556610497 100644 --- a/src/main/java/mekanism/common/item/ItemFreeRunners.java +++ b/src/main/java/mekanism/common/item/ItemFreeRunners.java @@ -47,8 +47,6 @@ public class ItemFreeRunners extends ItemArmor implements IEnergizedItem, ISpeci { super(EnumHelper.addArmorMaterial("FRICTIONBOOTS", 0, new int[] {0, 0, 0, 0}, 0), 0, 3); setMaxStackSize(1); - setMaxDamage(100); - setNoRepair(); setCreativeTab(Mekanism.tabMekanism); } @@ -85,16 +83,13 @@ public class ItemFreeRunners extends ItemArmor implements IEnergizedItem, ISpeci public ItemStack getUnchargedItem() { - ItemStack charged = new ItemStack(this); - charged.setItemDamage(100); - return charged; + return new ItemStack(this); } @Override public void getSubItems(Item item, CreativeTabs tabs, List list) { ItemStack discharged = new ItemStack(this); - discharged.setItemDamage(100); list.add(discharged); ItemStack charged = new ItemStack(this); setEnergy(charged, ((IEnergizedItem)charged.getItem()).getMaxEnergy(charged)); @@ -151,10 +146,7 @@ public class ItemFreeRunners extends ItemArmor implements IEnergizedItem, ISpeci return 0; } - double electricityStored = itemStack.stackTagCompound.getDouble("electricity"); - itemStack.setItemDamage((int)Math.max(1, (Math.abs(((electricityStored/getMaxEnergy(itemStack))*100)-100)))); - - return electricityStored; + return itemStack.stackTagCompound.getDouble("electricity"); } @Override @@ -167,7 +159,6 @@ public class ItemFreeRunners extends ItemArmor implements IEnergizedItem, ISpeci double electricityStored = Math.max(Math.min(amount, getMaxEnergy(itemStack)), 0); itemStack.stackTagCompound.setDouble("electricity", electricityStored); - itemStack.setItemDamage((int)Math.max(1, (Math.abs(((electricityStored/getMaxEnergy(itemStack))*100)-100)))); } @Override @@ -245,9 +236,15 @@ public class ItemFreeRunners extends ItemArmor implements IEnergizedItem, ISpeci } @Override - public boolean isMetadataSpecific(ItemStack itemStack) + public boolean showDurabilityBar(ItemStack stack) { - return false; + return true; + } + + @Override + public double getDurabilityForDisplay(ItemStack stack) + { + return 1D-(getEnergy(stack)/getMaxEnergy(stack)); } @Override diff --git a/src/main/java/mekanism/common/item/ItemGaugeDropper.java b/src/main/java/mekanism/common/item/ItemGaugeDropper.java index 3a0cd7d5e..8d2d3dd6f 100644 --- a/src/main/java/mekanism/common/item/ItemGaugeDropper.java +++ b/src/main/java/mekanism/common/item/ItemGaugeDropper.java @@ -30,34 +30,12 @@ public class ItemGaugeDropper extends ItemMekanism implements IGasItem, IFluidCo { super(); setMaxStackSize(1); - setMaxDamage(100); - setNoRepair(); setCreativeTab(Mekanism.tabMekanism); } - private void updateDamage(ItemStack stack) - { - GasStack gas = getGas_do(stack); - FluidStack fluid = getFluid_do(stack); - - if((gas == null || gas.amount == 0) && (fluid == null || fluid.amount == 0)) - { - stack.setItemDamage(100); - } - else if(gas != null && gas.amount > 0) - { - stack.setItemDamage((int)Math.max(1, (Math.abs((((float)gas.amount/getMaxGas(stack))*100)-100)))); - } - else if(fluid != null && fluid.amount > 0) - { - stack.setItemDamage((int)Math.max(1, (Math.abs((((float)fluid.amount/getCapacity(stack))*100)-100)))); - } - } - public ItemStack getEmptyItem() { ItemStack empty = new ItemStack(this); - empty.setItemDamage(100); setGas(empty, null); setFluid(empty, null); return empty; @@ -69,6 +47,21 @@ public class ItemGaugeDropper extends ItemMekanism implements IGasItem, IFluidCo list.add(getEmptyItem()); } + @Override + public boolean showDurabilityBar(ItemStack stack) + { + return true; + } + + @Override + public double getDurabilityForDisplay(ItemStack stack) + { + double gasRatio = ((getGas(stack) != null ? (double)getGas(stack).amount : 0D)/(double)CAPACITY); + double fluidRatio = ((getFluid(stack) != null ? (double)getFluid(stack).amount : 0D)/(double)CAPACITY); + + return 1D-Math.max(gasRatio, fluidRatio); + } + @Override public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player) { @@ -124,7 +117,6 @@ public class ItemGaugeDropper extends ItemMekanism implements IGasItem, IFluidCo @Override public FluidStack getFluid(ItemStack container) { - updateDamage(container); return getFluid_do(container); } @@ -142,8 +134,6 @@ public class ItemGaugeDropper extends ItemMekanism implements IGasItem, IFluidCo else { container.stackTagCompound.setTag("fluidStack", stack.writeToNBT(new NBTTagCompound())); } - - updateDamage(container); } @Override @@ -267,7 +257,6 @@ public class ItemGaugeDropper extends ItemMekanism implements IGasItem, IFluidCo @Override public GasStack getGas(ItemStack itemstack) { - updateDamage(itemstack); return getGas_do(itemstack); } @@ -289,8 +278,6 @@ public class ItemGaugeDropper extends ItemMekanism implements IGasItem, IFluidCo itemstack.stackTagCompound.setTag("gasStack", gasStack.write(new NBTTagCompound())); } - - updateDamage(itemstack); } @Override @@ -298,10 +285,4 @@ public class ItemGaugeDropper extends ItemMekanism implements IGasItem, IFluidCo { return CAPACITY; } - - @Override - public boolean isMetadataSpecific(ItemStack itemstack) - { - return false; - } } diff --git a/src/main/java/mekanism/common/item/ItemJetpack.java b/src/main/java/mekanism/common/item/ItemJetpack.java index 02554a937..db5100d2e 100644 --- a/src/main/java/mekanism/common/item/ItemJetpack.java +++ b/src/main/java/mekanism/common/item/ItemJetpack.java @@ -175,12 +175,6 @@ public class ItemJetpack extends ItemArmor implements IGasItem, ISpecialArmor return GasStack.readFromNBT(itemstack.stackTagCompound.getCompoundTag("stored")); } - - @Override - public boolean isMetadataSpecific(ItemStack itemStack) - { - return false; - } public JetpackMode getMode(ItemStack stack) { diff --git a/src/main/java/mekanism/common/item/ItemScubaTank.java b/src/main/java/mekanism/common/item/ItemScubaTank.java index 013f3d444..7e8953fdd 100644 --- a/src/main/java/mekanism/common/item/ItemScubaTank.java +++ b/src/main/java/mekanism/common/item/ItemScubaTank.java @@ -221,12 +221,6 @@ public class ItemScubaTank extends ItemArmor implements IGasItem itemstack.stackTagCompound.setTag("stored", gasStack.write(new NBTTagCompound())); } } - - @Override - public boolean isMetadataSpecific(ItemStack itemStack) - { - return false; - } public ItemStack getEmptyItem() { diff --git a/src/main/java/mekanism/common/util/RecipeUtils.java b/src/main/java/mekanism/common/util/RecipeUtils.java index 4f3e5c857..d47d52e20 100644 --- a/src/main/java/mekanism/common/util/RecipeUtils.java +++ b/src/main/java/mekanism/common/util/RecipeUtils.java @@ -48,61 +48,37 @@ public class RecipeUtils { return false; } - - if(!(target.getItem() instanceof IEnergizedItem) && !(input.getItem() instanceof IEnergizedItem) && !(target.getItem() instanceof IGasItem) && !(input.getItem() instanceof IGasItem)) + + if(target.getItemDamage() != input.getItemDamage() && target.getItemDamage() != OreDictionary.WILDCARD_VALUE) { - if(target.getItemDamage() != input.getItemDamage() && target.getItemDamage() != OreDictionary.WILDCARD_VALUE) + return false; + } + + if(target.getItem() instanceof IEnergyCube && input.getItem() instanceof IEnergyCube) + { + if(((IEnergyCube)target.getItem()).getEnergyCubeTier(target) != ((IEnergyCube)input.getItem()).getEnergyCubeTier(input)) { return false; } } - else { - if(target.getItem() instanceof IEnergizedItem && input.getItem() instanceof IEnergizedItem) + + if(target.getItem() instanceof ITierItem && input.getItem() instanceof ITierItem) + { + if(((ITierItem)target.getItem()).getBaseTier(target) != ((ITierItem)input.getItem()).getBaseTier(input)) { - if(((IEnergizedItem)target.getItem()).isMetadataSpecific(target) && ((IEnergizedItem)input.getItem()).isMetadataSpecific(input)) - { - if(target.getItemDamage() != input.getItemDamage() && target.getItemDamage() != OreDictionary.WILDCARD_VALUE) - { - return false; - } - } + return false; } - - if(target.getItem() instanceof IGasItem && input.getItem() instanceof IGasItem) + } + + if(target.getItem() instanceof IFactory && input.getItem() instanceof IFactory) + { + if(isFactory(target) && isFactory(input)) { - if(((IGasItem)target.getItem()).isMetadataSpecific(target) && ((IGasItem)input.getItem()).isMetadataSpecific(input)) - { - if(target.getItemDamage() != input.getItemDamage() && target.getItemDamage() != OreDictionary.WILDCARD_VALUE) - { - return false; - } - } - } - - if(target.getItem() instanceof IEnergyCube && input.getItem() instanceof IEnergyCube) - { - if(((IEnergyCube)target.getItem()).getEnergyCubeTier(target) != ((IEnergyCube)input.getItem()).getEnergyCubeTier(input)) + if(((IFactory)target.getItem()).getRecipeType(target) != ((IFactory)input.getItem()).getRecipeType(input)) { return false; } } - else if(target.getItem() instanceof ITierItem && input.getItem() instanceof ITierItem) - { - if(((ITierItem)target.getItem()).getBaseTier(target) != ((ITierItem)input.getItem()).getBaseTier(input)) - { - return false; - } - } - else if(target.getItem() instanceof IFactory && input.getItem() instanceof IFactory) - { - if(isFactory(target) && isFactory(input)) - { - if(((IFactory)target.getItem()).getRecipeType(target) != ((IFactory)input.getItem()).getRecipeType(input)) - { - return false; - } - } - } } return true; diff --git a/src/main/java/mekanism/generators/common/item/ItemBlockGenerator.java b/src/main/java/mekanism/generators/common/item/ItemBlockGenerator.java index 0afbb3995..9c1be3eb5 100644 --- a/src/main/java/mekanism/generators/common/item/ItemBlockGenerator.java +++ b/src/main/java/mekanism/generators/common/item/ItemBlockGenerator.java @@ -450,12 +450,6 @@ public class ItemBlockGenerator extends ItemBlock implements IEnergizedItem, ISp return (int)(getMaxEnergy(theItem)* general.TO_TE); } - @Override - public boolean isMetadataSpecific(ItemStack itemStack) - { - return true; - } - @Override @Method(modid = "IC2") public IElectricItemManager getManager(ItemStack itemStack) diff --git a/src/main/java/mekanism/generators/common/item/ItemHohlraum.java b/src/main/java/mekanism/generators/common/item/ItemHohlraum.java index b830d81fd..f3282062f 100644 --- a/src/main/java/mekanism/generators/common/item/ItemHohlraum.java +++ b/src/main/java/mekanism/generators/common/item/ItemHohlraum.java @@ -24,8 +24,6 @@ public class ItemHohlraum extends ItemMekanism implements IGasItem { super(); setMaxStackSize(1); - setMaxDamage(100); - setNoRepair(); } @Override @@ -113,23 +111,19 @@ public class ItemHohlraum extends ItemMekanism implements IGasItem return null; } - GasStack stored = GasStack.readFromNBT(itemstack.stackTagCompound.getCompoundTag("stored")); - - if(stored == null) - { - itemstack.setItemDamage(100); - } - else { - itemstack.setItemDamage((int)Math.max(1, (Math.abs((((float)stored.amount/getMaxGas(itemstack))*100)-100)))); - } - - return stored; + return GasStack.readFromNBT(itemstack.stackTagCompound.getCompoundTag("stored")); } @Override - public boolean isMetadataSpecific(ItemStack itemStack) + public boolean showDurabilityBar(ItemStack stack) { - return false; + return true; + } + + @Override + public double getDurabilityForDisplay(ItemStack stack) + { + return 1D-((getGas(stack) != null ? (double)getGas(stack).amount : 0D)/(double)getMaxGas(stack)); } @Override @@ -142,14 +136,12 @@ public class ItemHohlraum extends ItemMekanism implements IGasItem if(stack == null || stack.amount == 0) { - itemstack.setItemDamage(100); itemstack.stackTagCompound.removeTag("stored"); } else { int amount = Math.max(0, Math.min(stack.amount, getMaxGas(itemstack))); GasStack gasStack = new GasStack(stack.getGas(), amount); - itemstack.setItemDamage((int)Math.max(1, (Math.abs((((float)amount/getMaxGas(itemstack))*100)-100)))); itemstack.stackTagCompound.setTag("stored", gasStack.write(new NBTTagCompound())); } } @@ -158,7 +150,7 @@ public class ItemHohlraum extends ItemMekanism implements IGasItem { ItemStack stack = new ItemStack(this); setGas(stack, null); - stack.setItemDamage(100); + return stack; } @@ -167,7 +159,6 @@ public class ItemHohlraum extends ItemMekanism implements IGasItem { ItemStack empty = new ItemStack(this); setGas(empty, null); - empty.setItemDamage(100); list.add(empty); ItemStack filled = new ItemStack(this); From e53c00d2b807902fa363f403cdb1f862b832e598 Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Thu, 17 Mar 2016 20:11:38 -0400 Subject: [PATCH 52/52] Fixed reactors shutting off when unloaded --- src/main/java/mekanism/api/reactor/IFusionReactor.java | 2 +- .../java/mekanism/generators/common/FusionReactor.java | 8 ++++---- .../common/tile/reactor/TileEntityReactorBlock.java | 8 ++++---- .../common/tile/reactor/TileEntityReactorController.java | 8 ++++---- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/main/java/mekanism/api/reactor/IFusionReactor.java b/src/main/java/mekanism/api/reactor/IFusionReactor.java index ecb2f66e7..da96a27c3 100644 --- a/src/main/java/mekanism/api/reactor/IFusionReactor.java +++ b/src/main/java/mekanism/api/reactor/IFusionReactor.java @@ -35,7 +35,7 @@ public interface IFusionReactor extends IHeatTransfer public double getBufferSize(); - public void formMultiblock(); + public void formMultiblock(boolean keepBurning); public boolean isFormed(); diff --git a/src/main/java/mekanism/generators/common/FusionReactor.java b/src/main/java/mekanism/generators/common/FusionReactor.java index 3d9b58dc7..9ab515397 100644 --- a/src/main/java/mekanism/generators/common/FusionReactor.java +++ b/src/main/java/mekanism/generators/common/FusionReactor.java @@ -354,7 +354,7 @@ public class FusionReactor implements IFusionReactor } @Override - public void formMultiblock() + public void formMultiblock(boolean keepBurning) { updatedThisTick = true; @@ -367,19 +367,19 @@ public class FusionReactor implements IFusionReactor if(!createFrame(centreOfReactor)) { - unformMultiblock(false); + unformMultiblock(keepBurning); return; } if(!addSides(centreOfReactor)) { - unformMultiblock(false); + unformMultiblock(keepBurning); return; } if(!centreIsClear(centreOfReactor)) { - unformMultiblock(false); + unformMultiblock(keepBurning); return; } diff --git a/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorBlock.java b/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorBlock.java index 87657110b..3d2cce459 100644 --- a/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorBlock.java +++ b/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorBlock.java @@ -54,7 +54,7 @@ public abstract class TileEntityReactorBlock extends TileEntityElectricBlock imp if(getReactor() != null) { - getReactor().formMultiblock(); + getReactor().formMultiblock(false); } } @@ -95,7 +95,7 @@ public abstract class TileEntityReactorBlock extends TileEntityElectricBlock imp if(!(this instanceof TileEntityReactorController) && getReactor() != null) { - getReactor().formMultiblock(); + getReactor().formMultiblock(true); } } @@ -108,7 +108,7 @@ public abstract class TileEntityReactorBlock extends TileEntityElectricBlock imp { if(getReactor() != null) { - getReactor().formMultiblock(); + getReactor().formMultiblock(false); } else { updateController(); @@ -124,7 +124,7 @@ public abstract class TileEntityReactorBlock extends TileEntityElectricBlock imp if(found != null && (found.getReactor() == null || !found.getReactor().isFormed())) { - found.formMultiblock(); + found.formMultiblock(false); } } } diff --git a/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorController.java b/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorController.java index df5d6745d..ad72c4253 100644 --- a/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorController.java +++ b/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorController.java @@ -71,14 +71,14 @@ public class TileEntityReactorController extends TileEntityReactorBlock implemen public void radiateNeutrons(int neutrons) {} //future impl - public void formMultiblock() + public void formMultiblock(boolean keepBurning) { if(getReactor() == null) { setReactor(new FusionReactor(this)); } - getReactor().formMultiblock(); + getReactor().formMultiblock(keepBurning); } public double getPlasmaTemp() @@ -139,7 +139,7 @@ public class TileEntityReactorController extends TileEntityReactorBlock implemen { super.onChunkUnload(); - formMultiblock(); + formMultiblock(true); } @Override @@ -147,7 +147,7 @@ public class TileEntityReactorController extends TileEntityReactorBlock implemen { super.onAdded(); - formMultiblock(); + formMultiblock(false); } @Override

LF3Arm3RxW}H(#_weljg<nW8ir)WcxdY! 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 Date: Fri, 26 Feb 2016 20:44:21 -0500 Subject: [PATCH 10/52] Resistive heater is just about done! --- .../client/gui/GuiResistiveHeater.java | 69 +++++++++++++++++- .../mekanism/common/block/BlockMachine.java | 5 +- .../container/ContainerResistiveHeater.java | 2 +- .../tile/TileEntityResistiveHeater.java | 14 +++- .../mekanism/gui/GuiResistiveHeater.png | Bin 3898 -> 3940 bytes .../resources/assets/mekanism/lang/en_US.lang | 1 + 6 files changed, 84 insertions(+), 7 deletions(-) diff --git a/src/main/java/mekanism/client/gui/GuiResistiveHeater.java b/src/main/java/mekanism/client/gui/GuiResistiveHeater.java index c07367c6f..95a9e3155 100644 --- a/src/main/java/mekanism/client/gui/GuiResistiveHeater.java +++ b/src/main/java/mekanism/client/gui/GuiResistiveHeater.java @@ -1,9 +1,17 @@ package mekanism.client.gui; +import java.util.ArrayList; + +import mekanism.api.Coord4D; +import mekanism.api.util.UnitDisplayUtils.TemperatureUnit; +import mekanism.client.gui.element.GuiPowerBar; import mekanism.client.gui.element.GuiSlot; import mekanism.client.gui.element.GuiSlot.SlotOverlay; import mekanism.client.gui.element.GuiSlot.SlotType; +import mekanism.client.sound.SoundHandler; +import mekanism.common.Mekanism; import mekanism.common.inventory.container.ContainerResistiveHeater; +import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.tile.TileEntityResistiveHeater; import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; @@ -29,7 +37,8 @@ public class GuiResistiveHeater extends GuiMekanism super(tentity, new ContainerResistiveHeater(inventory, tentity)); tileEntity = tentity; - guiElements.add(new GuiSlot(SlotType.POWER, this, MekanismUtils.getResource(ResourceType.GUI, "GuiBlank.png"), 27, 34).with(SlotOverlay.POWER)); + guiElements.add(new GuiPowerBar(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiResistiveHeater.png"), 164, 15)); + guiElements.add(new GuiSlot(SlotType.POWER, this, MekanismUtils.getResource(ResourceType.GUI, "GuiResistiveHeater.png"), 14, 34).with(SlotOverlay.POWER)); } @Override @@ -42,7 +51,7 @@ public class GuiResistiveHeater extends GuiMekanism String prevEnergyUsage = energyUsageField != null ? energyUsageField.getText() : ""; - energyUsageField = new GuiTextField(fontRendererObj, guiWidth + 50, guiHeight + 104, 86, 11); + energyUsageField = new GuiTextField(fontRendererObj, guiWidth + 49, guiHeight + 52, 66, 11); energyUsageField.setMaxStringLength(7); energyUsageField.setEnableBackgroundDrawing(false); energyUsageField.setText(prevEnergyUsage); @@ -53,6 +62,9 @@ public class GuiResistiveHeater extends GuiMekanism { fontRendererObj.drawString(tileEntity.getInventoryName(), (xSize / 2) - (fontRendererObj.getStringWidth(tileEntity.getInventoryName()) / 2), 6, 0x404040); fontRendererObj.drawString(LangUtils.localize("container.inventory"), 8, (ySize - 94) + 2, 0x404040); + + renderScaledText(LangUtils.localize("gui.temp") + ": " + MekanismUtils.getTemperatureDisplay(tileEntity.temperature, TemperatureUnit.AMBIENT), 50, 25, 0x00CD00, 76); + renderScaledText(LangUtils.localize("gui.usage") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.energyUsage), 50, 41, 0x00CD00, 76); super.drawGuiContainerForegroundLayer(mouseX, mouseY); } @@ -60,18 +72,69 @@ public class GuiResistiveHeater extends GuiMekanism @Override protected void drawGuiContainerBackgroundLayer(float partialTick, int mouseX, int mouseY) { - mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.GUI, "GuiBlank.png")); + mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.GUI, "GuiResistiveHeater.png")); GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); int guiWidth = (width - xSize) / 2; int guiHeight = (height - ySize) / 2; drawTexturedModalRect(guiWidth, guiHeight, 0, 0, xSize, ySize); + + int xAxis = (mouseX - (width - xSize) / 2); + int yAxis = (mouseY - (height - ySize) / 2); + + if(xAxis >= 116 && xAxis <= 126 && yAxis >= 51 && yAxis <= 61) + { + drawTexturedModalRect(guiWidth + 116, guiHeight + 51, xSize, 0, 11, 11); + } + else { + drawTexturedModalRect(guiWidth + 116, guiHeight + 51, xSize, 11, 11, 11); + } super.drawGuiContainerBackgroundLayer(partialTick, mouseX, mouseY); + + energyUsageField.drawTextBox(); } private void setEnergyUsage() { + if(!energyUsageField.getText().isEmpty()) + { + int toUse = Integer.parseInt(energyUsageField.getText()); + + ArrayList data = new ArrayList(); + data.add(toUse); + + Mekanism.packetHandler.sendToServer(new TileEntityMessage(Coord4D.get(tileEntity), data)); + + energyUsageField.setText(""); + } + } + + @Override + public void updateScreen() + { + super.updateScreen(); + energyUsageField.updateCursorCounter(); + } + + @Override + public void mouseClicked(int mouseX, int mouseY, int button) + { + super.mouseClicked(mouseX, mouseY, button); + + energyUsageField.mouseClicked(mouseX, mouseY, button); + + if(button == 0) + { + int xAxis = (mouseX - (width - xSize) / 2); + int yAxis = (mouseY - (height - ySize) / 2); + + if(xAxis >= 116 && xAxis <= 126 && yAxis >= 51 && yAxis <= 61) + { + setEnergyUsage(); + SoundHandler.playSound("gui.button.press"); + } + } } @Override diff --git a/src/main/java/mekanism/common/block/BlockMachine.java b/src/main/java/mekanism/common/block/BlockMachine.java index 81b1108c6..d100cdcb0 100644 --- a/src/main/java/mekanism/common/block/BlockMachine.java +++ b/src/main/java/mekanism/common/block/BlockMachine.java @@ -225,6 +225,7 @@ public class BlockMachine extends BlockContainer implements ISpecialBounds, IBlo case MACHINE_BLOCK_3: icons[0][0] = register.registerIcon("mekanism:AmbientAccumulator"); icons[2][0] = BASE_ICON; + icons[4][0] = BASE_ICON; MekanismRenderer.loadDynamicTextures(register, MachineType.OREDICTIONIFICATOR.name, icons[3], DefIcon.getAll(register.registerIcon("mekanism:OredictionificatorSide"))); break; } @@ -1147,7 +1148,7 @@ public class BlockMachine extends BlockContainer implements ISpecialBounds, IBlo SOLAR_NEUTRON_ACTIVATOR(MachineBlock.MACHINE_BLOCK_3, 1, "SolarNeutronActivator", 47, TileEntitySolarNeutronActivator.class, false, true, false), AMBIENT_ACCUMULATOR(MachineBlock.MACHINE_BLOCK_3, 2, "AmbientAccumulator", 48, TileEntityAmbientAccumulator.class, true, false, false), OREDICTIONIFICATOR(MachineBlock.MACHINE_BLOCK_3, 3, "Oredictionificator", 52, TileEntityOredictionificator.class, false, false, false), - RESISTIVE_HEATER(MachineBlock.MACHINE_BLOCK_3, 4, "ResistiveHeater", 53, TileEntityResistiveHeater.class, true, true, false); + RESISTIVE_HEATER(MachineBlock.MACHINE_BLOCK_3, 4, "ResistiveHeater", 53, TileEntityResistiveHeater.class, true, false, false); public MachineBlock typeBlock; public int meta; @@ -1198,7 +1199,7 @@ public class BlockMachine extends BlockContainer implements ISpecialBounds, IBlo for(MachineType type : MachineType.values()) { - if(type != ENTANGLED_BLOCK && type != AMBIENT_ACCUMULATOR && type != RESISTIVE_HEATER) + if(type != ENTANGLED_BLOCK && type != AMBIENT_ACCUMULATOR) { ret.add(type); } diff --git a/src/main/java/mekanism/common/inventory/container/ContainerResistiveHeater.java b/src/main/java/mekanism/common/inventory/container/ContainerResistiveHeater.java index 46ae9328a..2f67947f6 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerResistiveHeater.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerResistiveHeater.java @@ -16,7 +16,7 @@ public class ContainerResistiveHeater extends Container public ContainerResistiveHeater(InventoryPlayer inventory, TileEntityResistiveHeater tentity) { tileEntity = tentity; - addSlotToContainer(new SlotDischarge(tentity, 0, 28, 35)); + addSlotToContainer(new SlotDischarge(tentity, 0, 15, 35)); int slotY; diff --git a/src/main/java/mekanism/common/tile/TileEntityResistiveHeater.java b/src/main/java/mekanism/common/tile/TileEntityResistiveHeater.java index 090be3b6e..fbb654fba 100644 --- a/src/main/java/mekanism/common/tile/TileEntityResistiveHeater.java +++ b/src/main/java/mekanism/common/tile/TileEntityResistiveHeater.java @@ -16,6 +16,7 @@ import mekanism.common.util.HeatUtils; import mekanism.common.util.MekanismUtils; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.ForgeDirection; public class TileEntityResistiveHeater extends TileEntityNoisyElectricBlock implements IHeatTransfer @@ -73,6 +74,7 @@ public class TileEntityResistiveHeater extends TileEntityNoisyElectricBlock impl double toUse = Math.min(getEnergy(), energyUsage); heatToAbsorb += toUse/general.energyPerHeat; setEnergy(getEnergy() - toUse); + setActive(toUse > 0); simulateHeat(); applyTemperatureChange(); @@ -87,6 +89,8 @@ public class TileEntityResistiveHeater extends TileEntityNoisyElectricBlock impl energyUsage = nbtTags.getDouble("energyUsage"); temperature = nbtTags.getDouble("temperature"); clientActive = isActive = nbtTags.getBoolean("isActive"); + + maxEnergy = energyUsage * 400; } @Override @@ -104,7 +108,8 @@ public class TileEntityResistiveHeater extends TileEntityNoisyElectricBlock impl { if(!worldObj.isRemote) { - energyUsage = dataStream.readDouble(); + energyUsage = dataStream.readInt(); + maxEnergy = energyUsage * 400; return; } @@ -185,6 +190,13 @@ public class TileEntityResistiveHeater extends TileEntityNoisyElectricBlock impl @Override public IHeatTransfer getAdjacent(ForgeDirection side) { + TileEntity adj = Coord4D.get(this).getFromSide(side).getTileEntity(worldObj); + + if(adj instanceof IHeatTransfer) + { + return (IHeatTransfer)adj; + } + return null; } diff --git a/src/main/resources/assets/mekanism/gui/GuiResistiveHeater.png b/src/main/resources/assets/mekanism/gui/GuiResistiveHeater.png index cd1a0231ed84bdac7cf32b9ded6c067bec8348a0..67588cf77610516d8b9aefa148b742cede0f009f 100644 GIT binary patch delta 2492 zcmb`JX;4$=8plr#Nk~`&vM92IA{7b<3PP#|4$8hOA_%fvswl_~0)pY>*eVzh9JGj_ zCRYThqCo<}MJNH46j`(eT7dvzQHdsmeTzcR%$>Pk+BA2y;aW3TX)cQ~?!+UH2ukKX4zRTd1or?qUj<2hZnuxO>2Fl}XL*peKL4qWC$jR9^U}svo&-3WLqkI_ z=d3k0zMR|9;lgQZ8WfAgx(0f?z4twn!jw|#5bty0&&{J^seui=@kv_BTp#}w6&)?I zRe8r*HthwXuF7xZw|g0aYQQYLFgp6|+e+yU?7;ygwxX-j)sNBCro%k z(vg-2v3<{!cyJm08D+5Rq(-jg>dh~AUM-k$`9o8sY%pEh4M=?&6nq8R$LHB7BaO5f z;pB<7p@xK^aFw~+P`V=yYRId=5ub~)z4+u@|8)XlmoQS-^<9fKy?DGG28G}yTm|tt zhlUoAqw25BN*6!cLfdJ($0#M7`;9%+R~du8kp?lRC6 zYHr~s6!U1R2KKR8`dv3M-IjNNl7!=VA?BoTaF5KGnb9!1HQS*%0u<(i49sc43e6d_ z?d;VPeHAM}#`@>89W%Q_!^3l|B9U=9a?FR|i-CL3GxwcMuD=)@U?lXX$9P1Ov2So# zsOg3l_P!bk=)d*`BHUFZ&{M4~2#1ZxzeKq9PP-`!C?HnO_hIun&^O=9sfME8w6RUhja)?Dh6{Uz7mJT zV6o8d3L6qA0zvYymm=6tApCzw;D4jA7_CZ^mV&$5VTz!kpEIz+kJv7sg8c{Mf=~kt z11Weyeh>uYH?Catfq=hvVlmjD%;S>?=^pQE7o0=&M$l+9c-s>A$jMvWbmPo)kZvSrGA~Qd0QYJJf_J#BSb;vH6wR ziS^6XEwxYr@I0&>_?FK(`DzfTVa7Y#5AWbtjB#38s9%1Sa8aE~N-^nJ4|Nh?8~}TU z6P3)#03Khz7c?dk=tcJ{*jT(436T4KP!B0W2k+khCJ>ZE1BN(C3LtkB_il{H3_);M zE|-<&%G!p;=TQB^k6bR=Q-t4BBfla#VDeM&nny$gYR0N+Sk1&80Sj7GkXoUx*!Y6qJfH6Lk)Z@m-KtXGukwf9XW;a56$$3^Ixr+ zfpM|1b?MC<&ZdSWrLspRue0zZS-u?gWb%u$Y^wb{t=D1aVndCsGdBw`4Sr(mcLPm& zHS6L5vNM|WQv=1&36#C|yp9T@f#&+oi4gEdB21vaREVKq521}RisOifza|6Um{pCD z+|bqfpR4?-2-+MFcwfY}WtPo~TD4E7V2`OyF)|+!`c&=i7Mg*JAs?zGRJmL|*wrxQ z>%eBw?-SOeJWXWna`JDPs$^H+5by$Oyj`(MhD}D%3T{8aDxfQULECScIEltfml{XZ zKv!D9k~O{Q7nJqe%t3XNV-TPb1`Th&f?fm33w6eRjp!tr=}o?5R|uG#iuPnBqQlC- zoMA!*bl{g?`Nc3ahDwJ`nfw58QDx!U7%=TdKg-H#-9oWQ!}^%Si#k?DCuSVc=ha{uL({8pHL` zz;Dq@>F*kY|Evs>E&|6EpR_iei|@F%5mw!!mKY#JeLLjQAAqX7X=83;@sbmZf|@+m znOee4L}O3!%xc0QBGHDjpx&$uWe9V%M)}~D#4q56{ESk4+A<^k8GwH7 M&OT0$_D7um0|H}6%m4rY delta 2449 zcmcJPe>7BiAII;#U74YnA$gLW=CDjEKQ>wv;}ZGxELx$=h|8B!S{lm$(fhn>2;eEwhEM<jA7r@%NUPQ&VSh~BQGW#hn58_9N|%SuUd2^21M71>TX z&CkUhO&^uIEu3^*N$RtNn3h%XCr*WJ;kA#DW<&{NbW~*{Zh4vDsPSU=b^g<*Zl|kA z&R5hjNtK1}c)43%vEbnR0@(sL zyb`r@X%xh$q|4*>%_~dSMM7Z&i7RVuf0%RzE?#Nh^}5SMGB+x>sXes%ZZ)U*l2SZ! zL7LP2`f);3*`cs7OM6Q$><9D9zBy-h*^LA9ryG$P<(u{pMLVh-O`3ISmZpo8YE{qd z++69uI__y&0MVAQXdv+*o$ip_YMqX*Mp>k*-da8xbfJ9%$7g?_OaWbju2EPN8o~Hw zHAXP`T%8$y)|R?hGUM9)L}(1Ya3!w$>ThgWMtEMrP@KXE^aM(#BFh~OhsII0s`)#< zOx7z$0Uh1(Y|pSUQZ5tD^Vfj+T=O|^bBSCUUZ`GCHi$;2Pedq?kumgpbxiQ%58gEg zs9+?+fB;lD1xFL)eWJLX>zG#U)5d&yUMmOpVjrK#KT#x(%7B*VMq|WHjcQaj>AfI) za$!Jh^~MK`-&B5hqNs#=cDJf-{@V7CwkgQZU;3&%ggY-&dhuz1?uA7t$9CoIt#C); zLF#gIU7f=R2gwL3QY=ipQ7EkVf~Z6|zBV&OAD?Th&Z(@)2e$eu6tcG+Qt{iDywu>} z;5ObW^Gl4wTesQFV5=vXLqUIdI(bd~?p1kbp?zFIQ&ZC|+rqgj4gRUKOH@;K!ZY>1 zTQj9&<}Q`t%~aJ6L}AV`Wz}d;Sn>r{b6=PTK%5zz)Z#A8T&%8Pxp zyLcD&A5wLPZ(qm$f;MrluQJhO?f!;JFzypxa z@K-ae9h8q=_5Vy`72IW5!Mn9^tn7%-DFHbw;7(bA$c=N81x(|jnb0mg?*B>4yJ-(5kBuqu@vSnCs!1cDzW=pWGh zDG7UE2F#t8`2n(S~m(akg1k@lv1(%lg_rOMFaNd z_V(?2#smTjmyRPty@8x19B1(mY5Gd5LEP|?oIcC^kXqK1`coKOv}XE76b-tDwcuy1 zTC;#3u$1m`O80Uyv6TLp1pSkrL1vZ!dRb}H@R{g0eUA-eOriU@{=jYn z_V7g7;z@$*0aI4*NsGwHldXk`&QwEXok>8${>Ta@Ky>~Z|0$NqbM0fO95%r& z;|;DQdlFkugX>EWcLZ=>d}wx=jsTxpb0+jJV&}V9Tnk^tCc~tL-5H38O@^0!c}M~l zXCo`kpKL+~Op=H7ys*h|)v!l`cgNc4?oWfBW95`VMpX7i7I1Nz;Y)t>E4Q??ss1-^ z)D)@+fiq6svt%>yCt_o>8-7pVf8UsoC8dCagM%$hW7)eZ8jaS*%tku9xRqLGbl43k zxQAGV|` y#{E4^xOn8-cY7YLsd3fO0&@sD>6>iMvej!G)QQ_n#i2U@?D6*SbHDEvasEH_4NE-$ diff --git a/src/main/resources/assets/mekanism/lang/en_US.lang b/src/main/resources/assets/mekanism/lang/en_US.lang index b891dec81..43be41f24 100644 --- a/src/main/resources/assets/mekanism/lang/en_US.lang +++ b/src/main/resources/assets/mekanism/lang/en_US.lang @@ -518,6 +518,7 @@ gui.steamInput=Steam Input gui.capacity=Capacity gui.unit=Unit gui.temp=Temp +gui.usage=Usage gui.reactor.injectionRate=Injection Rate From 9b9ed0a4c0f61c11e56b6f34559a317c1575f921 Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Sat, 27 Feb 2016 01:27:26 -0500 Subject: [PATCH 11/52] Polished resistive heaters, fixed a small bug in the sound system (a bit uncleanly) --- .../client/gui/GuiResistiveHeater.java | 2 + .../java/mekanism/common/CommonProxy.java | 1 + .../TileEntityAdvancedElectricMachine.java | 2 +- .../common/tile/TileEntityChanceMachine.java | 2 +- .../tile/TileEntityElectricMachine.java | 2 +- .../tile/TileEntityElectrolyticSeparator.java | 2 +- .../common/tile/TileEntityEnergyCube.java | 2 +- .../common/tile/TileEntityFactory.java | 2 +- .../tile/TileEntityFluidicPlenisher.java | 28 ++++- .../tile/TileEntityInductionCasing.java | 2 +- .../common/tile/TileEntityLaserAmplifier.java | 2 +- .../tile/TileEntityMetallurgicInfuser.java | 4 +- .../tile/TileEntityNoisyElectricBlock.java | 2 +- .../mekanism/common/tile/TileEntityPRC.java | 2 +- .../tile/TileEntityResistiveHeater.java | 104 +++++++++++++++++- .../common/tile/TileEntityTeleporter.java | 6 +- .../common/tile/TileEntityBioGenerator.java | 2 +- .../common/tile/TileEntityGasGenerator.java | 2 +- .../common/tile/TileEntityHeatGenerator.java | 2 +- .../common/tile/TileEntitySolarGenerator.java | 2 +- .../common/tile/TileEntityWindGenerator.java | 2 +- 21 files changed, 147 insertions(+), 28 deletions(-) diff --git a/src/main/java/mekanism/client/gui/GuiResistiveHeater.java b/src/main/java/mekanism/client/gui/GuiResistiveHeater.java index 95a9e3155..f85a195cc 100644 --- a/src/main/java/mekanism/client/gui/GuiResistiveHeater.java +++ b/src/main/java/mekanism/client/gui/GuiResistiveHeater.java @@ -5,6 +5,7 @@ import java.util.ArrayList; import mekanism.api.Coord4D; import mekanism.api.util.UnitDisplayUtils.TemperatureUnit; import mekanism.client.gui.element.GuiPowerBar; +import mekanism.client.gui.element.GuiRedstoneControl; import mekanism.client.gui.element.GuiSlot; import mekanism.client.gui.element.GuiSlot.SlotOverlay; import mekanism.client.gui.element.GuiSlot.SlotType; @@ -39,6 +40,7 @@ public class GuiResistiveHeater extends GuiMekanism guiElements.add(new GuiPowerBar(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiResistiveHeater.png"), 164, 15)); guiElements.add(new GuiSlot(SlotType.POWER, this, MekanismUtils.getResource(ResourceType.GUI, "GuiResistiveHeater.png"), 14, 34).with(SlotOverlay.POWER)); + guiElements.add(new GuiRedstoneControl(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiResistiveHeater.png"))); } @Override diff --git a/src/main/java/mekanism/common/CommonProxy.java b/src/main/java/mekanism/common/CommonProxy.java index b24a0d392..082bd3fb8 100644 --- a/src/main/java/mekanism/common/CommonProxy.java +++ b/src/main/java/mekanism/common/CommonProxy.java @@ -277,6 +277,7 @@ public class CommonProxy implements IGuiProvider general.evaporationTempMultiplier = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "EvaporationTempMultiplier", 0.1D).getDouble(); general.evaporationSolarMultiplier = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "EvaporationSolarMultiplier", 0.2D).getDouble(); general.evaporationMaxTemp = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "EvaporationMaxTemp", 3000D).getDouble(); + general.energyPerHeat = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "EnergyPerHeat", 1000D).getDouble(); general.blacklistIC2 = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "BlacklistIC2Power", false).getBoolean(); general.blacklistRF = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "BlacklistRFPower", false).getBoolean(); diff --git a/src/main/java/mekanism/common/tile/TileEntityAdvancedElectricMachine.java b/src/main/java/mekanism/common/tile/TileEntityAdvancedElectricMachine.java index 60c219017..9de3ea37a 100644 --- a/src/main/java/mekanism/common/tile/TileEntityAdvancedElectricMachine.java +++ b/src/main/java/mekanism/common/tile/TileEntityAdvancedElectricMachine.java @@ -429,7 +429,7 @@ public abstract class TileEntityAdvancedElectricMachine activeNodes = new HashSet(); public Set usedNodes = new HashSet(); @@ -60,6 +62,8 @@ public class TileEntityFluidicPlenisher extends TileEntityElectricBlock implemen /** How many ticks this machine has been operating for. */ public int operatingTicks; + public RedstoneControl controlType = RedstoneControl.DISABLED; + private static EnumSet dirs = EnumSet.complementOf(EnumSet.of(ForgeDirection.UP, ForgeDirection.UNKNOWN)); public TileComponentUpgrade upgradeComponent = new TileComponentUpgrade(this, 3); @@ -278,6 +282,7 @@ public class TileEntityFluidicPlenisher extends TileEntityElectricBlock implemen super.handlePacketData(dataStream); finishedCalc = dataStream.readBoolean(); + controlType = RedstoneControl.values()[dataStream.readInt()]; if(dataStream.readInt() == 1) { @@ -296,6 +301,7 @@ public class TileEntityFluidicPlenisher extends TileEntityElectricBlock implemen super.getNetworkedData(data); data.add(finishedCalc); + data.add(controlType.ordinal()); if(fluidTank.getFluid() != null) { @@ -317,6 +323,7 @@ public class TileEntityFluidicPlenisher extends TileEntityElectricBlock implemen nbtTags.setInteger("operatingTicks", operatingTicks); nbtTags.setBoolean("finishedCalc", finishedCalc); + nbtTags.setInteger("controlType", controlType.ordinal()); if(fluidTank.getFluid() != null) { @@ -357,6 +364,7 @@ public class TileEntityFluidicPlenisher extends TileEntityElectricBlock implemen operatingTicks = nbtTags.getInteger("operatingTicks"); finishedCalc = nbtTags.getBoolean("finishedCalc"); + controlType = RedstoneControl.values()[nbtTags.getInteger("controlType")]; if(nbtTags.hasKey("fluidTank")) { @@ -579,4 +587,22 @@ public class TileEntityFluidicPlenisher extends TileEntityElectricBlock implemen break; } } + + @Override + public RedstoneControl getControlType() + { + return controlType; + } + + @Override + public void setControlType(RedstoneControl type) + { + controlType = type; + } + + @Override + public boolean canPulse() + { + return false; + } } diff --git a/src/main/java/mekanism/common/tile/TileEntityInductionCasing.java b/src/main/java/mekanism/common/tile/TileEntityInductionCasing.java index c78a5051e..abff1efaf 100644 --- a/src/main/java/mekanism/common/tile/TileEntityInductionCasing.java +++ b/src/main/java/mekanism/common/tile/TileEntityInductionCasing.java @@ -180,7 +180,7 @@ public class TileEntityInductionCasing extends TileEntityMultiblock 0) { updateDelay--; if(updateDelay == 0 && clientActive != isActive) { - Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new ArrayList())), new Range4D(Coord4D.get(this))); + packet = true; } } ChargeUtils.discharge(0, this); - double toUse = Math.min(getEnergy(), energyUsage); - heatToAbsorb += toUse/general.energyPerHeat; - setEnergy(getEnergy() - toUse); + double toUse = 0; + + if(MekanismUtils.canFunction(this)) + { + toUse = Math.min(getEnergy(), energyUsage); + heatToAbsorb += toUse/general.energyPerHeat; + setEnergy(getEnergy() - toUse); + } + setActive(toUse > 0); simulateHeat(); applyTemperatureChange(); + + float newSoundScale = (float)Math.max(0, (toUse/1E5)); + + if(Math.abs(newSoundScale-soundScale) > 0.01) + { + packet = true; + } + + soundScale = newSoundScale; + + if(packet) + { + Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new ArrayList())), new Range4D(Coord4D.get(this))); + } } } + @Override + public float getVolume() + { + return super.getVolume()*Math.max(0.001F, soundScale); + } + @Override public void readFromNBT(NBTTagCompound nbtTags) { @@ -89,6 +123,7 @@ public class TileEntityResistiveHeater extends TileEntityNoisyElectricBlock impl energyUsage = nbtTags.getDouble("energyUsage"); temperature = nbtTags.getDouble("temperature"); clientActive = isActive = nbtTags.getBoolean("isActive"); + controlType = RedstoneControl.values()[nbtTags.getInteger("controlType")]; maxEnergy = energyUsage * 400; } @@ -101,6 +136,7 @@ public class TileEntityResistiveHeater extends TileEntityNoisyElectricBlock impl nbtTags.setDouble("energyUsage", energyUsage); nbtTags.setDouble("temperature", temperature); nbtTags.setBoolean("isActive", isActive); + nbtTags.setInteger("controlType", controlType.ordinal()); } @Override @@ -120,6 +156,8 @@ public class TileEntityResistiveHeater extends TileEntityNoisyElectricBlock impl temperature = dataStream.readDouble(); clientActive = dataStream.readBoolean(); maxEnergy = dataStream.readDouble(); + soundScale = dataStream.readFloat(); + controlType = RedstoneControl.values()[dataStream.readInt()]; if(updateDelay == 0 && clientActive != isActive) { @@ -138,6 +176,8 @@ public class TileEntityResistiveHeater extends TileEntityNoisyElectricBlock impl data.add(temperature); data.add(isActive); data.add(maxEnergy); + data.add(soundScale); + data.add(controlType.ordinal()); return data; } @@ -223,7 +263,7 @@ public class TileEntityResistiveHeater extends TileEntityNoisyElectricBlock impl @Override public boolean renderUpdate() { - return true; + return false; } @Override @@ -231,4 +271,56 @@ public class TileEntityResistiveHeater extends TileEntityNoisyElectricBlock impl { return true; } + + private static final String[] methods = new String[] {"getEnergy", "getMaxEnergy", "getTemperature", "setEnergyUsage"}; + + @Override + public String[] getMethods() + { + return methods; + } + + @Override + public Object[] invoke(int method, Object[] arguments) throws Exception + { + switch(method) + { + case 0: + return new Object[] {getEnergy()}; + case 1: + return new Object[] {getMaxEnergy()}; + case 2: + return new Object[] {temperature}; + case 3: + if(arguments.length == 1) + { + if(arguments[0] instanceof Double) + { + temperature = (Double)arguments[0]; + } + } + + return new Object[] {"Invalid parameters."}; + default: + throw new NoSuchMethodException(); + } + } + + @Override + public RedstoneControl getControlType() + { + return controlType; + } + + @Override + public void setControlType(RedstoneControl type) + { + controlType = type; + } + + @Override + public boolean canPulse() + { + return false; + } } diff --git a/src/main/java/mekanism/common/tile/TileEntityTeleporter.java b/src/main/java/mekanism/common/tile/TileEntityTeleporter.java index 10168af77..8b0155f9f 100644 --- a/src/main/java/mekanism/common/tile/TileEntityTeleporter.java +++ b/src/main/java/mekanism/common/tile/TileEntityTeleporter.java @@ -698,7 +698,7 @@ public class TileEntityTeleporter extends TileEntityElectricBlock implements ICo return ChargeUtils.canBeOutputted(itemstack, false); } - private static final String[] methods = new String[] {"getStored", "canTeleport", "getMaxEnergy", "getEnergyNeeded", "teleport", "set"}; + private static final String[] methods = new String[] {"getEnergy", "canTeleport", "getMaxEnergy", "teleport", "set"}; @Override public String[] getMethods() @@ -718,11 +718,9 @@ public class TileEntityTeleporter extends TileEntityElectricBlock implements ICo case 2: return new Object[] {getMaxEnergy()}; case 3: - return new Object[] {(getMaxEnergy()-getEnergy())}; - case 4: teleport(); return new Object[] {"Attempted to teleport."}; - case 5: + case 4: if(!(arguments[0] instanceof String) || !(arguments[1] instanceof Boolean)) { return new Object[] {"Invalid parameters."}; diff --git a/src/main/java/mekanism/generators/common/tile/TileEntityBioGenerator.java b/src/main/java/mekanism/generators/common/tile/TileEntityBioGenerator.java index 9e3d09513..cf8ef7ea3 100644 --- a/src/main/java/mekanism/generators/common/tile/TileEntityBioGenerator.java +++ b/src/main/java/mekanism/generators/common/tile/TileEntityBioGenerator.java @@ -211,7 +211,7 @@ public class TileEntityBioGenerator extends TileEntityGenerator implements IFlui return EnumSet.of(ForgeDirection.getOrientation(facing).getOpposite()); } - private static final String[] methods = new String[] {"getStored", "getOutput", "getMaxEnergy", "getEnergyNeeded", "getBioFuel", "getBioFuelNeeded"}; + private static final String[] methods = new String[] {"getEnergy", "getOutput", "getMaxEnergy", "getEnergyNeeded", "getBioFuel", "getBioFuelNeeded"}; @Override public String[] getMethods() diff --git a/src/main/java/mekanism/generators/common/tile/TileEntityGasGenerator.java b/src/main/java/mekanism/generators/common/tile/TileEntityGasGenerator.java index 84ed468ea..63a91cd6b 100644 --- a/src/main/java/mekanism/generators/common/tile/TileEntityGasGenerator.java +++ b/src/main/java/mekanism/generators/common/tile/TileEntityGasGenerator.java @@ -156,7 +156,7 @@ public class TileEntityGasGenerator extends TileEntityGenerator implements IGasH return fuelTank.getStored()*i / MAX_GAS; } - private static final String[] methods = new String[] {"getStored", "getOutput", "getMaxEnergy", "getEnergyNeeded", "getGas", "getGasNeeded"}; + private static final String[] methods = new String[] {"getEnergy", "getOutput", "getMaxEnergy", "getEnergyNeeded", "getGas", "getGasNeeded"}; @Override public String[] getMethods() diff --git a/src/main/java/mekanism/generators/common/tile/TileEntityHeatGenerator.java b/src/main/java/mekanism/generators/common/tile/TileEntityHeatGenerator.java index b4576b6cd..b5ae01cb5 100644 --- a/src/main/java/mekanism/generators/common/tile/TileEntityHeatGenerator.java +++ b/src/main/java/mekanism/generators/common/tile/TileEntityHeatGenerator.java @@ -276,7 +276,7 @@ public class TileEntityHeatGenerator extends TileEntityGenerator implements IFlu return data; } - private static final String[] methods = new String[] {"getStored", "getOutput", "getMaxEnergy", "getEnergyNeeded", "getFuel", "getFuelNeeded"}; + private static final String[] methods = new String[] {"getEnergy", "getOutput", "getMaxEnergy", "getEnergyNeeded", "getFuel", "getFuelNeeded"}; @Override public String[] getMethods() diff --git a/src/main/java/mekanism/generators/common/tile/TileEntitySolarGenerator.java b/src/main/java/mekanism/generators/common/tile/TileEntitySolarGenerator.java index 85116c129..c7626e5ca 100644 --- a/src/main/java/mekanism/generators/common/tile/TileEntitySolarGenerator.java +++ b/src/main/java/mekanism/generators/common/tile/TileEntitySolarGenerator.java @@ -139,7 +139,7 @@ public class TileEntitySolarGenerator extends TileEntityGenerator return 0; } - private static final String[] methods = new String[] {"getStored", "getOutput", "getMaxEnergy", "getEnergyNeeded", "getSeesSun"}; + private static final String[] methods = new String[] {"getEnergy", "getOutput", "getMaxEnergy", "getEnergyNeeded", "getSeesSun"}; @Override public String[] getMethods() diff --git a/src/main/java/mekanism/generators/common/tile/TileEntityWindGenerator.java b/src/main/java/mekanism/generators/common/tile/TileEntityWindGenerator.java index f1ef89e4c..a40a267aa 100644 --- a/src/main/java/mekanism/generators/common/tile/TileEntityWindGenerator.java +++ b/src/main/java/mekanism/generators/common/tile/TileEntityWindGenerator.java @@ -71,7 +71,7 @@ public class TileEntityWindGenerator extends TileEntityGenerator implements IBou return 1.5F*super.getVolume(); } - private static final String[] methods = new String[] {"getStored", "getOutput", "getMaxEnergy", "getEnergyNeeded", "getMultiplier"}; + private static final String[] methods = new String[] {"getEnergy", "getOutput", "getMaxEnergy", "getEnergyNeeded", "getMultiplier"}; @Override public String[] getMethods() From 87438dcc7fdfdf0a37877222dba860f2b7b3d015 Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Sat, 27 Feb 2016 13:32:48 -0500 Subject: [PATCH 12/52] Boiler work, added heat info tab, worked on polishing heat interactions among machines --- src/main/java/mekanism/api/Coord4D.java | 7 +- src/main/java/mekanism/api/MekanismAPI.java | 1 - .../java/mekanism/api/MekanismConfig.java | 3 +- .../mekanism/api/energy/package-info.java | 2 +- .../java/mekanism/api/gas/GasNetwork.java | 15 +++- .../mekanism/api/gas/IGasTransmitter.java | 1 - .../java/mekanism/api/gas/package-info.java | 2 +- .../mekanism/api/infuse/package-info.java | 2 +- .../mekanism/api/lasers/package-info.java | 2 +- src/main/java/mekanism/api/package-info.java | 2 +- .../mekanism/api/reactor/IFusionReactor.java | 1 - .../mekanism/api/reactor/package-info.java | 2 +- .../mekanism/api/recipe/package-info.java | 2 +- .../api/transmitters/DynamicNetwork.java | 21 +++-- .../api/transmitters/IGridTransmitter.java | 4 +- .../api/transmitters/TransmissionType.java | 1 - .../api/transmitters/package-info.java | 2 +- .../java/mekanism/api/util/package-info.java | 2 +- .../mekanism/client/CapeBufferDownload.java | 6 -- .../client/ClientConnectionHandler.java | 1 - .../mekanism/client/ClientPlayerTracker.java | 1 - .../mekanism/client/ClientTickHandler.java | 33 +++++--- .../mekanism/client/MekanismKeyHandler.java | 24 ++++-- .../mekanism/client/ThreadClientUpdate.java | 1 - .../mekanism/client/entity/EntityLaser.java | 6 +- .../gui/GuiAdvancedElectricMachine.java | 4 +- .../mekanism/client/gui/GuiChanceMachine.java | 4 +- .../client/gui/GuiChemicalCrystallizer.java | 8 +- .../gui/GuiChemicalDissolutionChamber.java | 15 ++-- .../client/gui/GuiChemicalInfuser.java | 20 ++--- .../client/gui/GuiChemicalOxidizer.java | 15 ++-- .../client/gui/GuiChemicalWasher.java | 24 +++--- .../java/mekanism/client/gui/GuiCredits.java | 1 - .../mekanism/client/gui/GuiDictionary.java | 5 +- .../mekanism/client/gui/GuiDigitalMiner.java | 11 +-- .../client/gui/GuiDigitalMinerConfig.java | 5 +- .../mekanism/client/gui/GuiDynamicTank.java | 5 +- .../mekanism/client/gui/GuiElectricChest.java | 5 +- .../client/gui/GuiElectricMachine.java | 6 +- .../mekanism/client/gui/GuiElectricPump.java | 2 +- .../client/gui/GuiElectrolyticSeparator.java | 22 +++-- .../mekanism/client/gui/GuiEnergyCube.java | 2 +- .../client/gui/GuiEntangledBlock.java | 5 +- .../java/mekanism/client/gui/GuiFactory.java | 2 +- .../mekanism/client/gui/GuiFluidTank.java | 7 +- .../client/gui/GuiFluidicPlenisher.java | 2 +- .../client/gui/GuiInductionMatrix.java | 2 +- .../mekanism/client/gui/GuiMFilterSelect.java | 5 +- .../client/gui/GuiMItemStackFilter.java | 6 +- .../client/gui/GuiMMaterialFilter.java | 6 +- .../mekanism/client/gui/GuiMatrixStats.java | 5 +- .../client/gui/GuiMetallurgicInfuser.java | 2 +- .../gui/GuiOredictionificatorFilter.java | 1 - src/main/java/mekanism/client/gui/GuiPRC.java | 4 +- .../mekanism/client/gui/GuiPasswordEnter.java | 5 +- .../client/gui/GuiPasswordModify.java | 5 +- .../client/gui/GuiResistiveHeater.java | 23 ++++++ .../mekanism/client/gui/GuiRobitCrafting.java | 5 +- .../client/gui/GuiRobitInventory.java | 5 +- .../mekanism/client/gui/GuiRobitMain.java | 5 +- .../mekanism/client/gui/GuiRobitRepair.java | 7 +- .../client/gui/GuiRotaryCondensentrator.java | 12 +-- .../client/gui/GuiSeismicVibrator.java | 2 +- .../client/gui/GuiSolarNeutronActivator.java | 6 +- .../mekanism/client/gui/GuiTFilterSelect.java | 5 +- .../client/gui/GuiTItemStackFilter.java | 5 +- .../client/gui/GuiTMaterialFilter.java | 5 +- .../client/gui/GuiTOreDictFilter.java | 5 +- .../gui/GuiThermalEvaporationController.java | 14 ++++ .../client/gui/GuiTransporterConfig.java | 1 - .../client/gui/element/GuiBucketIO.java | 2 +- .../client/gui/element/GuiElement.java | 10 ++- .../client/gui/element/GuiEnergyInfo.java | 12 ++- .../client/gui/element/GuiFluidGauge.java | 5 +- .../client/gui/element/GuiGasGauge.java | 5 +- .../client/gui/element/GuiHeatInfo.java | 76 ++++++++++++++++++ .../client/gui/element/GuiProgress.java | 2 +- .../gui/element/GuiSideConfigurationTab.java | 2 +- .../client/model/ModelArmoredJetpack.java | 1 - .../client/model/ModelAtomicDisassembler.java | 1 - .../mekanism/client/model/ModelBalloon.java | 6 +- .../model/ModelChemicalCrystallizer.java | 1 - .../ModelChemicalDissolutionChamber.java | 1 - .../client/model/ModelChemicalInfuser.java | 6 +- .../client/model/ModelChemicalOxidizer.java | 6 +- .../client/model/ModelChemicalWasher.java | 1 - .../client/model/ModelDigitalMiner.java | 1 - .../client/model/ModelEnergyCube.java | 1 - .../mekanism/client/model/ModelGasMask.java | 6 +- .../mekanism/client/model/ModelJetpack.java | 6 +- .../client/model/ModelLogisticalSorter.java | 1 - .../mekanism/client/model/ModelRobit.java | 6 +- .../client/model/ModelSeismicVibrator.java | 5 +- .../nei/AdvancedMachineRecipeHandler.java | 12 +-- .../client/nei/BaseRecipeHandler.java | 7 +- .../nei/ChanceMachineRecipeHandler.java | 13 +-- .../nei/ChemicalInfuserRecipeHandler.java | 8 +- .../nei/ChemicalOxidizerRecipeHandler.java | 2 +- .../ElectrolyticSeparatorRecipeHandler.java | 5 +- .../client/nei/MachineRecipeHandler.java | 11 +-- .../client/nei/MekanismSlotClickHandler.java | 2 - .../client/nei/NEIMekanismConfig.java | 2 +- .../mekanism/client/nei/PRCRecipeHandler.java | 4 +- .../RotaryCondensentratorRecipeHandler.java | 12 +-- .../client/nei/SolarNeutronRecipeHandler.java | 3 - .../nei/ThermalEvaporationRecipeHandler.java | 1 - .../client/render/ColourTemperature.java | 1 - .../client/render/MinerVisualRenderer.java | 1 - .../client/render/ModelCustomArmor.java | 6 +- .../client/render/RenderGlowPanel.java | 2 - .../render/block/MachineRenderingHandler.java | 2 - .../render/block/PlasticRenderingHandler.java | 2 - .../client/render/block/RenderBlocksCTM.java | 1 - .../client/render/entity/RenderBalloon.java | 6 +- .../client/render/entity/RenderFlame.java | 6 +- .../entity/RenderObsidianTNTPrimed.java | 6 +- .../client/render/entity/RenderRobit.java | 1 - .../client/render/tileentity/RenderBin.java | 6 +- .../render/tileentity/RenderChargepad.java | 6 +- .../RenderChemicalCrystallizer.java | 6 +- .../RenderChemicalDissolutionChamber.java | 6 +- .../tileentity/RenderChemicalInfuser.java | 1 - .../tileentity/RenderChemicalOxidizer.java | 1 - .../tileentity/RenderChemicalWasher.java | 1 - .../render/tileentity/RenderDigitalMiner.java | 6 +- .../render/tileentity/RenderDynamicTank.java | 6 +- .../tileentity/RenderElectricChest.java | 6 +- .../render/tileentity/RenderElectricPump.java | 6 +- .../RenderElectrolyticSeparator.java | 6 +- .../render/tileentity/RenderEnergyCube.java | 6 +- .../tileentity/RenderFluidicPlenisher.java | 6 +- .../client/render/tileentity/RenderLaser.java | 6 +- .../tileentity/RenderLaserAmplifier.java | 6 +- .../tileentity/RenderLaserTractorBeam.java | 1 - .../tileentity/RenderLogisticalSorter.java | 6 +- .../tileentity/RenderMetallurgicInfuser.java | 6 +- .../render/tileentity/RenderObsidianTNT.java | 6 +- .../RenderPressurizedReactionChamber.java | 6 +- .../RenderRotaryCondensentrator.java | 6 +- .../tileentity/RenderSeismicVibrator.java | 6 +- .../RenderSolarNeutronActivator.java | 1 - .../render/tileentity/RenderTeleporter.java | 1 - .../RenderThermalEvaporationController.java | 6 +- .../client/sound/FlamethrowerSound.java | 1 - .../mekanism/client/sound/GasMaskSound.java | 1 - .../mekanism/client/sound/JetpackSound.java | 1 - .../java/mekanism/client/sound/Sound.java | 1 - .../mekanism/client/sound/SoundHandler.java | 1 - .../mekanism/client/voice/VoiceClient.java | 5 +- .../mekanism/client/voice/VoiceInput.java | 11 ++- .../mekanism/client/voice/VoiceOutput.java | 9 +-- .../mekanism/common/BoxBlacklistParser.java | 1 - src/main/java/mekanism/common/CTMData.java | 1 - .../java/mekanism/common/CTMTextureData.java | 1 - .../java/mekanism/common/CommandMekanism.java | 3 - .../mekanism/common/CommonPlayerTracker.java | 1 - .../java/mekanism/common/CommonProxy.java | 8 +- .../java/mekanism/common/EnergyNetwork.java | 2 +- .../java/mekanism/common/FluidNetwork.java | 14 +++- src/main/java/mekanism/common/HashList.java | 2 - .../mekanism/common/InventoryNetwork.java | 2 - .../java/mekanism/common/MekanismBlocks.java | 12 ++- .../java/mekanism/common/OreDictCache.java | 1 - .../java/mekanism/common/RobitAIFollow.java | 1 - .../java/mekanism/common/RobitAIPickup.java | 1 - .../java/mekanism/common/asm/LoadingHook.java | 3 +- .../common/base/EnergyAcceptorWrapper.java | 5 +- .../common/base/IAdvancedBoundingBlock.java | 6 +- .../mekanism/common/base/IEnergyCube.java | 1 - .../mekanism/common/base/IEnergyWrapper.java | 11 +-- .../common/base/ILogisticalTransporter.java | 1 - .../java/mekanism/common/base/IModule.java | 4 +- .../mekanism/common/base/ITileComponent.java | 4 +- .../mekanism/common/base/ITileNetwork.java | 4 +- .../common/base/ITransporterTile.java | 1 - .../mekanism/common/base/IUpgradeItem.java | 1 - .../mekanism/common/base/SoundWrapper.java | 2 +- .../mekanism/common/block/BlockBasic.java | 2 +- .../mekanism/common/block/BlockBounding.java | 8 +- .../common/block/BlockCardboardBox.java | 1 - .../common/block/BlockObsidianTNT.java | 1 - .../java/mekanism/common/block/BlockOre.java | 1 - .../mekanism/common/block/BlockPlastic.java | 2 - .../common/block/BlockPlasticFence.java | 1 - .../java/mekanism/common/block/BlockSalt.java | 1 - .../boiler/SynchronizedBoilerData.java | 47 ++++------- .../common/content/matrix/MatrixCache.java | 1 - .../content/miner/MItemStackFilter.java | 5 +- .../common/content/miner/MMaterialFilter.java | 5 +- .../common/content/miner/MModIDFilter.java | 5 +- .../common/content/miner/MOreDictFilter.java | 5 +- .../common/content/miner/MinerFilter.java | 5 +- .../content/tank/SynchronizedTankData.java | 1 - .../common/content/tank/TankCache.java | 1 - .../content/tank/TankUpdateProtocol.java | 1 - .../teleportation/SharedInventory.java | 1 - .../teleportation/SharedInventoryManager.java | 1 - .../common/content/transporter/Finder.java | 1 - .../content/transporter/PathfinderCache.java | 1 - .../content/transporter/StackSearcher.java | 1 - .../content/transporter/TItemStackFilter.java | 8 +- .../content/transporter/TMaterialFilter.java | 8 +- .../content/transporter/TModIDFilter.java | 8 +- .../content/transporter/TOreDictFilter.java | 8 +- .../transporter/TransporterFilter.java | 3 - .../mekanism/common/entity/EntityBalloon.java | 11 +-- .../mekanism/common/entity/EntityFlame.java | 13 ++- .../common/entity/EntityObsidianTNT.java | 1 - .../mekanism/common/entity/EntityRobit.java | 11 ++- .../common/integration/CCPeripheral.java | 4 +- .../common/integration/IC2ItemManager.java | 4 +- .../common/integration/MekanismHooks.java | 21 +++-- .../mekanism/common/integration/OCDriver.java | 6 +- .../common/inventory/InventoryBin.java | 1 - .../inventory/InventoryElectricChest.java | 1 - .../ContainerAdvancedElectricMachine.java | 1 - .../container/ContainerChanceMachine.java | 1 - .../ContainerChemicalCrystallizer.java | 1 - .../ContainerChemicalDissolutionChamber.java | 1 - .../container/ContainerChemicalInfuser.java | 1 - .../container/ContainerChemicalOxidizer.java | 1 - .../container/ContainerChemicalWasher.java | 1 - .../container/ContainerDigitalMiner.java | 1 - .../container/ContainerElectricChest.java | 4 +- .../container/ContainerElectricMachine.java | 1 - .../container/ContainerElectricPump.java | 1 - .../ContainerElectrolyticSeparator.java | 1 - .../container/ContainerEnergyCube.java | 4 +- .../inventory/container/ContainerFilter.java | 1 - .../container/ContainerFluidTank.java | 1 - .../container/ContainerFluidicPlenisher.java | 1 - .../inventory/container/ContainerGasTank.java | 1 - .../inventory/container/ContainerNull.java | 1 - .../ContainerOredictionificator.java | 3 - .../inventory/container/ContainerPRC.java | 1 - .../container/ContainerRobitInventory.java | 1 - .../container/ContainerRobitMain.java | 1 - .../container/ContainerRobitSmelting.java | 1 - .../ContainerRotaryCondensentrator.java | 1 - .../container/ContainerSeismicVibrator.java | 1 - .../ContainerSolarNeutronActivator.java | 4 - .../container/ContainerTeleporter.java | 1 - ...ContainerThermalEvaporationController.java | 1 - .../container/ContainerUpgradeManagement.java | 1 - .../inventory/slot/SlotElectricChest.java | 1 - .../common/inventory/slot/SlotEnergy.java | 1 - .../inventory/slot/SlotMachineUpgrade.java | 1 - .../inventory/slot/SlotStorageTank.java | 1 - .../mekanism/common/item/ItemBalloon.java | 8 +- .../common/item/ItemBlockPlastic.java | 4 +- .../common/item/ItemControlCircuit.java | 1 - .../mekanism/common/item/ItemDirtyDust.java | 1 - .../mekanism/common/item/ItemEnergized.java | 7 +- .../common/item/ItemFlamethrower.java | 8 +- .../mekanism/common/item/ItemFreeRunners.java | 7 +- .../mekanism/common/item/ItemGasMask.java | 1 - .../common/item/ItemGaugeDropper.java | 1 - .../java/mekanism/common/item/ItemHDPE.java | 1 - .../mekanism/common/item/ItemMekanism.java | 1 - .../common/item/ItemPortableTeleporter.java | 4 - .../mekanism/common/item/ItemUpgrade.java | 5 +- .../multiblock/IStructuralMultiblock.java | 1 - .../common/multiblock/MultiblockCache.java | 1 - .../common/multiblock/SynchronizedData.java | 1 - .../common/multipart/ItemGlowPanel.java | 20 ++--- .../multipart/MultipartTransmitter.java | 4 +- .../multipart/PartDiversionTransporter.java | 4 +- .../common/multipart/PartGlowPanel.java | 6 +- .../multipart/PartRestrictiveTransporter.java | 2 - .../multipart/PlasticMicroMaterial.java | 1 - .../common/network/PacketBoxBlacklist.java | 4 +- .../common/network/PacketConfigSync.java | 4 +- .../network/PacketContainerEditMode.java | 4 +- .../common/network/PacketDigitalMinerGui.java | 5 +- .../network/PacketElectricBowState.java | 4 +- .../common/network/PacketElectricChest.java | 4 +- .../network/PacketFlamethrowerData.java | 6 +- .../common/network/PacketJetpackData.java | 4 +- .../mekanism/common/network/PacketKey.java | 4 +- .../network/PacketLogisticalSorterGui.java | 4 +- .../network/PacketPortableTankState.java | 4 +- .../network/PacketPortableTeleporter.java | 15 ++-- .../common/network/PacketPortalFX.java | 5 +- .../common/network/PacketRedstoneControl.java | 4 +- .../common/network/PacketRemoveUpgrade.java | 4 +- .../mekanism/common/network/PacketRobit.java | 4 +- .../common/network/PacketScubaTankData.java | 4 +- .../network/PacketTransmitterUpdate.java | 7 +- .../network/PacketWalkieTalkieState.java | 4 +- .../mekanism/common/recipe/BinRecipe.java | 1 - .../recipe/inputs/ChemicalPairInput.java | 2 +- .../machines/AdvancedMachineRecipe.java | 1 - .../recipe/machines/BasicMachineRecipe.java | 1 - .../recipe/machines/ChanceMachineRecipe.java | 1 - .../recipe/machines/CombinerRecipe.java | 1 - .../common/recipe/machines/CrusherRecipe.java | 1 - .../recipe/machines/CrystallizerRecipe.java | 1 - .../recipe/machines/DissolutionRecipe.java | 1 - .../recipe/machines/EnrichmentRecipe.java | 1 - .../recipe/machines/InjectionRecipe.java | 1 - .../machines/OsmiumCompressorRecipe.java | 1 - .../recipe/machines/OxidationRecipe.java | 1 - .../recipe/machines/PressurizedRecipe.java | 1 - .../recipe/machines/PurificationRecipe.java | 1 - .../common/recipe/machines/SawmillRecipe.java | 1 - .../recipe/machines/SeparatorRecipe.java | 1 - .../recipe/machines/SmeltingRecipe.java | 1 - .../common/recipe/machines/WasherRecipe.java | 1 - .../recipe/outputs/ChemicalPairOutput.java | 2 +- .../common/recipe/outputs/GasOutput.java | 2 +- .../tile/TileEntityAdvancedBoundingBlock.java | 8 +- .../tile/TileEntityAmbientAccumulator.java | 5 +- .../common/tile/TileEntityBasicMachine.java | 13 ++- .../mekanism/common/tile/TileEntityBin.java | 5 +- .../common/tile/TileEntityBoilerCasing.java | 35 +++++--- .../common/tile/TileEntityBoilerValve.java | 1 - .../common/tile/TileEntityBoundingBlock.java | 5 +- .../common/tile/TileEntityCardboardBox.java | 1 - .../common/tile/TileEntityChanceMachine.java | 4 +- .../TileEntityChemicalInjectionChamber.java | 2 - .../tile/TileEntityChemicalOxidizer.java | 2 +- .../common/tile/TileEntityCombiner.java | 1 - .../common/tile/TileEntityCrusher.java | 1 - .../common/tile/TileEntityDigitalMiner.java | 29 +++++-- .../common/tile/TileEntityElectricBlock.java | 1 - .../common/tile/TileEntityElectricChest.java | 5 +- .../tile/TileEntityElectrolyticSeparator.java | 31 +++++-- .../common/tile/TileEntityEntangledBlock.java | 5 +- .../tile/TileEntityFluidicPlenisher.java | 1 - .../common/tile/TileEntityLaserAmplifier.java | 5 +- .../tile/TileEntityLogisticalSorter.java | 19 +++-- .../common/tile/TileEntityMultiblock.java | 1 - .../tile/TileEntityOredictionificator.java | 6 -- .../tile/TileEntityOsmiumCompressor.java | 2 - .../mekanism/common/tile/TileEntityPRC.java | 21 +++-- .../tile/TileEntityPrecisionSawmill.java | 1 - .../tile/TileEntityPurificationChamber.java | 3 - .../tile/TileEntityResistiveHeater.java | 14 +++- .../tile/TileEntityRotaryCondensentrator.java | 2 +- .../tile/TileEntitySeismicVibrator.java | 5 +- .../tile/TileEntitySolarNeutronActivator.java | 2 +- ...ileEntityThermalEvaporationController.java | 19 +++++ .../java/mekanism/common/util/CableUtils.java | 1 - .../mekanism/common/util/InventoryUtils.java | 1 - .../mekanism/common/util/MekanismUtils.java | 6 +- .../java/mekanism/common/util/MinerUtils.java | 1 - .../java/mekanism/common/util/PipeUtils.java | 1 - .../java/mekanism/common/util/StatUtils.java | 10 +-- .../common/voice/VoiceConnection.java | 1 - .../mekanism/common/world/GenHandler.java | 1 - .../mekanism/common/world/WorldGenSalt.java | 1 - .../client/BlockRenderingHandler.java | 6 +- .../client/gui/GuiBioGenerator.java | 8 +- .../client/gui/GuiGasGenerator.java | 12 +-- .../client/gui/GuiGeneratorsConfig.java | 1 - .../client/gui/GuiHeatGenerator.java | 25 ++++-- .../client/gui/GuiIndustrialTurbine.java | 2 +- .../client/gui/GuiNeutronCapture.java | 7 +- .../client/gui/GuiReactorController.java | 7 +- .../generators/client/gui/GuiReactorFuel.java | 2 +- .../generators/client/gui/GuiReactorHeat.java | 2 +- .../client/gui/GuiReactorStats.java | 2 +- .../client/gui/GuiSolarGenerator.java | 8 +- .../client/gui/GuiTurbineStats.java | 2 +- .../client/gui/GuiWindGenerator.java | 8 +- .../model/ModelAdvancedSolarGenerator.java | 1 - .../generators/client/model/ModelTurbine.java | 5 +- .../render/RenderAdvancedSolarGenerator.java | 6 +- .../client/render/RenderBioGenerator.java | 6 +- .../client/render/RenderGasGenerator.java | 6 +- .../client/render/RenderHeatGenerator.java | 6 +- .../client/render/RenderReactor.java | 6 +- .../client/render/RenderSolarGenerator.java | 1 - .../client/render/RenderWindTurbine.java | 1 - .../generators/common/GeneratorsBlocks.java | 1 - .../common/GeneratorsCommonProxy.java | 1 - .../container/ContainerBioGenerator.java | 1 - .../container/ContainerGasGenerator.java | 1 - .../container/ContainerHeatGenerator.java | 1 - .../container/ContainerNeutronCapture.java | 1 - .../container/ContainerReactorController.java | 1 - .../container/ContainerSolarGenerator.java | 1 - .../container/ContainerWindGenerator.java | 1 - .../TileEntityAdvancedSolarGenerator.java | 1 - .../common/tile/TileEntityBioGenerator.java | 14 +++- .../common/tile/TileEntityGasGenerator.java | 14 +++- .../common/tile/TileEntityGenerator.java | 11 +-- .../common/tile/TileEntityHeatGenerator.java | 34 ++++++-- .../common/tile/TileEntityWindGenerator.java | 4 +- .../tile/reactor/TileEntityReactorBlock.java | 1 - .../TileEntityReactorLaserFocusMatrix.java | 1 - .../tile/turbine/TileEntityTurbineValve.java | 1 - .../mekanism/tools/common/MekanismTools.java | 23 +++--- .../mekanism/tools/common/ToolsItems.java | 1 - .../mekanism/gui/elements/GuiHeatInfo.png | Bin 0 -> 2757 bytes .../resources/assets/mekanism/lang/en_US.lang | 2 + 396 files changed, 1014 insertions(+), 950 deletions(-) create mode 100644 src/main/java/mekanism/client/gui/element/GuiHeatInfo.java create mode 100644 src/main/resources/assets/mekanism/gui/elements/GuiHeatInfo.png diff --git a/src/main/java/mekanism/api/Coord4D.java b/src/main/java/mekanism/api/Coord4D.java index 1a0f7e4d5..4a62f845b 100644 --- a/src/main/java/mekanism/api/Coord4D.java +++ b/src/main/java/mekanism/api/Coord4D.java @@ -1,7 +1,9 @@ package mekanism.api; -import cpw.mods.fml.common.network.NetworkRegistry.TargetPoint; import io.netty.buffer.ByteBuf; + +import java.util.ArrayList; + import net.minecraft.block.Block; import net.minecraft.entity.Entity; import net.minecraft.init.Blocks; @@ -15,8 +17,7 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraft.world.chunk.Chunk; import net.minecraftforge.common.util.ForgeDirection; - -import java.util.ArrayList; +import cpw.mods.fml.common.network.NetworkRegistry.TargetPoint; /** * Coord4D - an integer-based way to keep track of and perform operations on blocks in a Minecraft-based environment. This also takes diff --git a/src/main/java/mekanism/api/MekanismAPI.java b/src/main/java/mekanism/api/MekanismAPI.java index abdd6da5e..8594b6c44 100644 --- a/src/main/java/mekanism/api/MekanismAPI.java +++ b/src/main/java/mekanism/api/MekanismAPI.java @@ -4,7 +4,6 @@ import java.util.HashSet; import java.util.Set; import mekanism.api.util.BlockInfo; - import net.minecraft.block.Block; import net.minecraft.item.Item; import net.minecraftforge.oredict.OreDictionary; diff --git a/src/main/java/mekanism/api/MekanismConfig.java b/src/main/java/mekanism/api/MekanismConfig.java index 01ed80b3b..29e497bd3 100644 --- a/src/main/java/mekanism/api/MekanismConfig.java +++ b/src/main/java/mekanism/api/MekanismConfig.java @@ -32,7 +32,7 @@ public class MekanismConfig public static double ENERGY_PER_REDSTONE = 10000; public static int ETHENE_BURN_TIME = 40; public static double DISASSEMBLER_USAGE = 10; - public static EnergyType activeType = EnergyType.J; + public static EnergyType energyUnit = EnergyType.J; public static TempType tempUnit = TempType.K; public static double TO_IC2; public static double TO_TE; @@ -62,6 +62,7 @@ public class MekanismConfig public static double evaporationSolarMultiplier = 0.2; public static double evaporationMaxTemp = 3000; public static double energyPerHeat = 1000; + public static double superheatingHeatTransfer = 10000; } public static class client diff --git a/src/main/java/mekanism/api/energy/package-info.java b/src/main/java/mekanism/api/energy/package-info.java index 8f3d3716e..f75ddd69d 100644 --- a/src/main/java/mekanism/api/energy/package-info.java +++ b/src/main/java/mekanism/api/energy/package-info.java @@ -1,3 +1,3 @@ @API(apiVersion = "8.0.0", owner = "Mekanism", provides = "MekanismAPI|energy") package mekanism.api.energy; -import cpw.mods.fml.common.API; \ No newline at end of file +import cpw.mods.fml.common.API; diff --git a/src/main/java/mekanism/api/gas/GasNetwork.java b/src/main/java/mekanism/api/gas/GasNetwork.java index 7258167c2..688c63bca 100644 --- a/src/main/java/mekanism/api/gas/GasNetwork.java +++ b/src/main/java/mekanism/api/gas/GasNetwork.java @@ -1,8 +1,12 @@ package mekanism.api.gas; -import com.google.common.collect.Lists; -import cpw.mods.fml.common.FMLCommonHandler; -import cpw.mods.fml.common.eventhandler.Event; +import java.util.Collection; +import java.util.Collections; +import java.util.EnumSet; +import java.util.HashSet; +import java.util.List; +import java.util.Set; + import mekanism.api.Coord4D; import mekanism.api.transmitters.DynamicNetwork; import mekanism.api.transmitters.IGridTransmitter; @@ -10,7 +14,10 @@ import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.util.ForgeDirection; -import java.util.*; +import com.google.common.collect.Lists; + +import cpw.mods.fml.common.FMLCommonHandler; +import cpw.mods.fml.common.eventhandler.Event; /** * A DynamicNetwork extension created specifically for the transfer of Gasses. By default this is server-only, but if ticked on diff --git a/src/main/java/mekanism/api/gas/IGasTransmitter.java b/src/main/java/mekanism/api/gas/IGasTransmitter.java index 57ec4c1fc..2785ac1c8 100644 --- a/src/main/java/mekanism/api/gas/IGasTransmitter.java +++ b/src/main/java/mekanism/api/gas/IGasTransmitter.java @@ -1,7 +1,6 @@ package mekanism.api.gas; import mekanism.api.transmitters.IGridTransmitter; - import net.minecraft.tileentity.TileEntity; public interface IGasTransmitter extends IGridTransmitter diff --git a/src/main/java/mekanism/api/gas/package-info.java b/src/main/java/mekanism/api/gas/package-info.java index 4418451ff..90bd8f761 100644 --- a/src/main/java/mekanism/api/gas/package-info.java +++ b/src/main/java/mekanism/api/gas/package-info.java @@ -1,3 +1,3 @@ @API(apiVersion = "8.0.0", owner = "Mekanism", provides = "MekanismAPI|gas") package mekanism.api.gas; -import cpw.mods.fml.common.API; \ No newline at end of file +import cpw.mods.fml.common.API; diff --git a/src/main/java/mekanism/api/infuse/package-info.java b/src/main/java/mekanism/api/infuse/package-info.java index 871899688..606e94648 100644 --- a/src/main/java/mekanism/api/infuse/package-info.java +++ b/src/main/java/mekanism/api/infuse/package-info.java @@ -1,3 +1,3 @@ @API(apiVersion = "8.0.0", owner = "Mekanism", provides = "MekanismAPI|infuse") package mekanism.api.infuse; -import cpw.mods.fml.common.API; \ No newline at end of file +import cpw.mods.fml.common.API; diff --git a/src/main/java/mekanism/api/lasers/package-info.java b/src/main/java/mekanism/api/lasers/package-info.java index b45693745..ea5376255 100644 --- a/src/main/java/mekanism/api/lasers/package-info.java +++ b/src/main/java/mekanism/api/lasers/package-info.java @@ -1,3 +1,3 @@ @API(apiVersion = "8.0.0", owner = "Mekanism", provides = "MekanismAPI|laser") package mekanism.api.lasers; -import cpw.mods.fml.common.API; \ No newline at end of file +import cpw.mods.fml.common.API; diff --git a/src/main/java/mekanism/api/package-info.java b/src/main/java/mekanism/api/package-info.java index 2b9fcabca..49bcf9de7 100644 --- a/src/main/java/mekanism/api/package-info.java +++ b/src/main/java/mekanism/api/package-info.java @@ -1,3 +1,3 @@ @API(apiVersion = "8.0.0", owner = "Mekanism", provides = "MekanismAPI|core") package mekanism.api; -import cpw.mods.fml.common.API; \ No newline at end of file +import cpw.mods.fml.common.API; diff --git a/src/main/java/mekanism/api/reactor/IFusionReactor.java b/src/main/java/mekanism/api/reactor/IFusionReactor.java index 9d9d96de9..ecb2f66e7 100644 --- a/src/main/java/mekanism/api/reactor/IFusionReactor.java +++ b/src/main/java/mekanism/api/reactor/IFusionReactor.java @@ -2,7 +2,6 @@ package mekanism.api.reactor; import mekanism.api.IHeatTransfer; import mekanism.api.gas.GasTank; - import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidTank; diff --git a/src/main/java/mekanism/api/reactor/package-info.java b/src/main/java/mekanism/api/reactor/package-info.java index 6a00fc693..7fbf4ef69 100644 --- a/src/main/java/mekanism/api/reactor/package-info.java +++ b/src/main/java/mekanism/api/reactor/package-info.java @@ -1,3 +1,3 @@ @API(apiVersion = "8.0.0", owner = "Mekanism", provides = "MekanismAPI|reactor") package mekanism.api.reactor; -import cpw.mods.fml.common.API; \ No newline at end of file +import cpw.mods.fml.common.API; diff --git a/src/main/java/mekanism/api/recipe/package-info.java b/src/main/java/mekanism/api/recipe/package-info.java index f166da475..4f2851287 100644 --- a/src/main/java/mekanism/api/recipe/package-info.java +++ b/src/main/java/mekanism/api/recipe/package-info.java @@ -1,3 +1,3 @@ @API(apiVersion = "8.0.0", owner = "Mekanism", provides = "MekanismAPI|recipe") package mekanism.api.recipe; -import cpw.mods.fml.common.API; \ No newline at end of file +import cpw.mods.fml.common.API; diff --git a/src/main/java/mekanism/api/transmitters/DynamicNetwork.java b/src/main/java/mekanism/api/transmitters/DynamicNetwork.java index ee4e8a2b7..1bf01a879 100644 --- a/src/main/java/mekanism/api/transmitters/DynamicNetwork.java +++ b/src/main/java/mekanism/api/transmitters/DynamicNetwork.java @@ -1,10 +1,13 @@ package mekanism.api.transmitters; -import com.google.common.collect.Lists; -import com.google.common.collect.Maps; -import com.google.common.collect.Sets; -import cpw.mods.fml.common.FMLCommonHandler; -import cpw.mods.fml.common.eventhandler.Event; +import java.util.Collection; +import java.util.EnumSet; +import java.util.HashMap; +import java.util.Iterator; +import java.util.LinkedHashSet; +import java.util.Map.Entry; +import java.util.Set; + import mekanism.api.Coord4D; import mekanism.api.IClientTicker; import mekanism.api.Range4D; @@ -14,8 +17,12 @@ import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.util.ForgeDirection; -import java.util.*; -import java.util.Map.Entry; +import com.google.common.collect.Lists; +import com.google.common.collect.Maps; +import com.google.common.collect.Sets; + +import cpw.mods.fml.common.FMLCommonHandler; +import cpw.mods.fml.common.eventhandler.Event; public abstract class DynamicNetwork> implements IClientTicker, INetworkDataHandler { diff --git a/src/main/java/mekanism/api/transmitters/IGridTransmitter.java b/src/main/java/mekanism/api/transmitters/IGridTransmitter.java index 9d82d486b..c0ea3d5fd 100644 --- a/src/main/java/mekanism/api/transmitters/IGridTransmitter.java +++ b/src/main/java/mekanism/api/transmitters/IGridTransmitter.java @@ -1,11 +1,11 @@ package mekanism.api.transmitters; +import java.util.Collection; + import mekanism.api.Coord4D; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; -import java.util.Collection; - public interface IGridTransmitter> extends ITransmitter { public boolean hasTransmitterNetwork(); diff --git a/src/main/java/mekanism/api/transmitters/TransmissionType.java b/src/main/java/mekanism/api/transmitters/TransmissionType.java index 7b54e9cc7..8ea4b4311 100644 --- a/src/main/java/mekanism/api/transmitters/TransmissionType.java +++ b/src/main/java/mekanism/api/transmitters/TransmissionType.java @@ -1,7 +1,6 @@ package mekanism.api.transmitters; import mekanism.api.gas.IGasTransmitter; - import net.minecraft.tileentity.TileEntity; import net.minecraft.util.StatCollector; diff --git a/src/main/java/mekanism/api/transmitters/package-info.java b/src/main/java/mekanism/api/transmitters/package-info.java index 06819e741..323628ebb 100644 --- a/src/main/java/mekanism/api/transmitters/package-info.java +++ b/src/main/java/mekanism/api/transmitters/package-info.java @@ -1,3 +1,3 @@ @API(apiVersion = "8.0.0", owner = "Mekanism", provides = "MekanismAPI|transmitter") package mekanism.api.transmitters; -import cpw.mods.fml.common.API; \ No newline at end of file +import cpw.mods.fml.common.API; diff --git a/src/main/java/mekanism/api/util/package-info.java b/src/main/java/mekanism/api/util/package-info.java index e5253bcbc..6836bdc6e 100644 --- a/src/main/java/mekanism/api/util/package-info.java +++ b/src/main/java/mekanism/api/util/package-info.java @@ -1,3 +1,3 @@ @API(apiVersion = "8.0.0", owner = "Mekanism", provides = "MekanismAPI|util") package mekanism.api.util; -import cpw.mods.fml.common.API; \ No newline at end of file +import cpw.mods.fml.common.API; diff --git a/src/main/java/mekanism/client/CapeBufferDownload.java b/src/main/java/mekanism/client/CapeBufferDownload.java index 079d8b94d..f84d8dbbe 100644 --- a/src/main/java/mekanism/client/CapeBufferDownload.java +++ b/src/main/java/mekanism/client/CapeBufferDownload.java @@ -1,15 +1,9 @@ package mekanism.client; import java.io.File; -import java.lang.reflect.Method; -import mekanism.common.ObfuscatedNames; -import mekanism.common.util.MekanismUtils; import net.minecraft.client.Minecraft; -import net.minecraft.client.entity.AbstractClientPlayer; -import net.minecraft.client.renderer.IImageBuffer; import net.minecraft.client.renderer.ThreadDownloadImageData; -import net.minecraft.client.renderer.texture.ITextureObject; import net.minecraft.client.renderer.texture.TextureManager; import net.minecraft.util.ResourceLocation; import net.minecraft.util.StringUtils; diff --git a/src/main/java/mekanism/client/ClientConnectionHandler.java b/src/main/java/mekanism/client/ClientConnectionHandler.java index c8d4164b2..2289e0d58 100644 --- a/src/main/java/mekanism/client/ClientConnectionHandler.java +++ b/src/main/java/mekanism/client/ClientConnectionHandler.java @@ -5,7 +5,6 @@ import java.net.InetSocketAddress; import mekanism.api.MekanismConfig.general; import mekanism.client.voice.VoiceClient; import mekanism.common.Mekanism; - import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.network.FMLNetworkEvent.ClientConnectedToServerEvent; import cpw.mods.fml.relauncher.Side; diff --git a/src/main/java/mekanism/client/ClientPlayerTracker.java b/src/main/java/mekanism/client/ClientPlayerTracker.java index c39d4dc9b..67e36a2e4 100644 --- a/src/main/java/mekanism/client/ClientPlayerTracker.java +++ b/src/main/java/mekanism/client/ClientPlayerTracker.java @@ -1,7 +1,6 @@ package mekanism.client; import mekanism.common.Mekanism; - import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.gameevent.PlayerEvent.PlayerChangedDimensionEvent; import cpw.mods.fml.relauncher.Side; diff --git a/src/main/java/mekanism/client/ClientTickHandler.java b/src/main/java/mekanism/client/ClientTickHandler.java index 87f9ac330..cefdb776d 100644 --- a/src/main/java/mekanism/client/ClientTickHandler.java +++ b/src/main/java/mekanism/client/ClientTickHandler.java @@ -1,20 +1,28 @@ package mekanism.client; -import com.mojang.authlib.minecraft.MinecraftProfileTexture; -import cpw.mods.fml.client.FMLClientHandler; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import cpw.mods.fml.common.gameevent.TickEvent.ClientTickEvent; -import cpw.mods.fml.common.gameevent.TickEvent.Phase; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import static mekanism.client.sound.SoundHandler.Channel.FLAMETHROWER; +import static mekanism.client.sound.SoundHandler.Channel.GASMASK; +import static mekanism.client.sound.SoundHandler.Channel.JETPACK; + +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Set; + import mekanism.api.IClientTicker; import mekanism.api.MekanismConfig.client; import mekanism.api.gas.GasStack; import mekanism.client.sound.SoundHandler; import mekanism.common.KeySync; import mekanism.common.Mekanism; -import mekanism.common.item.*; +import mekanism.common.item.ItemFlamethrower; +import mekanism.common.item.ItemFreeRunners; +import mekanism.common.item.ItemGasMask; +import mekanism.common.item.ItemJetpack; import mekanism.common.item.ItemJetpack.JetpackMode; +import mekanism.common.item.ItemScubaTank; import mekanism.common.network.PacketFlamethrowerData; import mekanism.common.network.PacketFlamethrowerData.FlamethrowerDataMessage; import mekanism.common.network.PacketJetpackData.JetpackDataMessage; @@ -28,9 +36,14 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.StringUtils; -import java.util.*; +import com.mojang.authlib.minecraft.MinecraftProfileTexture; -import static mekanism.client.sound.SoundHandler.Channel.*; +import cpw.mods.fml.client.FMLClientHandler; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import cpw.mods.fml.common.gameevent.TickEvent.ClientTickEvent; +import cpw.mods.fml.common.gameevent.TickEvent.Phase; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; /** * Client-side tick handler for Mekanism. Used mainly for the update check upon startup. diff --git a/src/main/java/mekanism/client/MekanismKeyHandler.java b/src/main/java/mekanism/client/MekanismKeyHandler.java index 42d9a1dd8..2d7887e02 100644 --- a/src/main/java/mekanism/client/MekanismKeyHandler.java +++ b/src/main/java/mekanism/client/MekanismKeyHandler.java @@ -1,20 +1,19 @@ package mekanism.client; -import cpw.mods.fml.client.FMLClientHandler; -import cpw.mods.fml.client.registry.ClientRegistry; -import cpw.mods.fml.common.FMLCommonHandler; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import cpw.mods.fml.common.gameevent.InputEvent; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import mekanism.api.EnumColor; import mekanism.api.util.StackUtils; import mekanism.client.sound.SoundHandler; import mekanism.common.Mekanism; import mekanism.common.block.BlockMachine.MachineType; -import mekanism.common.item.*; +import mekanism.common.item.ItemBlockMachine; +import mekanism.common.item.ItemConfigurator; import mekanism.common.item.ItemConfigurator.ConfiguratorMode; +import mekanism.common.item.ItemElectricBow; +import mekanism.common.item.ItemFlamethrower; +import mekanism.common.item.ItemJetpack; import mekanism.common.item.ItemJetpack.JetpackMode; +import mekanism.common.item.ItemScubaTank; +import mekanism.common.item.ItemWalkieTalkie; import mekanism.common.network.PacketConfiguratorState.ConfiguratorStateMessage; import mekanism.common.network.PacketElectricBowState.ElectricBowStateMessage; import mekanism.common.network.PacketFlamethrowerData; @@ -31,8 +30,17 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.ChatComponentText; + import org.lwjgl.input.Keyboard; +import cpw.mods.fml.client.FMLClientHandler; +import cpw.mods.fml.client.registry.ClientRegistry; +import cpw.mods.fml.common.FMLCommonHandler; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import cpw.mods.fml.common.gameevent.InputEvent; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + @SideOnly(Side.CLIENT) public class MekanismKeyHandler extends MekKeyHandler { diff --git a/src/main/java/mekanism/client/ThreadClientUpdate.java b/src/main/java/mekanism/client/ThreadClientUpdate.java index a6ee1b172..5fd364ccb 100644 --- a/src/main/java/mekanism/client/ThreadClientUpdate.java +++ b/src/main/java/mekanism/client/ThreadClientUpdate.java @@ -14,7 +14,6 @@ import mekanism.client.gui.GuiCredits; import mekanism.common.Mekanism; import mekanism.common.Version; import mekanism.common.base.IModule; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/mekanism/client/entity/EntityLaser.java b/src/main/java/mekanism/client/entity/EntityLaser.java index cd716be47..c91db933b 100644 --- a/src/main/java/mekanism/client/entity/EntityLaser.java +++ b/src/main/java/mekanism/client/entity/EntityLaser.java @@ -2,18 +2,18 @@ package mekanism.client.entity; import mekanism.api.Pos3D; import mekanism.client.render.MekanismRenderer; - import net.minecraft.client.Minecraft; import net.minecraft.client.particle.EntityFX; import net.minecraft.client.renderer.Tessellator; import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + @SideOnly(Side.CLIENT) public class EntityLaser extends EntityFX { diff --git a/src/main/java/mekanism/client/gui/GuiAdvancedElectricMachine.java b/src/main/java/mekanism/client/gui/GuiAdvancedElectricMachine.java index 6b6a44d9f..2d61169c5 100644 --- a/src/main/java/mekanism/client/gui/GuiAdvancedElectricMachine.java +++ b/src/main/java/mekanism/client/gui/GuiAdvancedElectricMachine.java @@ -4,13 +4,13 @@ import java.util.List; import mekanism.api.gas.GasStack; import mekanism.api.util.ListUtils; +import mekanism.client.gui.element.GuiElement.IInfoHandler; import mekanism.client.gui.element.GuiEnergyInfo; -import mekanism.client.gui.element.GuiEnergyInfo.IInfoHandler; import mekanism.client.gui.element.GuiPowerBar; import mekanism.client.gui.element.GuiProgress; -import mekanism.client.gui.element.GuiRedstoneControl; import mekanism.client.gui.element.GuiProgress.IProgressInfoHandler; import mekanism.client.gui.element.GuiProgress.ProgressBar; +import mekanism.client.gui.element.GuiRedstoneControl; import mekanism.client.gui.element.GuiSideConfigurationTab; import mekanism.client.gui.element.GuiSlot; import mekanism.client.gui.element.GuiSlot.SlotOverlay; diff --git a/src/main/java/mekanism/client/gui/GuiChanceMachine.java b/src/main/java/mekanism/client/gui/GuiChanceMachine.java index a0122ca17..856a2f770 100644 --- a/src/main/java/mekanism/client/gui/GuiChanceMachine.java +++ b/src/main/java/mekanism/client/gui/GuiChanceMachine.java @@ -3,13 +3,13 @@ package mekanism.client.gui; import java.util.List; import mekanism.api.util.ListUtils; +import mekanism.client.gui.element.GuiElement.IInfoHandler; import mekanism.client.gui.element.GuiEnergyInfo; -import mekanism.client.gui.element.GuiEnergyInfo.IInfoHandler; import mekanism.client.gui.element.GuiPowerBar; import mekanism.client.gui.element.GuiProgress; -import mekanism.client.gui.element.GuiRedstoneControl; import mekanism.client.gui.element.GuiProgress.IProgressInfoHandler; import mekanism.client.gui.element.GuiProgress.ProgressBar; +import mekanism.client.gui.element.GuiRedstoneControl; import mekanism.client.gui.element.GuiSideConfigurationTab; import mekanism.client.gui.element.GuiSlot; import mekanism.client.gui.element.GuiSlot.SlotOverlay; diff --git a/src/main/java/mekanism/client/gui/GuiChemicalCrystallizer.java b/src/main/java/mekanism/client/gui/GuiChemicalCrystallizer.java index 74bb6ed66..5e8ca3ff3 100644 --- a/src/main/java/mekanism/client/gui/GuiChemicalCrystallizer.java +++ b/src/main/java/mekanism/client/gui/GuiChemicalCrystallizer.java @@ -3,31 +3,27 @@ package mekanism.client.gui; import java.util.ArrayList; import java.util.List; -import mekanism.api.Coord4D; import mekanism.api.gas.Gas; import mekanism.api.gas.GasTank; import mekanism.api.gas.OreGas; import mekanism.api.util.ListUtils; +import mekanism.client.gui.element.GuiElement.IInfoHandler; import mekanism.client.gui.element.GuiEnergyInfo; -import mekanism.client.gui.element.GuiEnergyInfo.IInfoHandler; import mekanism.client.gui.element.GuiGasGauge; import mekanism.client.gui.element.GuiGasGauge.IGasInfoHandler; import mekanism.client.gui.element.GuiGauge; import mekanism.client.gui.element.GuiPowerBar; import mekanism.client.gui.element.GuiProgress; -import mekanism.client.gui.element.GuiRedstoneControl; import mekanism.client.gui.element.GuiProgress.IProgressInfoHandler; import mekanism.client.gui.element.GuiProgress.ProgressBar; +import mekanism.client.gui.element.GuiRedstoneControl; import mekanism.client.gui.element.GuiSideConfigurationTab; import mekanism.client.gui.element.GuiSlot; import mekanism.client.gui.element.GuiSlot.SlotOverlay; import mekanism.client.gui.element.GuiSlot.SlotType; import mekanism.client.gui.element.GuiTransporterConfigTab; import mekanism.client.gui.element.GuiUpgradeTab; -import mekanism.client.sound.SoundHandler; -import mekanism.common.Mekanism; import mekanism.common.inventory.container.ContainerChemicalCrystallizer; -import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.recipe.machines.CrystallizerRecipe; import mekanism.common.tile.TileEntityChemicalCrystallizer; import mekanism.common.util.LangUtils; diff --git a/src/main/java/mekanism/client/gui/GuiChemicalDissolutionChamber.java b/src/main/java/mekanism/client/gui/GuiChemicalDissolutionChamber.java index 657c36101..3fe93088f 100644 --- a/src/main/java/mekanism/client/gui/GuiChemicalDissolutionChamber.java +++ b/src/main/java/mekanism/client/gui/GuiChemicalDissolutionChamber.java @@ -4,30 +4,31 @@ import java.util.List; import mekanism.api.gas.GasTank; import mekanism.api.util.ListUtils; +import mekanism.client.gui.element.GuiElement.IInfoHandler; import mekanism.client.gui.element.GuiEnergyInfo; import mekanism.client.gui.element.GuiGasGauge; +import mekanism.client.gui.element.GuiGasGauge.IGasInfoHandler; import mekanism.client.gui.element.GuiGauge; import mekanism.client.gui.element.GuiProgress; -import mekanism.client.gui.element.GuiRedstoneControl; -import mekanism.client.gui.element.GuiSlot; -import mekanism.client.gui.element.GuiUpgradeTab; -import mekanism.client.gui.element.GuiEnergyInfo.IInfoHandler; -import mekanism.client.gui.element.GuiGasGauge.IGasInfoHandler; import mekanism.client.gui.element.GuiProgress.IProgressInfoHandler; import mekanism.client.gui.element.GuiProgress.ProgressBar; +import mekanism.client.gui.element.GuiRedstoneControl; +import mekanism.client.gui.element.GuiSlot; import mekanism.client.gui.element.GuiSlot.SlotOverlay; import mekanism.client.gui.element.GuiSlot.SlotType; +import mekanism.client.gui.element.GuiUpgradeTab; import mekanism.common.inventory.container.ContainerChemicalDissolutionChamber; import mekanism.common.tile.TileEntityChemicalDissolutionChamber; import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.entity.player.InventoryPlayer; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + @SideOnly(Side.CLIENT) public class GuiChemicalDissolutionChamber extends GuiMekanism { diff --git a/src/main/java/mekanism/client/gui/GuiChemicalInfuser.java b/src/main/java/mekanism/client/gui/GuiChemicalInfuser.java index 08ea8a8a2..a85f03024 100644 --- a/src/main/java/mekanism/client/gui/GuiChemicalInfuser.java +++ b/src/main/java/mekanism/client/gui/GuiChemicalInfuser.java @@ -1,38 +1,34 @@ package mekanism.client.gui; -import java.util.ArrayList; import java.util.List; -import mekanism.api.Coord4D; import mekanism.api.gas.GasTank; import mekanism.api.util.ListUtils; +import mekanism.client.gui.element.GuiElement.IInfoHandler; import mekanism.client.gui.element.GuiEnergyInfo; import mekanism.client.gui.element.GuiGasGauge; +import mekanism.client.gui.element.GuiGasGauge.IGasInfoHandler; import mekanism.client.gui.element.GuiGauge; import mekanism.client.gui.element.GuiProgress; -import mekanism.client.gui.element.GuiRedstoneControl; -import mekanism.client.gui.element.GuiSlot; -import mekanism.client.gui.element.GuiUpgradeTab; -import mekanism.client.gui.element.GuiEnergyInfo.IInfoHandler; -import mekanism.client.gui.element.GuiGasGauge.IGasInfoHandler; import mekanism.client.gui.element.GuiProgress.IProgressInfoHandler; import mekanism.client.gui.element.GuiProgress.ProgressBar; +import mekanism.client.gui.element.GuiRedstoneControl; +import mekanism.client.gui.element.GuiSlot; import mekanism.client.gui.element.GuiSlot.SlotOverlay; import mekanism.client.gui.element.GuiSlot.SlotType; -import mekanism.client.sound.SoundHandler; -import mekanism.common.Mekanism; +import mekanism.client.gui.element.GuiUpgradeTab; import mekanism.common.inventory.container.ContainerChemicalInfuser; -import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.tile.TileEntityChemicalInfuser; import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.entity.player.InventoryPlayer; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + @SideOnly(Side.CLIENT) public class GuiChemicalInfuser extends GuiMekanism { diff --git a/src/main/java/mekanism/client/gui/GuiChemicalOxidizer.java b/src/main/java/mekanism/client/gui/GuiChemicalOxidizer.java index a81931728..ec43d1aba 100644 --- a/src/main/java/mekanism/client/gui/GuiChemicalOxidizer.java +++ b/src/main/java/mekanism/client/gui/GuiChemicalOxidizer.java @@ -4,30 +4,31 @@ import java.util.List; import mekanism.api.gas.GasTank; import mekanism.api.util.ListUtils; +import mekanism.client.gui.element.GuiElement.IInfoHandler; import mekanism.client.gui.element.GuiEnergyInfo; import mekanism.client.gui.element.GuiGasGauge; +import mekanism.client.gui.element.GuiGasGauge.IGasInfoHandler; import mekanism.client.gui.element.GuiGauge; import mekanism.client.gui.element.GuiProgress; -import mekanism.client.gui.element.GuiRedstoneControl; -import mekanism.client.gui.element.GuiSlot; -import mekanism.client.gui.element.GuiUpgradeTab; -import mekanism.client.gui.element.GuiEnergyInfo.IInfoHandler; -import mekanism.client.gui.element.GuiGasGauge.IGasInfoHandler; import mekanism.client.gui.element.GuiProgress.IProgressInfoHandler; import mekanism.client.gui.element.GuiProgress.ProgressBar; +import mekanism.client.gui.element.GuiRedstoneControl; +import mekanism.client.gui.element.GuiSlot; import mekanism.client.gui.element.GuiSlot.SlotOverlay; import mekanism.client.gui.element.GuiSlot.SlotType; +import mekanism.client.gui.element.GuiUpgradeTab; import mekanism.common.inventory.container.ContainerChemicalOxidizer; import mekanism.common.tile.TileEntityChemicalOxidizer; import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.entity.player.InventoryPlayer; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + @SideOnly(Side.CLIENT) public class GuiChemicalOxidizer extends GuiMekanism { diff --git a/src/main/java/mekanism/client/gui/GuiChemicalWasher.java b/src/main/java/mekanism/client/gui/GuiChemicalWasher.java index 847fb2648..a83dff1c8 100644 --- a/src/main/java/mekanism/client/gui/GuiChemicalWasher.java +++ b/src/main/java/mekanism/client/gui/GuiChemicalWasher.java @@ -1,43 +1,39 @@ package mekanism.client.gui; -import java.util.ArrayList; import java.util.List; -import mekanism.api.Coord4D; import mekanism.api.gas.GasTank; import mekanism.api.util.ListUtils; import mekanism.client.gui.element.GuiBucketIO; +import mekanism.client.gui.element.GuiElement.IInfoHandler; import mekanism.client.gui.element.GuiEnergyInfo; import mekanism.client.gui.element.GuiFluidGauge; -import mekanism.client.gui.element.GuiGasGauge; -import mekanism.client.gui.element.GuiGauge; -import mekanism.client.gui.element.GuiProgress; -import mekanism.client.gui.element.GuiRedstoneControl; -import mekanism.client.gui.element.GuiSlot; -import mekanism.client.gui.element.GuiUpgradeTab; -import mekanism.client.gui.element.GuiEnergyInfo.IInfoHandler; import mekanism.client.gui.element.GuiFluidGauge.IFluidInfoHandler; +import mekanism.client.gui.element.GuiGasGauge; import mekanism.client.gui.element.GuiGasGauge.IGasInfoHandler; +import mekanism.client.gui.element.GuiGauge; import mekanism.client.gui.element.GuiGauge.Type; +import mekanism.client.gui.element.GuiProgress; import mekanism.client.gui.element.GuiProgress.IProgressInfoHandler; import mekanism.client.gui.element.GuiProgress.ProgressBar; +import mekanism.client.gui.element.GuiRedstoneControl; +import mekanism.client.gui.element.GuiSlot; import mekanism.client.gui.element.GuiSlot.SlotOverlay; import mekanism.client.gui.element.GuiSlot.SlotType; -import mekanism.client.sound.SoundHandler; -import mekanism.common.Mekanism; +import mekanism.client.gui.element.GuiUpgradeTab; import mekanism.common.inventory.container.ContainerChemicalWasher; -import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.tile.TileEntityChemicalWasher; import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.entity.player.InventoryPlayer; import net.minecraftforge.fluids.FluidTank; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + @SideOnly(Side.CLIENT) public class GuiChemicalWasher extends GuiMekanism { diff --git a/src/main/java/mekanism/client/gui/GuiCredits.java b/src/main/java/mekanism/client/gui/GuiCredits.java index 81a20ac89..dc1089694 100644 --- a/src/main/java/mekanism/client/gui/GuiCredits.java +++ b/src/main/java/mekanism/client/gui/GuiCredits.java @@ -6,7 +6,6 @@ import mekanism.common.Mekanism; import mekanism.common.Version; import mekanism.common.base.IModule; import mekanism.common.util.MekanismUtils; - import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiScreen; import cpw.mods.fml.relauncher.Side; diff --git a/src/main/java/mekanism/client/gui/GuiDictionary.java b/src/main/java/mekanism/client/gui/GuiDictionary.java index 134468833..e89dbcf7d 100644 --- a/src/main/java/mekanism/client/gui/GuiDictionary.java +++ b/src/main/java/mekanism/client/gui/GuiDictionary.java @@ -9,12 +9,13 @@ import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import org.lwjgl.input.Keyboard; import org.lwjgl.opengl.GL11; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + @SideOnly(Side.CLIENT) public class GuiDictionary extends GuiMekanism { diff --git a/src/main/java/mekanism/client/gui/GuiDigitalMiner.java b/src/main/java/mekanism/client/gui/GuiDigitalMiner.java index a7baa0603..c60070eb0 100644 --- a/src/main/java/mekanism/client/gui/GuiDigitalMiner.java +++ b/src/main/java/mekanism/client/gui/GuiDigitalMiner.java @@ -6,15 +6,15 @@ import java.util.List; import mekanism.api.Coord4D; import mekanism.api.EnumColor; import mekanism.api.util.ListUtils; +import mekanism.client.gui.element.GuiElement.IInfoHandler; import mekanism.client.gui.element.GuiEnergyInfo; import mekanism.client.gui.element.GuiPowerBar; import mekanism.client.gui.element.GuiRedstoneControl; import mekanism.client.gui.element.GuiSlot; -import mekanism.client.gui.element.GuiUpgradeTab; -import mekanism.client.gui.element.GuiVisualsTab; -import mekanism.client.gui.element.GuiEnergyInfo.IInfoHandler; import mekanism.client.gui.element.GuiSlot.SlotOverlay; import mekanism.client.gui.element.GuiSlot.SlotType; +import mekanism.client.gui.element.GuiUpgradeTab; +import mekanism.client.gui.element.GuiVisualsTab; import mekanism.client.render.MekanismRenderer; import mekanism.client.sound.SoundHandler; import mekanism.common.Mekanism; @@ -29,12 +29,13 @@ import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.client.gui.GuiButton; import net.minecraft.entity.player.InventoryPlayer; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + @SideOnly(Side.CLIENT) public class GuiDigitalMiner extends GuiMekanism { diff --git a/src/main/java/mekanism/client/gui/GuiDigitalMinerConfig.java b/src/main/java/mekanism/client/gui/GuiDigitalMinerConfig.java index 99b342379..258092596 100644 --- a/src/main/java/mekanism/client/gui/GuiDigitalMinerConfig.java +++ b/src/main/java/mekanism/client/gui/GuiDigitalMinerConfig.java @@ -30,13 +30,14 @@ import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiTextField; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import org.lwjgl.input.Keyboard; import org.lwjgl.input.Mouse; import org.lwjgl.opengl.GL11; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + @SideOnly(Side.CLIENT) public class GuiDigitalMinerConfig extends GuiMekanism { diff --git a/src/main/java/mekanism/client/gui/GuiDynamicTank.java b/src/main/java/mekanism/client/gui/GuiDynamicTank.java index e35c6ed23..df836864a 100644 --- a/src/main/java/mekanism/client/gui/GuiDynamicTank.java +++ b/src/main/java/mekanism/client/gui/GuiDynamicTank.java @@ -10,11 +10,12 @@ import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.entity.player.InventoryPlayer; import net.minecraftforge.fluids.FluidStack; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + @SideOnly(Side.CLIENT) public class GuiDynamicTank extends GuiMekanism { diff --git a/src/main/java/mekanism/client/gui/GuiElectricChest.java b/src/main/java/mekanism/client/gui/GuiElectricChest.java index f3cb18b60..35b9c96b1 100644 --- a/src/main/java/mekanism/client/gui/GuiElectricChest.java +++ b/src/main/java/mekanism/client/gui/GuiElectricChest.java @@ -17,12 +17,13 @@ import net.minecraft.client.gui.GuiButton; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; + +import org.lwjgl.opengl.GL11; + import cpw.mods.fml.client.FMLClientHandler; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import org.lwjgl.opengl.GL11; - @SideOnly(Side.CLIENT) public class GuiElectricChest extends GuiMekanism { diff --git a/src/main/java/mekanism/client/gui/GuiElectricMachine.java b/src/main/java/mekanism/client/gui/GuiElectricMachine.java index 483be0b6b..238e274b9 100644 --- a/src/main/java/mekanism/client/gui/GuiElectricMachine.java +++ b/src/main/java/mekanism/client/gui/GuiElectricMachine.java @@ -3,14 +3,14 @@ package mekanism.client.gui; import java.util.List; import mekanism.api.util.ListUtils; -import mekanism.client.gui.element.GuiRedstoneControl; -import mekanism.client.gui.element.GuiSideConfigurationTab; +import mekanism.client.gui.element.GuiElement.IInfoHandler; import mekanism.client.gui.element.GuiEnergyInfo; -import mekanism.client.gui.element.GuiEnergyInfo.IInfoHandler; import mekanism.client.gui.element.GuiPowerBar; import mekanism.client.gui.element.GuiProgress; import mekanism.client.gui.element.GuiProgress.IProgressInfoHandler; import mekanism.client.gui.element.GuiProgress.ProgressBar; +import mekanism.client.gui.element.GuiRedstoneControl; +import mekanism.client.gui.element.GuiSideConfigurationTab; import mekanism.client.gui.element.GuiSlot; import mekanism.client.gui.element.GuiSlot.SlotOverlay; import mekanism.client.gui.element.GuiSlot.SlotType; diff --git a/src/main/java/mekanism/client/gui/GuiElectricPump.java b/src/main/java/mekanism/client/gui/GuiElectricPump.java index 9a11de9c3..c77452f5b 100644 --- a/src/main/java/mekanism/client/gui/GuiElectricPump.java +++ b/src/main/java/mekanism/client/gui/GuiElectricPump.java @@ -3,8 +3,8 @@ package mekanism.client.gui; import java.util.List; import mekanism.api.util.ListUtils; +import mekanism.client.gui.element.GuiElement.IInfoHandler; import mekanism.client.gui.element.GuiEnergyInfo; -import mekanism.client.gui.element.GuiEnergyInfo.IInfoHandler; import mekanism.client.gui.element.GuiFluidGauge; import mekanism.client.gui.element.GuiFluidGauge.IFluidInfoHandler; import mekanism.client.gui.element.GuiGauge; diff --git a/src/main/java/mekanism/client/gui/GuiElectrolyticSeparator.java b/src/main/java/mekanism/client/gui/GuiElectrolyticSeparator.java index a9148d533..9a1d259b5 100755 --- a/src/main/java/mekanism/client/gui/GuiElectrolyticSeparator.java +++ b/src/main/java/mekanism/client/gui/GuiElectrolyticSeparator.java @@ -1,18 +1,27 @@ package mekanism.client.gui; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import java.util.ArrayList; +import java.util.List; + import mekanism.api.Coord4D; import mekanism.api.gas.GasTank; import mekanism.api.util.ListUtils; -import mekanism.client.gui.element.*; -import mekanism.client.gui.element.GuiEnergyInfo.IInfoHandler; +import mekanism.client.gui.element.GuiElement.IInfoHandler; +import mekanism.client.gui.element.GuiEnergyInfo; +import mekanism.client.gui.element.GuiFluidGauge; import mekanism.client.gui.element.GuiFluidGauge.IFluidInfoHandler; +import mekanism.client.gui.element.GuiGasGauge; import mekanism.client.gui.element.GuiGasGauge.IGasInfoHandler; +import mekanism.client.gui.element.GuiGauge; +import mekanism.client.gui.element.GuiPowerBar; +import mekanism.client.gui.element.GuiProgress; import mekanism.client.gui.element.GuiProgress.IProgressInfoHandler; import mekanism.client.gui.element.GuiProgress.ProgressBar; +import mekanism.client.gui.element.GuiRedstoneControl; +import mekanism.client.gui.element.GuiSlot; import mekanism.client.gui.element.GuiSlot.SlotOverlay; import mekanism.client.gui.element.GuiSlot.SlotType; +import mekanism.client.gui.element.GuiUpgradeTab; import mekanism.client.sound.SoundHandler; import mekanism.common.Mekanism; import mekanism.common.inventory.container.ContainerElectrolyticSeparator; @@ -24,10 +33,11 @@ import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.entity.player.InventoryPlayer; import net.minecraftforge.fluids.FluidTank; + import org.lwjgl.opengl.GL11; -import java.util.ArrayList; -import java.util.List; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class GuiElectrolyticSeparator extends GuiMekanism diff --git a/src/main/java/mekanism/client/gui/GuiEnergyCube.java b/src/main/java/mekanism/client/gui/GuiEnergyCube.java index d6df52b23..7ff8c13e0 100644 --- a/src/main/java/mekanism/client/gui/GuiEnergyCube.java +++ b/src/main/java/mekanism/client/gui/GuiEnergyCube.java @@ -4,10 +4,10 @@ import java.util.List; import mekanism.api.energy.IStrictEnergyStorage; import mekanism.api.util.ListUtils; +import mekanism.client.gui.element.GuiElement.IInfoHandler; import mekanism.client.gui.element.GuiEnergyGauge; import mekanism.client.gui.element.GuiEnergyGauge.IEnergyInfoHandler; import mekanism.client.gui.element.GuiEnergyInfo; -import mekanism.client.gui.element.GuiEnergyInfo.IInfoHandler; import mekanism.client.gui.element.GuiRedstoneControl; import mekanism.client.gui.element.GuiSideConfigurationTab; import mekanism.client.gui.element.GuiSlot; diff --git a/src/main/java/mekanism/client/gui/GuiEntangledBlock.java b/src/main/java/mekanism/client/gui/GuiEntangledBlock.java index 5205709e3..96ee1f026 100644 --- a/src/main/java/mekanism/client/gui/GuiEntangledBlock.java +++ b/src/main/java/mekanism/client/gui/GuiEntangledBlock.java @@ -12,12 +12,13 @@ import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.client.gui.GuiTextField; import net.minecraft.entity.player.InventoryPlayer; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import org.lwjgl.input.Keyboard; import org.lwjgl.opengl.GL11; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + @SideOnly(Side.CLIENT) public class GuiEntangledBlock extends GuiMekanism { diff --git a/src/main/java/mekanism/client/gui/GuiFactory.java b/src/main/java/mekanism/client/gui/GuiFactory.java index 3f5cd84b8..cde719a3a 100644 --- a/src/main/java/mekanism/client/gui/GuiFactory.java +++ b/src/main/java/mekanism/client/gui/GuiFactory.java @@ -5,8 +5,8 @@ import java.util.List; import mekanism.api.Coord4D; import mekanism.api.util.ListUtils; +import mekanism.client.gui.element.GuiElement.IInfoHandler; import mekanism.client.gui.element.GuiEnergyInfo; -import mekanism.client.gui.element.GuiEnergyInfo.IInfoHandler; import mekanism.client.gui.element.GuiRecipeType; import mekanism.client.gui.element.GuiRedstoneControl; import mekanism.client.gui.element.GuiSideConfigurationTab; diff --git a/src/main/java/mekanism/client/gui/GuiFluidTank.java b/src/main/java/mekanism/client/gui/GuiFluidTank.java index fb038f2b2..171ec58a6 100644 --- a/src/main/java/mekanism/client/gui/GuiFluidTank.java +++ b/src/main/java/mekanism/client/gui/GuiFluidTank.java @@ -2,8 +2,8 @@ package mekanism.client.gui; import mekanism.client.gui.element.GuiContainerEditMode; import mekanism.client.gui.element.GuiFluidGauge; -import mekanism.client.gui.element.GuiSlot; import mekanism.client.gui.element.GuiFluidGauge.IFluidInfoHandler; +import mekanism.client.gui.element.GuiSlot; import mekanism.client.gui.element.GuiSlot.SlotOverlay; import mekanism.client.gui.element.GuiSlot.SlotType; import mekanism.common.inventory.container.ContainerFluidTank; @@ -13,11 +13,12 @@ import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.entity.player.InventoryPlayer; import net.minecraftforge.fluids.FluidTank; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + @SideOnly(Side.CLIENT) public class GuiFluidTank extends GuiMekanism { diff --git a/src/main/java/mekanism/client/gui/GuiFluidicPlenisher.java b/src/main/java/mekanism/client/gui/GuiFluidicPlenisher.java index 8a8fde335..dd79025d9 100644 --- a/src/main/java/mekanism/client/gui/GuiFluidicPlenisher.java +++ b/src/main/java/mekanism/client/gui/GuiFluidicPlenisher.java @@ -3,8 +3,8 @@ package mekanism.client.gui; import java.util.List; import mekanism.api.util.ListUtils; +import mekanism.client.gui.element.GuiElement.IInfoHandler; import mekanism.client.gui.element.GuiEnergyInfo; -import mekanism.client.gui.element.GuiEnergyInfo.IInfoHandler; import mekanism.client.gui.element.GuiFluidGauge; import mekanism.client.gui.element.GuiFluidGauge.IFluidInfoHandler; import mekanism.client.gui.element.GuiGauge; diff --git a/src/main/java/mekanism/client/gui/GuiInductionMatrix.java b/src/main/java/mekanism/client/gui/GuiInductionMatrix.java index e9507b077..fce2961c2 100644 --- a/src/main/java/mekanism/client/gui/GuiInductionMatrix.java +++ b/src/main/java/mekanism/client/gui/GuiInductionMatrix.java @@ -3,8 +3,8 @@ package mekanism.client.gui; import java.util.List; import mekanism.api.util.ListUtils; +import mekanism.client.gui.element.GuiElement.IInfoHandler; import mekanism.client.gui.element.GuiEnergyInfo; -import mekanism.client.gui.element.GuiEnergyInfo.IInfoHandler; import mekanism.client.gui.element.GuiMatrixTab; import mekanism.client.gui.element.GuiMatrixTab.MatrixTab; import mekanism.client.render.MekanismRenderer; diff --git a/src/main/java/mekanism/client/gui/GuiMFilterSelect.java b/src/main/java/mekanism/client/gui/GuiMFilterSelect.java index 3f47a4bfd..37fc8e773 100644 --- a/src/main/java/mekanism/client/gui/GuiMFilterSelect.java +++ b/src/main/java/mekanism/client/gui/GuiMFilterSelect.java @@ -12,11 +12,12 @@ import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.client.gui.GuiButton; import net.minecraft.entity.player.EntityPlayer; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + @SideOnly(Side.CLIENT) public class GuiMFilterSelect extends GuiMekanism { diff --git a/src/main/java/mekanism/client/gui/GuiMItemStackFilter.java b/src/main/java/mekanism/client/gui/GuiMItemStackFilter.java index 7c7444170..debcd3c43 100644 --- a/src/main/java/mekanism/client/gui/GuiMItemStackFilter.java +++ b/src/main/java/mekanism/client/gui/GuiMItemStackFilter.java @@ -14,19 +14,19 @@ import mekanism.common.tile.TileEntityDigitalMiner; import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; - import net.minecraft.block.Block; import net.minecraft.client.gui.GuiButton; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import org.lwjgl.input.Keyboard; import org.lwjgl.opengl.GL11; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + @SideOnly(Side.CLIENT) public class GuiMItemStackFilter extends GuiMekanism { diff --git a/src/main/java/mekanism/client/gui/GuiMMaterialFilter.java b/src/main/java/mekanism/client/gui/GuiMMaterialFilter.java index 20ea778b8..9696101bc 100644 --- a/src/main/java/mekanism/client/gui/GuiMMaterialFilter.java +++ b/src/main/java/mekanism/client/gui/GuiMMaterialFilter.java @@ -14,19 +14,19 @@ import mekanism.common.tile.TileEntityDigitalMiner; import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; - import net.minecraft.block.Block; import net.minecraft.client.gui.GuiButton; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import org.lwjgl.input.Keyboard; import org.lwjgl.opengl.GL11; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + @SideOnly(Side.CLIENT) public class GuiMMaterialFilter extends GuiMekanism { diff --git a/src/main/java/mekanism/client/gui/GuiMatrixStats.java b/src/main/java/mekanism/client/gui/GuiMatrixStats.java index 2c6c9326e..2697af13c 100644 --- a/src/main/java/mekanism/client/gui/GuiMatrixStats.java +++ b/src/main/java/mekanism/client/gui/GuiMatrixStats.java @@ -2,13 +2,12 @@ package mekanism.client.gui; import java.util.List; -import mekanism.api.MekanismConfig.generators; import mekanism.api.energy.IStrictEnergyStorage; import mekanism.api.util.ListUtils; +import mekanism.client.gui.element.GuiElement.IInfoHandler; import mekanism.client.gui.element.GuiEnergyGauge; -import mekanism.client.gui.element.GuiEnergyInfo; import mekanism.client.gui.element.GuiEnergyGauge.IEnergyInfoHandler; -import mekanism.client.gui.element.GuiEnergyInfo.IInfoHandler; +import mekanism.client.gui.element.GuiEnergyInfo; import mekanism.client.gui.element.GuiMatrixTab; import mekanism.client.gui.element.GuiMatrixTab.MatrixTab; import mekanism.client.gui.element.GuiRateBar; diff --git a/src/main/java/mekanism/client/gui/GuiMetallurgicInfuser.java b/src/main/java/mekanism/client/gui/GuiMetallurgicInfuser.java index f70deeec5..8b092966f 100644 --- a/src/main/java/mekanism/client/gui/GuiMetallurgicInfuser.java +++ b/src/main/java/mekanism/client/gui/GuiMetallurgicInfuser.java @@ -5,8 +5,8 @@ import java.util.List; import mekanism.api.Coord4D; import mekanism.api.util.ListUtils; +import mekanism.client.gui.element.GuiElement.IInfoHandler; import mekanism.client.gui.element.GuiEnergyInfo; -import mekanism.client.gui.element.GuiEnergyInfo.IInfoHandler; import mekanism.client.gui.element.GuiPowerBar; import mekanism.client.gui.element.GuiProgress; import mekanism.client.gui.element.GuiProgress.IProgressInfoHandler; diff --git a/src/main/java/mekanism/client/gui/GuiOredictionificatorFilter.java b/src/main/java/mekanism/client/gui/GuiOredictionificatorFilter.java index fb8e41b84..a9b8c0a34 100644 --- a/src/main/java/mekanism/client/gui/GuiOredictionificatorFilter.java +++ b/src/main/java/mekanism/client/gui/GuiOredictionificatorFilter.java @@ -1,6 +1,5 @@ package mekanism.client.gui; -import java.util.Arrays; import java.util.List; import mekanism.api.Coord4D; diff --git a/src/main/java/mekanism/client/gui/GuiPRC.java b/src/main/java/mekanism/client/gui/GuiPRC.java index 64bd7324d..0862c96d6 100644 --- a/src/main/java/mekanism/client/gui/GuiPRC.java +++ b/src/main/java/mekanism/client/gui/GuiPRC.java @@ -4,8 +4,8 @@ import java.util.List; import mekanism.api.gas.GasTank; import mekanism.api.util.ListUtils; +import mekanism.client.gui.element.GuiElement.IInfoHandler; import mekanism.client.gui.element.GuiEnergyInfo; -import mekanism.client.gui.element.GuiEnergyInfo.IInfoHandler; import mekanism.client.gui.element.GuiFluidGauge; import mekanism.client.gui.element.GuiFluidGauge.IFluidInfoHandler; import mekanism.client.gui.element.GuiGasGauge; @@ -13,9 +13,9 @@ import mekanism.client.gui.element.GuiGasGauge.IGasInfoHandler; import mekanism.client.gui.element.GuiGauge; import mekanism.client.gui.element.GuiPowerBar; import mekanism.client.gui.element.GuiProgress; -import mekanism.client.gui.element.GuiRedstoneControl; import mekanism.client.gui.element.GuiProgress.IProgressInfoHandler; import mekanism.client.gui.element.GuiProgress.ProgressBar; +import mekanism.client.gui.element.GuiRedstoneControl; import mekanism.client.gui.element.GuiSideConfigurationTab; import mekanism.client.gui.element.GuiSlot; import mekanism.client.gui.element.GuiSlot.SlotOverlay; diff --git a/src/main/java/mekanism/client/gui/GuiPasswordEnter.java b/src/main/java/mekanism/client/gui/GuiPasswordEnter.java index f561849c0..e07b1651e 100644 --- a/src/main/java/mekanism/client/gui/GuiPasswordEnter.java +++ b/src/main/java/mekanism/client/gui/GuiPasswordEnter.java @@ -16,12 +16,13 @@ import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.gui.GuiTextField; import net.minecraft.item.ItemStack; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import org.lwjgl.input.Keyboard; import org.lwjgl.opengl.GL11; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + @SideOnly(Side.CLIENT) public class GuiPasswordEnter extends GuiScreen { diff --git a/src/main/java/mekanism/client/gui/GuiPasswordModify.java b/src/main/java/mekanism/client/gui/GuiPasswordModify.java index 2876146f5..a30af375f 100644 --- a/src/main/java/mekanism/client/gui/GuiPasswordModify.java +++ b/src/main/java/mekanism/client/gui/GuiPasswordModify.java @@ -14,12 +14,13 @@ import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.gui.GuiTextField; import net.minecraft.item.ItemStack; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import org.lwjgl.input.Keyboard; import org.lwjgl.opengl.GL11; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + @SideOnly(Side.CLIENT) public class GuiPasswordModify extends GuiScreen { diff --git a/src/main/java/mekanism/client/gui/GuiResistiveHeater.java b/src/main/java/mekanism/client/gui/GuiResistiveHeater.java index f85a195cc..a7b5720d8 100644 --- a/src/main/java/mekanism/client/gui/GuiResistiveHeater.java +++ b/src/main/java/mekanism/client/gui/GuiResistiveHeater.java @@ -1,9 +1,15 @@ package mekanism.client.gui; import java.util.ArrayList; +import java.util.List; import mekanism.api.Coord4D; +import mekanism.api.util.ListUtils; +import mekanism.api.util.UnitDisplayUtils; import mekanism.api.util.UnitDisplayUtils.TemperatureUnit; +import mekanism.client.gui.element.GuiElement.IInfoHandler; +import mekanism.client.gui.element.GuiEnergyInfo; +import mekanism.client.gui.element.GuiHeatInfo; import mekanism.client.gui.element.GuiPowerBar; import mekanism.client.gui.element.GuiRedstoneControl; import mekanism.client.gui.element.GuiSlot; @@ -41,6 +47,23 @@ public class GuiResistiveHeater extends GuiMekanism guiElements.add(new GuiPowerBar(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiResistiveHeater.png"), 164, 15)); guiElements.add(new GuiSlot(SlotType.POWER, this, MekanismUtils.getResource(ResourceType.GUI, "GuiResistiveHeater.png"), 14, 34).with(SlotOverlay.POWER)); guiElements.add(new GuiRedstoneControl(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiResistiveHeater.png"))); + guiElements.add(new GuiEnergyInfo(new IInfoHandler() { + @Override + public List getInfo() + { + String multiplier = MekanismUtils.getEnergyDisplay(tileEntity.energyUsage); + return ListUtils.asList(LangUtils.localize("gui.using") + ": " + multiplier + "/t", LangUtils.localize("gui.needed") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getMaxEnergy()-tileEntity.getEnergy())); + } + }, this, MekanismUtils.getResource(ResourceType.GUI, "GuiResistiveHeater.png"))); + guiElements.add(new GuiHeatInfo(new IInfoHandler() { + @Override + public List getInfo() + { + String transfer = UnitDisplayUtils.getDisplayShort(tileEntity.lastTransferLoss, TemperatureUnit.KELVIN); + String environment = UnitDisplayUtils.getDisplayShort(tileEntity.lastEnvironmentLoss, TemperatureUnit.KELVIN); + return ListUtils.asList(LangUtils.localize("gui.transferred") + ": " + transfer + "/t", LangUtils.localize("gui.dissipated") + ": " + environment + "/t"); + } + }, this, MekanismUtils.getResource(ResourceType.GUI, "GuiResistiveHeater.png"))); } @Override diff --git a/src/main/java/mekanism/client/gui/GuiRobitCrafting.java b/src/main/java/mekanism/client/gui/GuiRobitCrafting.java index 3a1cf193f..bed932bf2 100644 --- a/src/main/java/mekanism/client/gui/GuiRobitCrafting.java +++ b/src/main/java/mekanism/client/gui/GuiRobitCrafting.java @@ -10,11 +10,12 @@ import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.world.World; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + @SideOnly(Side.CLIENT) public class GuiRobitCrafting extends GuiMekanism { diff --git a/src/main/java/mekanism/client/gui/GuiRobitInventory.java b/src/main/java/mekanism/client/gui/GuiRobitInventory.java index fa7d487de..921318bc0 100644 --- a/src/main/java/mekanism/client/gui/GuiRobitInventory.java +++ b/src/main/java/mekanism/client/gui/GuiRobitInventory.java @@ -10,11 +10,12 @@ import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.entity.player.InventoryPlayer; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + @SideOnly(Side.CLIENT) public class GuiRobitInventory extends GuiMekanism { diff --git a/src/main/java/mekanism/client/gui/GuiRobitMain.java b/src/main/java/mekanism/client/gui/GuiRobitMain.java index 09019d650..3e96ce071 100644 --- a/src/main/java/mekanism/client/gui/GuiRobitMain.java +++ b/src/main/java/mekanism/client/gui/GuiRobitMain.java @@ -12,12 +12,13 @@ import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiTextField; import net.minecraft.entity.player.InventoryPlayer; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import org.lwjgl.input.Keyboard; import org.lwjgl.opengl.GL11; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + @SideOnly(Side.CLIENT) public class GuiRobitMain extends GuiMekanism { diff --git a/src/main/java/mekanism/client/gui/GuiRobitRepair.java b/src/main/java/mekanism/client/gui/GuiRobitRepair.java index a9aad5289..0c8e2724a 100644 --- a/src/main/java/mekanism/client/gui/GuiRobitRepair.java +++ b/src/main/java/mekanism/client/gui/GuiRobitRepair.java @@ -19,12 +19,13 @@ import net.minecraft.item.ItemStack; import net.minecraft.network.play.client.C17PacketCustomPayload; import net.minecraft.util.StatCollector; import net.minecraft.world.World; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import org.apache.commons.io.Charsets; import org.lwjgl.input.Keyboard; import org.lwjgl.opengl.GL11; -import org.apache.commons.io.Charsets; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class GuiRobitRepair extends GuiMekanism implements ICrafting diff --git a/src/main/java/mekanism/client/gui/GuiRotaryCondensentrator.java b/src/main/java/mekanism/client/gui/GuiRotaryCondensentrator.java index c298569b5..981b4b66c 100644 --- a/src/main/java/mekanism/client/gui/GuiRotaryCondensentrator.java +++ b/src/main/java/mekanism/client/gui/GuiRotaryCondensentrator.java @@ -6,21 +6,21 @@ import java.util.List; import mekanism.api.Coord4D; import mekanism.api.gas.GasTank; import mekanism.api.util.ListUtils; +import mekanism.client.gui.element.GuiElement.IInfoHandler; import mekanism.client.gui.element.GuiEnergyInfo; import mekanism.client.gui.element.GuiFluidGauge; +import mekanism.client.gui.element.GuiFluidGauge.IFluidInfoHandler; import mekanism.client.gui.element.GuiGasGauge; +import mekanism.client.gui.element.GuiGasGauge.IGasInfoHandler; import mekanism.client.gui.element.GuiGauge; import mekanism.client.gui.element.GuiProgress; -import mekanism.client.gui.element.GuiRedstoneControl; -import mekanism.client.gui.element.GuiSlot; -import mekanism.client.gui.element.GuiUpgradeTab; -import mekanism.client.gui.element.GuiEnergyInfo.IInfoHandler; -import mekanism.client.gui.element.GuiFluidGauge.IFluidInfoHandler; -import mekanism.client.gui.element.GuiGasGauge.IGasInfoHandler; import mekanism.client.gui.element.GuiProgress.IProgressInfoHandler; import mekanism.client.gui.element.GuiProgress.ProgressBar; +import mekanism.client.gui.element.GuiRedstoneControl; +import mekanism.client.gui.element.GuiSlot; import mekanism.client.gui.element.GuiSlot.SlotOverlay; import mekanism.client.gui.element.GuiSlot.SlotType; +import mekanism.client.gui.element.GuiUpgradeTab; import mekanism.client.sound.SoundHandler; import mekanism.common.Mekanism; import mekanism.common.inventory.container.ContainerRotaryCondensentrator; diff --git a/src/main/java/mekanism/client/gui/GuiSeismicVibrator.java b/src/main/java/mekanism/client/gui/GuiSeismicVibrator.java index dfcd7d87d..cc813c4cf 100644 --- a/src/main/java/mekanism/client/gui/GuiSeismicVibrator.java +++ b/src/main/java/mekanism/client/gui/GuiSeismicVibrator.java @@ -4,8 +4,8 @@ import java.util.List; import mekanism.api.MekanismConfig.usage; import mekanism.api.util.ListUtils; +import mekanism.client.gui.element.GuiElement.IInfoHandler; import mekanism.client.gui.element.GuiEnergyInfo; -import mekanism.client.gui.element.GuiEnergyInfo.IInfoHandler; import mekanism.client.gui.element.GuiPowerBar; import mekanism.client.gui.element.GuiRedstoneControl; import mekanism.client.gui.element.GuiSlot; diff --git a/src/main/java/mekanism/client/gui/GuiSolarNeutronActivator.java b/src/main/java/mekanism/client/gui/GuiSolarNeutronActivator.java index afe63c4b3..8dff192fc 100644 --- a/src/main/java/mekanism/client/gui/GuiSolarNeutronActivator.java +++ b/src/main/java/mekanism/client/gui/GuiSolarNeutronActivator.java @@ -2,13 +2,13 @@ package mekanism.client.gui; import mekanism.api.gas.GasTank; import mekanism.client.gui.element.GuiGasGauge; +import mekanism.client.gui.element.GuiGasGauge.IGasInfoHandler; import mekanism.client.gui.element.GuiGauge; import mekanism.client.gui.element.GuiProgress; -import mekanism.client.gui.element.GuiRedstoneControl; -import mekanism.client.gui.element.GuiSlot; -import mekanism.client.gui.element.GuiGasGauge.IGasInfoHandler; import mekanism.client.gui.element.GuiProgress.IProgressInfoHandler; import mekanism.client.gui.element.GuiProgress.ProgressBar; +import mekanism.client.gui.element.GuiRedstoneControl; +import mekanism.client.gui.element.GuiSlot; import mekanism.client.gui.element.GuiSlot.SlotOverlay; import mekanism.client.gui.element.GuiSlot.SlotType; import mekanism.common.inventory.container.ContainerSolarNeutronActivator; diff --git a/src/main/java/mekanism/client/gui/GuiTFilterSelect.java b/src/main/java/mekanism/client/gui/GuiTFilterSelect.java index dbeb6e0b1..97ccc5d0c 100644 --- a/src/main/java/mekanism/client/gui/GuiTFilterSelect.java +++ b/src/main/java/mekanism/client/gui/GuiTFilterSelect.java @@ -12,11 +12,12 @@ import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.client.gui.GuiButton; import net.minecraft.entity.player.EntityPlayer; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + @SideOnly(Side.CLIENT) public class GuiTFilterSelect extends GuiMekanism { diff --git a/src/main/java/mekanism/client/gui/GuiTItemStackFilter.java b/src/main/java/mekanism/client/gui/GuiTItemStackFilter.java index 63e67eaca..62938c7c6 100644 --- a/src/main/java/mekanism/client/gui/GuiTItemStackFilter.java +++ b/src/main/java/mekanism/client/gui/GuiTItemStackFilter.java @@ -20,13 +20,14 @@ import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiTextField; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import org.lwjgl.input.Keyboard; import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + @SideOnly(Side.CLIENT) public class GuiTItemStackFilter extends GuiMekanism { diff --git a/src/main/java/mekanism/client/gui/GuiTMaterialFilter.java b/src/main/java/mekanism/client/gui/GuiTMaterialFilter.java index 7037bad0c..f0f8b6a3d 100644 --- a/src/main/java/mekanism/client/gui/GuiTMaterialFilter.java +++ b/src/main/java/mekanism/client/gui/GuiTMaterialFilter.java @@ -22,13 +22,14 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import org.lwjgl.input.Keyboard; import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + @SideOnly(Side.CLIENT) public class GuiTMaterialFilter extends GuiMekanism { diff --git a/src/main/java/mekanism/client/gui/GuiTOreDictFilter.java b/src/main/java/mekanism/client/gui/GuiTOreDictFilter.java index ebcda29c7..9594490c7 100644 --- a/src/main/java/mekanism/client/gui/GuiTOreDictFilter.java +++ b/src/main/java/mekanism/client/gui/GuiTOreDictFilter.java @@ -24,13 +24,14 @@ import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiTextField; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import org.lwjgl.input.Keyboard; import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + @SideOnly(Side.CLIENT) public class GuiTOreDictFilter extends GuiMekanism { diff --git a/src/main/java/mekanism/client/gui/GuiThermalEvaporationController.java b/src/main/java/mekanism/client/gui/GuiThermalEvaporationController.java index c82d7c7d3..400cc28e0 100644 --- a/src/main/java/mekanism/client/gui/GuiThermalEvaporationController.java +++ b/src/main/java/mekanism/client/gui/GuiThermalEvaporationController.java @@ -1,9 +1,15 @@ package mekanism.client.gui; +import java.util.List; + +import mekanism.api.util.ListUtils; +import mekanism.api.util.UnitDisplayUtils; import mekanism.api.util.UnitDisplayUtils.TemperatureUnit; +import mekanism.client.gui.element.GuiElement.IInfoHandler; import mekanism.client.gui.element.GuiFluidGauge; import mekanism.client.gui.element.GuiFluidGauge.IFluidInfoHandler; import mekanism.client.gui.element.GuiGauge; +import mekanism.client.gui.element.GuiHeatInfo; import mekanism.common.inventory.container.ContainerThermalEvaporationController; import mekanism.common.tile.TileEntityThermalEvaporationController; import mekanism.common.util.LangUtils; @@ -41,6 +47,14 @@ public class GuiThermalEvaporationController extends GuiMekanism return tileEntity.outputTank; } }, GuiGauge.Type.STANDARD, this, MekanismUtils.getResource(ResourceType.GUI, "GuiThermalEvaporationController.png"), 152, 13)); + guiElements.add(new GuiHeatInfo(new IInfoHandler() { + @Override + public List getInfo() + { + String loss = UnitDisplayUtils.getDisplayShort(tileEntity.totalLoss, TemperatureUnit.KELVIN); + return ListUtils.asList(LangUtils.localize("gui.dissipated") + ": " + loss + "/t"); + } + }, this, MekanismUtils.getResource(ResourceType.GUI, "GuiThermalEvaporationController.png"))); } @Override diff --git a/src/main/java/mekanism/client/gui/GuiTransporterConfig.java b/src/main/java/mekanism/client/gui/GuiTransporterConfig.java index 742f67a6b..8a96c7d48 100644 --- a/src/main/java/mekanism/client/gui/GuiTransporterConfig.java +++ b/src/main/java/mekanism/client/gui/GuiTransporterConfig.java @@ -10,7 +10,6 @@ import mekanism.client.render.MekanismRenderer; import mekanism.client.sound.SoundHandler; import mekanism.common.Mekanism; import mekanism.common.base.ISideConfiguration; -import mekanism.common.block.BlockMachine.MachineType; import mekanism.common.inventory.container.ContainerNull; import mekanism.common.network.PacketConfigurationUpdate.ConfigurationPacket; import mekanism.common.network.PacketConfigurationUpdate.ConfigurationUpdateMessage; diff --git a/src/main/java/mekanism/client/gui/element/GuiBucketIO.java b/src/main/java/mekanism/client/gui/element/GuiBucketIO.java index 79774736c..944479a79 100644 --- a/src/main/java/mekanism/client/gui/element/GuiBucketIO.java +++ b/src/main/java/mekanism/client/gui/element/GuiBucketIO.java @@ -4,9 +4,9 @@ import mekanism.client.gui.IGuiWrapper; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.util.ResourceLocation; +import codechicken.lib.vec.Rectangle4i; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import codechicken.lib.vec.Rectangle4i; @SideOnly(Side.CLIENT) public class GuiBucketIO extends GuiElement diff --git a/src/main/java/mekanism/client/gui/element/GuiElement.java b/src/main/java/mekanism/client/gui/element/GuiElement.java index 712c425e3..af0c0d74a 100644 --- a/src/main/java/mekanism/client/gui/element/GuiElement.java +++ b/src/main/java/mekanism/client/gui/element/GuiElement.java @@ -2,8 +2,6 @@ package mekanism.client.gui.element; import java.util.List; -import org.lwjgl.opengl.GL11; - import mekanism.client.gui.IGuiWrapper; import mekanism.common.ObfuscatedNames; import mekanism.common.util.MekanismUtils; @@ -11,6 +9,9 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.util.ResourceLocation; + +import org.lwjgl.opengl.GL11; + import codechicken.lib.vec.Rectangle4i; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -136,4 +137,9 @@ public abstract class GuiElement public abstract void preMouseClicked(int xAxis, int yAxis, int button); public abstract void mouseClicked(int xAxis, int yAxis, int button); + + public static interface IInfoHandler + { + public List getInfo(); + } } diff --git a/src/main/java/mekanism/client/gui/element/GuiEnergyInfo.java b/src/main/java/mekanism/client/gui/element/GuiEnergyInfo.java index 2c4044d38..c734f0e2a 100644 --- a/src/main/java/mekanism/client/gui/element/GuiEnergyInfo.java +++ b/src/main/java/mekanism/client/gui/element/GuiEnergyInfo.java @@ -32,11 +32,6 @@ public class GuiEnergyInfo extends GuiElement return new Rectangle4i(guiWidth - 26, guiHeight + 138, 26, 26); } - public static interface IInfoHandler - { - public List getInfo(); - } - @Override public void renderBackground(int xAxis, int yAxis, int guiWidth, int guiHeight) { @@ -59,7 +54,7 @@ public class GuiEnergyInfo extends GuiElement info.add(s); } - info.add(LangUtils.localize("gui.unit") + ": " + general.activeType); + info.add(LangUtils.localize("gui.unit") + ": " + general.energyUnit); displayTooltips(info, xAxis, yAxis); } } @@ -72,7 +67,10 @@ public class GuiEnergyInfo extends GuiElement { if(button == 0) { - general.activeType = EnergyType.values()[(general.activeType.ordinal()+1)%EnergyType.values().length]; + if(xAxis >= -21 && xAxis <= -3 && yAxis >= 142 && yAxis <= 160) + { + general.energyUnit = EnergyType.values()[(general.energyUnit.ordinal()+1)%EnergyType.values().length]; + } } } } diff --git a/src/main/java/mekanism/client/gui/element/GuiFluidGauge.java b/src/main/java/mekanism/client/gui/element/GuiFluidGauge.java index 9155961e1..1f491648d 100644 --- a/src/main/java/mekanism/client/gui/element/GuiFluidGauge.java +++ b/src/main/java/mekanism/client/gui/element/GuiFluidGauge.java @@ -1,5 +1,7 @@ package mekanism.client.gui.element; +import java.util.Arrays; + import mekanism.api.Coord4D; import mekanism.api.transmitters.TransmissionType; import mekanism.client.gui.GuiMekanism; @@ -15,9 +17,8 @@ import net.minecraft.util.IIcon; import net.minecraft.util.ResourceLocation; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidTank; -import org.lwjgl.input.Keyboard; -import java.util.Arrays; +import org.lwjgl.input.Keyboard; public class GuiFluidGauge extends GuiGauge { diff --git a/src/main/java/mekanism/client/gui/element/GuiGasGauge.java b/src/main/java/mekanism/client/gui/element/GuiGasGauge.java index 3d4112f43..97069a2e1 100644 --- a/src/main/java/mekanism/client/gui/element/GuiGasGauge.java +++ b/src/main/java/mekanism/client/gui/element/GuiGasGauge.java @@ -1,5 +1,7 @@ package mekanism.client.gui.element; +import java.util.Arrays; + import mekanism.api.Coord4D; import mekanism.api.gas.Gas; import mekanism.api.gas.GasTank; @@ -15,9 +17,8 @@ import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; import net.minecraft.util.ResourceLocation; -import org.lwjgl.input.Keyboard; -import java.util.Arrays; +import org.lwjgl.input.Keyboard; public class GuiGasGauge extends GuiGauge { diff --git a/src/main/java/mekanism/client/gui/element/GuiHeatInfo.java b/src/main/java/mekanism/client/gui/element/GuiHeatInfo.java new file mode 100644 index 000000000..41d335736 --- /dev/null +++ b/src/main/java/mekanism/client/gui/element/GuiHeatInfo.java @@ -0,0 +1,76 @@ +package mekanism.client.gui.element; + +import java.util.ArrayList; +import java.util.List; + +import mekanism.api.MekanismConfig.general; +import mekanism.api.util.UnitDisplayUtils.TempType; +import mekanism.client.gui.IGuiWrapper; +import mekanism.common.util.LangUtils; +import mekanism.common.util.MekanismUtils; +import mekanism.common.util.MekanismUtils.ResourceType; +import net.minecraft.util.ResourceLocation; +import codechicken.lib.vec.Rectangle4i; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + +@SideOnly(Side.CLIENT) +public class GuiHeatInfo extends GuiElement +{ + public IInfoHandler infoHandler; + + public GuiHeatInfo(IInfoHandler handler, IGuiWrapper gui, ResourceLocation def) + { + super(MekanismUtils.getResource(ResourceType.GUI_ELEMENT, "GuiHeatInfo.png"), gui, def); + + infoHandler = handler; + } + + @Override + public Rectangle4i getBounds(int guiWidth, int guiHeight) + { + return new Rectangle4i(guiWidth - 26, guiHeight + 138, 26, 26); + } + + @Override + public void renderBackground(int xAxis, int yAxis, int guiWidth, int guiHeight) + { + mc.renderEngine.bindTexture(RESOURCE); + + guiObj.drawTexturedRect(guiWidth - 26, guiHeight + 112, 0, 0, 26, 26); + + mc.renderEngine.bindTexture(defaultLocation); + } + + @Override + public void renderForeground(int xAxis, int yAxis) + { + if(xAxis >= -21 && xAxis <= -3 && yAxis >= 116 && yAxis <= 134) + { + List info = new ArrayList(); + + for(String s : infoHandler.getInfo()) + { + info.add(s); + } + + info.add(LangUtils.localize("gui.unit") + ": " + general.tempUnit); + displayTooltips(info, xAxis, yAxis); + } + } + + @Override + public void preMouseClicked(int xAxis, int yAxis, int button) {} + + @Override + public void mouseClicked(int xAxis, int yAxis, int button) + { + if(button == 0) + { + if(xAxis >= -21 && xAxis <= -3 && yAxis >= 116 && yAxis <= 134) + { + general.tempUnit = TempType.values()[(general.tempUnit.ordinal()+1)%TempType.values().length]; + } + } + } +} diff --git a/src/main/java/mekanism/client/gui/element/GuiProgress.java b/src/main/java/mekanism/client/gui/element/GuiProgress.java index cc03c0ae0..97c716cca 100644 --- a/src/main/java/mekanism/client/gui/element/GuiProgress.java +++ b/src/main/java/mekanism/client/gui/element/GuiProgress.java @@ -4,9 +4,9 @@ import mekanism.client.gui.IGuiWrapper; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.util.ResourceLocation; +import codechicken.lib.vec.Rectangle4i; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import codechicken.lib.vec.Rectangle4i; @SideOnly(Side.CLIENT) public class GuiProgress extends GuiElement diff --git a/src/main/java/mekanism/client/gui/element/GuiSideConfigurationTab.java b/src/main/java/mekanism/client/gui/element/GuiSideConfigurationTab.java index 477f95a73..21d09df96 100644 --- a/src/main/java/mekanism/client/gui/element/GuiSideConfigurationTab.java +++ b/src/main/java/mekanism/client/gui/element/GuiSideConfigurationTab.java @@ -10,9 +10,9 @@ import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; +import codechicken.lib.vec.Rectangle4i; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import codechicken.lib.vec.Rectangle4i; @SideOnly(Side.CLIENT) public class GuiSideConfigurationTab extends GuiElement diff --git a/src/main/java/mekanism/client/model/ModelArmoredJetpack.java b/src/main/java/mekanism/client/model/ModelArmoredJetpack.java index 12d500cc2..55083bec4 100644 --- a/src/main/java/mekanism/client/model/ModelArmoredJetpack.java +++ b/src/main/java/mekanism/client/model/ModelArmoredJetpack.java @@ -1,7 +1,6 @@ package mekanism.client.model; import mekanism.client.render.MekanismRenderer; - import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; diff --git a/src/main/java/mekanism/client/model/ModelAtomicDisassembler.java b/src/main/java/mekanism/client/model/ModelAtomicDisassembler.java index a9ba4be4b..c312595f5 100644 --- a/src/main/java/mekanism/client/model/ModelAtomicDisassembler.java +++ b/src/main/java/mekanism/client/model/ModelAtomicDisassembler.java @@ -1,7 +1,6 @@ package mekanism.client.model; import mekanism.client.render.MekanismRenderer; - import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; diff --git a/src/main/java/mekanism/client/model/ModelBalloon.java b/src/main/java/mekanism/client/model/ModelBalloon.java index d1a16c4ef..dab4fb017 100644 --- a/src/main/java/mekanism/client/model/ModelBalloon.java +++ b/src/main/java/mekanism/client/model/ModelBalloon.java @@ -1,14 +1,14 @@ package mekanism.client.model; import mekanism.api.EnumColor; - import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + @SideOnly(Side.CLIENT) public class ModelBalloon extends ModelBase { diff --git a/src/main/java/mekanism/client/model/ModelChemicalCrystallizer.java b/src/main/java/mekanism/client/model/ModelChemicalCrystallizer.java index fc6e4c91d..18cc82b80 100644 --- a/src/main/java/mekanism/client/model/ModelChemicalCrystallizer.java +++ b/src/main/java/mekanism/client/model/ModelChemicalCrystallizer.java @@ -1,7 +1,6 @@ package mekanism.client.model; import mekanism.client.render.MekanismRenderer; - import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; import cpw.mods.fml.relauncher.Side; diff --git a/src/main/java/mekanism/client/model/ModelChemicalDissolutionChamber.java b/src/main/java/mekanism/client/model/ModelChemicalDissolutionChamber.java index 9d21c26e9..470ae4726 100644 --- a/src/main/java/mekanism/client/model/ModelChemicalDissolutionChamber.java +++ b/src/main/java/mekanism/client/model/ModelChemicalDissolutionChamber.java @@ -1,7 +1,6 @@ package mekanism.client.model; import mekanism.client.render.MekanismRenderer; - import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; import cpw.mods.fml.relauncher.Side; diff --git a/src/main/java/mekanism/client/model/ModelChemicalInfuser.java b/src/main/java/mekanism/client/model/ModelChemicalInfuser.java index 28cd2dd62..b7e2b8329 100644 --- a/src/main/java/mekanism/client/model/ModelChemicalInfuser.java +++ b/src/main/java/mekanism/client/model/ModelChemicalInfuser.java @@ -1,14 +1,14 @@ package mekanism.client.model; import mekanism.client.render.MekanismRenderer; - import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + @SideOnly(Side.CLIENT) public class ModelChemicalInfuser extends ModelBase { diff --git a/src/main/java/mekanism/client/model/ModelChemicalOxidizer.java b/src/main/java/mekanism/client/model/ModelChemicalOxidizer.java index f6dc605ab..9519791fd 100644 --- a/src/main/java/mekanism/client/model/ModelChemicalOxidizer.java +++ b/src/main/java/mekanism/client/model/ModelChemicalOxidizer.java @@ -1,14 +1,14 @@ package mekanism.client.model; import mekanism.client.render.MekanismRenderer; - import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + @SideOnly(Side.CLIENT) public class ModelChemicalOxidizer extends ModelBase { diff --git a/src/main/java/mekanism/client/model/ModelChemicalWasher.java b/src/main/java/mekanism/client/model/ModelChemicalWasher.java index 82f2251e1..434e29a32 100644 --- a/src/main/java/mekanism/client/model/ModelChemicalWasher.java +++ b/src/main/java/mekanism/client/model/ModelChemicalWasher.java @@ -1,7 +1,6 @@ package mekanism.client.model; import mekanism.client.render.MekanismRenderer; - import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; import cpw.mods.fml.relauncher.Side; diff --git a/src/main/java/mekanism/client/model/ModelDigitalMiner.java b/src/main/java/mekanism/client/model/ModelDigitalMiner.java index 8c20ea876..b54698b10 100644 --- a/src/main/java/mekanism/client/model/ModelDigitalMiner.java +++ b/src/main/java/mekanism/client/model/ModelDigitalMiner.java @@ -1,7 +1,6 @@ package mekanism.client.model; import mekanism.client.render.MekanismRenderer; - import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; import cpw.mods.fml.relauncher.Side; diff --git a/src/main/java/mekanism/client/model/ModelEnergyCube.java b/src/main/java/mekanism/client/model/ModelEnergyCube.java index 33382ee42..bccffea10 100644 --- a/src/main/java/mekanism/client/model/ModelEnergyCube.java +++ b/src/main/java/mekanism/client/model/ModelEnergyCube.java @@ -1,7 +1,6 @@ package mekanism.client.model; import mekanism.client.render.MekanismRenderer; - import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; import cpw.mods.fml.relauncher.Side; diff --git a/src/main/java/mekanism/client/model/ModelGasMask.java b/src/main/java/mekanism/client/model/ModelGasMask.java index bcdbe9725..469a43070 100644 --- a/src/main/java/mekanism/client/model/ModelGasMask.java +++ b/src/main/java/mekanism/client/model/ModelGasMask.java @@ -1,14 +1,14 @@ package mekanism.client.model; import mekanism.client.render.MekanismRenderer; - import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + @SideOnly(Side.CLIENT) public class ModelGasMask extends ModelBase { diff --git a/src/main/java/mekanism/client/model/ModelJetpack.java b/src/main/java/mekanism/client/model/ModelJetpack.java index d5f5a0122..19d31a719 100644 --- a/src/main/java/mekanism/client/model/ModelJetpack.java +++ b/src/main/java/mekanism/client/model/ModelJetpack.java @@ -1,14 +1,14 @@ package mekanism.client.model; import mekanism.client.render.MekanismRenderer; - import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + @SideOnly(Side.CLIENT) public class ModelJetpack extends ModelBase { diff --git a/src/main/java/mekanism/client/model/ModelLogisticalSorter.java b/src/main/java/mekanism/client/model/ModelLogisticalSorter.java index 8979bda3c..fc065cd10 100644 --- a/src/main/java/mekanism/client/model/ModelLogisticalSorter.java +++ b/src/main/java/mekanism/client/model/ModelLogisticalSorter.java @@ -1,7 +1,6 @@ package mekanism.client.model; import mekanism.client.render.MekanismRenderer; - import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; import cpw.mods.fml.relauncher.Side; diff --git a/src/main/java/mekanism/client/model/ModelRobit.java b/src/main/java/mekanism/client/model/ModelRobit.java index d6a3a1eb5..6796e0798 100644 --- a/src/main/java/mekanism/client/model/ModelRobit.java +++ b/src/main/java/mekanism/client/model/ModelRobit.java @@ -1,15 +1,15 @@ package mekanism.client.model; import mekanism.client.render.MekanismRenderer; - import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; import net.minecraft.entity.Entity; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + @SideOnly(Side.CLIENT) public class ModelRobit extends ModelBase { diff --git a/src/main/java/mekanism/client/model/ModelSeismicVibrator.java b/src/main/java/mekanism/client/model/ModelSeismicVibrator.java index e27dd6bf5..4d1d895f7 100644 --- a/src/main/java/mekanism/client/model/ModelSeismicVibrator.java +++ b/src/main/java/mekanism/client/model/ModelSeismicVibrator.java @@ -2,11 +2,12 @@ package mekanism.client.model; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + @SideOnly(Side.CLIENT) public class ModelSeismicVibrator extends ModelBase { diff --git a/src/main/java/mekanism/client/nei/AdvancedMachineRecipeHandler.java b/src/main/java/mekanism/client/nei/AdvancedMachineRecipeHandler.java index e93a2c995..536a86cfc 100644 --- a/src/main/java/mekanism/client/nei/AdvancedMachineRecipeHandler.java +++ b/src/main/java/mekanism/client/nei/AdvancedMachineRecipeHandler.java @@ -1,6 +1,10 @@ package mekanism.client.nei; -import java.awt.*; +import static codechicken.lib.gui.GuiDraw.changeTexture; +import static codechicken.lib.gui.GuiDraw.drawTexturedModalRect; + +import java.awt.Point; +import java.awt.Rectangle; import java.util.Collection; import java.util.List; @@ -8,11 +12,11 @@ import mekanism.api.gas.Gas; import mekanism.api.gas.GasStack; import mekanism.client.gui.element.GuiElement; import mekanism.client.gui.element.GuiPowerBar; -import mekanism.client.gui.element.GuiProgress; -import mekanism.client.gui.element.GuiSlot; import mekanism.client.gui.element.GuiPowerBar.IPowerInfoHandler; +import mekanism.client.gui.element.GuiProgress; import mekanism.client.gui.element.GuiProgress.IProgressInfoHandler; import mekanism.client.gui.element.GuiProgress.ProgressBar; +import mekanism.client.gui.element.GuiSlot; import mekanism.client.gui.element.GuiSlot.SlotOverlay; import mekanism.client.gui.element.GuiSlot.SlotType; import mekanism.common.ObfuscatedNames; @@ -31,8 +35,6 @@ import codechicken.nei.NEIServerUtils; import codechicken.nei.PositionedStack; import codechicken.nei.recipe.GuiRecipe; import codechicken.nei.recipe.TemplateRecipeHandler; -import static codechicken.lib.gui.GuiDraw.changeTexture; -import static codechicken.lib.gui.GuiDraw.drawTexturedModalRect; public abstract class AdvancedMachineRecipeHandler extends BaseRecipeHandler { diff --git a/src/main/java/mekanism/client/nei/BaseRecipeHandler.java b/src/main/java/mekanism/client/nei/BaseRecipeHandler.java index 878e01077..5fe5f3879 100644 --- a/src/main/java/mekanism/client/nei/BaseRecipeHandler.java +++ b/src/main/java/mekanism/client/nei/BaseRecipeHandler.java @@ -1,5 +1,9 @@ package mekanism.client.nei; +import static codechicken.lib.gui.GuiDraw.changeTexture; +import static codechicken.lib.gui.GuiDraw.drawTexturedModalRect; +import static codechicken.lib.gui.GuiDraw.gui; + import java.util.HashSet; import java.util.List; import java.util.Set; @@ -14,9 +18,6 @@ import net.minecraftforge.fluids.FluidStack; import codechicken.nei.recipe.GuiCraftingRecipe; import codechicken.nei.recipe.GuiUsageRecipe; import codechicken.nei.recipe.TemplateRecipeHandler; -import static codechicken.lib.gui.GuiDraw.changeTexture; -import static codechicken.lib.gui.GuiDraw.drawTexturedModalRect; -import static codechicken.lib.gui.GuiDraw.gui; public abstract class BaseRecipeHandler extends TemplateRecipeHandler implements IGuiWrapper { diff --git a/src/main/java/mekanism/client/nei/ChanceMachineRecipeHandler.java b/src/main/java/mekanism/client/nei/ChanceMachineRecipeHandler.java index 8ceda4b9a..e9e56e0ac 100644 --- a/src/main/java/mekanism/client/nei/ChanceMachineRecipeHandler.java +++ b/src/main/java/mekanism/client/nei/ChanceMachineRecipeHandler.java @@ -1,15 +1,19 @@ package mekanism.client.nei; -import java.awt.*; +import static codechicken.lib.gui.GuiDraw.changeTexture; +import static codechicken.lib.gui.GuiDraw.drawString; +import static codechicken.lib.gui.GuiDraw.drawTexturedModalRect; + +import java.awt.Rectangle; import java.util.Collection; import mekanism.client.gui.element.GuiElement; import mekanism.client.gui.element.GuiPowerBar; -import mekanism.client.gui.element.GuiProgress; -import mekanism.client.gui.element.GuiSlot; import mekanism.client.gui.element.GuiPowerBar.IPowerInfoHandler; +import mekanism.client.gui.element.GuiProgress; import mekanism.client.gui.element.GuiProgress.IProgressInfoHandler; import mekanism.client.gui.element.GuiProgress.ProgressBar; +import mekanism.client.gui.element.GuiSlot; import mekanism.client.gui.element.GuiSlot.SlotOverlay; import mekanism.client.gui.element.GuiSlot.SlotType; import mekanism.common.recipe.machines.ChanceMachineRecipe; @@ -23,9 +27,6 @@ import org.lwjgl.opengl.GL11; import codechicken.nei.NEIServerUtils; import codechicken.nei.PositionedStack; import codechicken.nei.recipe.TemplateRecipeHandler; -import static codechicken.lib.gui.GuiDraw.changeTexture; -import static codechicken.lib.gui.GuiDraw.drawString; -import static codechicken.lib.gui.GuiDraw.drawTexturedModalRect; public abstract class ChanceMachineRecipeHandler extends BaseRecipeHandler { diff --git a/src/main/java/mekanism/client/nei/ChemicalInfuserRecipeHandler.java b/src/main/java/mekanism/client/nei/ChemicalInfuserRecipeHandler.java index e11247265..f0040b32a 100644 --- a/src/main/java/mekanism/client/nei/ChemicalInfuserRecipeHandler.java +++ b/src/main/java/mekanism/client/nei/ChemicalInfuserRecipeHandler.java @@ -1,6 +1,10 @@ package mekanism.client.nei; -import java.awt.*; +import static codechicken.lib.gui.GuiDraw.changeTexture; +import static codechicken.lib.gui.GuiDraw.drawTexturedModalRect; + +import java.awt.Point; +import java.awt.Rectangle; import java.util.Collection; import java.util.List; @@ -21,8 +25,6 @@ import codechicken.nei.NEIClientConfig; import codechicken.nei.PositionedStack; import codechicken.nei.recipe.GuiRecipe; import codechicken.nei.recipe.TemplateRecipeHandler; -import static codechicken.lib.gui.GuiDraw.changeTexture; -import static codechicken.lib.gui.GuiDraw.drawTexturedModalRect; public class ChemicalInfuserRecipeHandler extends BaseRecipeHandler { diff --git a/src/main/java/mekanism/client/nei/ChemicalOxidizerRecipeHandler.java b/src/main/java/mekanism/client/nei/ChemicalOxidizerRecipeHandler.java index 731042785..6f5b877c5 100644 --- a/src/main/java/mekanism/client/nei/ChemicalOxidizerRecipeHandler.java +++ b/src/main/java/mekanism/client/nei/ChemicalOxidizerRecipeHandler.java @@ -14,9 +14,9 @@ import mekanism.client.gui.element.GuiElement; import mekanism.client.gui.element.GuiGasGauge; import mekanism.client.gui.element.GuiGauge; import mekanism.client.gui.element.GuiProgress; -import mekanism.client.gui.element.GuiSlot; import mekanism.client.gui.element.GuiProgress.IProgressInfoHandler; import mekanism.client.gui.element.GuiProgress.ProgressBar; +import mekanism.client.gui.element.GuiSlot; import mekanism.client.gui.element.GuiSlot.SlotOverlay; import mekanism.client.gui.element.GuiSlot.SlotType; import mekanism.common.ObfuscatedNames; diff --git a/src/main/java/mekanism/client/nei/ElectrolyticSeparatorRecipeHandler.java b/src/main/java/mekanism/client/nei/ElectrolyticSeparatorRecipeHandler.java index 565ae0d47..cb5a27450 100644 --- a/src/main/java/mekanism/client/nei/ElectrolyticSeparatorRecipeHandler.java +++ b/src/main/java/mekanism/client/nei/ElectrolyticSeparatorRecipeHandler.java @@ -7,7 +7,6 @@ import java.awt.Point; import java.awt.Rectangle; import java.util.Collection; import java.util.List; -import java.util.Map; import mekanism.api.gas.GasStack; import mekanism.client.gui.GuiElectrolyticSeparator; @@ -16,11 +15,11 @@ import mekanism.client.gui.element.GuiFluidGauge; import mekanism.client.gui.element.GuiGasGauge; import mekanism.client.gui.element.GuiGauge; import mekanism.client.gui.element.GuiPowerBar; -import mekanism.client.gui.element.GuiProgress; -import mekanism.client.gui.element.GuiSlot; import mekanism.client.gui.element.GuiPowerBar.IPowerInfoHandler; +import mekanism.client.gui.element.GuiProgress; import mekanism.client.gui.element.GuiProgress.IProgressInfoHandler; import mekanism.client.gui.element.GuiProgress.ProgressBar; +import mekanism.client.gui.element.GuiSlot; import mekanism.client.gui.element.GuiSlot.SlotOverlay; import mekanism.client.gui.element.GuiSlot.SlotType; import mekanism.common.ObfuscatedNames; diff --git a/src/main/java/mekanism/client/nei/MachineRecipeHandler.java b/src/main/java/mekanism/client/nei/MachineRecipeHandler.java index daff7b57b..d9551fae2 100644 --- a/src/main/java/mekanism/client/nei/MachineRecipeHandler.java +++ b/src/main/java/mekanism/client/nei/MachineRecipeHandler.java @@ -1,15 +1,18 @@ package mekanism.client.nei; -import java.awt.*; +import static codechicken.lib.gui.GuiDraw.changeTexture; +import static codechicken.lib.gui.GuiDraw.drawTexturedModalRect; + +import java.awt.Rectangle; import java.util.Collection; import mekanism.client.gui.element.GuiElement; import mekanism.client.gui.element.GuiPowerBar; -import mekanism.client.gui.element.GuiProgress; -import mekanism.client.gui.element.GuiSlot; import mekanism.client.gui.element.GuiPowerBar.IPowerInfoHandler; +import mekanism.client.gui.element.GuiProgress; import mekanism.client.gui.element.GuiProgress.IProgressInfoHandler; import mekanism.client.gui.element.GuiProgress.ProgressBar; +import mekanism.client.gui.element.GuiSlot; import mekanism.client.gui.element.GuiSlot.SlotOverlay; import mekanism.client.gui.element.GuiSlot.SlotType; import mekanism.common.recipe.machines.BasicMachineRecipe; @@ -22,8 +25,6 @@ import org.lwjgl.opengl.GL11; import codechicken.nei.NEIServerUtils; import codechicken.nei.PositionedStack; import codechicken.nei.recipe.TemplateRecipeHandler; -import static codechicken.lib.gui.GuiDraw.changeTexture; -import static codechicken.lib.gui.GuiDraw.drawTexturedModalRect; public abstract class MachineRecipeHandler extends BaseRecipeHandler { diff --git a/src/main/java/mekanism/client/nei/MekanismSlotClickHandler.java b/src/main/java/mekanism/client/nei/MekanismSlotClickHandler.java index 7eae53fb9..229831a5b 100644 --- a/src/main/java/mekanism/client/nei/MekanismSlotClickHandler.java +++ b/src/main/java/mekanism/client/nei/MekanismSlotClickHandler.java @@ -1,10 +1,8 @@ package mekanism.client.nei; import mekanism.client.gui.GuiMekanism; - import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.inventory.Slot; - import codechicken.nei.guihook.IContainerSlotClickHandler; public class MekanismSlotClickHandler implements IContainerSlotClickHandler diff --git a/src/main/java/mekanism/client/nei/NEIMekanismConfig.java b/src/main/java/mekanism/client/nei/NEIMekanismConfig.java index c4d9c8ddb..cecb68de5 100644 --- a/src/main/java/mekanism/client/nei/NEIMekanismConfig.java +++ b/src/main/java/mekanism/client/nei/NEIMekanismConfig.java @@ -16,8 +16,8 @@ import mekanism.client.gui.GuiPRC; import mekanism.client.gui.GuiPrecisionSawmill; import mekanism.client.gui.GuiPurificationChamber; import mekanism.client.gui.GuiRotaryCondensentrator; -import mekanism.client.gui.GuiThermalEvaporationController; import mekanism.client.gui.GuiSolarNeutronActivator; +import mekanism.client.gui.GuiThermalEvaporationController; import mekanism.common.MekanismBlocks; import mekanism.common.MekanismItems; import net.minecraft.item.ItemStack; diff --git a/src/main/java/mekanism/client/nei/PRCRecipeHandler.java b/src/main/java/mekanism/client/nei/PRCRecipeHandler.java index ba320a47d..4dbb1484b 100644 --- a/src/main/java/mekanism/client/nei/PRCRecipeHandler.java +++ b/src/main/java/mekanism/client/nei/PRCRecipeHandler.java @@ -17,11 +17,11 @@ import mekanism.client.gui.element.GuiFluidGauge; import mekanism.client.gui.element.GuiGasGauge; import mekanism.client.gui.element.GuiGauge; import mekanism.client.gui.element.GuiPowerBar; -import mekanism.client.gui.element.GuiProgress; -import mekanism.client.gui.element.GuiSlot; import mekanism.client.gui.element.GuiPowerBar.IPowerInfoHandler; +import mekanism.client.gui.element.GuiProgress; import mekanism.client.gui.element.GuiProgress.IProgressInfoHandler; import mekanism.client.gui.element.GuiProgress.ProgressBar; +import mekanism.client.gui.element.GuiSlot; import mekanism.client.gui.element.GuiSlot.SlotOverlay; import mekanism.client.gui.element.GuiSlot.SlotType; import mekanism.common.ObfuscatedNames; diff --git a/src/main/java/mekanism/client/nei/RotaryCondensentratorRecipeHandler.java b/src/main/java/mekanism/client/nei/RotaryCondensentratorRecipeHandler.java index 8f99dc790..03afb2ae3 100644 --- a/src/main/java/mekanism/client/nei/RotaryCondensentratorRecipeHandler.java +++ b/src/main/java/mekanism/client/nei/RotaryCondensentratorRecipeHandler.java @@ -1,6 +1,11 @@ package mekanism.client.nei; -import java.awt.*; +import static codechicken.lib.gui.GuiDraw.changeTexture; +import static codechicken.lib.gui.GuiDraw.drawString; +import static codechicken.lib.gui.GuiDraw.drawTexturedModalRect; + +import java.awt.Point; +import java.awt.Rectangle; import java.util.List; import mekanism.api.gas.Gas; @@ -10,7 +15,6 @@ import mekanism.client.gui.GuiRotaryCondensentrator; import mekanism.common.ObfuscatedNames; import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; - import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraftforge.fluids.FluidStack; @@ -22,10 +26,6 @@ import codechicken.nei.PositionedStack; import codechicken.nei.recipe.GuiRecipe; import codechicken.nei.recipe.TemplateRecipeHandler; -import static codechicken.lib.gui.GuiDraw.changeTexture; -import static codechicken.lib.gui.GuiDraw.drawString; -import static codechicken.lib.gui.GuiDraw.drawTexturedModalRect; - public class RotaryCondensentratorRecipeHandler extends BaseRecipeHandler { private int ticksPassed; diff --git a/src/main/java/mekanism/client/nei/SolarNeutronRecipeHandler.java b/src/main/java/mekanism/client/nei/SolarNeutronRecipeHandler.java index d62fe0da1..f7d2b88c2 100644 --- a/src/main/java/mekanism/client/nei/SolarNeutronRecipeHandler.java +++ b/src/main/java/mekanism/client/nei/SolarNeutronRecipeHandler.java @@ -10,15 +10,12 @@ import java.util.List; import mekanism.api.gas.GasStack; import mekanism.client.gui.GuiSolarNeutronActivator; -import mekanism.client.nei.RotaryCondensentratorRecipeHandler.CachedIORecipe; import mekanism.common.ObfuscatedNames; import mekanism.common.recipe.RecipeHandler.Recipe; import mekanism.common.recipe.machines.SolarNeutronRecipe; import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import net.minecraft.client.gui.inventory.GuiContainer; -import net.minecraftforge.fluids.FluidRegistry; -import net.minecraftforge.fluids.FluidStack; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/mekanism/client/nei/ThermalEvaporationRecipeHandler.java b/src/main/java/mekanism/client/nei/ThermalEvaporationRecipeHandler.java index e53294d23..bf924aae7 100644 --- a/src/main/java/mekanism/client/nei/ThermalEvaporationRecipeHandler.java +++ b/src/main/java/mekanism/client/nei/ThermalEvaporationRecipeHandler.java @@ -7,7 +7,6 @@ import java.awt.Point; import java.awt.Rectangle; import java.util.Collection; import java.util.List; -import java.util.Map; import mekanism.client.gui.GuiThermalEvaporationController; import mekanism.common.ObfuscatedNames; diff --git a/src/main/java/mekanism/client/render/ColourTemperature.java b/src/main/java/mekanism/client/render/ColourTemperature.java index 0e66bf9df..18e62ccc2 100644 --- a/src/main/java/mekanism/client/render/ColourTemperature.java +++ b/src/main/java/mekanism/client/render/ColourTemperature.java @@ -3,7 +3,6 @@ package mekanism.client.render; import java.util.HashMap; import mekanism.api.IHeatTransfer; - import codechicken.lib.colour.ColourRGBA; public class ColourTemperature extends ColourRGBA diff --git a/src/main/java/mekanism/client/render/MinerVisualRenderer.java b/src/main/java/mekanism/client/render/MinerVisualRenderer.java index f8790d135..aeabc8a0a 100644 --- a/src/main/java/mekanism/client/render/MinerVisualRenderer.java +++ b/src/main/java/mekanism/client/render/MinerVisualRenderer.java @@ -10,7 +10,6 @@ import mekanism.api.EnumColor; import mekanism.client.render.MekanismRenderer.DisplayInteger; import mekanism.client.render.MekanismRenderer.Model3D; import mekanism.common.tile.TileEntityDigitalMiner; - import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; import net.minecraft.init.Blocks; diff --git a/src/main/java/mekanism/client/render/ModelCustomArmor.java b/src/main/java/mekanism/client/render/ModelCustomArmor.java index d908e0984..071937055 100644 --- a/src/main/java/mekanism/client/render/ModelCustomArmor.java +++ b/src/main/java/mekanism/client/render/ModelCustomArmor.java @@ -7,18 +7,18 @@ import mekanism.client.model.ModelJetpack; import mekanism.client.model.ModelScubaTank; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; - import net.minecraft.client.Minecraft; import net.minecraft.client.model.ModelBiped; import net.minecraft.client.model.ModelRenderer; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.util.ResourceLocation; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + @SideOnly(Side.CLIENT) public class ModelCustomArmor extends ModelBiped { diff --git a/src/main/java/mekanism/client/render/RenderGlowPanel.java b/src/main/java/mekanism/client/render/RenderGlowPanel.java index 51d7a0196..b88fc6f60 100644 --- a/src/main/java/mekanism/client/render/RenderGlowPanel.java +++ b/src/main/java/mekanism/client/render/RenderGlowPanel.java @@ -6,10 +6,8 @@ import mekanism.api.EnumColor; import mekanism.common.multipart.PartGlowPanel; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; - import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.util.IIcon; - import codechicken.lib.colour.Colour; import codechicken.lib.colour.ColourRGBA; import codechicken.lib.lighting.LightModel; diff --git a/src/main/java/mekanism/client/render/block/MachineRenderingHandler.java b/src/main/java/mekanism/client/render/block/MachineRenderingHandler.java index 4c3d0ba69..f9f79e2b9 100644 --- a/src/main/java/mekanism/client/render/block/MachineRenderingHandler.java +++ b/src/main/java/mekanism/client/render/block/MachineRenderingHandler.java @@ -20,13 +20,11 @@ import mekanism.client.model.ModelRotaryCondensentrator; import mekanism.client.model.ModelSeismicVibrator; import mekanism.client.render.MekanismRenderer; import mekanism.common.block.BlockMachine.MachineType; -import mekanism.common.tile.TileEntityBasicBlock; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.RenderBlocks; -import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; import net.minecraft.world.IBlockAccess; import net.minecraftforge.client.model.AdvancedModelLoader; diff --git a/src/main/java/mekanism/client/render/block/PlasticRenderingHandler.java b/src/main/java/mekanism/client/render/block/PlasticRenderingHandler.java index 4e0c7e917..8358af979 100644 --- a/src/main/java/mekanism/client/render/block/PlasticRenderingHandler.java +++ b/src/main/java/mekanism/client/render/block/PlasticRenderingHandler.java @@ -2,9 +2,7 @@ package mekanism.client.render.block; import mekanism.client.ClientProxy; import mekanism.client.render.MekanismRenderer; -import mekanism.common.Mekanism; import mekanism.common.MekanismBlocks; - import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.Tessellator; diff --git a/src/main/java/mekanism/client/render/block/RenderBlocksCTM.java b/src/main/java/mekanism/client/render/block/RenderBlocksCTM.java index 0676e396e..871ff161e 100644 --- a/src/main/java/mekanism/client/render/block/RenderBlocksCTM.java +++ b/src/main/java/mekanism/client/render/block/RenderBlocksCTM.java @@ -2,7 +2,6 @@ package mekanism.client.render.block; import mekanism.client.render.CTM; import mekanism.common.CTMData; - import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.Tessellator; diff --git a/src/main/java/mekanism/client/render/entity/RenderBalloon.java b/src/main/java/mekanism/client/render/entity/RenderBalloon.java index 1250ef591..4f0168de8 100644 --- a/src/main/java/mekanism/client/render/entity/RenderBalloon.java +++ b/src/main/java/mekanism/client/render/entity/RenderBalloon.java @@ -5,17 +5,17 @@ import mekanism.client.model.ModelBalloon; import mekanism.common.entity.EntityBalloon; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; - import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.entity.Render; import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.entity.Entity; import net.minecraft.util.ResourceLocation; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + @SideOnly(Side.CLIENT) public class RenderBalloon extends Render { diff --git a/src/main/java/mekanism/client/render/entity/RenderFlame.java b/src/main/java/mekanism/client/render/entity/RenderFlame.java index be6f6b847..fd369b0f9 100644 --- a/src/main/java/mekanism/client/render/entity/RenderFlame.java +++ b/src/main/java/mekanism/client/render/entity/RenderFlame.java @@ -2,17 +2,17 @@ package mekanism.client.render.entity; import mekanism.client.render.MekanismRenderer; import mekanism.common.entity.EntityFlame; - import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.entity.Render; import net.minecraft.entity.Entity; import net.minecraft.util.ResourceLocation; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + @SideOnly(Side.CLIENT) public class RenderFlame extends Render { diff --git a/src/main/java/mekanism/client/render/entity/RenderObsidianTNTPrimed.java b/src/main/java/mekanism/client/render/entity/RenderObsidianTNTPrimed.java index d6385a48d..51a4e5ce5 100644 --- a/src/main/java/mekanism/client/render/entity/RenderObsidianTNTPrimed.java +++ b/src/main/java/mekanism/client/render/entity/RenderObsidianTNTPrimed.java @@ -4,17 +4,17 @@ import mekanism.client.model.ModelObsidianTNT; import mekanism.common.entity.EntityObsidianTNT; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; - import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.entity.Render; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.entity.Entity; import net.minecraft.util.ResourceLocation; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + @SideOnly(Side.CLIENT) public class RenderObsidianTNTPrimed extends Render { diff --git a/src/main/java/mekanism/client/render/entity/RenderRobit.java b/src/main/java/mekanism/client/render/entity/RenderRobit.java index 2cb6c6bbf..d585102a2 100644 --- a/src/main/java/mekanism/client/render/entity/RenderRobit.java +++ b/src/main/java/mekanism/client/render/entity/RenderRobit.java @@ -4,7 +4,6 @@ import mekanism.client.model.ModelRobit; import mekanism.common.entity.EntityRobit; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; - import net.minecraft.client.renderer.entity.RenderLiving; import net.minecraft.entity.Entity; import net.minecraft.util.ResourceLocation; diff --git a/src/main/java/mekanism/client/render/tileentity/RenderBin.java b/src/main/java/mekanism/client/render/tileentity/RenderBin.java index 5834a1e1b..6516cedab 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderBin.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderBin.java @@ -2,7 +2,6 @@ package mekanism.client.render.tileentity; import mekanism.api.Coord4D; import mekanism.common.tile.TileEntityBin; - import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.renderer.OpenGlHelper; @@ -16,11 +15,12 @@ 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.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + @SideOnly(Side.CLIENT) public class RenderBin extends TileEntitySpecialRenderer { diff --git a/src/main/java/mekanism/client/render/tileentity/RenderChargepad.java b/src/main/java/mekanism/client/render/tileentity/RenderChargepad.java index d95105987..96c439baf 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderChargepad.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderChargepad.java @@ -4,14 +4,14 @@ import mekanism.client.model.ModelChargepad; import mekanism.common.tile.TileEntityChargepad; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; - import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + @SideOnly(Side.CLIENT) public class RenderChargepad extends TileEntitySpecialRenderer { diff --git a/src/main/java/mekanism/client/render/tileentity/RenderChemicalCrystallizer.java b/src/main/java/mekanism/client/render/tileentity/RenderChemicalCrystallizer.java index 483650f29..73f91d754 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderChemicalCrystallizer.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderChemicalCrystallizer.java @@ -5,14 +5,14 @@ import mekanism.client.render.MekanismRenderer; import mekanism.common.tile.TileEntityChemicalCrystallizer; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; - import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + @SideOnly(Side.CLIENT) public class RenderChemicalCrystallizer extends TileEntitySpecialRenderer { diff --git a/src/main/java/mekanism/client/render/tileentity/RenderChemicalDissolutionChamber.java b/src/main/java/mekanism/client/render/tileentity/RenderChemicalDissolutionChamber.java index d269af136..2fee0e8d1 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderChemicalDissolutionChamber.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderChemicalDissolutionChamber.java @@ -4,14 +4,14 @@ import mekanism.client.model.ModelChemicalDissolutionChamber; import mekanism.common.tile.TileEntityChemicalDissolutionChamber; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; - import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + @SideOnly(Side.CLIENT) public class RenderChemicalDissolutionChamber extends TileEntitySpecialRenderer { diff --git a/src/main/java/mekanism/client/render/tileentity/RenderChemicalInfuser.java b/src/main/java/mekanism/client/render/tileentity/RenderChemicalInfuser.java index 8685ed7cc..290fb04b1 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderChemicalInfuser.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderChemicalInfuser.java @@ -11,7 +11,6 @@ import mekanism.client.render.MekanismRenderer.Model3D; import mekanism.common.tile.TileEntityChemicalInfuser; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; - import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.init.Blocks; import net.minecraft.tileentity.TileEntity; diff --git a/src/main/java/mekanism/client/render/tileentity/RenderChemicalOxidizer.java b/src/main/java/mekanism/client/render/tileentity/RenderChemicalOxidizer.java index 1b23615e5..6d094c4a2 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderChemicalOxidizer.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderChemicalOxidizer.java @@ -11,7 +11,6 @@ import mekanism.client.render.MekanismRenderer.Model3D; import mekanism.common.tile.TileEntityChemicalOxidizer; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; - import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.init.Blocks; import net.minecraft.tileentity.TileEntity; diff --git a/src/main/java/mekanism/client/render/tileentity/RenderChemicalWasher.java b/src/main/java/mekanism/client/render/tileentity/RenderChemicalWasher.java index c3e61a58e..04c8f889d 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderChemicalWasher.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderChemicalWasher.java @@ -4,7 +4,6 @@ import mekanism.client.model.ModelChemicalWasher; import mekanism.common.tile.TileEntityChemicalWasher; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; - import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; diff --git a/src/main/java/mekanism/client/render/tileentity/RenderDigitalMiner.java b/src/main/java/mekanism/client/render/tileentity/RenderDigitalMiner.java index 24c40c04d..0d1375db4 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderDigitalMiner.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderDigitalMiner.java @@ -5,14 +5,14 @@ import mekanism.client.render.MinerVisualRenderer; import mekanism.common.tile.TileEntityDigitalMiner; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; - import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + @SideOnly(Side.CLIENT) public class RenderDigitalMiner extends TileEntitySpecialRenderer { diff --git a/src/main/java/mekanism/client/render/tileentity/RenderDynamicTank.java b/src/main/java/mekanism/client/render/tileentity/RenderDynamicTank.java index 54444d7a5..bcacc1b87 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderDynamicTank.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderDynamicTank.java @@ -10,7 +10,6 @@ import mekanism.client.render.MekanismRenderer.Model3D; import mekanism.common.content.tank.SynchronizedTankData.ValveData; import mekanism.common.content.tank.TankUpdateProtocol; import mekanism.common.tile.TileEntityDynamicTank; - import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.init.Blocks; @@ -18,11 +17,12 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.Fluid; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + @SideOnly(Side.CLIENT) public class RenderDynamicTank extends TileEntitySpecialRenderer { diff --git a/src/main/java/mekanism/client/render/tileentity/RenderElectricChest.java b/src/main/java/mekanism/client/render/tileentity/RenderElectricChest.java index 2e661fc50..6cc21badb 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderElectricChest.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderElectricChest.java @@ -3,15 +3,15 @@ package mekanism.client.render.tileentity; import mekanism.common.tile.TileEntityElectricChest; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; - import net.minecraft.client.model.ModelChest; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + @SideOnly(Side.CLIENT) public class RenderElectricChest extends TileEntitySpecialRenderer { diff --git a/src/main/java/mekanism/client/render/tileentity/RenderElectricPump.java b/src/main/java/mekanism/client/render/tileentity/RenderElectricPump.java index b852e29c6..0c08cb083 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderElectricPump.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderElectricPump.java @@ -4,14 +4,14 @@ import mekanism.client.model.ModelElectricPump; import mekanism.common.tile.TileEntityElectricPump; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; - import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + @SideOnly(Side.CLIENT) public class RenderElectricPump extends TileEntitySpecialRenderer { diff --git a/src/main/java/mekanism/client/render/tileentity/RenderElectrolyticSeparator.java b/src/main/java/mekanism/client/render/tileentity/RenderElectrolyticSeparator.java index c3eefb923..79b1885ba 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderElectrolyticSeparator.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderElectrolyticSeparator.java @@ -4,14 +4,14 @@ import mekanism.client.model.ModelElectrolyticSeparator; import mekanism.common.tile.TileEntityElectrolyticSeparator; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; - import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + @SideOnly(Side.CLIENT) public class RenderElectrolyticSeparator extends TileEntitySpecialRenderer { diff --git a/src/main/java/mekanism/client/render/tileentity/RenderEnergyCube.java b/src/main/java/mekanism/client/render/tileentity/RenderEnergyCube.java index add663ef4..487a35992 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderEnergyCube.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderEnergyCube.java @@ -8,14 +8,14 @@ import mekanism.client.render.MekanismRenderer; import mekanism.common.tile.TileEntityEnergyCube; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; - import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + @SideOnly(Side.CLIENT) public class RenderEnergyCube extends TileEntitySpecialRenderer { diff --git a/src/main/java/mekanism/client/render/tileentity/RenderFluidicPlenisher.java b/src/main/java/mekanism/client/render/tileentity/RenderFluidicPlenisher.java index 344b6dc4b..52c1375b0 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderFluidicPlenisher.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderFluidicPlenisher.java @@ -4,14 +4,14 @@ import mekanism.client.model.ModelFluidicPlenisher; import mekanism.common.tile.TileEntityFluidicPlenisher; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; - import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + @SideOnly(Side.CLIENT) public class RenderFluidicPlenisher extends TileEntitySpecialRenderer { diff --git a/src/main/java/mekanism/client/render/tileentity/RenderLaser.java b/src/main/java/mekanism/client/render/tileentity/RenderLaser.java index 8efcb8a6d..114fc4266 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderLaser.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderLaser.java @@ -4,14 +4,14 @@ import mekanism.client.model.ModelLaser; import mekanism.common.tile.TileEntityLaser; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; - import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + @SideOnly(Side.CLIENT) public class RenderLaser extends TileEntitySpecialRenderer { diff --git a/src/main/java/mekanism/client/render/tileentity/RenderLaserAmplifier.java b/src/main/java/mekanism/client/render/tileentity/RenderLaserAmplifier.java index 0c60be021..747e8f887 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderLaserAmplifier.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderLaserAmplifier.java @@ -5,14 +5,14 @@ import mekanism.client.render.MekanismRenderer; import mekanism.common.tile.TileEntityLaserAmplifier; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; - import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + @SideOnly(Side.CLIENT) public class RenderLaserAmplifier extends TileEntitySpecialRenderer { diff --git a/src/main/java/mekanism/client/render/tileentity/RenderLaserTractorBeam.java b/src/main/java/mekanism/client/render/tileentity/RenderLaserTractorBeam.java index 6c154f603..522cc8a49 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderLaserTractorBeam.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderLaserTractorBeam.java @@ -5,7 +5,6 @@ import mekanism.client.render.MekanismRenderer; import mekanism.common.tile.TileEntityLaserTractorBeam; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; - import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; diff --git a/src/main/java/mekanism/client/render/tileentity/RenderLogisticalSorter.java b/src/main/java/mekanism/client/render/tileentity/RenderLogisticalSorter.java index 0a0416bb0..3adaa8efd 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderLogisticalSorter.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderLogisticalSorter.java @@ -4,14 +4,14 @@ import mekanism.client.model.ModelLogisticalSorter; import mekanism.common.tile.TileEntityLogisticalSorter; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; - import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + @SideOnly(Side.CLIENT) public class RenderLogisticalSorter extends TileEntitySpecialRenderer { diff --git a/src/main/java/mekanism/client/render/tileentity/RenderMetallurgicInfuser.java b/src/main/java/mekanism/client/render/tileentity/RenderMetallurgicInfuser.java index f0bab79e8..c0e8b3410 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderMetallurgicInfuser.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderMetallurgicInfuser.java @@ -5,14 +5,14 @@ import mekanism.client.render.MekanismRenderer; import mekanism.common.tile.TileEntityMetallurgicInfuser; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; - import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + @SideOnly(Side.CLIENT) public class RenderMetallurgicInfuser extends TileEntitySpecialRenderer { diff --git a/src/main/java/mekanism/client/render/tileentity/RenderObsidianTNT.java b/src/main/java/mekanism/client/render/tileentity/RenderObsidianTNT.java index 321ff39e7..0e0621cc4 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderObsidianTNT.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderObsidianTNT.java @@ -4,14 +4,14 @@ import mekanism.client.model.ModelObsidianTNT; import mekanism.common.tile.TileEntityObsidianTNT; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; - import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + @SideOnly(Side.CLIENT) public class RenderObsidianTNT extends TileEntitySpecialRenderer { diff --git a/src/main/java/mekanism/client/render/tileentity/RenderPressurizedReactionChamber.java b/src/main/java/mekanism/client/render/tileentity/RenderPressurizedReactionChamber.java index 0c8a43068..ba955e013 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderPressurizedReactionChamber.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderPressurizedReactionChamber.java @@ -5,14 +5,14 @@ import mekanism.client.render.MekanismRenderer; import mekanism.common.tile.TileEntityPRC; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; - import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + @SideOnly(Side.CLIENT) public class RenderPressurizedReactionChamber extends TileEntitySpecialRenderer { diff --git a/src/main/java/mekanism/client/render/tileentity/RenderRotaryCondensentrator.java b/src/main/java/mekanism/client/render/tileentity/RenderRotaryCondensentrator.java index 41ec74148..f1a96863e 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderRotaryCondensentrator.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderRotaryCondensentrator.java @@ -4,14 +4,14 @@ import mekanism.client.model.ModelRotaryCondensentrator; import mekanism.common.tile.TileEntityRotaryCondensentrator; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; - import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + @SideOnly(Side.CLIENT) public class RenderRotaryCondensentrator extends TileEntitySpecialRenderer { diff --git a/src/main/java/mekanism/client/render/tileentity/RenderSeismicVibrator.java b/src/main/java/mekanism/client/render/tileentity/RenderSeismicVibrator.java index f0b965fe7..de2980387 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderSeismicVibrator.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderSeismicVibrator.java @@ -5,14 +5,14 @@ import mekanism.common.Mekanism; import mekanism.common.tile.TileEntitySeismicVibrator; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; - import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + @SideOnly(Side.CLIENT) public class RenderSeismicVibrator extends TileEntitySpecialRenderer { diff --git a/src/main/java/mekanism/client/render/tileentity/RenderSolarNeutronActivator.java b/src/main/java/mekanism/client/render/tileentity/RenderSolarNeutronActivator.java index 48d496478..043aa0db6 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderSolarNeutronActivator.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderSolarNeutronActivator.java @@ -5,7 +5,6 @@ import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.model.AdvancedModelLoader; import net.minecraftforge.client.model.IModelCustom; diff --git a/src/main/java/mekanism/client/render/tileentity/RenderTeleporter.java b/src/main/java/mekanism/client/render/tileentity/RenderTeleporter.java index 0c7790a73..fcc05fecc 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderTeleporter.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderTeleporter.java @@ -10,7 +10,6 @@ import mekanism.client.render.MekanismRenderer.DisplayInteger; import mekanism.client.render.MekanismRenderer.Model3D; import mekanism.common.MekanismBlocks; import mekanism.common.tile.TileEntityTeleporter; - import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.init.Blocks; import net.minecraft.tileentity.TileEntity; diff --git a/src/main/java/mekanism/client/render/tileentity/RenderThermalEvaporationController.java b/src/main/java/mekanism/client/render/tileentity/RenderThermalEvaporationController.java index 20fe89826..1d6cf6e5e 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderThermalEvaporationController.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderThermalEvaporationController.java @@ -9,18 +9,18 @@ import mekanism.client.render.MekanismRenderer.DisplayInteger; import mekanism.client.render.MekanismRenderer.Model3D; import mekanism.common.content.tank.TankUpdateProtocol; import mekanism.common.tile.TileEntityThermalEvaporationController; - import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.init.Blocks; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.Fluid; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + @SideOnly(Side.CLIENT) public class RenderThermalEvaporationController extends TileEntitySpecialRenderer { diff --git a/src/main/java/mekanism/client/sound/FlamethrowerSound.java b/src/main/java/mekanism/client/sound/FlamethrowerSound.java index 651bc55aa..982ba4394 100644 --- a/src/main/java/mekanism/client/sound/FlamethrowerSound.java +++ b/src/main/java/mekanism/client/sound/FlamethrowerSound.java @@ -1,7 +1,6 @@ package mekanism.client.sound; import mekanism.client.ClientTickHandler; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.ResourceLocation; import cpw.mods.fml.relauncher.Side; diff --git a/src/main/java/mekanism/client/sound/GasMaskSound.java b/src/main/java/mekanism/client/sound/GasMaskSound.java index de4a81529..b6e4d50cc 100644 --- a/src/main/java/mekanism/client/sound/GasMaskSound.java +++ b/src/main/java/mekanism/client/sound/GasMaskSound.java @@ -2,7 +2,6 @@ package mekanism.client.sound; import mekanism.client.ClientTickHandler; import mekanism.common.item.ItemGasMask; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.ResourceLocation; import cpw.mods.fml.relauncher.Side; diff --git a/src/main/java/mekanism/client/sound/JetpackSound.java b/src/main/java/mekanism/client/sound/JetpackSound.java index 5548cb978..dac03f285 100644 --- a/src/main/java/mekanism/client/sound/JetpackSound.java +++ b/src/main/java/mekanism/client/sound/JetpackSound.java @@ -2,7 +2,6 @@ package mekanism.client.sound; import mekanism.client.ClientTickHandler; import mekanism.common.item.ItemJetpack; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.ResourceLocation; import cpw.mods.fml.relauncher.Side; diff --git a/src/main/java/mekanism/client/sound/Sound.java b/src/main/java/mekanism/client/sound/Sound.java index 2ea23d890..bfad38fa7 100644 --- a/src/main/java/mekanism/client/sound/Sound.java +++ b/src/main/java/mekanism/client/sound/Sound.java @@ -1,7 +1,6 @@ package mekanism.client.sound; import mekanism.api.MekanismConfig.client; - import net.minecraft.client.audio.ISound; import net.minecraft.util.ResourceLocation; import cpw.mods.fml.relauncher.Side; diff --git a/src/main/java/mekanism/client/sound/SoundHandler.java b/src/main/java/mekanism/client/sound/SoundHandler.java index 5134985ee..1f00b8c8c 100644 --- a/src/main/java/mekanism/client/sound/SoundHandler.java +++ b/src/main/java/mekanism/client/sound/SoundHandler.java @@ -5,7 +5,6 @@ import java.util.Map; import mekanism.common.ObfuscatedNames; import mekanism.common.util.MekanismUtils; - import net.minecraft.client.Minecraft; import net.minecraft.client.audio.ISound; import net.minecraft.client.audio.ITickableSound; diff --git a/src/main/java/mekanism/client/voice/VoiceClient.java b/src/main/java/mekanism/client/voice/VoiceClient.java index 3cc58e32f..1adbb3872 100644 --- a/src/main/java/mekanism/client/voice/VoiceClient.java +++ b/src/main/java/mekanism/client/voice/VoiceClient.java @@ -7,14 +7,13 @@ import java.io.DataOutputStream; import java.net.ConnectException; import java.net.Socket; +import javax.sound.sampled.AudioFormat; + import mekanism.api.MekanismConfig.general; import mekanism.common.Mekanism; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import javax.sound.sampled.AudioFormat; - @SideOnly(Side.CLIENT) public class VoiceClient extends Thread { diff --git a/src/main/java/mekanism/client/voice/VoiceInput.java b/src/main/java/mekanism/client/voice/VoiceInput.java index 4147eae88..c4c418cd2 100644 --- a/src/main/java/mekanism/client/voice/VoiceInput.java +++ b/src/main/java/mekanism/client/voice/VoiceInput.java @@ -1,16 +1,15 @@ package mekanism.client.voice; -import mekanism.client.MekanismKeyHandler; -import mekanism.common.Mekanism; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - import javax.sound.sampled.AudioInputStream; import javax.sound.sampled.AudioSystem; import javax.sound.sampled.DataLine; import javax.sound.sampled.TargetDataLine; +import mekanism.client.MekanismKeyHandler; +import mekanism.common.Mekanism; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + @SideOnly(Side.CLIENT) public class VoiceInput extends Thread { diff --git a/src/main/java/mekanism/client/voice/VoiceOutput.java b/src/main/java/mekanism/client/voice/VoiceOutput.java index 01c5e609f..f037c2481 100644 --- a/src/main/java/mekanism/client/voice/VoiceOutput.java +++ b/src/main/java/mekanism/client/voice/VoiceOutput.java @@ -1,14 +1,13 @@ package mekanism.client.voice; -import mekanism.common.Mekanism; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - import javax.sound.sampled.AudioSystem; import javax.sound.sampled.DataLine; import javax.sound.sampled.SourceDataLine; +import mekanism.common.Mekanism; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + @SideOnly(Side.CLIENT) public class VoiceOutput extends Thread { diff --git a/src/main/java/mekanism/common/BoxBlacklistParser.java b/src/main/java/mekanism/common/BoxBlacklistParser.java index d83fca4fa..0a18aafe7 100644 --- a/src/main/java/mekanism/common/BoxBlacklistParser.java +++ b/src/main/java/mekanism/common/BoxBlacklistParser.java @@ -8,7 +8,6 @@ import java.io.FileWriter; import java.io.IOException; import mekanism.api.MekanismAPI; - import net.minecraft.block.Block; public final class BoxBlacklistParser diff --git a/src/main/java/mekanism/common/CTMData.java b/src/main/java/mekanism/common/CTMData.java index 0c9858c7e..c295f1800 100644 --- a/src/main/java/mekanism/common/CTMData.java +++ b/src/main/java/mekanism/common/CTMData.java @@ -6,7 +6,6 @@ import java.util.Map.Entry; import mekanism.api.Coord4D; import mekanism.client.render.block.TextureSubmap; - import net.minecraft.block.Block; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.util.IIcon; diff --git a/src/main/java/mekanism/common/CTMTextureData.java b/src/main/java/mekanism/common/CTMTextureData.java index 490bd8e4f..fc1919fd6 100644 --- a/src/main/java/mekanism/common/CTMTextureData.java +++ b/src/main/java/mekanism/common/CTMTextureData.java @@ -1,7 +1,6 @@ package mekanism.common; import mekanism.client.render.block.TextureSubmap; - import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.util.IIcon; diff --git a/src/main/java/mekanism/common/CommandMekanism.java b/src/main/java/mekanism/common/CommandMekanism.java index 08b0da89f..38856605b 100644 --- a/src/main/java/mekanism/common/CommandMekanism.java +++ b/src/main/java/mekanism/common/CommandMekanism.java @@ -11,14 +11,11 @@ import mekanism.common.frequency.FrequencyManager; import mekanism.common.tile.TileEntityTeleporter; import mekanism.common.util.MekanismUtils; import net.minecraft.command.CommandBase; -import net.minecraft.command.CommandException; import net.minecraft.command.ICommandSender; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.server.MinecraftServer; import net.minecraft.util.ChatComponentText; -import com.mojang.authlib.GameProfile; - public class CommandMekanism extends CommandBase { @Override diff --git a/src/main/java/mekanism/common/CommonPlayerTracker.java b/src/main/java/mekanism/common/CommonPlayerTracker.java index 438bd523a..56f182036 100644 --- a/src/main/java/mekanism/common/CommonPlayerTracker.java +++ b/src/main/java/mekanism/common/CommonPlayerTracker.java @@ -6,7 +6,6 @@ import mekanism.common.network.PacketJetpackData.JetpackDataMessage; import mekanism.common.network.PacketJetpackData.JetpackPacket; import mekanism.common.network.PacketScubaTankData.ScubaTankDataMessage; import mekanism.common.network.PacketScubaTankData.ScubaTankPacket; - import net.minecraft.entity.player.EntityPlayerMP; import net.minecraftforge.common.MinecraftForge; import cpw.mods.fml.common.eventhandler.SubscribeEvent; diff --git a/src/main/java/mekanism/common/CommonProxy.java b/src/main/java/mekanism/common/CommonProxy.java index 082bd3fb8..27eeafe49 100644 --- a/src/main/java/mekanism/common/CommonProxy.java +++ b/src/main/java/mekanism/common/CommonProxy.java @@ -288,19 +288,19 @@ public class CommonProxy implements IGuiProvider { if(s.trim().equalsIgnoreCase("j") || s.trim().equalsIgnoreCase("joules")) { - general.activeType = EnergyType.J; + general.energyUnit = EnergyType.J; } else if(s.trim().equalsIgnoreCase("rf") || s.trim().equalsIgnoreCase("te") || s.trim().equalsIgnoreCase("thermal expansion")) { - general.activeType = EnergyType.RF; + general.energyUnit = EnergyType.RF; } else if(s.trim().equalsIgnoreCase("eu") || s.trim().equalsIgnoreCase("ic2")) { - general.activeType = EnergyType.EU; + general.energyUnit = EnergyType.EU; } else if(s.trim().equalsIgnoreCase("mj") || s.trim().equalsIgnoreCase("bc") || s.trim().equalsIgnoreCase("buildcraft")) { - general.activeType = EnergyType.MJ; + general.energyUnit = EnergyType.MJ; } } diff --git a/src/main/java/mekanism/common/EnergyNetwork.java b/src/main/java/mekanism/common/EnergyNetwork.java index c2c9918ca..ec7fca8af 100644 --- a/src/main/java/mekanism/common/EnergyNetwork.java +++ b/src/main/java/mekanism/common/EnergyNetwork.java @@ -9,10 +9,10 @@ import java.util.List; import java.util.Set; import mekanism.api.Coord4D; -import mekanism.common.base.EnergyAcceptorWrapper; import mekanism.api.energy.EnergyStack; import mekanism.api.transmitters.DynamicNetwork; import mekanism.api.transmitters.IGridTransmitter; +import mekanism.common.base.EnergyAcceptorWrapper; import mekanism.common.util.MekanismUtils; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.MinecraftForge; diff --git a/src/main/java/mekanism/common/FluidNetwork.java b/src/main/java/mekanism/common/FluidNetwork.java index 096797f3a..82015a8a8 100644 --- a/src/main/java/mekanism/common/FluidNetwork.java +++ b/src/main/java/mekanism/common/FluidNetwork.java @@ -1,7 +1,13 @@ package mekanism.common; -import cpw.mods.fml.common.FMLCommonHandler; -import cpw.mods.fml.common.eventhandler.Event; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.EnumSet; +import java.util.HashSet; +import java.util.List; +import java.util.Set; + import mekanism.api.Coord4D; import mekanism.api.transmitters.DynamicNetwork; import mekanism.api.transmitters.IGridTransmitter; @@ -12,8 +18,8 @@ import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.IFluidHandler; - -import java.util.*; +import cpw.mods.fml.common.FMLCommonHandler; +import cpw.mods.fml.common.eventhandler.Event; public class FluidNetwork extends DynamicNetwork { diff --git a/src/main/java/mekanism/common/HashList.java b/src/main/java/mekanism/common/HashList.java index 6d9305850..2d932f4ce 100644 --- a/src/main/java/mekanism/common/HashList.java +++ b/src/main/java/mekanism/common/HashList.java @@ -3,8 +3,6 @@ package mekanism.common; import java.util.ArrayList; import java.util.Iterator; -import mekanism.common.content.transporter.TransporterFilter; - public class HashList implements Iterable { private ArrayList list = new ArrayList(256); diff --git a/src/main/java/mekanism/common/InventoryNetwork.java b/src/main/java/mekanism/common/InventoryNetwork.java index 7ef23db57..492bd40f4 100644 --- a/src/main/java/mekanism/common/InventoryNetwork.java +++ b/src/main/java/mekanism/common/InventoryNetwork.java @@ -5,7 +5,6 @@ import java.util.Collection; import java.util.EnumSet; import java.util.HashSet; import java.util.List; -import java.util.Map.Entry; import java.util.Set; import mekanism.api.Coord4D; @@ -13,7 +12,6 @@ import mekanism.api.EnumColor; import mekanism.api.transmitters.DynamicNetwork; import mekanism.api.transmitters.IGridTransmitter; import mekanism.common.content.transporter.TransporterManager; - import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; diff --git a/src/main/java/mekanism/common/MekanismBlocks.java b/src/main/java/mekanism/common/MekanismBlocks.java index bddb156d0..66d97b699 100644 --- a/src/main/java/mekanism/common/MekanismBlocks.java +++ b/src/main/java/mekanism/common/MekanismBlocks.java @@ -1,5 +1,10 @@ package mekanism.common; +import static mekanism.common.block.BlockBasic.BasicBlock.BASIC_BLOCK_1; +import static mekanism.common.block.BlockBasic.BasicBlock.BASIC_BLOCK_2; +import static mekanism.common.block.BlockMachine.MachineBlock.MACHINE_BLOCK_1; +import static mekanism.common.block.BlockMachine.MachineBlock.MACHINE_BLOCK_2; +import static mekanism.common.block.BlockMachine.MachineBlock.MACHINE_BLOCK_3; import mekanism.common.block.BlockBasic; import mekanism.common.block.BlockBounding; import mekanism.common.block.BlockCardboardBox; @@ -18,17 +23,10 @@ import mekanism.common.item.ItemBlockGasTank; import mekanism.common.item.ItemBlockMachine; import mekanism.common.item.ItemBlockOre; import mekanism.common.item.ItemBlockPlastic; - import net.minecraft.block.Block; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.common.registry.GameRegistry.ObjectHolder; -import static mekanism.common.block.BlockBasic.BasicBlock.BASIC_BLOCK_1; -import static mekanism.common.block.BlockBasic.BasicBlock.BASIC_BLOCK_2; -import static mekanism.common.block.BlockMachine.MachineBlock.MACHINE_BLOCK_1; -import static mekanism.common.block.BlockMachine.MachineBlock.MACHINE_BLOCK_2; -import static mekanism.common.block.BlockMachine.MachineBlock.MACHINE_BLOCK_3; - @ObjectHolder("Mekanism") public class MekanismBlocks { diff --git a/src/main/java/mekanism/common/OreDictCache.java b/src/main/java/mekanism/common/OreDictCache.java index 4367bc098..1badf146d 100644 --- a/src/main/java/mekanism/common/OreDictCache.java +++ b/src/main/java/mekanism/common/OreDictCache.java @@ -6,7 +6,6 @@ import java.util.List; import mekanism.api.util.ItemInfo; import mekanism.common.util.MekanismUtils; - import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraftforge.oredict.OreDictionary; diff --git a/src/main/java/mekanism/common/RobitAIFollow.java b/src/main/java/mekanism/common/RobitAIFollow.java index dd43c42d0..64738d22f 100644 --- a/src/main/java/mekanism/common/RobitAIFollow.java +++ b/src/main/java/mekanism/common/RobitAIFollow.java @@ -1,7 +1,6 @@ package mekanism.common; import mekanism.common.entity.EntityRobit; - import net.minecraft.entity.ai.EntityAIBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.pathfinding.PathNavigate; diff --git a/src/main/java/mekanism/common/RobitAIPickup.java b/src/main/java/mekanism/common/RobitAIPickup.java index 28f3aeaed..bf4e6f25f 100644 --- a/src/main/java/mekanism/common/RobitAIPickup.java +++ b/src/main/java/mekanism/common/RobitAIPickup.java @@ -4,7 +4,6 @@ import java.util.Iterator; import java.util.List; import mekanism.common.entity.EntityRobit; - import net.minecraft.entity.ai.EntityAIBase; import net.minecraft.entity.item.EntityItem; import net.minecraft.pathfinding.PathNavigate; diff --git a/src/main/java/mekanism/common/asm/LoadingHook.java b/src/main/java/mekanism/common/asm/LoadingHook.java index e84895469..f2807c9cf 100644 --- a/src/main/java/mekanism/common/asm/LoadingHook.java +++ b/src/main/java/mekanism/common/asm/LoadingHook.java @@ -2,9 +2,8 @@ package mekanism.common.asm; import java.util.Map; -import cpw.mods.fml.relauncher.IFMLLoadingPlugin; - import codechicken.core.launch.DepLoader; +import cpw.mods.fml.relauncher.IFMLLoadingPlugin; public class LoadingHook implements IFMLLoadingPlugin { diff --git a/src/main/java/mekanism/common/base/EnergyAcceptorWrapper.java b/src/main/java/mekanism/common/base/EnergyAcceptorWrapper.java index becdc629d..2bd88308e 100644 --- a/src/main/java/mekanism/common/base/EnergyAcceptorWrapper.java +++ b/src/main/java/mekanism/common/base/EnergyAcceptorWrapper.java @@ -1,16 +1,13 @@ package mekanism.common.base; +import ic2.api.energy.tile.IEnergySink; import mekanism.api.Coord4D; import mekanism.api.MekanismConfig.general; import mekanism.api.energy.IStrictEnergyAcceptor; import mekanism.common.util.MekanismUtils; - import net.minecraft.tileentity.TileEntity; - import net.minecraftforge.common.util.ForgeDirection; - import cofh.api.energy.IEnergyReceiver; -import ic2.api.energy.tile.IEnergySink; public abstract class EnergyAcceptorWrapper implements IStrictEnergyAcceptor { diff --git a/src/main/java/mekanism/common/base/IAdvancedBoundingBlock.java b/src/main/java/mekanism/common/base/IAdvancedBoundingBlock.java index dab93a94e..87498523b 100644 --- a/src/main/java/mekanism/common/base/IAdvancedBoundingBlock.java +++ b/src/main/java/mekanism/common/base/IAdvancedBoundingBlock.java @@ -1,8 +1,5 @@ package mekanism.common.base; -import cofh.api.energy.IEnergyHandler; -import cpw.mods.fml.common.Optional.Interface; -import cpw.mods.fml.common.Optional.InterfaceList; import ic2.api.energy.tile.IEnergySink; import mekanism.api.Coord4D; import mekanism.api.IFilterAccess; @@ -11,6 +8,9 @@ import mekanism.api.energy.IStrictEnergyStorage; import mekanism.common.integration.IComputerIntegration; import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; +import cofh.api.energy.IEnergyHandler; +import cpw.mods.fml.common.Optional.Interface; +import cpw.mods.fml.common.Optional.InterfaceList; @InterfaceList({ @Interface(iface = "ic2.api.energy.tile.IEnergySink", modid = "IC2"), diff --git a/src/main/java/mekanism/common/base/IEnergyCube.java b/src/main/java/mekanism/common/base/IEnergyCube.java index de2c866fe..3858a86db 100644 --- a/src/main/java/mekanism/common/base/IEnergyCube.java +++ b/src/main/java/mekanism/common/base/IEnergyCube.java @@ -1,7 +1,6 @@ package mekanism.common.base; import mekanism.common.Tier.EnergyCubeTier; - import net.minecraft.item.ItemStack; /** diff --git a/src/main/java/mekanism/common/base/IEnergyWrapper.java b/src/main/java/mekanism/common/base/IEnergyWrapper.java index 6c7757a00..aae2cb34a 100644 --- a/src/main/java/mekanism/common/base/IEnergyWrapper.java +++ b/src/main/java/mekanism/common/base/IEnergyWrapper.java @@ -1,18 +1,19 @@ package mekanism.common.base; -import cofh.api.energy.IEnergyHandler; -import cpw.mods.fml.common.Optional.Interface; -import cpw.mods.fml.common.Optional.InterfaceList; import ic2.api.energy.tile.IEnergySink; import ic2.api.energy.tile.IEnergySource; import ic2.api.tile.IEnergyStorage; + +import java.util.EnumSet; + import mekanism.api.energy.ICableOutputter; import mekanism.api.energy.IStrictEnergyAcceptor; import mekanism.api.energy.IStrictEnergyStorage; import net.minecraft.inventory.IInventory; import net.minecraftforge.common.util.ForgeDirection; - -import java.util.EnumSet; +import cofh.api.energy.IEnergyHandler; +import cpw.mods.fml.common.Optional.Interface; +import cpw.mods.fml.common.Optional.InterfaceList; @InterfaceList({ @Interface(iface = "ic2.api.energy.tile.IEnergySink", modid = "IC2"), diff --git a/src/main/java/mekanism/common/base/ILogisticalTransporter.java b/src/main/java/mekanism/common/base/ILogisticalTransporter.java index e0dcae5a7..ece1d5930 100644 --- a/src/main/java/mekanism/common/base/ILogisticalTransporter.java +++ b/src/main/java/mekanism/common/base/ILogisticalTransporter.java @@ -7,7 +7,6 @@ import mekanism.api.transmitters.IGridTransmitter; import mekanism.common.InventoryNetwork; import mekanism.common.content.transporter.TransporterStack; import mekanism.common.tile.TileEntityLogisticalSorter; - import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; diff --git a/src/main/java/mekanism/common/base/IModule.java b/src/main/java/mekanism/common/base/IModule.java index fe3583491..41c83c629 100644 --- a/src/main/java/mekanism/common/base/IModule.java +++ b/src/main/java/mekanism/common/base/IModule.java @@ -1,11 +1,11 @@ package mekanism.common.base; +import io.netty.buffer.ByteBuf; + import java.io.IOException; import mekanism.common.Version; -import io.netty.buffer.ByteBuf; - /** * Implement in your main class if your mod happens to be completely reliant on Mekanism, or in other words, is a Mekanism module. * @author aidancbrady diff --git a/src/main/java/mekanism/common/base/ITileComponent.java b/src/main/java/mekanism/common/base/ITileComponent.java index 5253b98d2..d69119553 100644 --- a/src/main/java/mekanism/common/base/ITileComponent.java +++ b/src/main/java/mekanism/common/base/ITileComponent.java @@ -1,11 +1,11 @@ package mekanism.common.base; +import io.netty.buffer.ByteBuf; + import java.util.ArrayList; import net.minecraft.nbt.NBTTagCompound; -import io.netty.buffer.ByteBuf; - public interface ITileComponent { public void tick(); diff --git a/src/main/java/mekanism/common/base/ITileNetwork.java b/src/main/java/mekanism/common/base/ITileNetwork.java index cf9c6227f..49f055270 100644 --- a/src/main/java/mekanism/common/base/ITileNetwork.java +++ b/src/main/java/mekanism/common/base/ITileNetwork.java @@ -1,9 +1,9 @@ package mekanism.common.base; -import java.util.ArrayList; - import io.netty.buffer.ByteBuf; +import java.util.ArrayList; + /** * Internal interface used for blocks that send data between clients and the server * @author AidanBrady diff --git a/src/main/java/mekanism/common/base/ITransporterTile.java b/src/main/java/mekanism/common/base/ITransporterTile.java index 2d030d5fa..7ddf2d38d 100644 --- a/src/main/java/mekanism/common/base/ITransporterTile.java +++ b/src/main/java/mekanism/common/base/ITransporterTile.java @@ -4,7 +4,6 @@ package mekanism.common.base; import mekanism.api.transmitters.IBlockableConnection; import mekanism.api.transmitters.ITransmitterTile; import mekanism.common.InventoryNetwork; - import net.minecraft.inventory.IInventory; public interface ITransporterTile extends ITransmitterTile, IBlockableConnection diff --git a/src/main/java/mekanism/common/base/IUpgradeItem.java b/src/main/java/mekanism/common/base/IUpgradeItem.java index c3f485c98..ec33efa5a 100644 --- a/src/main/java/mekanism/common/base/IUpgradeItem.java +++ b/src/main/java/mekanism/common/base/IUpgradeItem.java @@ -1,7 +1,6 @@ package mekanism.common.base; import mekanism.common.Upgrade; - import net.minecraft.item.ItemStack; public interface IUpgradeItem diff --git a/src/main/java/mekanism/common/base/SoundWrapper.java b/src/main/java/mekanism/common/base/SoundWrapper.java index c7f97df65..83d04d4dc 100644 --- a/src/main/java/mekanism/common/base/SoundWrapper.java +++ b/src/main/java/mekanism/common/base/SoundWrapper.java @@ -1,10 +1,10 @@ package mekanism.common.base; -import net.minecraft.util.ResourceLocation; import mekanism.client.sound.IResettableSound; import mekanism.client.sound.ISoundSource; import mekanism.client.sound.SoundHandler; import mekanism.client.sound.TileSound; +import net.minecraft.util.ResourceLocation; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/mekanism/common/block/BlockBasic.java b/src/main/java/mekanism/common/block/BlockBasic.java index 79fa0e1ce..677f83ceb 100644 --- a/src/main/java/mekanism/common/block/BlockBasic.java +++ b/src/main/java/mekanism/common/block/BlockBasic.java @@ -33,10 +33,10 @@ import mekanism.common.tile.TileEntityInductionCell; import mekanism.common.tile.TileEntityInductionPort; import mekanism.common.tile.TileEntityInductionProvider; import mekanism.common.tile.TileEntityPressureDisperser; +import mekanism.common.tile.TileEntityStructuralGlass; import mekanism.common.tile.TileEntityThermalEvaporationBlock; import mekanism.common.tile.TileEntityThermalEvaporationController; import mekanism.common.tile.TileEntityThermalEvaporationValve; -import mekanism.common.tile.TileEntityStructuralGlass; import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import net.minecraft.block.Block; diff --git a/src/main/java/mekanism/common/block/BlockBounding.java b/src/main/java/mekanism/common/block/BlockBounding.java index 08b575d65..7a0a0664a 100644 --- a/src/main/java/mekanism/common/block/BlockBounding.java +++ b/src/main/java/mekanism/common/block/BlockBounding.java @@ -1,7 +1,7 @@ package mekanism.common.block; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import java.util.Random; + import mekanism.common.tile.TileEntityAdvancedBoundingBlock; import mekanism.common.tile.TileEntityBoundingBlock; import net.minecraft.block.Block; @@ -13,8 +13,8 @@ import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; - -import java.util.Random; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class BlockBounding extends Block { diff --git a/src/main/java/mekanism/common/block/BlockCardboardBox.java b/src/main/java/mekanism/common/block/BlockCardboardBox.java index 386e49549..9f4fca734 100644 --- a/src/main/java/mekanism/common/block/BlockCardboardBox.java +++ b/src/main/java/mekanism/common/block/BlockCardboardBox.java @@ -6,7 +6,6 @@ import mekanism.common.Mekanism; import mekanism.common.MekanismBlocks; import mekanism.common.item.ItemBlockCardboardBox; import mekanism.common.tile.TileEntityCardboardBox; - import net.minecraft.block.Block; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; diff --git a/src/main/java/mekanism/common/block/BlockObsidianTNT.java b/src/main/java/mekanism/common/block/BlockObsidianTNT.java index 93b1cc174..6e54a94ac 100644 --- a/src/main/java/mekanism/common/block/BlockObsidianTNT.java +++ b/src/main/java/mekanism/common/block/BlockObsidianTNT.java @@ -3,7 +3,6 @@ package mekanism.common.block; import mekanism.common.Mekanism; import mekanism.common.entity.EntityObsidianTNT; import mekanism.common.tile.TileEntityObsidianTNT; - import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; diff --git a/src/main/java/mekanism/common/block/BlockOre.java b/src/main/java/mekanism/common/block/BlockOre.java index 538383975..d8679fa69 100644 --- a/src/main/java/mekanism/common/block/BlockOre.java +++ b/src/main/java/mekanism/common/block/BlockOre.java @@ -3,7 +3,6 @@ package mekanism.common.block; import java.util.List; import mekanism.common.Mekanism; - import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; diff --git a/src/main/java/mekanism/common/block/BlockPlastic.java b/src/main/java/mekanism/common/block/BlockPlastic.java index 3942a9395..03c4d8a73 100644 --- a/src/main/java/mekanism/common/block/BlockPlastic.java +++ b/src/main/java/mekanism/common/block/BlockPlastic.java @@ -3,10 +3,8 @@ package mekanism.common.block; import java.util.List; import mekanism.api.EnumColor; -import mekanism.client.ClientProxy; import mekanism.common.Mekanism; import mekanism.common.MekanismBlocks; - import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; diff --git a/src/main/java/mekanism/common/block/BlockPlasticFence.java b/src/main/java/mekanism/common/block/BlockPlasticFence.java index ce0565398..bef99a790 100644 --- a/src/main/java/mekanism/common/block/BlockPlasticFence.java +++ b/src/main/java/mekanism/common/block/BlockPlasticFence.java @@ -4,7 +4,6 @@ import java.util.List; import mekanism.api.EnumColor; import mekanism.common.Mekanism; - import net.minecraft.block.BlockFence; import net.minecraft.block.material.Material; import net.minecraft.creativetab.CreativeTabs; diff --git a/src/main/java/mekanism/common/block/BlockSalt.java b/src/main/java/mekanism/common/block/BlockSalt.java index 6a7de0ba7..d34b7251f 100644 --- a/src/main/java/mekanism/common/block/BlockSalt.java +++ b/src/main/java/mekanism/common/block/BlockSalt.java @@ -4,7 +4,6 @@ import java.util.Random; import mekanism.common.Mekanism; import mekanism.common.MekanismItems; - import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; diff --git a/src/main/java/mekanism/common/content/boiler/SynchronizedBoilerData.java b/src/main/java/mekanism/common/content/boiler/SynchronizedBoilerData.java index f44ffc3a2..2e83ff67f 100644 --- a/src/main/java/mekanism/common/content/boiler/SynchronizedBoilerData.java +++ b/src/main/java/mekanism/common/content/boiler/SynchronizedBoilerData.java @@ -9,11 +9,13 @@ import mekanism.common.multiblock.SynchronizedData; import mekanism.common.util.FluidContainerUtils.ContainerEditMode; import net.minecraft.item.ItemStack; import net.minecraftforge.common.util.ForgeDirection; -import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; public class SynchronizedBoilerData extends SynchronizedData implements IHeatTransfer { + public static double CASING_INSULATION_COEFFICIENT = 50; + public static double CASING_INVERSE_CONDUCTION_COEFFICIENT = 1; + public FluidStack waterStored; public FluidStack prevWater; @@ -24,7 +26,7 @@ public class SynchronizedBoilerData extends SynchronizedData= 100 + IHeatTransfer.AMBIENT_TEMP && waterStored != null) - { - int amountToBoil = (int)Math.floor(heatToAbsorb / enthalpyOfVaporization); - amountToBoil = Math.min(amountToBoil, waterStored.amount); - waterStored.amount -= amountToBoil; - - if(steamStored == null) - { - steamStored = new FluidStack(FluidRegistry.getFluid("steam"), amountToBoil); - } - else { - steamStored.amount += amountToBoil; - } - - heatToAbsorb -= amountToBoil * enthalpyOfVaporization; - } - - heatToAbsorb *= 0.8; + temperature += heatToAbsorb / locations.size(); + heatToAbsorb = 0; return temperature; } diff --git a/src/main/java/mekanism/common/content/matrix/MatrixCache.java b/src/main/java/mekanism/common/content/matrix/MatrixCache.java index 67ad9b7cd..482a2a4ec 100644 --- a/src/main/java/mekanism/common/content/matrix/MatrixCache.java +++ b/src/main/java/mekanism/common/content/matrix/MatrixCache.java @@ -1,7 +1,6 @@ package mekanism.common.content.matrix; import mekanism.common.multiblock.MultiblockCache; - import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; diff --git a/src/main/java/mekanism/common/content/miner/MItemStackFilter.java b/src/main/java/mekanism/common/content/miner/MItemStackFilter.java index 8dee7b9b2..d4ac726f0 100644 --- a/src/main/java/mekanism/common/content/miner/MItemStackFilter.java +++ b/src/main/java/mekanism/common/content/miner/MItemStackFilter.java @@ -1,15 +1,14 @@ package mekanism.common.content.miner; +import io.netty.buffer.ByteBuf; + import java.util.ArrayList; import mekanism.common.util.MekanismUtils; - import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import io.netty.buffer.ByteBuf; - public class MItemStackFilter extends MinerFilter { public ItemStack itemType; diff --git a/src/main/java/mekanism/common/content/miner/MMaterialFilter.java b/src/main/java/mekanism/common/content/miner/MMaterialFilter.java index 5fb478ab1..a429c4c33 100644 --- a/src/main/java/mekanism/common/content/miner/MMaterialFilter.java +++ b/src/main/java/mekanism/common/content/miner/MMaterialFilter.java @@ -1,10 +1,11 @@ package mekanism.common.content.miner; +import io.netty.buffer.ByteBuf; + import java.util.ArrayList; import mekanism.common.content.transporter.Finder.MaterialFinder; import mekanism.common.util.MekanismUtils; - import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.item.Item; @@ -12,8 +13,6 @@ import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import io.netty.buffer.ByteBuf; - public class MMaterialFilter extends MinerFilter { public ItemStack materialItem; diff --git a/src/main/java/mekanism/common/content/miner/MModIDFilter.java b/src/main/java/mekanism/common/content/miner/MModIDFilter.java index afa592e96..c92ba95c5 100644 --- a/src/main/java/mekanism/common/content/miner/MModIDFilter.java +++ b/src/main/java/mekanism/common/content/miner/MModIDFilter.java @@ -1,16 +1,15 @@ package mekanism.common.content.miner; +import io.netty.buffer.ByteBuf; + import java.util.ArrayList; import mekanism.common.PacketHandler; import mekanism.common.content.transporter.Finder.ModIDFinder; - import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import io.netty.buffer.ByteBuf; - public class MModIDFilter extends MinerFilter { public String modID; diff --git a/src/main/java/mekanism/common/content/miner/MOreDictFilter.java b/src/main/java/mekanism/common/content/miner/MOreDictFilter.java index 99347eca1..6a71326d1 100644 --- a/src/main/java/mekanism/common/content/miner/MOreDictFilter.java +++ b/src/main/java/mekanism/common/content/miner/MOreDictFilter.java @@ -1,16 +1,15 @@ package mekanism.common.content.miner; +import io.netty.buffer.ByteBuf; + import java.util.ArrayList; import mekanism.common.PacketHandler; import mekanism.common.content.transporter.Finder.OreDictFinder; - import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import io.netty.buffer.ByteBuf; - public class MOreDictFilter extends MinerFilter { public String oreDictName; diff --git a/src/main/java/mekanism/common/content/miner/MinerFilter.java b/src/main/java/mekanism/common/content/miner/MinerFilter.java index 483075d5b..560fced04 100644 --- a/src/main/java/mekanism/common/content/miner/MinerFilter.java +++ b/src/main/java/mekanism/common/content/miner/MinerFilter.java @@ -1,15 +1,14 @@ package mekanism.common.content.miner; +import io.netty.buffer.ByteBuf; + import java.util.ArrayList; import mekanism.common.util.MekanismUtils; - import net.minecraft.block.Block; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import io.netty.buffer.ByteBuf; - public abstract class MinerFilter { public ItemStack replaceStack; diff --git a/src/main/java/mekanism/common/content/tank/SynchronizedTankData.java b/src/main/java/mekanism/common/content/tank/SynchronizedTankData.java index 7e231adc6..db2251dbe 100644 --- a/src/main/java/mekanism/common/content/tank/SynchronizedTankData.java +++ b/src/main/java/mekanism/common/content/tank/SynchronizedTankData.java @@ -8,7 +8,6 @@ import mekanism.common.multiblock.SynchronizedData; import mekanism.common.util.FluidContainerUtils.ContainerEditMode; import net.minecraft.item.ItemStack; import net.minecraftforge.common.util.ForgeDirection; -import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; public class SynchronizedTankData extends SynchronizedData diff --git a/src/main/java/mekanism/common/content/tank/TankCache.java b/src/main/java/mekanism/common/content/tank/TankCache.java index cb2a1b1cd..eb23200c4 100644 --- a/src/main/java/mekanism/common/content/tank/TankCache.java +++ b/src/main/java/mekanism/common/content/tank/TankCache.java @@ -2,7 +2,6 @@ package mekanism.common.content.tank; import mekanism.common.multiblock.MultiblockCache; import mekanism.common.util.FluidContainerUtils.ContainerEditMode; - import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; diff --git a/src/main/java/mekanism/common/content/tank/TankUpdateProtocol.java b/src/main/java/mekanism/common/content/tank/TankUpdateProtocol.java index 4c114237f..aa73aa55e 100644 --- a/src/main/java/mekanism/common/content/tank/TankUpdateProtocol.java +++ b/src/main/java/mekanism/common/content/tank/TankUpdateProtocol.java @@ -12,7 +12,6 @@ import mekanism.common.multiblock.MultiblockManager; import mekanism.common.multiblock.UpdateProtocol; import mekanism.common.tile.TileEntityDynamicTank; import mekanism.common.tile.TileEntityDynamicValve; - import net.minecraft.item.ItemStack; public class TankUpdateProtocol extends UpdateProtocol diff --git a/src/main/java/mekanism/common/content/teleportation/SharedInventory.java b/src/main/java/mekanism/common/content/teleportation/SharedInventory.java index 63e05acf9..75501909b 100644 --- a/src/main/java/mekanism/common/content/teleportation/SharedInventory.java +++ b/src/main/java/mekanism/common/content/teleportation/SharedInventory.java @@ -5,7 +5,6 @@ import mekanism.api.gas.Gas; import mekanism.api.gas.GasStack; import mekanism.api.gas.GasTank; import mekanism.api.gas.IGasHandler; - import net.minecraft.item.ItemStack; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.Fluid; diff --git a/src/main/java/mekanism/common/content/teleportation/SharedInventoryManager.java b/src/main/java/mekanism/common/content/teleportation/SharedInventoryManager.java index 0c8a7a5a8..8d6aded9e 100644 --- a/src/main/java/mekanism/common/content/teleportation/SharedInventoryManager.java +++ b/src/main/java/mekanism/common/content/teleportation/SharedInventoryManager.java @@ -6,7 +6,6 @@ import java.util.Iterator; import mekanism.api.gas.GasRegistry; import mekanism.api.gas.GasStack; - import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; diff --git a/src/main/java/mekanism/common/content/transporter/Finder.java b/src/main/java/mekanism/common/content/transporter/Finder.java index 2afe51af6..f4f13981f 100644 --- a/src/main/java/mekanism/common/content/transporter/Finder.java +++ b/src/main/java/mekanism/common/content/transporter/Finder.java @@ -4,7 +4,6 @@ import java.util.List; import mekanism.api.util.StackUtils; import mekanism.common.util.MekanismUtils; - import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.item.ItemBlock; diff --git a/src/main/java/mekanism/common/content/transporter/PathfinderCache.java b/src/main/java/mekanism/common/content/transporter/PathfinderCache.java index 2e8f4e015..0fd041199 100644 --- a/src/main/java/mekanism/common/content/transporter/PathfinderCache.java +++ b/src/main/java/mekanism/common/content/transporter/PathfinderCache.java @@ -6,7 +6,6 @@ import java.util.List; import java.util.Map; import mekanism.api.Coord4D; - import net.minecraftforge.common.util.ForgeDirection; public class PathfinderCache diff --git a/src/main/java/mekanism/common/content/transporter/StackSearcher.java b/src/main/java/mekanism/common/content/transporter/StackSearcher.java index 2110fe913..3a0e684e4 100644 --- a/src/main/java/mekanism/common/content/transporter/StackSearcher.java +++ b/src/main/java/mekanism/common/content/transporter/StackSearcher.java @@ -2,7 +2,6 @@ package mekanism.common.content.transporter; import mekanism.api.util.StackUtils; import mekanism.common.util.InventoryUtils; - import net.minecraft.inventory.IInventory; import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; diff --git a/src/main/java/mekanism/common/content/transporter/TItemStackFilter.java b/src/main/java/mekanism/common/content/transporter/TItemStackFilter.java index fbea5de3a..b2481ab00 100644 --- a/src/main/java/mekanism/common/content/transporter/TItemStackFilter.java +++ b/src/main/java/mekanism/common/content/transporter/TItemStackFilter.java @@ -1,18 +1,14 @@ package mekanism.common.content.transporter; +import io.netty.buffer.ByteBuf; + import java.util.ArrayList; import mekanism.common.content.transporter.Finder.ItemStackFinder; -import mekanism.common.util.InventoryUtils; import mekanism.common.util.MekanismUtils; - -import net.minecraft.inventory.IInventory; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraftforge.common.util.ForgeDirection; - -import io.netty.buffer.ByteBuf; public class TItemStackFilter extends TransporterFilter { diff --git a/src/main/java/mekanism/common/content/transporter/TMaterialFilter.java b/src/main/java/mekanism/common/content/transporter/TMaterialFilter.java index 0c0ee4503..dceba2777 100644 --- a/src/main/java/mekanism/common/content/transporter/TMaterialFilter.java +++ b/src/main/java/mekanism/common/content/transporter/TMaterialFilter.java @@ -1,21 +1,17 @@ package mekanism.common.content.transporter; +import io.netty.buffer.ByteBuf; + import java.util.ArrayList; import mekanism.common.content.transporter.Finder.MaterialFinder; -import mekanism.common.util.InventoryUtils; import mekanism.common.util.MekanismUtils; - import net.minecraft.block.Block; import net.minecraft.block.material.Material; -import net.minecraft.inventory.IInventory; import net.minecraft.item.Item; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraftforge.common.util.ForgeDirection; - -import io.netty.buffer.ByteBuf; public class TMaterialFilter extends TransporterFilter { diff --git a/src/main/java/mekanism/common/content/transporter/TModIDFilter.java b/src/main/java/mekanism/common/content/transporter/TModIDFilter.java index db363e41a..af23ece04 100644 --- a/src/main/java/mekanism/common/content/transporter/TModIDFilter.java +++ b/src/main/java/mekanism/common/content/transporter/TModIDFilter.java @@ -1,17 +1,13 @@ package mekanism.common.content.transporter; +import io.netty.buffer.ByteBuf; + import java.util.ArrayList; import mekanism.common.PacketHandler; import mekanism.common.content.transporter.Finder.ModIDFinder; -import mekanism.common.util.InventoryUtils; - -import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraftforge.common.util.ForgeDirection; - -import io.netty.buffer.ByteBuf; public class TModIDFilter extends TransporterFilter { diff --git a/src/main/java/mekanism/common/content/transporter/TOreDictFilter.java b/src/main/java/mekanism/common/content/transporter/TOreDictFilter.java index ace0d5452..0549b18ca 100644 --- a/src/main/java/mekanism/common/content/transporter/TOreDictFilter.java +++ b/src/main/java/mekanism/common/content/transporter/TOreDictFilter.java @@ -1,17 +1,13 @@ package mekanism.common.content.transporter; +import io.netty.buffer.ByteBuf; + import java.util.ArrayList; import mekanism.common.PacketHandler; import mekanism.common.content.transporter.Finder.OreDictFinder; -import mekanism.common.util.InventoryUtils; - -import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraftforge.common.util.ForgeDirection; - -import io.netty.buffer.ByteBuf; public class TOreDictFilter extends TransporterFilter { diff --git a/src/main/java/mekanism/common/content/transporter/TransporterFilter.java b/src/main/java/mekanism/common/content/transporter/TransporterFilter.java index 3ffbd2c19..e91045972 100644 --- a/src/main/java/mekanism/common/content/transporter/TransporterFilter.java +++ b/src/main/java/mekanism/common/content/transporter/TransporterFilter.java @@ -7,12 +7,9 @@ import java.util.Arrays; import java.util.List; import mekanism.api.EnumColor; -import mekanism.common.util.InventoryUtils; import mekanism.common.util.TransporterUtils; -import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraftforge.common.util.ForgeDirection; public abstract class TransporterFilter { diff --git a/src/main/java/mekanism/common/entity/EntityBalloon.java b/src/main/java/mekanism/common/entity/EntityBalloon.java index 00525290e..ae707b420 100644 --- a/src/main/java/mekanism/common/entity/EntityBalloon.java +++ b/src/main/java/mekanism/common/entity/EntityBalloon.java @@ -1,9 +1,9 @@ package mekanism.common.entity; -import cpw.mods.fml.common.registry.IEntityAdditionalSpawnData; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import io.netty.buffer.ByteBuf; + +import java.util.UUID; + import mekanism.api.Coord4D; import mekanism.api.EnumColor; import mekanism.api.Pos3D; @@ -17,8 +17,9 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.DamageSource; import net.minecraft.util.MathHelper; import net.minecraft.world.World; - -import java.util.UUID; +import cpw.mods.fml.common.registry.IEntityAdditionalSpawnData; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class EntityBalloon extends Entity implements IEntityAdditionalSpawnData { diff --git a/src/main/java/mekanism/common/entity/EntityFlame.java b/src/main/java/mekanism/common/entity/EntityFlame.java index 08541091d..699da0778 100644 --- a/src/main/java/mekanism/common/entity/EntityFlame.java +++ b/src/main/java/mekanism/common/entity/EntityFlame.java @@ -1,7 +1,9 @@ package mekanism.common.entity; -import cpw.mods.fml.common.registry.IEntityAdditionalSpawnData; import io.netty.buffer.ByteBuf; + +import java.util.List; + import mekanism.api.Coord4D; import mekanism.api.MekanismConfig.general; import mekanism.api.Pos3D; @@ -16,11 +18,14 @@ import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.FurnaceRecipes; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.*; +import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.DamageSource; +import net.minecraft.util.MathHelper; +import net.minecraft.util.MovingObjectPosition; +import net.minecraft.util.Vec3; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; - -import java.util.List; +import cpw.mods.fml.common.registry.IEntityAdditionalSpawnData; public class EntityFlame extends Entity implements IEntityAdditionalSpawnData { diff --git a/src/main/java/mekanism/common/entity/EntityObsidianTNT.java b/src/main/java/mekanism/common/entity/EntityObsidianTNT.java index dbdb6beb6..310d71173 100644 --- a/src/main/java/mekanism/common/entity/EntityObsidianTNT.java +++ b/src/main/java/mekanism/common/entity/EntityObsidianTNT.java @@ -1,7 +1,6 @@ package mekanism.common.entity; import mekanism.api.MekanismConfig.general; - import net.minecraft.entity.Entity; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; diff --git a/src/main/java/mekanism/common/entity/EntityRobit.java b/src/main/java/mekanism/common/entity/EntityRobit.java index 4defbd6b3..c34dd0eca 100644 --- a/src/main/java/mekanism/common/entity/EntityRobit.java +++ b/src/main/java/mekanism/common/entity/EntityRobit.java @@ -1,5 +1,8 @@ package mekanism.common.entity; +import ic2.api.item.ElectricItem; +import ic2.api.item.IElectricItem; + import java.math.BigDecimal; import java.math.RoundingMode; import java.util.List; @@ -17,7 +20,7 @@ import mekanism.common.item.ItemConfigurator; import mekanism.common.item.ItemRobit; import mekanism.common.tile.TileEntityChargepad; import mekanism.common.util.MekanismUtils; - +import micdoodle8.mods.galacticraft.api.entity.IEntityBreathable; import net.minecraft.entity.EntityCreature; import net.minecraft.entity.SharedMonsterAttributes; import net.minecraft.entity.ai.EntityAILookIdle; @@ -38,12 +41,8 @@ import net.minecraft.util.MathHelper; import net.minecraft.world.World; import net.minecraftforge.common.ForgeHooks; import net.minecraftforge.common.util.Constants; -import cpw.mods.fml.common.Optional.Interface; - import cofh.api.energy.IEnergyContainerItem; -import ic2.api.item.ElectricItem; -import ic2.api.item.IElectricItem; -import micdoodle8.mods.galacticraft.api.entity.IEntityBreathable; +import cpw.mods.fml.common.Optional.Interface; @Interface(iface = "micdoodle8.mods.galacticraft.api.entity.IEntityBreathable", modid = "Galacticraft API") public class EntityRobit extends EntityCreature implements IInventory, ISustainedInventory, IEntityBreathable diff --git a/src/main/java/mekanism/common/integration/CCPeripheral.java b/src/main/java/mekanism/common/integration/CCPeripheral.java index bfd0ed303..5d92d54d9 100644 --- a/src/main/java/mekanism/common/integration/CCPeripheral.java +++ b/src/main/java/mekanism/common/integration/CCPeripheral.java @@ -1,13 +1,13 @@ package mekanism.common.integration; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.World; import cpw.mods.fml.common.Optional; import dan200.computercraft.api.lua.ILuaContext; import dan200.computercraft.api.lua.LuaException; import dan200.computercraft.api.peripheral.IComputerAccess; import dan200.computercraft.api.peripheral.IPeripheral; import dan200.computercraft.api.peripheral.IPeripheralProvider; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.World; /** * Created by aidancbrady on 7/20/15. diff --git a/src/main/java/mekanism/common/integration/IC2ItemManager.java b/src/main/java/mekanism/common/integration/IC2ItemManager.java index 5c4031437..04d2c1539 100644 --- a/src/main/java/mekanism/common/integration/IC2ItemManager.java +++ b/src/main/java/mekanism/common/integration/IC2ItemManager.java @@ -1,13 +1,11 @@ package mekanism.common.integration; +import ic2.api.item.IElectricItemManager; import mekanism.api.MekanismConfig.general; import mekanism.api.energy.IEnergizedItem; - import net.minecraft.entity.EntityLivingBase; import net.minecraft.item.ItemStack; -import ic2.api.item.IElectricItemManager; - public class IC2ItemManager implements IElectricItemManager { public IEnergizedItem energizedItem; diff --git a/src/main/java/mekanism/common/integration/MekanismHooks.java b/src/main/java/mekanism/common/integration/MekanismHooks.java index 03f34659c..e3e1d5f41 100644 --- a/src/main/java/mekanism/common/integration/MekanismHooks.java +++ b/src/main/java/mekanism/common/integration/MekanismHooks.java @@ -1,10 +1,14 @@ package mekanism.common.integration; -import cpw.mods.fml.common.Loader; -import cpw.mods.fml.common.Optional.Method; -import cpw.mods.fml.common.event.FMLInterModComms; -import dan200.computercraft.api.ComputerCraftAPI; -import ic2.api.recipe.*; +import ic2.api.recipe.IRecipeInput; +import ic2.api.recipe.RecipeInputItemStack; +import ic2.api.recipe.RecipeInputOreDict; +import ic2.api.recipe.RecipeOutput; +import ic2.api.recipe.Recipes; + +import java.util.List; +import java.util.Map; + import li.cil.oc.api.Driver; import mekanism.api.transmitters.TransmissionType; import mekanism.common.Mekanism; @@ -16,9 +20,10 @@ import mekanism.common.util.MekanismUtils; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; - -import java.util.List; -import java.util.Map; +import cpw.mods.fml.common.Loader; +import cpw.mods.fml.common.Optional.Method; +import cpw.mods.fml.common.event.FMLInterModComms; +import dan200.computercraft.api.ComputerCraftAPI; /** * Hooks for Mekanism. Use to grab items or blocks out of different mods. diff --git a/src/main/java/mekanism/common/integration/OCDriver.java b/src/main/java/mekanism/common/integration/OCDriver.java index 61afd30f3..bd65d7595 100644 --- a/src/main/java/mekanism/common/integration/OCDriver.java +++ b/src/main/java/mekanism/common/integration/OCDriver.java @@ -1,5 +1,8 @@ package mekanism.common.integration; +import java.util.Arrays; +import java.util.Locale; + import li.cil.oc.api.Network; import li.cil.oc.api.driver.NamedBlock; import li.cil.oc.api.machine.Arguments; @@ -11,9 +14,6 @@ import li.cil.oc.api.prefab.ManagedEnvironment; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; -import java.util.Arrays; -import java.util.Locale; - /** * Created by aidancbrady on 7/20/15. */ diff --git a/src/main/java/mekanism/common/inventory/InventoryBin.java b/src/main/java/mekanism/common/inventory/InventoryBin.java index a56ae67fc..1ce4c1e39 100644 --- a/src/main/java/mekanism/common/inventory/InventoryBin.java +++ b/src/main/java/mekanism/common/inventory/InventoryBin.java @@ -2,7 +2,6 @@ package mekanism.common.inventory; import mekanism.api.util.StackUtils; import mekanism.common.item.ItemBlockBasic; - import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/main/java/mekanism/common/inventory/InventoryElectricChest.java b/src/main/java/mekanism/common/inventory/InventoryElectricChest.java index c12dcb6a0..5de410c4a 100644 --- a/src/main/java/mekanism/common/inventory/InventoryElectricChest.java +++ b/src/main/java/mekanism/common/inventory/InventoryElectricChest.java @@ -2,7 +2,6 @@ package mekanism.common.inventory; import mekanism.common.base.IElectricChest; import mekanism.common.base.ISustainedInventory; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.InventoryBasic; import net.minecraft.item.ItemStack; diff --git a/src/main/java/mekanism/common/inventory/container/ContainerAdvancedElectricMachine.java b/src/main/java/mekanism/common/inventory/container/ContainerAdvancedElectricMachine.java index 96b51e099..f7bcae5df 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerAdvancedElectricMachine.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerAdvancedElectricMachine.java @@ -7,7 +7,6 @@ import mekanism.common.inventory.slot.SlotOutput; import mekanism.common.recipe.inputs.AdvancedMachineInput; import mekanism.common.tile.TileEntityAdvancedElectricMachine; import mekanism.common.util.ChargeUtils; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/src/main/java/mekanism/common/inventory/container/ContainerChanceMachine.java b/src/main/java/mekanism/common/inventory/container/ContainerChanceMachine.java index c2799862d..a2ca72c74 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerChanceMachine.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerChanceMachine.java @@ -6,7 +6,6 @@ import mekanism.common.recipe.RecipeHandler; import mekanism.common.recipe.inputs.ItemStackInput; import mekanism.common.tile.TileEntityChanceMachine; import mekanism.common.util.ChargeUtils; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/src/main/java/mekanism/common/inventory/container/ContainerChemicalCrystallizer.java b/src/main/java/mekanism/common/inventory/container/ContainerChemicalCrystallizer.java index 551843237..fab2cfbaa 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerChemicalCrystallizer.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerChemicalCrystallizer.java @@ -6,7 +6,6 @@ import mekanism.common.inventory.slot.SlotOutput; import mekanism.common.inventory.slot.SlotStorageTank; import mekanism.common.tile.TileEntityChemicalCrystallizer; import mekanism.common.util.ChargeUtils; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/src/main/java/mekanism/common/inventory/container/ContainerChemicalDissolutionChamber.java b/src/main/java/mekanism/common/inventory/container/ContainerChemicalDissolutionChamber.java index ccf102d56..5af4f16df 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerChemicalDissolutionChamber.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerChemicalDissolutionChamber.java @@ -7,7 +7,6 @@ import mekanism.common.recipe.RecipeHandler; import mekanism.common.recipe.inputs.ItemStackInput; import mekanism.common.tile.TileEntityChemicalDissolutionChamber; import mekanism.common.util.ChargeUtils; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/src/main/java/mekanism/common/inventory/container/ContainerChemicalInfuser.java b/src/main/java/mekanism/common/inventory/container/ContainerChemicalInfuser.java index 512fbd6f2..c01f44061 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerChemicalInfuser.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerChemicalInfuser.java @@ -5,7 +5,6 @@ import mekanism.common.inventory.slot.SlotEnergy.SlotDischarge; import mekanism.common.inventory.slot.SlotStorageTank; import mekanism.common.tile.TileEntityChemicalInfuser; import mekanism.common.util.ChargeUtils; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/src/main/java/mekanism/common/inventory/container/ContainerChemicalOxidizer.java b/src/main/java/mekanism/common/inventory/container/ContainerChemicalOxidizer.java index d1fa971a5..25c0d6b0d 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerChemicalOxidizer.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerChemicalOxidizer.java @@ -7,7 +7,6 @@ import mekanism.common.recipe.RecipeHandler; import mekanism.common.recipe.inputs.ItemStackInput; import mekanism.common.tile.TileEntityChemicalOxidizer; import mekanism.common.util.ChargeUtils; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/src/main/java/mekanism/common/inventory/container/ContainerChemicalWasher.java b/src/main/java/mekanism/common/inventory/container/ContainerChemicalWasher.java index 8770f3bc2..f715faee0 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerChemicalWasher.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerChemicalWasher.java @@ -6,7 +6,6 @@ import mekanism.common.inventory.slot.SlotOutput; import mekanism.common.inventory.slot.SlotStorageTank; import mekanism.common.tile.TileEntityChemicalWasher; import mekanism.common.util.ChargeUtils; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/src/main/java/mekanism/common/inventory/container/ContainerDigitalMiner.java b/src/main/java/mekanism/common/inventory/container/ContainerDigitalMiner.java index 07dc5e6b8..b6866973f 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerDigitalMiner.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerDigitalMiner.java @@ -3,7 +3,6 @@ package mekanism.common.inventory.container; import mekanism.common.inventory.slot.SlotEnergy.SlotDischarge; import mekanism.common.tile.TileEntityDigitalMiner; import mekanism.common.util.ChargeUtils; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/src/main/java/mekanism/common/inventory/container/ContainerElectricChest.java b/src/main/java/mekanism/common/inventory/container/ContainerElectricChest.java index 4bfcb5548..21651d283 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerElectricChest.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerElectricChest.java @@ -1,12 +1,12 @@ package mekanism.common.inventory.container; +import invtweaks.api.container.ChestContainer; import mekanism.common.base.IElectricChest; import mekanism.common.block.BlockMachine.MachineType; import mekanism.common.inventory.slot.SlotElectricChest; import mekanism.common.inventory.slot.SlotEnergy.SlotDischarge; import mekanism.common.tile.TileEntityElectricChest; import mekanism.common.util.ChargeUtils; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; @@ -14,8 +14,6 @@ import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; -import invtweaks.api.container.ChestContainer; - @ChestContainer(isLargeChest=true) public class ContainerElectricChest extends Container { diff --git a/src/main/java/mekanism/common/inventory/container/ContainerElectricMachine.java b/src/main/java/mekanism/common/inventory/container/ContainerElectricMachine.java index 7a155e999..849d968b3 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerElectricMachine.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerElectricMachine.java @@ -6,7 +6,6 @@ import mekanism.common.recipe.RecipeHandler; import mekanism.common.recipe.inputs.ItemStackInput; import mekanism.common.tile.TileEntityElectricMachine; import mekanism.common.util.ChargeUtils; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/src/main/java/mekanism/common/inventory/container/ContainerElectricPump.java b/src/main/java/mekanism/common/inventory/container/ContainerElectricPump.java index 98de4114d..d517c727d 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerElectricPump.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerElectricPump.java @@ -4,7 +4,6 @@ import mekanism.common.inventory.slot.SlotEnergy.SlotDischarge; import mekanism.common.inventory.slot.SlotOutput; import mekanism.common.tile.TileEntityElectricPump; import mekanism.common.util.ChargeUtils; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/src/main/java/mekanism/common/inventory/container/ContainerElectrolyticSeparator.java b/src/main/java/mekanism/common/inventory/container/ContainerElectrolyticSeparator.java index 96414957a..9154a4525 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerElectrolyticSeparator.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerElectrolyticSeparator.java @@ -7,7 +7,6 @@ import mekanism.common.inventory.slot.SlotStorageTank; import mekanism.common.recipe.RecipeHandler; import mekanism.common.tile.TileEntityElectrolyticSeparator; import mekanism.common.util.ChargeUtils; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/src/main/java/mekanism/common/inventory/container/ContainerEnergyCube.java b/src/main/java/mekanism/common/inventory/container/ContainerEnergyCube.java index 47b2fd146..fe03c6ad3 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerEnergyCube.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerEnergyCube.java @@ -1,11 +1,11 @@ package mekanism.common.inventory.container; +import ic2.api.item.IElectricItem; import mekanism.common.inventory.slot.SlotEnergy.SlotCharge; import mekanism.common.inventory.slot.SlotEnergy.SlotDischarge; import mekanism.common.tile.TileEntityEnergyCube; import mekanism.common.util.ChargeUtils; import mekanism.common.util.MekanismUtils; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.init.Items; @@ -13,8 +13,6 @@ import net.minecraft.inventory.Container; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; -import ic2.api.item.IElectricItem; - public class ContainerEnergyCube extends Container { private TileEntityEnergyCube tileEntity; diff --git a/src/main/java/mekanism/common/inventory/container/ContainerFilter.java b/src/main/java/mekanism/common/inventory/container/ContainerFilter.java index d6a60cb7e..aad856607 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerFilter.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerFilter.java @@ -1,7 +1,6 @@ package mekanism.common.inventory.container; import mekanism.common.tile.TileEntityContainerBlock; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/src/main/java/mekanism/common/inventory/container/ContainerFluidTank.java b/src/main/java/mekanism/common/inventory/container/ContainerFluidTank.java index 664a0077a..6e8652ccb 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerFluidTank.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerFluidTank.java @@ -2,7 +2,6 @@ package mekanism.common.inventory.container; import mekanism.common.inventory.slot.SlotOutput; import mekanism.common.tile.TileEntityFluidTank; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/src/main/java/mekanism/common/inventory/container/ContainerFluidicPlenisher.java b/src/main/java/mekanism/common/inventory/container/ContainerFluidicPlenisher.java index 79831ac2a..3f1fc8452 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerFluidicPlenisher.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerFluidicPlenisher.java @@ -4,7 +4,6 @@ import mekanism.common.inventory.slot.SlotEnergy.SlotDischarge; import mekanism.common.inventory.slot.SlotOutput; import mekanism.common.tile.TileEntityFluidicPlenisher; import mekanism.common.util.ChargeUtils; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/src/main/java/mekanism/common/inventory/container/ContainerGasTank.java b/src/main/java/mekanism/common/inventory/container/ContainerGasTank.java index b2917fbac..7350b823a 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerGasTank.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerGasTank.java @@ -3,7 +3,6 @@ package mekanism.common.inventory.container; import mekanism.api.gas.IGasItem; import mekanism.common.inventory.slot.SlotStorageTank; import mekanism.common.tile.TileEntityGasTank; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/src/main/java/mekanism/common/inventory/container/ContainerNull.java b/src/main/java/mekanism/common/inventory/container/ContainerNull.java index ec45c9280..8ee419179 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerNull.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerNull.java @@ -1,7 +1,6 @@ package mekanism.common.inventory.container; import mekanism.common.tile.TileEntityContainerBlock; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Container; diff --git a/src/main/java/mekanism/common/inventory/container/ContainerOredictionificator.java b/src/main/java/mekanism/common/inventory/container/ContainerOredictionificator.java index cb838b110..16f359877 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerOredictionificator.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerOredictionificator.java @@ -1,10 +1,7 @@ package mekanism.common.inventory.container; import mekanism.common.inventory.slot.SlotOutput; -import mekanism.common.recipe.RecipeHandler; -import mekanism.common.recipe.inputs.ItemStackInput; import mekanism.common.tile.TileEntityOredictionificator; -import mekanism.common.util.ChargeUtils; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/src/main/java/mekanism/common/inventory/container/ContainerPRC.java b/src/main/java/mekanism/common/inventory/container/ContainerPRC.java index a16ff7c4d..1a85acf7d 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerPRC.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerPRC.java @@ -5,7 +5,6 @@ import mekanism.common.inventory.slot.SlotOutput; import mekanism.common.recipe.RecipeHandler; import mekanism.common.tile.TileEntityPRC; import mekanism.common.util.ChargeUtils; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/src/main/java/mekanism/common/inventory/container/ContainerRobitInventory.java b/src/main/java/mekanism/common/inventory/container/ContainerRobitInventory.java index 10213cae4..63eff3bec 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerRobitInventory.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerRobitInventory.java @@ -1,7 +1,6 @@ package mekanism.common.inventory.container; import mekanism.common.entity.EntityRobit; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/src/main/java/mekanism/common/inventory/container/ContainerRobitMain.java b/src/main/java/mekanism/common/inventory/container/ContainerRobitMain.java index 2b857f260..6d03f493c 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerRobitMain.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerRobitMain.java @@ -2,7 +2,6 @@ package mekanism.common.inventory.container; import mekanism.common.entity.EntityRobit; import mekanism.common.inventory.slot.SlotEnergy.SlotDischarge; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/src/main/java/mekanism/common/inventory/container/ContainerRobitSmelting.java b/src/main/java/mekanism/common/inventory/container/ContainerRobitSmelting.java index 5f4bb3e90..40dd9b655 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerRobitSmelting.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerRobitSmelting.java @@ -1,7 +1,6 @@ package mekanism.common.inventory.container; import mekanism.common.entity.EntityRobit; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/src/main/java/mekanism/common/inventory/container/ContainerRotaryCondensentrator.java b/src/main/java/mekanism/common/inventory/container/ContainerRotaryCondensentrator.java index 854d08e93..6528d0110 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerRotaryCondensentrator.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerRotaryCondensentrator.java @@ -6,7 +6,6 @@ import mekanism.common.inventory.slot.SlotOutput; import mekanism.common.inventory.slot.SlotStorageTank; import mekanism.common.tile.TileEntityRotaryCondensentrator; import mekanism.common.util.ChargeUtils; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/src/main/java/mekanism/common/inventory/container/ContainerSeismicVibrator.java b/src/main/java/mekanism/common/inventory/container/ContainerSeismicVibrator.java index f4782d7ed..7c58cad90 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerSeismicVibrator.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerSeismicVibrator.java @@ -3,7 +3,6 @@ package mekanism.common.inventory.container; import mekanism.common.inventory.slot.SlotEnergy.SlotDischarge; import mekanism.common.tile.TileEntitySeismicVibrator; import mekanism.common.util.ChargeUtils; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/src/main/java/mekanism/common/inventory/container/ContainerSolarNeutronActivator.java b/src/main/java/mekanism/common/inventory/container/ContainerSolarNeutronActivator.java index fc3cb25df..d99db7e5b 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerSolarNeutronActivator.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerSolarNeutronActivator.java @@ -1,17 +1,13 @@ package mekanism.common.inventory.container; import mekanism.api.gas.IGasItem; -import mekanism.common.inventory.slot.SlotEnergy.SlotDischarge; -import mekanism.common.inventory.slot.SlotOutput; import mekanism.common.inventory.slot.SlotStorageTank; import mekanism.common.tile.TileEntitySolarNeutronActivator; -import mekanism.common.util.ChargeUtils; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; -import net.minecraftforge.fluids.FluidContainerRegistry; public class ContainerSolarNeutronActivator extends Container { diff --git a/src/main/java/mekanism/common/inventory/container/ContainerTeleporter.java b/src/main/java/mekanism/common/inventory/container/ContainerTeleporter.java index 2d82dc903..466163f55 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerTeleporter.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerTeleporter.java @@ -3,7 +3,6 @@ package mekanism.common.inventory.container; import mekanism.common.inventory.slot.SlotEnergy.SlotDischarge; import mekanism.common.tile.TileEntityTeleporter; import mekanism.common.util.ChargeUtils; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/src/main/java/mekanism/common/inventory/container/ContainerThermalEvaporationController.java b/src/main/java/mekanism/common/inventory/container/ContainerThermalEvaporationController.java index 1fa838641..e6f0302b2 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerThermalEvaporationController.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerThermalEvaporationController.java @@ -2,7 +2,6 @@ package mekanism.common.inventory.container; import mekanism.common.inventory.slot.SlotOutput; import mekanism.common.tile.TileEntityThermalEvaporationController; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/src/main/java/mekanism/common/inventory/container/ContainerUpgradeManagement.java b/src/main/java/mekanism/common/inventory/container/ContainerUpgradeManagement.java index a0526e16e..580d62c1c 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerUpgradeManagement.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerUpgradeManagement.java @@ -4,7 +4,6 @@ import mekanism.common.base.IUpgradeItem; import mekanism.common.base.IUpgradeTile; import mekanism.common.inventory.slot.SlotMachineUpgrade; import mekanism.common.tile.TileEntityContainerBlock; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/src/main/java/mekanism/common/inventory/slot/SlotElectricChest.java b/src/main/java/mekanism/common/inventory/slot/SlotElectricChest.java index 76a5670c8..3e9dccb56 100644 --- a/src/main/java/mekanism/common/inventory/slot/SlotElectricChest.java +++ b/src/main/java/mekanism/common/inventory/slot/SlotElectricChest.java @@ -2,7 +2,6 @@ package mekanism.common.inventory.slot; import mekanism.common.base.IElectricChest; import mekanism.common.block.BlockMachine.MachineType; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; diff --git a/src/main/java/mekanism/common/inventory/slot/SlotEnergy.java b/src/main/java/mekanism/common/inventory/slot/SlotEnergy.java index b860ff6b6..370bcc29e 100644 --- a/src/main/java/mekanism/common/inventory/slot/SlotEnergy.java +++ b/src/main/java/mekanism/common/inventory/slot/SlotEnergy.java @@ -1,7 +1,6 @@ package mekanism.common.inventory.slot; import mekanism.common.util.ChargeUtils; - import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; diff --git a/src/main/java/mekanism/common/inventory/slot/SlotMachineUpgrade.java b/src/main/java/mekanism/common/inventory/slot/SlotMachineUpgrade.java index 97b75d886..3b2882ee4 100644 --- a/src/main/java/mekanism/common/inventory/slot/SlotMachineUpgrade.java +++ b/src/main/java/mekanism/common/inventory/slot/SlotMachineUpgrade.java @@ -1,7 +1,6 @@ package mekanism.common.inventory.slot; import mekanism.common.base.IUpgradeItem; - import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; diff --git a/src/main/java/mekanism/common/inventory/slot/SlotStorageTank.java b/src/main/java/mekanism/common/inventory/slot/SlotStorageTank.java index a2348dd38..eed145d7b 100644 --- a/src/main/java/mekanism/common/inventory/slot/SlotStorageTank.java +++ b/src/main/java/mekanism/common/inventory/slot/SlotStorageTank.java @@ -5,7 +5,6 @@ import java.util.Collections; import mekanism.api.gas.Gas; import mekanism.api.gas.IGasItem; - import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; diff --git a/src/main/java/mekanism/common/item/ItemBalloon.java b/src/main/java/mekanism/common/item/ItemBalloon.java index 90ffafe19..9e1750c04 100644 --- a/src/main/java/mekanism/common/item/ItemBalloon.java +++ b/src/main/java/mekanism/common/item/ItemBalloon.java @@ -1,7 +1,7 @@ package mekanism.common.item; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import java.util.List; + import mekanism.api.Coord4D; import mekanism.api.EnumColor; import mekanism.api.Pos3D; @@ -20,8 +20,8 @@ import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.StatCollector; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; - -import java.util.List; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class ItemBalloon extends ItemMekanism { diff --git a/src/main/java/mekanism/common/item/ItemBlockPlastic.java b/src/main/java/mekanism/common/item/ItemBlockPlastic.java index ceaa791a2..1558d3fe2 100644 --- a/src/main/java/mekanism/common/item/ItemBlockPlastic.java +++ b/src/main/java/mekanism/common/item/ItemBlockPlastic.java @@ -1,7 +1,5 @@ package mekanism.common.item; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import mekanism.api.EnumColor; import mekanism.common.util.LangUtils; import net.minecraft.block.Block; @@ -9,6 +7,8 @@ import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; import net.minecraft.util.StatCollector; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class ItemBlockPlastic extends ItemBlock { diff --git a/src/main/java/mekanism/common/item/ItemControlCircuit.java b/src/main/java/mekanism/common/item/ItemControlCircuit.java index 531b57c59..5d8d94c08 100644 --- a/src/main/java/mekanism/common/item/ItemControlCircuit.java +++ b/src/main/java/mekanism/common/item/ItemControlCircuit.java @@ -4,7 +4,6 @@ import java.util.List; import mekanism.common.Mekanism; import mekanism.common.Tier.BaseTier; - import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; diff --git a/src/main/java/mekanism/common/item/ItemDirtyDust.java b/src/main/java/mekanism/common/item/ItemDirtyDust.java index 19a4c5085..b76ef2608 100644 --- a/src/main/java/mekanism/common/item/ItemDirtyDust.java +++ b/src/main/java/mekanism/common/item/ItemDirtyDust.java @@ -4,7 +4,6 @@ import java.util.List; import mekanism.common.Mekanism; import mekanism.common.Resource; - import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; diff --git a/src/main/java/mekanism/common/item/ItemEnergized.java b/src/main/java/mekanism/common/item/ItemEnergized.java index 0a0fdf657..5ea199638 100644 --- a/src/main/java/mekanism/common/item/ItemEnergized.java +++ b/src/main/java/mekanism/common/item/ItemEnergized.java @@ -1,5 +1,8 @@ package mekanism.common.item; +import ic2.api.item.IElectricItemManager; +import ic2.api.item.ISpecialElectricItem; + import java.util.List; import mekanism.api.EnumColor; @@ -14,12 +17,10 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import cofh.api.energy.IEnergyContainerItem; import cpw.mods.fml.common.Optional.Interface; import cpw.mods.fml.common.Optional.InterfaceList; import cpw.mods.fml.common.Optional.Method; -import cofh.api.energy.IEnergyContainerItem; -import ic2.api.item.IElectricItemManager; -import ic2.api.item.ISpecialElectricItem; @InterfaceList({ @Interface(iface = "cofh.api.energy.IEnergyContainerItem", modid = "CoFHCore"), diff --git a/src/main/java/mekanism/common/item/ItemFlamethrower.java b/src/main/java/mekanism/common/item/ItemFlamethrower.java index b017a55ff..4b59bb13f 100644 --- a/src/main/java/mekanism/common/item/ItemFlamethrower.java +++ b/src/main/java/mekanism/common/item/ItemFlamethrower.java @@ -1,7 +1,7 @@ package mekanism.common.item; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import java.util.List; + import mekanism.api.EnumColor; import mekanism.api.MekanismConfig.general; import mekanism.api.gas.Gas; @@ -15,8 +15,8 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; - -import java.util.List; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class ItemFlamethrower extends ItemMekanism implements IGasItem { diff --git a/src/main/java/mekanism/common/item/ItemFreeRunners.java b/src/main/java/mekanism/common/item/ItemFreeRunners.java index b206c66d7..991fbb27a 100644 --- a/src/main/java/mekanism/common/item/ItemFreeRunners.java +++ b/src/main/java/mekanism/common/item/ItemFreeRunners.java @@ -1,5 +1,8 @@ package mekanism.common.item; +import ic2.api.item.IElectricItemManager; +import ic2.api.item.ISpecialElectricItem; + import java.util.List; import mekanism.api.EnumColor; @@ -24,15 +27,13 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.DamageSource; import net.minecraftforge.common.util.EnumHelper; import net.minecraftforge.event.entity.living.LivingAttackEvent; +import cofh.api.energy.IEnergyContainerItem; import cpw.mods.fml.common.Optional.Interface; import cpw.mods.fml.common.Optional.InterfaceList; import cpw.mods.fml.common.Optional.Method; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import cofh.api.energy.IEnergyContainerItem; -import ic2.api.item.IElectricItemManager; -import ic2.api.item.ISpecialElectricItem; @InterfaceList({ @Interface(iface = "cofh.api.energy.IEnergyContainerItem", modid = "CoFHCore"), diff --git a/src/main/java/mekanism/common/item/ItemGasMask.java b/src/main/java/mekanism/common/item/ItemGasMask.java index e647f251c..208c3c42b 100644 --- a/src/main/java/mekanism/common/item/ItemGasMask.java +++ b/src/main/java/mekanism/common/item/ItemGasMask.java @@ -3,7 +3,6 @@ package mekanism.common.item; import mekanism.client.render.ModelCustomArmor; import mekanism.client.render.ModelCustomArmor.ArmorModel; import mekanism.common.Mekanism; - import net.minecraft.client.model.ModelBiped; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; diff --git a/src/main/java/mekanism/common/item/ItemGaugeDropper.java b/src/main/java/mekanism/common/item/ItemGaugeDropper.java index 0c21269eb..71b5ac265 100644 --- a/src/main/java/mekanism/common/item/ItemGaugeDropper.java +++ b/src/main/java/mekanism/common/item/ItemGaugeDropper.java @@ -6,7 +6,6 @@ import mekanism.api.gas.Gas; import mekanism.api.gas.GasStack; import mekanism.api.gas.IGasItem; import mekanism.common.Mekanism; -import mekanism.common.tile.TileEntityFluidTank; import mekanism.common.util.LangUtils; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/mekanism/common/item/ItemHDPE.java b/src/main/java/mekanism/common/item/ItemHDPE.java index 5badc57f0..068e42271 100644 --- a/src/main/java/mekanism/common/item/ItemHDPE.java +++ b/src/main/java/mekanism/common/item/ItemHDPE.java @@ -3,7 +3,6 @@ package mekanism.common.item; import java.util.List; import mekanism.common.Mekanism; - import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; diff --git a/src/main/java/mekanism/common/item/ItemMekanism.java b/src/main/java/mekanism/common/item/ItemMekanism.java index 81cd58200..b7156ebff 100644 --- a/src/main/java/mekanism/common/item/ItemMekanism.java +++ b/src/main/java/mekanism/common/item/ItemMekanism.java @@ -1,7 +1,6 @@ package mekanism.common.item; import mekanism.common.Mekanism; - import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.item.Item; diff --git a/src/main/java/mekanism/common/item/ItemPortableTeleporter.java b/src/main/java/mekanism/common/item/ItemPortableTeleporter.java index 84c1ca63a..040ef211c 100644 --- a/src/main/java/mekanism/common/item/ItemPortableTeleporter.java +++ b/src/main/java/mekanism/common/item/ItemPortableTeleporter.java @@ -1,14 +1,10 @@ package mekanism.common.item; import mekanism.api.Coord4D; -import mekanism.api.EnumColor; import mekanism.common.Mekanism; -import mekanism.common.util.MekanismUtils; - import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; public class ItemPortableTeleporter extends ItemEnergized diff --git a/src/main/java/mekanism/common/item/ItemUpgrade.java b/src/main/java/mekanism/common/item/ItemUpgrade.java index 67b6139d0..dcc34c861 100644 --- a/src/main/java/mekanism/common/item/ItemUpgrade.java +++ b/src/main/java/mekanism/common/item/ItemUpgrade.java @@ -9,11 +9,12 @@ import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import org.lwjgl.input.Keyboard; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + public class ItemUpgrade extends ItemMekanism implements IUpgradeItem { private Upgrade upgrade; diff --git a/src/main/java/mekanism/common/multiblock/IStructuralMultiblock.java b/src/main/java/mekanism/common/multiblock/IStructuralMultiblock.java index eda5c272a..279a6daf6 100644 --- a/src/main/java/mekanism/common/multiblock/IStructuralMultiblock.java +++ b/src/main/java/mekanism/common/multiblock/IStructuralMultiblock.java @@ -1,7 +1,6 @@ package mekanism.common.multiblock; import mekanism.api.Coord4D; -import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; diff --git a/src/main/java/mekanism/common/multiblock/MultiblockCache.java b/src/main/java/mekanism/common/multiblock/MultiblockCache.java index 3836889f8..09a636ba3 100644 --- a/src/main/java/mekanism/common/multiblock/MultiblockCache.java +++ b/src/main/java/mekanism/common/multiblock/MultiblockCache.java @@ -3,7 +3,6 @@ package mekanism.common.multiblock; import java.util.HashSet; import mekanism.api.Coord4D; - import net.minecraft.nbt.NBTTagCompound; public abstract class MultiblockCache> diff --git a/src/main/java/mekanism/common/multiblock/SynchronizedData.java b/src/main/java/mekanism/common/multiblock/SynchronizedData.java index 3bbe41c24..982f65575 100644 --- a/src/main/java/mekanism/common/multiblock/SynchronizedData.java +++ b/src/main/java/mekanism/common/multiblock/SynchronizedData.java @@ -4,7 +4,6 @@ import java.util.HashSet; import java.util.Set; import mekanism.api.Coord4D; - import net.minecraft.item.ItemStack; public abstract class SynchronizedData> diff --git a/src/main/java/mekanism/common/multipart/ItemGlowPanel.java b/src/main/java/mekanism/common/multipart/ItemGlowPanel.java index c630d584a..ac9f70a32 100644 --- a/src/main/java/mekanism/common/multipart/ItemGlowPanel.java +++ b/src/main/java/mekanism/common/multipart/ItemGlowPanel.java @@ -1,13 +1,7 @@ package mekanism.common.multipart; -import codechicken.lib.vec.BlockCoord; -import codechicken.lib.vec.Vector3; -import codechicken.microblock.HollowMicroblock; -import codechicken.multipart.JItemMultiPart; -import codechicken.multipart.TMultiPart; -import codechicken.multipart.TileMultipart; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import java.util.List; + import mekanism.api.EnumColor; import mekanism.common.Mekanism; import mekanism.common.util.LangUtils; @@ -19,8 +13,14 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.StatCollector; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; - -import java.util.List; +import codechicken.lib.vec.BlockCoord; +import codechicken.lib.vec.Vector3; +import codechicken.microblock.HollowMicroblock; +import codechicken.multipart.JItemMultiPart; +import codechicken.multipart.TMultiPart; +import codechicken.multipart.TileMultipart; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class ItemGlowPanel extends JItemMultiPart { diff --git a/src/main/java/mekanism/common/multipart/MultipartTransmitter.java b/src/main/java/mekanism/common/multipart/MultipartTransmitter.java index d6d8f289c..f05741c06 100644 --- a/src/main/java/mekanism/common/multipart/MultipartTransmitter.java +++ b/src/main/java/mekanism/common/multipart/MultipartTransmitter.java @@ -1,5 +1,7 @@ package mekanism.common.multipart; +import java.util.Collection; + import mekanism.api.Coord4D; import mekanism.api.transmitters.DynamicNetwork; import mekanism.api.transmitters.IGridTransmitter; @@ -10,8 +12,6 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; -import java.util.Collection; - public class MultipartTransmitter> extends Transmitter { public PartTransmitter containingPart; diff --git a/src/main/java/mekanism/common/multipart/PartDiversionTransporter.java b/src/main/java/mekanism/common/multipart/PartDiversionTransporter.java index 4f163883f..3082a0445 100644 --- a/src/main/java/mekanism/common/multipart/PartDiversionTransporter.java +++ b/src/main/java/mekanism/common/multipart/PartDiversionTransporter.java @@ -1,12 +1,13 @@ package mekanism.common.multipart; +import io.netty.buffer.ByteBuf; + import java.util.ArrayList; import mekanism.api.Coord4D; import mekanism.api.EnumColor; import mekanism.api.Range4D; import mekanism.common.Mekanism; -import mekanism.common.Tier.TransporterTier; import mekanism.common.content.transporter.TransporterStack; import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.util.LangUtils; @@ -15,7 +16,6 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.ChatComponentText; import net.minecraft.util.IIcon; import net.minecraftforge.common.util.ForgeDirection; -import io.netty.buffer.ByteBuf; public class PartDiversionTransporter extends PartLogisticalTransporter { diff --git a/src/main/java/mekanism/common/multipart/PartGlowPanel.java b/src/main/java/mekanism/common/multipart/PartGlowPanel.java index 34f7f3ffe..a56821324 100644 --- a/src/main/java/mekanism/common/multipart/PartGlowPanel.java +++ b/src/main/java/mekanism/common/multipart/PartGlowPanel.java @@ -6,16 +6,12 @@ import mekanism.api.Coord4D; import mekanism.api.EnumColor; import mekanism.client.render.RenderGlowPanel; import mekanism.common.MekanismItems; - import net.minecraft.client.particle.EffectRenderer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.IIcon; import net.minecraft.util.MovingObjectPosition; import net.minecraftforge.common.util.ForgeDirection; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - import codechicken.lib.data.MCDataInput; import codechicken.lib.data.MCDataOutput; import codechicken.lib.vec.Cuboid6; @@ -30,6 +26,8 @@ import codechicken.multipart.JNormalOcclusion; import codechicken.multipart.NormalOcclusionTest; import codechicken.multipart.TMultiPart; import codechicken.multipart.TileMultipart; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class PartGlowPanel extends JCuboidPart implements JNormalOcclusion, JIconHitEffects { diff --git a/src/main/java/mekanism/common/multipart/PartRestrictiveTransporter.java b/src/main/java/mekanism/common/multipart/PartRestrictiveTransporter.java index 45cc74fd3..266196094 100644 --- a/src/main/java/mekanism/common/multipart/PartRestrictiveTransporter.java +++ b/src/main/java/mekanism/common/multipart/PartRestrictiveTransporter.java @@ -1,7 +1,5 @@ package mekanism.common.multipart; -import mekanism.common.Tier.TransporterTier; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.IIcon; diff --git a/src/main/java/mekanism/common/multipart/PlasticMicroMaterial.java b/src/main/java/mekanism/common/multipart/PlasticMicroMaterial.java index 715fb696d..70bf96d20 100644 --- a/src/main/java/mekanism/common/multipart/PlasticMicroMaterial.java +++ b/src/main/java/mekanism/common/multipart/PlasticMicroMaterial.java @@ -1,7 +1,6 @@ package mekanism.common.multipart; import net.minecraft.block.Block; - import codechicken.microblock.BlockMicroMaterial; public class PlasticMicroMaterial extends BlockMicroMaterial diff --git a/src/main/java/mekanism/common/network/PacketBoxBlacklist.java b/src/main/java/mekanism/common/network/PacketBoxBlacklist.java index 738da38f6..ecfb36de6 100644 --- a/src/main/java/mekanism/common/network/PacketBoxBlacklist.java +++ b/src/main/java/mekanism/common/network/PacketBoxBlacklist.java @@ -1,17 +1,15 @@ package mekanism.common.network; +import io.netty.buffer.ByteBuf; import mekanism.api.MekanismAPI; import mekanism.api.util.BlockInfo; import mekanism.common.Mekanism; import mekanism.common.network.PacketBoxBlacklist.BoxBlacklistMessage; - import net.minecraft.block.Block; 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 io.netty.buffer.ByteBuf; - public class PacketBoxBlacklist implements IMessageHandler { @Override diff --git a/src/main/java/mekanism/common/network/PacketConfigSync.java b/src/main/java/mekanism/common/network/PacketConfigSync.java index 594c568ae..9d0d008bc 100644 --- a/src/main/java/mekanism/common/network/PacketConfigSync.java +++ b/src/main/java/mekanism/common/network/PacketConfigSync.java @@ -49,7 +49,7 @@ public class PacketConfigSync implements IMessageHandler { @Override diff --git a/src/main/java/mekanism/common/network/PacketDigitalMinerGui.java b/src/main/java/mekanism/common/network/PacketDigitalMinerGui.java index 931d3b7d4..e92801c02 100644 --- a/src/main/java/mekanism/common/network/PacketDigitalMinerGui.java +++ b/src/main/java/mekanism/common/network/PacketDigitalMinerGui.java @@ -1,5 +1,7 @@ package mekanism.common.network; +import io.netty.buffer.ByteBuf; + import java.util.ArrayList; import mekanism.api.Coord4D; @@ -19,7 +21,6 @@ import mekanism.common.network.PacketDigitalMinerGui.DigitalMinerGuiMessage; import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.tile.TileEntityContainerBlock; import mekanism.common.tile.TileEntityDigitalMiner; - import net.minecraft.client.gui.GuiScreen; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; @@ -32,8 +33,6 @@ import cpw.mods.fml.common.network.simpleimpl.MessageContext; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import io.netty.buffer.ByteBuf; - public class PacketDigitalMinerGui implements IMessageHandler { @Override diff --git a/src/main/java/mekanism/common/network/PacketElectricBowState.java b/src/main/java/mekanism/common/network/PacketElectricBowState.java index 10ab0c739..1c9b05569 100644 --- a/src/main/java/mekanism/common/network/PacketElectricBowState.java +++ b/src/main/java/mekanism/common/network/PacketElectricBowState.java @@ -1,16 +1,14 @@ package mekanism.common.network; +import io.netty.buffer.ByteBuf; import mekanism.common.PacketHandler; import mekanism.common.item.ItemElectricBow; import mekanism.common.network.PacketElectricBowState.ElectricBowStateMessage; - import net.minecraft.item.ItemStack; 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 io.netty.buffer.ByteBuf; - public class PacketElectricBowState implements IMessageHandler { @Override diff --git a/src/main/java/mekanism/common/network/PacketElectricChest.java b/src/main/java/mekanism/common/network/PacketElectricChest.java index 032110c1a..6ba1e4eca 100644 --- a/src/main/java/mekanism/common/network/PacketElectricChest.java +++ b/src/main/java/mekanism/common/network/PacketElectricChest.java @@ -1,5 +1,6 @@ package mekanism.common.network; +import io.netty.buffer.ByteBuf; import mekanism.api.Coord4D; import mekanism.api.energy.IEnergizedItem; import mekanism.common.Mekanism; @@ -10,7 +11,6 @@ import mekanism.common.inventory.InventoryElectricChest; import mekanism.common.network.PacketElectricChest.ElectricChestMessage; import mekanism.common.tile.TileEntityElectricChest; import mekanism.common.util.MekanismUtils; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; @@ -18,8 +18,6 @@ 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 io.netty.buffer.ByteBuf; - public class PacketElectricChest implements IMessageHandler { @Override diff --git a/src/main/java/mekanism/common/network/PacketFlamethrowerData.java b/src/main/java/mekanism/common/network/PacketFlamethrowerData.java index 99e677123..efdbb09f8 100644 --- a/src/main/java/mekanism/common/network/PacketFlamethrowerData.java +++ b/src/main/java/mekanism/common/network/PacketFlamethrowerData.java @@ -1,8 +1,5 @@ package mekanism.common.network; -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 io.netty.buffer.ByteBuf; import mekanism.common.Mekanism; import mekanism.common.PacketHandler; @@ -10,6 +7,9 @@ import mekanism.common.item.ItemFlamethrower; import mekanism.common.network.PacketFlamethrowerData.FlamethrowerDataMessage; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import cpw.mods.fml.common.network.simpleimpl.IMessage; +import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; +import cpw.mods.fml.common.network.simpleimpl.MessageContext; public class PacketFlamethrowerData implements IMessageHandler { diff --git a/src/main/java/mekanism/common/network/PacketJetpackData.java b/src/main/java/mekanism/common/network/PacketJetpackData.java index cdd88d370..dd22216b5 100644 --- a/src/main/java/mekanism/common/network/PacketJetpackData.java +++ b/src/main/java/mekanism/common/network/PacketJetpackData.java @@ -1,19 +1,17 @@ package mekanism.common.network; +import io.netty.buffer.ByteBuf; import mekanism.common.Mekanism; import mekanism.common.PacketHandler; import mekanism.common.item.ItemJetpack; import mekanism.common.item.ItemJetpack.JetpackMode; import mekanism.common.network.PacketJetpackData.JetpackDataMessage; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; 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 io.netty.buffer.ByteBuf; - public class PacketJetpackData implements IMessageHandler { @Override diff --git a/src/main/java/mekanism/common/network/PacketKey.java b/src/main/java/mekanism/common/network/PacketKey.java index d700a6932..05fad0273 100644 --- a/src/main/java/mekanism/common/network/PacketKey.java +++ b/src/main/java/mekanism/common/network/PacketKey.java @@ -1,15 +1,13 @@ package mekanism.common.network; +import io.netty.buffer.ByteBuf; import mekanism.common.Mekanism; import mekanism.common.PacketHandler; import mekanism.common.network.PacketKey.KeyMessage; - 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 io.netty.buffer.ByteBuf; - public class PacketKey implements IMessageHandler { @Override diff --git a/src/main/java/mekanism/common/network/PacketLogisticalSorterGui.java b/src/main/java/mekanism/common/network/PacketLogisticalSorterGui.java index a5dcb9ac4..5250048ee 100644 --- a/src/main/java/mekanism/common/network/PacketLogisticalSorterGui.java +++ b/src/main/java/mekanism/common/network/PacketLogisticalSorterGui.java @@ -1,5 +1,6 @@ package mekanism.common.network; +import io.netty.buffer.ByteBuf; import mekanism.api.Coord4D; import mekanism.client.gui.GuiLogisticalSorter; import mekanism.client.gui.GuiTFilterSelect; @@ -14,7 +15,6 @@ import mekanism.common.inventory.container.ContainerNull; import mekanism.common.network.PacketLogisticalSorterGui.LogisticalSorterGuiMessage; import mekanism.common.tile.TileEntityContainerBlock; import mekanism.common.tile.TileEntityLogisticalSorter; - import net.minecraft.client.gui.GuiScreen; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; @@ -27,8 +27,6 @@ import cpw.mods.fml.common.network.simpleimpl.MessageContext; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import io.netty.buffer.ByteBuf; - public class PacketLogisticalSorterGui implements IMessageHandler { @Override diff --git a/src/main/java/mekanism/common/network/PacketPortableTankState.java b/src/main/java/mekanism/common/network/PacketPortableTankState.java index 28069cde4..c04a30158 100644 --- a/src/main/java/mekanism/common/network/PacketPortableTankState.java +++ b/src/main/java/mekanism/common/network/PacketPortableTankState.java @@ -1,16 +1,14 @@ package mekanism.common.network; +import io.netty.buffer.ByteBuf; import mekanism.common.PacketHandler; import mekanism.common.item.ItemBlockMachine; import mekanism.common.network.PacketPortableTankState.PortableTankStateMessage; - import net.minecraft.item.ItemStack; 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 io.netty.buffer.ByteBuf; - public class PacketPortableTankState implements IMessageHandler { @Override diff --git a/src/main/java/mekanism/common/network/PacketPortableTeleporter.java b/src/main/java/mekanism/common/network/PacketPortableTeleporter.java index 25ba6a6f0..2ff72ecad 100644 --- a/src/main/java/mekanism/common/network/PacketPortableTeleporter.java +++ b/src/main/java/mekanism/common/network/PacketPortableTeleporter.java @@ -1,10 +1,10 @@ package mekanism.common.network; -import cpw.mods.fml.common.FMLCommonHandler; -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 io.netty.buffer.ByteBuf; + +import java.util.ArrayList; +import java.util.List; + import mekanism.api.Coord4D; import mekanism.api.Range4D; import mekanism.common.Mekanism; @@ -22,9 +22,10 @@ import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; import net.minecraft.network.NetHandlerPlayServer; import net.minecraft.world.World; - -import java.util.ArrayList; -import java.util.List; +import cpw.mods.fml.common.FMLCommonHandler; +import cpw.mods.fml.common.network.simpleimpl.IMessage; +import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; +import cpw.mods.fml.common.network.simpleimpl.MessageContext; public class PacketPortableTeleporter implements IMessageHandler { diff --git a/src/main/java/mekanism/common/network/PacketPortalFX.java b/src/main/java/mekanism/common/network/PacketPortalFX.java index da959db99..0ed7b2fe4 100644 --- a/src/main/java/mekanism/common/network/PacketPortalFX.java +++ b/src/main/java/mekanism/common/network/PacketPortalFX.java @@ -1,18 +1,17 @@ package mekanism.common.network; +import io.netty.buffer.ByteBuf; + import java.util.Random; import mekanism.api.Coord4D; import mekanism.common.PacketHandler; import mekanism.common.network.PacketPortalFX.PortalFXMessage; - import net.minecraft.entity.player.EntityPlayer; 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 io.netty.buffer.ByteBuf; - public class PacketPortalFX implements IMessageHandler { @Override diff --git a/src/main/java/mekanism/common/network/PacketRedstoneControl.java b/src/main/java/mekanism/common/network/PacketRedstoneControl.java index 7c54789b0..358bafb58 100644 --- a/src/main/java/mekanism/common/network/PacketRedstoneControl.java +++ b/src/main/java/mekanism/common/network/PacketRedstoneControl.java @@ -1,19 +1,17 @@ package mekanism.common.network; +import io.netty.buffer.ByteBuf; import mekanism.api.Coord4D; import mekanism.common.PacketHandler; import mekanism.common.base.IRedstoneControl; import mekanism.common.base.IRedstoneControl.RedstoneControl; import mekanism.common.network.PacketRedstoneControl.RedstoneControlMessage; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; 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 io.netty.buffer.ByteBuf; - public class PacketRedstoneControl implements IMessageHandler { @Override diff --git a/src/main/java/mekanism/common/network/PacketRemoveUpgrade.java b/src/main/java/mekanism/common/network/PacketRemoveUpgrade.java index 2561a404b..ce9181960 100644 --- a/src/main/java/mekanism/common/network/PacketRemoveUpgrade.java +++ b/src/main/java/mekanism/common/network/PacketRemoveUpgrade.java @@ -1,20 +1,18 @@ package mekanism.common.network; +import io.netty.buffer.ByteBuf; import mekanism.api.Coord4D; import mekanism.common.PacketHandler; import mekanism.common.Upgrade; import mekanism.common.base.IUpgradeTile; import mekanism.common.network.PacketRemoveUpgrade.RemoveUpgradeMessage; import mekanism.common.tile.TileEntityBasicBlock; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; 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 io.netty.buffer.ByteBuf; - public class PacketRemoveUpgrade implements IMessageHandler { @Override diff --git a/src/main/java/mekanism/common/network/PacketRobit.java b/src/main/java/mekanism/common/network/PacketRobit.java index 77a6d09d3..bf5069455 100644 --- a/src/main/java/mekanism/common/network/PacketRobit.java +++ b/src/main/java/mekanism/common/network/PacketRobit.java @@ -1,17 +1,15 @@ package mekanism.common.network; +import io.netty.buffer.ByteBuf; import mekanism.common.Mekanism; import mekanism.common.PacketHandler; import mekanism.common.entity.EntityRobit; import mekanism.common.network.PacketRobit.RobitMessage; - import net.minecraft.entity.player.EntityPlayer; 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 io.netty.buffer.ByteBuf; - public class PacketRobit implements IMessageHandler { @Override diff --git a/src/main/java/mekanism/common/network/PacketScubaTankData.java b/src/main/java/mekanism/common/network/PacketScubaTankData.java index ba59226ca..cf888990b 100644 --- a/src/main/java/mekanism/common/network/PacketScubaTankData.java +++ b/src/main/java/mekanism/common/network/PacketScubaTankData.java @@ -1,18 +1,16 @@ package mekanism.common.network; +import io.netty.buffer.ByteBuf; import mekanism.common.Mekanism; import mekanism.common.PacketHandler; import mekanism.common.item.ItemScubaTank; import mekanism.common.network.PacketScubaTankData.ScubaTankDataMessage; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; 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 io.netty.buffer.ByteBuf; - public class PacketScubaTankData implements IMessageHandler { @Override diff --git a/src/main/java/mekanism/common/network/PacketTransmitterUpdate.java b/src/main/java/mekanism/common/network/PacketTransmitterUpdate.java index e0a255640..d2a1a80ff 100644 --- a/src/main/java/mekanism/common/network/PacketTransmitterUpdate.java +++ b/src/main/java/mekanism/common/network/PacketTransmitterUpdate.java @@ -1,10 +1,11 @@ package mekanism.common.network; +import io.netty.buffer.ByteBuf; + import java.util.Collection; import java.util.HashSet; import mekanism.api.Coord4D; -import mekanism.common.base.EnergyAcceptorWrapper; import mekanism.api.gas.Gas; import mekanism.api.gas.GasNetwork; import mekanism.api.gas.GasRegistry; @@ -17,8 +18,8 @@ import mekanism.api.transmitters.TransmissionType; import mekanism.common.EnergyNetwork; import mekanism.common.FluidNetwork; import mekanism.common.PacketHandler; +import mekanism.common.base.EnergyAcceptorWrapper; import mekanism.common.network.PacketTransmitterUpdate.TransmitterUpdateMessage; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.fluids.Fluid; @@ -29,8 +30,6 @@ 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 io.netty.buffer.ByteBuf; - public class PacketTransmitterUpdate implements IMessageHandler { @Override diff --git a/src/main/java/mekanism/common/network/PacketWalkieTalkieState.java b/src/main/java/mekanism/common/network/PacketWalkieTalkieState.java index 130de17a1..561ce8b72 100644 --- a/src/main/java/mekanism/common/network/PacketWalkieTalkieState.java +++ b/src/main/java/mekanism/common/network/PacketWalkieTalkieState.java @@ -1,16 +1,14 @@ package mekanism.common.network; +import io.netty.buffer.ByteBuf; import mekanism.common.PacketHandler; import mekanism.common.item.ItemWalkieTalkie; import mekanism.common.network.PacketWalkieTalkieState.WalkieTalkieStateMessage; - import net.minecraft.item.ItemStack; 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 io.netty.buffer.ByteBuf; - public class PacketWalkieTalkieState implements IMessageHandler { @Override diff --git a/src/main/java/mekanism/common/recipe/BinRecipe.java b/src/main/java/mekanism/common/recipe/BinRecipe.java index 3c3a0b7cc..d4268595c 100644 --- a/src/main/java/mekanism/common/recipe/BinRecipe.java +++ b/src/main/java/mekanism/common/recipe/BinRecipe.java @@ -4,7 +4,6 @@ import mekanism.common.MekanismItems; import mekanism.common.inventory.InventoryBin; import mekanism.common.item.ItemBlockBasic; import mekanism.common.item.ItemProxy; - import net.minecraft.inventory.IInventory; import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemStack; diff --git a/src/main/java/mekanism/common/recipe/inputs/ChemicalPairInput.java b/src/main/java/mekanism/common/recipe/inputs/ChemicalPairInput.java index fa802e627..7be009fdf 100644 --- a/src/main/java/mekanism/common/recipe/inputs/ChemicalPairInput.java +++ b/src/main/java/mekanism/common/recipe/inputs/ChemicalPairInput.java @@ -1,8 +1,8 @@ package mekanism.common.recipe.inputs; -import net.minecraft.nbt.NBTTagCompound; import mekanism.api.gas.GasStack; import mekanism.api.gas.GasTank; +import net.minecraft.nbt.NBTTagCompound; /** * An input of gasses for recipe use. diff --git a/src/main/java/mekanism/common/recipe/machines/AdvancedMachineRecipe.java b/src/main/java/mekanism/common/recipe/machines/AdvancedMachineRecipe.java index f983270b3..06ca6782e 100644 --- a/src/main/java/mekanism/common/recipe/machines/AdvancedMachineRecipe.java +++ b/src/main/java/mekanism/common/recipe/machines/AdvancedMachineRecipe.java @@ -5,7 +5,6 @@ import mekanism.api.gas.GasRegistry; import mekanism.api.gas.GasTank; import mekanism.common.recipe.inputs.AdvancedMachineInput; import mekanism.common.recipe.outputs.ItemStackOutput; - import net.minecraft.item.ItemStack; public abstract class AdvancedMachineRecipe> extends MachineRecipe diff --git a/src/main/java/mekanism/common/recipe/machines/BasicMachineRecipe.java b/src/main/java/mekanism/common/recipe/machines/BasicMachineRecipe.java index 3c3d8ed25..e2f628edb 100644 --- a/src/main/java/mekanism/common/recipe/machines/BasicMachineRecipe.java +++ b/src/main/java/mekanism/common/recipe/machines/BasicMachineRecipe.java @@ -2,7 +2,6 @@ package mekanism.common.recipe.machines; import mekanism.common.recipe.inputs.ItemStackInput; import mekanism.common.recipe.outputs.ItemStackOutput; - import net.minecraft.item.ItemStack; public abstract class BasicMachineRecipe> extends MachineRecipe diff --git a/src/main/java/mekanism/common/recipe/machines/ChanceMachineRecipe.java b/src/main/java/mekanism/common/recipe/machines/ChanceMachineRecipe.java index bb374fdf2..159a2d1ab 100644 --- a/src/main/java/mekanism/common/recipe/machines/ChanceMachineRecipe.java +++ b/src/main/java/mekanism/common/recipe/machines/ChanceMachineRecipe.java @@ -2,7 +2,6 @@ package mekanism.common.recipe.machines; import mekanism.common.recipe.inputs.ItemStackInput; import mekanism.common.recipe.outputs.ChanceOutput; - import net.minecraft.item.ItemStack; public abstract class ChanceMachineRecipe> extends MachineRecipe diff --git a/src/main/java/mekanism/common/recipe/machines/CombinerRecipe.java b/src/main/java/mekanism/common/recipe/machines/CombinerRecipe.java index 783fff799..2f889fa0c 100644 --- a/src/main/java/mekanism/common/recipe/machines/CombinerRecipe.java +++ b/src/main/java/mekanism/common/recipe/machines/CombinerRecipe.java @@ -2,7 +2,6 @@ package mekanism.common.recipe.machines; import mekanism.common.recipe.inputs.AdvancedMachineInput; import mekanism.common.recipe.outputs.ItemStackOutput; - import net.minecraft.item.ItemStack; public class CombinerRecipe extends AdvancedMachineRecipe diff --git a/src/main/java/mekanism/common/recipe/machines/CrusherRecipe.java b/src/main/java/mekanism/common/recipe/machines/CrusherRecipe.java index 284217df1..c40937eb3 100644 --- a/src/main/java/mekanism/common/recipe/machines/CrusherRecipe.java +++ b/src/main/java/mekanism/common/recipe/machines/CrusherRecipe.java @@ -2,7 +2,6 @@ package mekanism.common.recipe.machines; import mekanism.common.recipe.inputs.ItemStackInput; import mekanism.common.recipe.outputs.ItemStackOutput; - import net.minecraft.item.ItemStack; public class CrusherRecipe extends BasicMachineRecipe diff --git a/src/main/java/mekanism/common/recipe/machines/CrystallizerRecipe.java b/src/main/java/mekanism/common/recipe/machines/CrystallizerRecipe.java index 6c0d1f91c..5122ca0c3 100644 --- a/src/main/java/mekanism/common/recipe/machines/CrystallizerRecipe.java +++ b/src/main/java/mekanism/common/recipe/machines/CrystallizerRecipe.java @@ -4,7 +4,6 @@ import mekanism.api.gas.GasStack; import mekanism.api.gas.GasTank; import mekanism.common.recipe.inputs.GasInput; import mekanism.common.recipe.outputs.ItemStackOutput; - import net.minecraft.item.ItemStack; public class CrystallizerRecipe extends MachineRecipe diff --git a/src/main/java/mekanism/common/recipe/machines/DissolutionRecipe.java b/src/main/java/mekanism/common/recipe/machines/DissolutionRecipe.java index eb073ce3d..9d36ac30d 100644 --- a/src/main/java/mekanism/common/recipe/machines/DissolutionRecipe.java +++ b/src/main/java/mekanism/common/recipe/machines/DissolutionRecipe.java @@ -4,7 +4,6 @@ import mekanism.api.gas.GasStack; import mekanism.api.gas.GasTank; import mekanism.common.recipe.inputs.ItemStackInput; import mekanism.common.recipe.outputs.GasOutput; - import net.minecraft.item.ItemStack; public class DissolutionRecipe extends MachineRecipe diff --git a/src/main/java/mekanism/common/recipe/machines/EnrichmentRecipe.java b/src/main/java/mekanism/common/recipe/machines/EnrichmentRecipe.java index bca882977..a54df895d 100644 --- a/src/main/java/mekanism/common/recipe/machines/EnrichmentRecipe.java +++ b/src/main/java/mekanism/common/recipe/machines/EnrichmentRecipe.java @@ -2,7 +2,6 @@ package mekanism.common.recipe.machines; import mekanism.common.recipe.inputs.ItemStackInput; import mekanism.common.recipe.outputs.ItemStackOutput; - import net.minecraft.item.ItemStack; public class EnrichmentRecipe extends BasicMachineRecipe diff --git a/src/main/java/mekanism/common/recipe/machines/InjectionRecipe.java b/src/main/java/mekanism/common/recipe/machines/InjectionRecipe.java index 37e86e76c..80c5c22b6 100644 --- a/src/main/java/mekanism/common/recipe/machines/InjectionRecipe.java +++ b/src/main/java/mekanism/common/recipe/machines/InjectionRecipe.java @@ -2,7 +2,6 @@ package mekanism.common.recipe.machines; import mekanism.common.recipe.inputs.AdvancedMachineInput; import mekanism.common.recipe.outputs.ItemStackOutput; - import net.minecraft.item.ItemStack; public class InjectionRecipe extends AdvancedMachineRecipe diff --git a/src/main/java/mekanism/common/recipe/machines/OsmiumCompressorRecipe.java b/src/main/java/mekanism/common/recipe/machines/OsmiumCompressorRecipe.java index f1d24ff6d..1c8a4b6d7 100644 --- a/src/main/java/mekanism/common/recipe/machines/OsmiumCompressorRecipe.java +++ b/src/main/java/mekanism/common/recipe/machines/OsmiumCompressorRecipe.java @@ -2,7 +2,6 @@ package mekanism.common.recipe.machines; import mekanism.common.recipe.inputs.AdvancedMachineInput; import mekanism.common.recipe.outputs.ItemStackOutput; - import net.minecraft.item.ItemStack; public class OsmiumCompressorRecipe extends AdvancedMachineRecipe diff --git a/src/main/java/mekanism/common/recipe/machines/OxidationRecipe.java b/src/main/java/mekanism/common/recipe/machines/OxidationRecipe.java index 6fd5a59ae..636592260 100644 --- a/src/main/java/mekanism/common/recipe/machines/OxidationRecipe.java +++ b/src/main/java/mekanism/common/recipe/machines/OxidationRecipe.java @@ -4,7 +4,6 @@ import mekanism.api.gas.GasStack; import mekanism.api.gas.GasTank; import mekanism.common.recipe.inputs.ItemStackInput; import mekanism.common.recipe.outputs.GasOutput; - import net.minecraft.item.ItemStack; public class OxidationRecipe extends MachineRecipe diff --git a/src/main/java/mekanism/common/recipe/machines/PressurizedRecipe.java b/src/main/java/mekanism/common/recipe/machines/PressurizedRecipe.java index 2d44b0336..0ff2e97cc 100644 --- a/src/main/java/mekanism/common/recipe/machines/PressurizedRecipe.java +++ b/src/main/java/mekanism/common/recipe/machines/PressurizedRecipe.java @@ -4,7 +4,6 @@ import mekanism.api.gas.GasStack; import mekanism.api.gas.GasTank; import mekanism.common.recipe.inputs.PressurizedInput; import mekanism.common.recipe.outputs.PressurizedOutput; - import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTank; diff --git a/src/main/java/mekanism/common/recipe/machines/PurificationRecipe.java b/src/main/java/mekanism/common/recipe/machines/PurificationRecipe.java index a07a5a9eb..d7859e08d 100644 --- a/src/main/java/mekanism/common/recipe/machines/PurificationRecipe.java +++ b/src/main/java/mekanism/common/recipe/machines/PurificationRecipe.java @@ -2,7 +2,6 @@ package mekanism.common.recipe.machines; import mekanism.common.recipe.inputs.AdvancedMachineInput; import mekanism.common.recipe.outputs.ItemStackOutput; - import net.minecraft.item.ItemStack; public class PurificationRecipe extends AdvancedMachineRecipe diff --git a/src/main/java/mekanism/common/recipe/machines/SawmillRecipe.java b/src/main/java/mekanism/common/recipe/machines/SawmillRecipe.java index 581a999c4..ca7817bff 100644 --- a/src/main/java/mekanism/common/recipe/machines/SawmillRecipe.java +++ b/src/main/java/mekanism/common/recipe/machines/SawmillRecipe.java @@ -2,7 +2,6 @@ package mekanism.common.recipe.machines; import mekanism.common.recipe.inputs.ItemStackInput; import mekanism.common.recipe.outputs.ChanceOutput; - import net.minecraft.item.ItemStack; public class SawmillRecipe extends ChanceMachineRecipe diff --git a/src/main/java/mekanism/common/recipe/machines/SeparatorRecipe.java b/src/main/java/mekanism/common/recipe/machines/SeparatorRecipe.java index aaf737f5b..1719d31c1 100644 --- a/src/main/java/mekanism/common/recipe/machines/SeparatorRecipe.java +++ b/src/main/java/mekanism/common/recipe/machines/SeparatorRecipe.java @@ -4,7 +4,6 @@ import mekanism.api.gas.GasStack; import mekanism.api.gas.GasTank; import mekanism.common.recipe.inputs.FluidInput; import mekanism.common.recipe.outputs.ChemicalPairOutput; - import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTank; diff --git a/src/main/java/mekanism/common/recipe/machines/SmeltingRecipe.java b/src/main/java/mekanism/common/recipe/machines/SmeltingRecipe.java index c762e9ce8..77e650956 100644 --- a/src/main/java/mekanism/common/recipe/machines/SmeltingRecipe.java +++ b/src/main/java/mekanism/common/recipe/machines/SmeltingRecipe.java @@ -2,7 +2,6 @@ package mekanism.common.recipe.machines; import mekanism.common.recipe.inputs.ItemStackInput; import mekanism.common.recipe.outputs.ItemStackOutput; - import net.minecraft.item.ItemStack; public class SmeltingRecipe extends BasicMachineRecipe diff --git a/src/main/java/mekanism/common/recipe/machines/WasherRecipe.java b/src/main/java/mekanism/common/recipe/machines/WasherRecipe.java index ad58eb662..e7a28a4f6 100644 --- a/src/main/java/mekanism/common/recipe/machines/WasherRecipe.java +++ b/src/main/java/mekanism/common/recipe/machines/WasherRecipe.java @@ -6,7 +6,6 @@ import mekanism.common.recipe.inputs.FluidInput; import mekanism.common.recipe.inputs.GasInput; import mekanism.common.recipe.outputs.GasOutput; import mekanism.common.tile.TileEntityChemicalWasher; - import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTank; diff --git a/src/main/java/mekanism/common/recipe/outputs/ChemicalPairOutput.java b/src/main/java/mekanism/common/recipe/outputs/ChemicalPairOutput.java index 627921ffd..a5e621e86 100644 --- a/src/main/java/mekanism/common/recipe/outputs/ChemicalPairOutput.java +++ b/src/main/java/mekanism/common/recipe/outputs/ChemicalPairOutput.java @@ -1,8 +1,8 @@ package mekanism.common.recipe.outputs; -import net.minecraft.nbt.NBTTagCompound; import mekanism.api.gas.GasStack; import mekanism.api.gas.GasTank; +import net.minecraft.nbt.NBTTagCompound; /** * An input of gasses for recipe use. diff --git a/src/main/java/mekanism/common/recipe/outputs/GasOutput.java b/src/main/java/mekanism/common/recipe/outputs/GasOutput.java index d304bd1f0..7d35459e3 100644 --- a/src/main/java/mekanism/common/recipe/outputs/GasOutput.java +++ b/src/main/java/mekanism/common/recipe/outputs/GasOutput.java @@ -1,8 +1,8 @@ package mekanism.common.recipe.outputs; -import net.minecraft.nbt.NBTTagCompound; import mekanism.api.gas.GasStack; import mekanism.api.gas.GasTank; +import net.minecraft.nbt.NBTTagCompound; public class GasOutput extends MachineOutput { diff --git a/src/main/java/mekanism/common/tile/TileEntityAdvancedBoundingBlock.java b/src/main/java/mekanism/common/tile/TileEntityAdvancedBoundingBlock.java index ccf6c13d0..a84099986 100644 --- a/src/main/java/mekanism/common/tile/TileEntityAdvancedBoundingBlock.java +++ b/src/main/java/mekanism/common/tile/TileEntityAdvancedBoundingBlock.java @@ -1,9 +1,5 @@ package mekanism.common.tile; -import cofh.api.energy.IEnergyHandler; -import cpw.mods.fml.common.Optional.Interface; -import cpw.mods.fml.common.Optional.InterfaceList; -import cpw.mods.fml.common.Optional.Method; import ic2.api.energy.tile.IEnergySink; import mekanism.api.Coord4D; import mekanism.api.IFilterAccess; @@ -17,6 +13,10 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.ForgeDirection; +import cofh.api.energy.IEnergyHandler; +import cpw.mods.fml.common.Optional.Interface; +import cpw.mods.fml.common.Optional.InterfaceList; +import cpw.mods.fml.common.Optional.Method; @InterfaceList({ @Interface(iface = "ic2.api.energy.tile.IEnergySink", modid = "IC2"), diff --git a/src/main/java/mekanism/common/tile/TileEntityAmbientAccumulator.java b/src/main/java/mekanism/common/tile/TileEntityAmbientAccumulator.java index fb7868ca8..e72e7e48c 100644 --- a/src/main/java/mekanism/common/tile/TileEntityAmbientAccumulator.java +++ b/src/main/java/mekanism/common/tile/TileEntityAmbientAccumulator.java @@ -1,5 +1,7 @@ package mekanism.common.tile; +import io.netty.buffer.ByteBuf; + import java.util.ArrayList; import java.util.Random; @@ -11,12 +13,9 @@ import mekanism.api.gas.ITubeConnection; import mekanism.common.recipe.RecipeHandler; import mekanism.common.recipe.inputs.IntegerInput; import mekanism.common.recipe.machines.AmbientGasRecipe; - import net.minecraft.item.ItemStack; import net.minecraftforge.common.util.ForgeDirection; -import io.netty.buffer.ByteBuf; - public class TileEntityAmbientAccumulator extends TileEntityContainerBlock implements IGasHandler, ITubeConnection { public GasTank collectedGas = new GasTank(1000); diff --git a/src/main/java/mekanism/common/tile/TileEntityBasicMachine.java b/src/main/java/mekanism/common/tile/TileEntityBasicMachine.java index 026074492..4892eb7c5 100644 --- a/src/main/java/mekanism/common/tile/TileEntityBasicMachine.java +++ b/src/main/java/mekanism/common/tile/TileEntityBasicMachine.java @@ -1,13 +1,21 @@ package mekanism.common.tile; import io.netty.buffer.ByteBuf; + +import java.util.ArrayList; +import java.util.EnumSet; + import mekanism.api.Coord4D; import mekanism.api.MekanismConfig.general; import mekanism.api.Range4D; import mekanism.api.transmitters.TransmissionType; import mekanism.common.Mekanism; import mekanism.common.Upgrade; -import mekanism.common.base.*; +import mekanism.common.base.IEjector; +import mekanism.common.base.IElectricMachine; +import mekanism.common.base.IRedstoneControl; +import mekanism.common.base.ISideConfiguration; +import mekanism.common.base.IUpgradeTile; import mekanism.common.integration.IComputerIntegration; import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.recipe.inputs.MachineInput; @@ -21,9 +29,6 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.ResourceLocation; import net.minecraftforge.common.util.ForgeDirection; -import java.util.ArrayList; -import java.util.EnumSet; - public abstract class TileEntityBasicMachine, OUTPUT extends MachineOutput, RECIPE extends MachineRecipe> extends TileEntityNoisyElectricBlock implements IElectricMachine, IComputerIntegration, ISideConfiguration, IUpgradeTile, IRedstoneControl { /** How much energy this machine uses per tick, un-upgraded. */ diff --git a/src/main/java/mekanism/common/tile/TileEntityBin.java b/src/main/java/mekanism/common/tile/TileEntityBin.java index 8d8889e9a..938731d09 100644 --- a/src/main/java/mekanism/common/tile/TileEntityBin.java +++ b/src/main/java/mekanism/common/tile/TileEntityBin.java @@ -1,5 +1,7 @@ package mekanism.common.tile; +import io.netty.buffer.ByteBuf; + import java.util.ArrayList; import mekanism.api.Coord4D; @@ -25,9 +27,8 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.ForgeDirection; -import cpw.mods.fml.common.Optional.Interface; -import io.netty.buffer.ByteBuf; import powercrystals.minefactoryreloaded.api.IDeepStorageUnit; +import cpw.mods.fml.common.Optional.Interface; @Interface(iface = "powercrystals.minefactoryreloaded.api.IDeepStorageUnit", modid = "MineFactoryReloaded") public class TileEntityBin extends TileEntityBasicBlock implements ISidedInventory, IActiveState, IDeepStorageUnit, IConfigurable diff --git a/src/main/java/mekanism/common/tile/TileEntityBoilerCasing.java b/src/main/java/mekanism/common/tile/TileEntityBoilerCasing.java index dad927fd7..80be3eeea 100644 --- a/src/main/java/mekanism/common/tile/TileEntityBoilerCasing.java +++ b/src/main/java/mekanism/common/tile/TileEntityBoilerCasing.java @@ -8,6 +8,7 @@ import java.util.Set; import mekanism.api.Coord4D; import mekanism.api.IHeatTransfer; +import mekanism.api.MekanismConfig.general; import mekanism.common.Mekanism; import mekanism.common.base.IFluidContainerManager; import mekanism.common.content.boiler.BoilerCache; @@ -35,10 +36,6 @@ public class TileEntityBoilerCasing extends TileEntityMultiblock= 100 && structure.waterStored != null) + { + double heatAvailable = (structure.temperature-100)*structure.locations.size(); + heatAvailable = Math.min(heatAvailable, structure.superheatingElements*general.superheatingHeatTransfer); + int amountToBoil = Math.min((int)Math.floor(heatAvailable / structure.enthalpyOfVaporization), structure.waterStored.amount); + structure.waterStored.amount -= amountToBoil; + + if(structure.steamStored == null) + { + structure.steamStored = new FluidStack(FluidRegistry.getFluid("steam"), amountToBoil); + } + else { + structure.steamStored.amount += amountToBoil; + } + } + structure.prevWater = structure.waterStored; structure.prevSteam = structure.steamStored; } @@ -307,19 +323,19 @@ public class TileEntityBoilerCasing extends TileEntityMultiblock> extends TileEntityBasicMachine { public TileEntityChanceMachine(String soundPath, String name, ResourceLocation location, double perTick, int ticksRequired, double maxEnergy) diff --git a/src/main/java/mekanism/common/tile/TileEntityChemicalInjectionChamber.java b/src/main/java/mekanism/common/tile/TileEntityChemicalInjectionChamber.java index 60920346f..2013c7a01 100644 --- a/src/main/java/mekanism/common/tile/TileEntityChemicalInjectionChamber.java +++ b/src/main/java/mekanism/common/tile/TileEntityChemicalInjectionChamber.java @@ -8,9 +8,7 @@ import mekanism.api.gas.Gas; import mekanism.api.gas.GasRegistry; import mekanism.api.gas.GasStack; import mekanism.api.gas.GasTransmission; -import mekanism.api.gas.IGasHandler; import mekanism.api.gas.IGasItem; -import mekanism.api.gas.ITubeConnection; import mekanism.api.transmitters.TransmissionType; import mekanism.common.MekanismBlocks; import mekanism.common.SideData; diff --git a/src/main/java/mekanism/common/tile/TileEntityChemicalOxidizer.java b/src/main/java/mekanism/common/tile/TileEntityChemicalOxidizer.java index ff3ddd77e..57cc3098d 100644 --- a/src/main/java/mekanism/common/tile/TileEntityChemicalOxidizer.java +++ b/src/main/java/mekanism/common/tile/TileEntityChemicalOxidizer.java @@ -16,9 +16,9 @@ import mekanism.api.gas.IGasItem; import mekanism.api.gas.ITubeConnection; import mekanism.common.Mekanism; import mekanism.common.Upgrade; -import mekanism.common.base.ITankManager; import mekanism.common.base.IRedstoneControl; import mekanism.common.base.ISustainedData; +import mekanism.common.base.ITankManager; import mekanism.common.base.IUpgradeTile; import mekanism.common.block.BlockMachine.MachineType; import mekanism.common.network.PacketTileEntity.TileEntityMessage; diff --git a/src/main/java/mekanism/common/tile/TileEntityCombiner.java b/src/main/java/mekanism/common/tile/TileEntityCombiner.java index f38e3b6bd..0f462d632 100644 --- a/src/main/java/mekanism/common/tile/TileEntityCombiner.java +++ b/src/main/java/mekanism/common/tile/TileEntityCombiner.java @@ -9,7 +9,6 @@ import mekanism.api.gas.GasStack; import mekanism.common.block.BlockMachine.MachineType; import mekanism.common.recipe.RecipeHandler.Recipe; import mekanism.common.recipe.machines.CombinerRecipe; - import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.item.ItemBlock; diff --git a/src/main/java/mekanism/common/tile/TileEntityCrusher.java b/src/main/java/mekanism/common/tile/TileEntityCrusher.java index dfac8af21..d23629ba6 100644 --- a/src/main/java/mekanism/common/tile/TileEntityCrusher.java +++ b/src/main/java/mekanism/common/tile/TileEntityCrusher.java @@ -6,7 +6,6 @@ import mekanism.api.MekanismConfig.usage; import mekanism.common.block.BlockMachine.MachineType; import mekanism.common.recipe.RecipeHandler.Recipe; import mekanism.common.recipe.machines.CrusherRecipe; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java b/src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java index 08e24843b..e85135f4c 100644 --- a/src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java +++ b/src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java @@ -1,8 +1,16 @@ package mekanism.common.tile; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import io.netty.buffer.ByteBuf; + +import java.util.ArrayList; +import java.util.BitSet; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Set; + import mekanism.api.Chunk3D; import mekanism.api.Coord4D; import mekanism.api.MekanismConfig.usage; @@ -10,7 +18,12 @@ import mekanism.api.Range4D; import mekanism.common.HashList; import mekanism.common.Mekanism; import mekanism.common.Upgrade; -import mekanism.common.base.*; +import mekanism.common.base.IActiveState; +import mekanism.common.base.IAdvancedBoundingBlock; +import mekanism.common.base.IRedstoneControl; +import mekanism.common.base.ISustainedData; +import mekanism.common.base.ITransporterTile; +import mekanism.common.base.IUpgradeTile; import mekanism.common.block.BlockMachine.MachineType; import mekanism.common.content.miner.MItemStackFilter; import mekanism.common.content.miner.MOreDictFilter; @@ -23,7 +36,11 @@ import mekanism.common.inventory.container.ContainerFilter; import mekanism.common.inventory.container.ContainerNull; import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.tile.component.TileComponentUpgrade; -import mekanism.common.util.*; +import mekanism.common.util.ChargeUtils; +import mekanism.common.util.InventoryUtils; +import mekanism.common.util.MekanismUtils; +import mekanism.common.util.MinerUtils; +import mekanism.common.util.TransporterUtils; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; @@ -39,8 +56,8 @@ import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.util.Constants.NBT; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.event.world.BlockEvent; - -import java.util.*; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class TileEntityDigitalMiner extends TileEntityElectricBlock implements IUpgradeTile, IRedstoneControl, IActiveState, ISustainedData, IAdvancedBoundingBlock { diff --git a/src/main/java/mekanism/common/tile/TileEntityElectricBlock.java b/src/main/java/mekanism/common/tile/TileEntityElectricBlock.java index 6a6060e14..afb2677a1 100644 --- a/src/main/java/mekanism/common/tile/TileEntityElectricBlock.java +++ b/src/main/java/mekanism/common/tile/TileEntityElectricBlock.java @@ -12,7 +12,6 @@ import java.util.EnumSet; import mekanism.api.Coord4D; import mekanism.api.MekanismConfig.general; -import mekanism.api.transmitters.IGridTransmitter; import mekanism.api.transmitters.ITransmitterTile; import mekanism.common.base.IEnergyWrapper; import mekanism.common.util.MekanismUtils; diff --git a/src/main/java/mekanism/common/tile/TileEntityElectricChest.java b/src/main/java/mekanism/common/tile/TileEntityElectricChest.java index 827de3ce2..e46163f5f 100644 --- a/src/main/java/mekanism/common/tile/TileEntityElectricChest.java +++ b/src/main/java/mekanism/common/tile/TileEntityElectricChest.java @@ -1,17 +1,16 @@ package mekanism.common.tile; +import io.netty.buffer.ByteBuf; + import java.util.ArrayList; import mekanism.common.PacketHandler; import mekanism.common.util.ChargeUtils; import mekanism.common.util.InventoryUtils; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import io.netty.buffer.ByteBuf; - public class TileEntityElectricChest extends TileEntityElectricBlock { public static int[] INV; diff --git a/src/main/java/mekanism/common/tile/TileEntityElectrolyticSeparator.java b/src/main/java/mekanism/common/tile/TileEntityElectrolyticSeparator.java index 748dd2816..fa395b2c5 100644 --- a/src/main/java/mekanism/common/tile/TileEntityElectrolyticSeparator.java +++ b/src/main/java/mekanism/common/tile/TileEntityElectrolyticSeparator.java @@ -1,14 +1,29 @@ package mekanism.common.tile; import io.netty.buffer.ByteBuf; + +import java.util.ArrayList; +import java.util.List; + import mekanism.api.Coord4D; import mekanism.api.MekanismConfig; import mekanism.api.Range4D; -import mekanism.api.gas.*; +import mekanism.api.gas.Gas; +import mekanism.api.gas.GasRegistry; +import mekanism.api.gas.GasStack; +import mekanism.api.gas.GasTank; +import mekanism.api.gas.GasTransmission; +import mekanism.api.gas.IGasHandler; +import mekanism.api.gas.IGasItem; +import mekanism.api.gas.ITubeConnection; import mekanism.common.Mekanism; import mekanism.common.Upgrade; import mekanism.common.Upgrade.IUpgradeInfoHandler; -import mekanism.common.base.*; +import mekanism.common.base.IActiveState; +import mekanism.common.base.IRedstoneControl; +import mekanism.common.base.ISustainedData; +import mekanism.common.base.ITankManager; +import mekanism.common.base.IUpgradeTile; import mekanism.common.block.BlockMachine.MachineType; import mekanism.common.integration.IComputerIntegration; import mekanism.common.network.PacketTileEntity.TileEntityMessage; @@ -27,10 +42,14 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.ForgeDirection; -import net.minecraftforge.fluids.*; - -import java.util.ArrayList; -import java.util.List; +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidContainerRegistry; +import net.minecraftforge.fluids.FluidRegistry; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.FluidTank; +import net.minecraftforge.fluids.FluidTankInfo; +import net.minecraftforge.fluids.IFluidContainerItem; +import net.minecraftforge.fluids.IFluidHandler; public class TileEntityElectrolyticSeparator extends TileEntityElectricBlock implements IFluidHandler, IComputerIntegration, ITubeConnection, ISustainedData, IGasHandler, IUpgradeTile, IUpgradeInfoHandler, ITankManager, IRedstoneControl, IActiveState { diff --git a/src/main/java/mekanism/common/tile/TileEntityEntangledBlock.java b/src/main/java/mekanism/common/tile/TileEntityEntangledBlock.java index 62aca60d2..2961b63da 100644 --- a/src/main/java/mekanism/common/tile/TileEntityEntangledBlock.java +++ b/src/main/java/mekanism/common/tile/TileEntityEntangledBlock.java @@ -1,5 +1,7 @@ package mekanism.common.tile; +import io.netty.buffer.ByteBuf; + import java.util.ArrayList; import java.util.EnumSet; @@ -11,7 +13,6 @@ import mekanism.common.PacketHandler; import mekanism.common.content.teleportation.SharedInventory; import mekanism.common.content.teleportation.SharedInventoryManager; import mekanism.common.util.CableUtils; - import net.minecraft.item.ItemStack; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.Fluid; @@ -19,8 +20,6 @@ import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.IFluidHandler; -import io.netty.buffer.ByteBuf; - public class TileEntityEntangledBlock extends TileEntityElectricBlock implements IFluidHandler, IGasHandler, ITubeConnection { public SharedInventory sharedInventory; diff --git a/src/main/java/mekanism/common/tile/TileEntityFluidicPlenisher.java b/src/main/java/mekanism/common/tile/TileEntityFluidicPlenisher.java index 7385c63a6..355239639 100644 --- a/src/main/java/mekanism/common/tile/TileEntityFluidicPlenisher.java +++ b/src/main/java/mekanism/common/tile/TileEntityFluidicPlenisher.java @@ -14,7 +14,6 @@ import mekanism.api.MekanismConfig.general; import mekanism.api.MekanismConfig.usage; import mekanism.common.Upgrade; import mekanism.common.base.IRedstoneControl; -import mekanism.common.base.IRedstoneControl.RedstoneControl; import mekanism.common.base.ISustainedTank; import mekanism.common.base.IUpgradeTile; import mekanism.common.block.BlockMachine.MachineType; diff --git a/src/main/java/mekanism/common/tile/TileEntityLaserAmplifier.java b/src/main/java/mekanism/common/tile/TileEntityLaserAmplifier.java index 6c0269516..9235c6d0f 100644 --- a/src/main/java/mekanism/common/tile/TileEntityLaserAmplifier.java +++ b/src/main/java/mekanism/common/tile/TileEntityLaserAmplifier.java @@ -1,6 +1,9 @@ package mekanism.common.tile; import io.netty.buffer.ByteBuf; + +import java.util.ArrayList; + import mekanism.api.Coord4D; import mekanism.api.MekanismConfig.general; import mekanism.api.energy.ICableOutputter; @@ -20,8 +23,6 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.MovingObjectPosition; import net.minecraftforge.common.util.ForgeDirection; -import java.util.ArrayList; - public class TileEntityLaserAmplifier extends TileEntityContainerBlock implements ILaserReceptor, IRedstoneControl, ICableOutputter, IStrictEnergyStorage, IComputerIntegration { public static final double MAX_ENERGY = 5E9; diff --git a/src/main/java/mekanism/common/tile/TileEntityLogisticalSorter.java b/src/main/java/mekanism/common/tile/TileEntityLogisticalSorter.java index 04c8fb344..a9fc13871 100644 --- a/src/main/java/mekanism/common/tile/TileEntityLogisticalSorter.java +++ b/src/main/java/mekanism/common/tile/TileEntityLogisticalSorter.java @@ -1,16 +1,28 @@ package mekanism.common.tile; import io.netty.buffer.ByteBuf; + +import java.util.ArrayList; +import java.util.EnumSet; + import mekanism.api.Coord4D; import mekanism.api.EnumColor; import mekanism.api.IFilterAccess; import mekanism.api.Range4D; import mekanism.common.HashList; import mekanism.common.Mekanism; -import mekanism.common.base.*; +import mekanism.common.base.IActiveState; +import mekanism.common.base.ILogisticalTransporter; +import mekanism.common.base.IRedstoneControl; +import mekanism.common.base.ISustainedData; +import mekanism.common.base.ITransporterTile; import mekanism.common.block.BlockMachine.MachineType; import mekanism.common.content.transporter.Finder.FirstFinder; -import mekanism.common.content.transporter.*; +import mekanism.common.content.transporter.InvStack; +import mekanism.common.content.transporter.StackSearcher; +import mekanism.common.content.transporter.TItemStackFilter; +import mekanism.common.content.transporter.TransporterFilter; +import mekanism.common.content.transporter.TransporterManager; import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.util.InventoryUtils; import mekanism.common.util.MekanismUtils; @@ -25,9 +37,6 @@ import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.Constants.NBT; import net.minecraftforge.common.util.ForgeDirection; -import java.util.ArrayList; -import java.util.EnumSet; - public class TileEntityLogisticalSorter extends TileEntityElectricBlock implements IRedstoneControl, IActiveState, IFilterAccess, ISustainedData { public HashList filters = new HashList(); diff --git a/src/main/java/mekanism/common/tile/TileEntityMultiblock.java b/src/main/java/mekanism/common/tile/TileEntityMultiblock.java index 8a4692347..c26a1a8c3 100644 --- a/src/main/java/mekanism/common/tile/TileEntityMultiblock.java +++ b/src/main/java/mekanism/common/tile/TileEntityMultiblock.java @@ -8,7 +8,6 @@ import mekanism.api.Coord4D; import mekanism.api.Range4D; import mekanism.common.Mekanism; import mekanism.common.multiblock.IMultiblock; -import mekanism.common.multiblock.IStructuralMultiblock; import mekanism.common.multiblock.MultiblockCache; import mekanism.common.multiblock.MultiblockManager; import mekanism.common.multiblock.SynchronizedData; diff --git a/src/main/java/mekanism/common/tile/TileEntityOredictionificator.java b/src/main/java/mekanism/common/tile/TileEntityOredictionificator.java index 88f478d09..c5b0a4026 100644 --- a/src/main/java/mekanism/common/tile/TileEntityOredictionificator.java +++ b/src/main/java/mekanism/common/tile/TileEntityOredictionificator.java @@ -9,20 +9,14 @@ import java.util.List; import mekanism.api.Coord4D; import mekanism.api.IFilterAccess; import mekanism.api.Range4D; -import mekanism.api.infuse.InfuseRegistry; import mekanism.common.HashList; import mekanism.common.Mekanism; -import mekanism.common.MekanismItems; import mekanism.common.OreDictCache; import mekanism.common.PacketHandler; import mekanism.common.base.IRedstoneControl; import mekanism.common.base.ISustainedData; import mekanism.common.block.BlockMachine.MachineType; import mekanism.common.network.PacketTileEntity.TileEntityMessage; -import mekanism.common.recipe.RecipeHandler; -import mekanism.common.recipe.RecipeHandler.Recipe; -import mekanism.common.recipe.inputs.InfusionInput; -import mekanism.common.util.ChargeUtils; import mekanism.common.util.InventoryUtils; import mekanism.common.util.MekanismUtils; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/mekanism/common/tile/TileEntityOsmiumCompressor.java b/src/main/java/mekanism/common/tile/TileEntityOsmiumCompressor.java index 1851f0b38..949da5e81 100644 --- a/src/main/java/mekanism/common/tile/TileEntityOsmiumCompressor.java +++ b/src/main/java/mekanism/common/tile/TileEntityOsmiumCompressor.java @@ -8,9 +8,7 @@ import mekanism.api.gas.GasRegistry; import mekanism.api.gas.GasStack; import mekanism.common.block.BlockMachine.MachineType; import mekanism.common.recipe.RecipeHandler.Recipe; -import mekanism.common.recipe.inputs.AdvancedMachineInput; import mekanism.common.recipe.machines.OsmiumCompressorRecipe; - import net.minecraft.item.ItemStack; import net.minecraftforge.oredict.OreDictionary; diff --git a/src/main/java/mekanism/common/tile/TileEntityPRC.java b/src/main/java/mekanism/common/tile/TileEntityPRC.java index 299085316..87bdb7158 100644 --- a/src/main/java/mekanism/common/tile/TileEntityPRC.java +++ b/src/main/java/mekanism/common/tile/TileEntityPRC.java @@ -1,9 +1,18 @@ package mekanism.common.tile; import io.netty.buffer.ByteBuf; + +import java.util.ArrayList; +import java.util.Map; + import mekanism.api.EnumColor; import mekanism.api.MekanismConfig.usage; -import mekanism.api.gas.*; +import mekanism.api.gas.Gas; +import mekanism.api.gas.GasRegistry; +import mekanism.api.gas.GasStack; +import mekanism.api.gas.GasTank; +import mekanism.api.gas.IGasHandler; +import mekanism.api.gas.ITubeConnection; import mekanism.api.transmitters.TransmissionType; import mekanism.common.SideData; import mekanism.common.Upgrade; @@ -26,10 +35,12 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.ResourceLocation; import net.minecraftforge.common.util.ForgeDirection; -import net.minecraftforge.fluids.*; - -import java.util.ArrayList; -import java.util.Map; +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidRegistry; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.FluidTank; +import net.minecraftforge.fluids.FluidTankInfo; +import net.minecraftforge.fluids.IFluidHandler; public class TileEntityPRC extends TileEntityBasicMachine implements IFluidHandler, IGasHandler, ITubeConnection, ISustainedData, ITankManager { diff --git a/src/main/java/mekanism/common/tile/TileEntityPrecisionSawmill.java b/src/main/java/mekanism/common/tile/TileEntityPrecisionSawmill.java index 2666ef907..5666d6526 100644 --- a/src/main/java/mekanism/common/tile/TileEntityPrecisionSawmill.java +++ b/src/main/java/mekanism/common/tile/TileEntityPrecisionSawmill.java @@ -9,7 +9,6 @@ import mekanism.common.recipe.inputs.ItemStackInput; import mekanism.common.recipe.machines.SawmillRecipe; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/mekanism/common/tile/TileEntityPurificationChamber.java b/src/main/java/mekanism/common/tile/TileEntityPurificationChamber.java index 59213e2b7..aba3328bd 100644 --- a/src/main/java/mekanism/common/tile/TileEntityPurificationChamber.java +++ b/src/main/java/mekanism/common/tile/TileEntityPurificationChamber.java @@ -7,14 +7,11 @@ import mekanism.api.gas.Gas; import mekanism.api.gas.GasRegistry; import mekanism.api.gas.GasStack; import mekanism.api.gas.GasTransmission; -import mekanism.api.gas.IGasHandler; import mekanism.api.gas.IGasItem; -import mekanism.api.gas.ITubeConnection; import mekanism.common.MekanismBlocks; import mekanism.common.block.BlockMachine.MachineType; import mekanism.common.recipe.RecipeHandler.Recipe; import mekanism.common.recipe.machines.PurificationRecipe; - import net.minecraft.block.Block; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; diff --git a/src/main/java/mekanism/common/tile/TileEntityResistiveHeater.java b/src/main/java/mekanism/common/tile/TileEntityResistiveHeater.java index 08816e8a6..e01795d1c 100644 --- a/src/main/java/mekanism/common/tile/TileEntityResistiveHeater.java +++ b/src/main/java/mekanism/common/tile/TileEntityResistiveHeater.java @@ -39,6 +39,9 @@ public class TileEntityResistiveHeater extends TileEntityNoisyElectricBlock impl public float soundScale = 1; + public double lastTransferLoss; + public double lastEnvironmentLoss; + public RedstoneControl controlType = RedstoneControl.DISABLED; public TileEntityResistiveHeater() @@ -90,9 +93,12 @@ public class TileEntityResistiveHeater extends TileEntityNoisyElectricBlock impl setActive(toUse > 0); - simulateHeat(); + double[] loss = simulateHeat(); applyTemperatureChange(); + lastTransferLoss = loss[0]; + lastEnvironmentLoss = loss[1]; + float newSoundScale = (float)Math.max(0, (toUse/1E5)); if(Math.abs(newSoundScale-soundScale) > 0.01) @@ -159,6 +165,9 @@ public class TileEntityResistiveHeater extends TileEntityNoisyElectricBlock impl soundScale = dataStream.readFloat(); controlType = RedstoneControl.values()[dataStream.readInt()]; + lastTransferLoss = dataStream.readDouble(); + lastEnvironmentLoss = dataStream.readDouble(); + if(updateDelay == 0 && clientActive != isActive) { updateDelay = general.UPDATE_DELAY; @@ -179,6 +188,9 @@ public class TileEntityResistiveHeater extends TileEntityNoisyElectricBlock impl data.add(soundScale); data.add(controlType.ordinal()); + data.add(lastTransferLoss); + data.add(lastEnvironmentLoss); + return data; } diff --git a/src/main/java/mekanism/common/tile/TileEntityRotaryCondensentrator.java b/src/main/java/mekanism/common/tile/TileEntityRotaryCondensentrator.java index 5ec7624dc..d9c5d3796 100644 --- a/src/main/java/mekanism/common/tile/TileEntityRotaryCondensentrator.java +++ b/src/main/java/mekanism/common/tile/TileEntityRotaryCondensentrator.java @@ -19,9 +19,9 @@ import mekanism.common.Mekanism; import mekanism.common.Upgrade; import mekanism.common.Upgrade.IUpgradeInfoHandler; import mekanism.common.base.IActiveState; -import mekanism.common.base.ITankManager; import mekanism.common.base.IRedstoneControl; import mekanism.common.base.ISustainedData; +import mekanism.common.base.ITankManager; import mekanism.common.base.IUpgradeTile; import mekanism.common.block.BlockMachine.MachineType; import mekanism.common.network.PacketTileEntity.TileEntityMessage; diff --git a/src/main/java/mekanism/common/tile/TileEntitySeismicVibrator.java b/src/main/java/mekanism/common/tile/TileEntitySeismicVibrator.java index 59326e2c2..aaaeee2b1 100644 --- a/src/main/java/mekanism/common/tile/TileEntitySeismicVibrator.java +++ b/src/main/java/mekanism/common/tile/TileEntitySeismicVibrator.java @@ -1,5 +1,7 @@ package mekanism.common.tile; +import io.netty.buffer.ByteBuf; + import java.util.ArrayList; import java.util.EnumSet; @@ -14,13 +16,10 @@ import mekanism.common.block.BlockMachine.MachineType; import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.util.ChargeUtils; import mekanism.common.util.MekanismUtils; - import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.common.util.ForgeDirection; -import io.netty.buffer.ByteBuf; - public class TileEntitySeismicVibrator extends TileEntityElectricBlock implements IActiveState, IRedstoneControl { public boolean isActive; diff --git a/src/main/java/mekanism/common/tile/TileEntitySolarNeutronActivator.java b/src/main/java/mekanism/common/tile/TileEntitySolarNeutronActivator.java index f3b337aba..1c4c6fbab 100644 --- a/src/main/java/mekanism/common/tile/TileEntitySolarNeutronActivator.java +++ b/src/main/java/mekanism/common/tile/TileEntitySolarNeutronActivator.java @@ -16,9 +16,9 @@ import mekanism.api.gas.ITubeConnection; import mekanism.common.Mekanism; import mekanism.common.base.IActiveState; import mekanism.common.base.IBoundingBlock; -import mekanism.common.base.ITankManager; import mekanism.common.base.IRedstoneControl; import mekanism.common.base.ISustainedData; +import mekanism.common.base.ITankManager; import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.recipe.RecipeHandler; import mekanism.common.recipe.inputs.GasInput; diff --git a/src/main/java/mekanism/common/tile/TileEntityThermalEvaporationController.java b/src/main/java/mekanism/common/tile/TileEntityThermalEvaporationController.java index 1e8833d36..e88c57dcb 100644 --- a/src/main/java/mekanism/common/tile/TileEntityThermalEvaporationController.java +++ b/src/main/java/mekanism/common/tile/TileEntityThermalEvaporationController.java @@ -71,6 +71,8 @@ public class TileEntityThermalEvaporationController extends TileEntityThermalEva public float prevScale; + public float totalLoss = 0; + public TileEntityThermalEvaporationController() { super("ThermalEvaporationController"); @@ -333,6 +335,12 @@ public class TileEntityThermalEvaporationController extends TileEntityThermalEva float biome = biomeTemp-0.5F; float base = biome > 0 ? biome*20 : biomeTemp*40; + + if(Math.abs(temperature-base) < 0.001) + { + temperature = base; + } + float incr = (float)Math.sqrt(Math.abs(temperature-base))*(float)general.evaporationHeatDissipation; if(temperature > base) @@ -340,8 +348,17 @@ public class TileEntityThermalEvaporationController extends TileEntityThermalEva incr = -incr; } + float prev = temperature; temperature = (float)Math.min(general.evaporationMaxTemp, temperature + incr/(float)height); + if(incr < 0) + { + totalLoss = prev-temperature; + } + else { + totalLoss = 0; + } + heatToAbsorb = 0; MekanismUtils.saveChunk(this); @@ -643,6 +660,7 @@ public class TileEntityThermalEvaporationController extends TileEntityThermalEva biomeTemp = dataStream.readFloat(); isLeftOnFace = dataStream.readBoolean(); lastGain = dataStream.readFloat(); + totalLoss = dataStream.readFloat(); if(structured != prev) { @@ -697,6 +715,7 @@ public class TileEntityThermalEvaporationController extends TileEntityThermalEva data.add(biomeTemp); data.add(isLeftOnFace); data.add(lastGain); + data.add(totalLoss); return data; } diff --git a/src/main/java/mekanism/common/util/CableUtils.java b/src/main/java/mekanism/common/util/CableUtils.java index 4e9d9ba6e..e305f60b0 100644 --- a/src/main/java/mekanism/common/util/CableUtils.java +++ b/src/main/java/mekanism/common/util/CableUtils.java @@ -6,7 +6,6 @@ import ic2.api.energy.tile.IEnergySink; import ic2.api.energy.tile.IEnergySource; import java.util.ArrayList; -import java.util.EnumSet; import java.util.List; import java.util.Set; diff --git a/src/main/java/mekanism/common/util/InventoryUtils.java b/src/main/java/mekanism/common/util/InventoryUtils.java index 9b3b4f88b..14e869563 100644 --- a/src/main/java/mekanism/common/util/InventoryUtils.java +++ b/src/main/java/mekanism/common/util/InventoryUtils.java @@ -7,7 +7,6 @@ import mekanism.common.content.transporter.Finder; import mekanism.common.content.transporter.InvStack; import mekanism.common.tile.TileEntityBin; import mekanism.common.tile.TileEntityLogisticalSorter; - import net.minecraft.inventory.IInventory; import net.minecraft.inventory.ISidedInventory; import net.minecraft.inventory.InventoryLargeChest; diff --git a/src/main/java/mekanism/common/util/MekanismUtils.java b/src/main/java/mekanism/common/util/MekanismUtils.java index 528d642c1..30418e2b6 100644 --- a/src/main/java/mekanism/common/util/MekanismUtils.java +++ b/src/main/java/mekanism/common/util/MekanismUtils.java @@ -1160,7 +1160,7 @@ public final class MekanismUtils return LangUtils.localize("gui.infinite"); } - switch(general.activeType) + switch(general.energyUnit) { case J: return UnitDisplayUtils.getDisplayShort(energy, ElectricUnit.JOULES); @@ -1182,7 +1182,7 @@ public final class MekanismUtils */ public static double convertToJoules(double energy) { - switch(general.activeType) + switch(general.energyUnit) { case RF: return energy * general.FROM_TE; @@ -1202,7 +1202,7 @@ public final class MekanismUtils */ public static double convertToDisplay(double energy) { - switch(general.activeType) + switch(general.energyUnit) { case RF: return energy * general.TO_TE; diff --git a/src/main/java/mekanism/common/util/MinerUtils.java b/src/main/java/mekanism/common/util/MinerUtils.java index 16af57855..31d3ecc23 100644 --- a/src/main/java/mekanism/common/util/MinerUtils.java +++ b/src/main/java/mekanism/common/util/MinerUtils.java @@ -5,7 +5,6 @@ import java.util.List; import mekanism.api.Coord4D; import mekanism.api.util.ListUtils; - import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; diff --git a/src/main/java/mekanism/common/util/PipeUtils.java b/src/main/java/mekanism/common/util/PipeUtils.java index b98b02573..8e83c2883 100644 --- a/src/main/java/mekanism/common/util/PipeUtils.java +++ b/src/main/java/mekanism/common/util/PipeUtils.java @@ -7,7 +7,6 @@ import java.util.List; import mekanism.api.Coord4D; import mekanism.api.transmitters.ITransmitterTile; - import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.FluidRegistry; diff --git a/src/main/java/mekanism/common/util/StatUtils.java b/src/main/java/mekanism/common/util/StatUtils.java index 6f71feecb..142d1def1 100644 --- a/src/main/java/mekanism/common/util/StatUtils.java +++ b/src/main/java/mekanism/common/util/StatUtils.java @@ -1,13 +1,13 @@ package mekanism.common.util; -import java.util.Random; - +import static java.lang.Math.E; +import static java.lang.Math.PI; import static java.lang.Math.ceil; -import static java.lang.Math.sqrt; import static java.lang.Math.exp; import static java.lang.Math.pow; -import static java.lang.Math.PI; -import static java.lang.Math.E; +import static java.lang.Math.sqrt; + +import java.util.Random; public class StatUtils { diff --git a/src/main/java/mekanism/common/voice/VoiceConnection.java b/src/main/java/mekanism/common/voice/VoiceConnection.java index 0d3027295..a68ab4acc 100644 --- a/src/main/java/mekanism/common/voice/VoiceConnection.java +++ b/src/main/java/mekanism/common/voice/VoiceConnection.java @@ -11,7 +11,6 @@ import java.util.List; import mekanism.common.Mekanism; import mekanism.common.item.ItemWalkieTalkie; - import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; import net.minecraft.server.MinecraftServer; diff --git a/src/main/java/mekanism/common/world/GenHandler.java b/src/main/java/mekanism/common/world/GenHandler.java index 487353a5a..61c489b8e 100644 --- a/src/main/java/mekanism/common/world/GenHandler.java +++ b/src/main/java/mekanism/common/world/GenHandler.java @@ -4,7 +4,6 @@ import java.util.Random; import mekanism.api.MekanismConfig.general; import mekanism.common.MekanismBlocks; - import net.minecraft.init.Blocks; import net.minecraft.world.World; import net.minecraft.world.chunk.IChunkProvider; diff --git a/src/main/java/mekanism/common/world/WorldGenSalt.java b/src/main/java/mekanism/common/world/WorldGenSalt.java index 4793e945d..f83116d4a 100644 --- a/src/main/java/mekanism/common/world/WorldGenSalt.java +++ b/src/main/java/mekanism/common/world/WorldGenSalt.java @@ -3,7 +3,6 @@ package mekanism.common.world; import java.util.Random; import mekanism.common.MekanismBlocks; - import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.init.Blocks; diff --git a/src/main/java/mekanism/generators/client/BlockRenderingHandler.java b/src/main/java/mekanism/generators/client/BlockRenderingHandler.java index 8e7bb173b..7016eb285 100644 --- a/src/main/java/mekanism/generators/client/BlockRenderingHandler.java +++ b/src/main/java/mekanism/generators/client/BlockRenderingHandler.java @@ -11,17 +11,17 @@ import mekanism.generators.client.model.ModelSolarGenerator; import mekanism.generators.client.model.ModelWindTurbine; import mekanism.generators.common.GeneratorsBlocks; import mekanism.generators.common.block.BlockGenerator.GeneratorType; - import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.world.IBlockAccess; + +import org.lwjgl.opengl.GL11; + import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import org.lwjgl.opengl.GL11; - @SideOnly(Side.CLIENT) public class BlockRenderingHandler implements ISimpleBlockRenderingHandler { diff --git a/src/main/java/mekanism/generators/client/gui/GuiBioGenerator.java b/src/main/java/mekanism/generators/client/gui/GuiBioGenerator.java index 113717db2..f2afbd048 100644 --- a/src/main/java/mekanism/generators/client/gui/GuiBioGenerator.java +++ b/src/main/java/mekanism/generators/client/gui/GuiBioGenerator.java @@ -5,11 +5,11 @@ import java.util.List; import mekanism.api.MekanismConfig.generators; import mekanism.api.util.ListUtils; import mekanism.client.gui.GuiMekanism; +import mekanism.client.gui.element.GuiElement.IInfoHandler; import mekanism.client.gui.element.GuiEnergyInfo; import mekanism.client.gui.element.GuiPowerBar; import mekanism.client.gui.element.GuiRedstoneControl; import mekanism.client.gui.element.GuiSlot; -import mekanism.client.gui.element.GuiEnergyInfo.IInfoHandler; import mekanism.client.gui.element.GuiSlot.SlotOverlay; import mekanism.client.gui.element.GuiSlot.SlotType; import mekanism.common.util.LangUtils; @@ -18,11 +18,12 @@ import mekanism.common.util.MekanismUtils.ResourceType; import mekanism.generators.common.inventory.container.ContainerBioGenerator; import mekanism.generators.common.tile.TileEntityBioGenerator; import net.minecraft.entity.player.InventoryPlayer; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + @SideOnly(Side.CLIENT) public class GuiBioGenerator extends GuiMekanism { @@ -40,7 +41,6 @@ public class GuiBioGenerator extends GuiMekanism { return ListUtils.asList( LangUtils.localize("gui.producing") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.isActive ? generators.bioGeneration : 0) + "/t", - LangUtils.localize("gui.storing") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getEnergy()), LangUtils.localize("gui.maxOutput") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getMaxOutput()) + "/t"); } }, this, MekanismUtils.getResource(ResourceType.GUI, "GuiBioGenerator.png"))); diff --git a/src/main/java/mekanism/generators/client/gui/GuiGasGenerator.java b/src/main/java/mekanism/generators/client/gui/GuiGasGenerator.java index 140cc889f..e5073a9ce 100644 --- a/src/main/java/mekanism/generators/client/gui/GuiGasGenerator.java +++ b/src/main/java/mekanism/generators/client/gui/GuiGasGenerator.java @@ -5,14 +5,14 @@ import java.util.List; import mekanism.api.gas.GasTank; import mekanism.api.util.ListUtils; import mekanism.client.gui.GuiMekanism; +import mekanism.client.gui.element.GuiElement.IInfoHandler; import mekanism.client.gui.element.GuiEnergyInfo; import mekanism.client.gui.element.GuiGasGauge; +import mekanism.client.gui.element.GuiGasGauge.IGasInfoHandler; +import mekanism.client.gui.element.GuiGauge.Type; import mekanism.client.gui.element.GuiPowerBar; import mekanism.client.gui.element.GuiRedstoneControl; import mekanism.client.gui.element.GuiSlot; -import mekanism.client.gui.element.GuiEnergyInfo.IInfoHandler; -import mekanism.client.gui.element.GuiGasGauge.IGasInfoHandler; -import mekanism.client.gui.element.GuiGauge.Type; import mekanism.client.gui.element.GuiSlot.SlotOverlay; import mekanism.client.gui.element.GuiSlot.SlotType; import mekanism.common.util.LangUtils; @@ -21,11 +21,12 @@ import mekanism.common.util.MekanismUtils.ResourceType; import mekanism.generators.common.inventory.container.ContainerGasGenerator; import mekanism.generators.common.tile.TileEntityGasGenerator; import net.minecraft.entity.player.InventoryPlayer; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + @SideOnly(Side.CLIENT) public class GuiGasGenerator extends GuiMekanism { @@ -42,7 +43,6 @@ public class GuiGasGenerator extends GuiMekanism { return ListUtils.asList( LangUtils.localize("gui.producing") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.generationRate) + "/t", - LangUtils.localize("gui.storing") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getEnergy()), LangUtils.localize("gui.maxOutput") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getMaxOutput()) + "/t"); } }, this, MekanismUtils.getResource(ResourceType.GUI, "GuiGasGenerator.png"))); diff --git a/src/main/java/mekanism/generators/client/gui/GuiGeneratorsConfig.java b/src/main/java/mekanism/generators/client/gui/GuiGeneratorsConfig.java index 3bd5c60de..46ed8db19 100644 --- a/src/main/java/mekanism/generators/client/gui/GuiGeneratorsConfig.java +++ b/src/main/java/mekanism/generators/client/gui/GuiGeneratorsConfig.java @@ -1,7 +1,6 @@ package mekanism.generators.client.gui; import mekanism.common.Mekanism; - import net.minecraft.client.gui.GuiScreen; import net.minecraftforge.common.config.ConfigElement; import cpw.mods.fml.client.config.GuiConfig; diff --git a/src/main/java/mekanism/generators/client/gui/GuiHeatGenerator.java b/src/main/java/mekanism/generators/client/gui/GuiHeatGenerator.java index d9d9c8160..f212666dc 100644 --- a/src/main/java/mekanism/generators/client/gui/GuiHeatGenerator.java +++ b/src/main/java/mekanism/generators/client/gui/GuiHeatGenerator.java @@ -2,17 +2,19 @@ package mekanism.generators.client.gui; import java.util.List; -import mekanism.api.MekanismConfig.generators; import mekanism.api.util.ListUtils; +import mekanism.api.util.UnitDisplayUtils; +import mekanism.api.util.UnitDisplayUtils.TemperatureUnit; import mekanism.client.gui.GuiMekanism; +import mekanism.client.gui.element.GuiElement.IInfoHandler; import mekanism.client.gui.element.GuiEnergyInfo; import mekanism.client.gui.element.GuiFluidGauge; +import mekanism.client.gui.element.GuiFluidGauge.IFluidInfoHandler; +import mekanism.client.gui.element.GuiGauge.Type; +import mekanism.client.gui.element.GuiHeatInfo; import mekanism.client.gui.element.GuiPowerBar; import mekanism.client.gui.element.GuiRedstoneControl; import mekanism.client.gui.element.GuiSlot; -import mekanism.client.gui.element.GuiEnergyInfo.IInfoHandler; -import mekanism.client.gui.element.GuiFluidGauge.IFluidInfoHandler; -import mekanism.client.gui.element.GuiGauge.Type; import mekanism.client.gui.element.GuiSlot.SlotOverlay; import mekanism.client.gui.element.GuiSlot.SlotType; import mekanism.common.util.LangUtils; @@ -22,11 +24,12 @@ import mekanism.generators.common.inventory.container.ContainerHeatGenerator; import mekanism.generators.common.tile.TileEntityHeatGenerator; import net.minecraft.entity.player.InventoryPlayer; import net.minecraftforge.fluids.FluidTank; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + @SideOnly(Side.CLIENT) public class GuiHeatGenerator extends GuiMekanism { @@ -44,7 +47,6 @@ public class GuiHeatGenerator extends GuiMekanism { return ListUtils.asList( LangUtils.localize("gui.producing") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.producingEnergy) + "/t", - LangUtils.localize("gui.storing") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getEnergy()), LangUtils.localize("gui.maxOutput") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getMaxOutput()) + "/t"); } }, this, MekanismUtils.getResource(ResourceType.GUI, "GuiHeatGenerator.png"))); @@ -58,6 +60,15 @@ public class GuiHeatGenerator extends GuiMekanism guiElements.add(new GuiPowerBar(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiHeatGenerator.png"), 164, 15)); guiElements.add(new GuiSlot(SlotType.NORMAL, this, MekanismUtils.getResource(ResourceType.GUI, "GuiHeatGenerator.png"), 16, 34)); guiElements.add(new GuiSlot(SlotType.NORMAL, this, MekanismUtils.getResource(ResourceType.GUI, "GuiHeatGenerator.png"), 142, 34).with(SlotOverlay.POWER)); + guiElements.add(new GuiHeatInfo(new IInfoHandler() { + @Override + public List getInfo() + { + String transfer = UnitDisplayUtils.getDisplayShort(tileEntity.lastTransferLoss, TemperatureUnit.KELVIN); + String environment = UnitDisplayUtils.getDisplayShort(tileEntity.lastEnvironmentLoss, TemperatureUnit.KELVIN); + return ListUtils.asList(LangUtils.localize("gui.transferred") + ": " + transfer + "/t", LangUtils.localize("gui.dissipated") + ": " + environment + "/t"); + } + }, this, MekanismUtils.getResource(ResourceType.GUI, "GuiHeatGenerator.png"))); } @Override diff --git a/src/main/java/mekanism/generators/client/gui/GuiIndustrialTurbine.java b/src/main/java/mekanism/generators/client/gui/GuiIndustrialTurbine.java index cf2cdca37..de43f96d7 100644 --- a/src/main/java/mekanism/generators/client/gui/GuiIndustrialTurbine.java +++ b/src/main/java/mekanism/generators/client/gui/GuiIndustrialTurbine.java @@ -5,8 +5,8 @@ import java.util.List; import mekanism.api.MekanismConfig.generators; import mekanism.api.util.ListUtils; import mekanism.client.gui.GuiMekanism; +import mekanism.client.gui.element.GuiElement.IInfoHandler; import mekanism.client.gui.element.GuiEnergyInfo; -import mekanism.client.gui.element.GuiEnergyInfo.IInfoHandler; import mekanism.client.gui.element.GuiPowerBar; import mekanism.client.gui.element.GuiRateBar; import mekanism.client.gui.element.GuiRateBar.IRateInfoHandler; diff --git a/src/main/java/mekanism/generators/client/gui/GuiNeutronCapture.java b/src/main/java/mekanism/generators/client/gui/GuiNeutronCapture.java index 575a2063e..684da7690 100644 --- a/src/main/java/mekanism/generators/client/gui/GuiNeutronCapture.java +++ b/src/main/java/mekanism/generators/client/gui/GuiNeutronCapture.java @@ -4,11 +4,11 @@ import java.util.List; import mekanism.api.util.ListUtils; import mekanism.client.gui.GuiMekanism; +import mekanism.client.gui.element.GuiElement.IInfoHandler; import mekanism.client.gui.element.GuiEnergyInfo; import mekanism.client.gui.element.GuiPowerBar; import mekanism.client.gui.element.GuiRedstoneControl; import mekanism.client.gui.element.GuiSlot; -import mekanism.client.gui.element.GuiEnergyInfo.IInfoHandler; import mekanism.client.gui.element.GuiSlot.SlotOverlay; import mekanism.client.gui.element.GuiSlot.SlotType; import mekanism.common.util.LangUtils; @@ -17,11 +17,12 @@ import mekanism.common.util.MekanismUtils.ResourceType; import mekanism.generators.common.inventory.container.ContainerNeutronCapture; import mekanism.generators.common.tile.reactor.TileEntityReactorNeutronCapture; import net.minecraft.entity.player.InventoryPlayer; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + @SideOnly(Side.CLIENT) public class GuiNeutronCapture extends GuiMekanism { diff --git a/src/main/java/mekanism/generators/client/gui/GuiReactorController.java b/src/main/java/mekanism/generators/client/gui/GuiReactorController.java index ad54d4b77..ba571fa86 100644 --- a/src/main/java/mekanism/generators/client/gui/GuiReactorController.java +++ b/src/main/java/mekanism/generators/client/gui/GuiReactorController.java @@ -5,9 +5,9 @@ import java.util.List; import mekanism.api.util.ListUtils; import mekanism.client.gui.GuiMekanism; +import mekanism.client.gui.element.GuiElement.IInfoHandler; import mekanism.client.gui.element.GuiEnergyInfo; import mekanism.client.gui.element.GuiSlot; -import mekanism.client.gui.element.GuiEnergyInfo.IInfoHandler; import mekanism.client.gui.element.GuiSlot.SlotType; import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; @@ -18,11 +18,12 @@ import mekanism.generators.client.gui.element.GuiStatTab; import mekanism.generators.common.inventory.container.ContainerReactorController; import mekanism.generators.common.tile.reactor.TileEntityReactorController; import net.minecraft.entity.player.InventoryPlayer; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + @SideOnly(Side.CLIENT) public class GuiReactorController extends GuiMekanism { diff --git a/src/main/java/mekanism/generators/client/gui/GuiReactorFuel.java b/src/main/java/mekanism/generators/client/gui/GuiReactorFuel.java index dace1b195..737348932 100644 --- a/src/main/java/mekanism/generators/client/gui/GuiReactorFuel.java +++ b/src/main/java/mekanism/generators/client/gui/GuiReactorFuel.java @@ -7,8 +7,8 @@ import mekanism.api.Coord4D; import mekanism.api.gas.GasTank; import mekanism.api.util.ListUtils; import mekanism.client.gui.GuiMekanism; +import mekanism.client.gui.element.GuiElement.IInfoHandler; import mekanism.client.gui.element.GuiEnergyInfo; -import mekanism.client.gui.element.GuiEnergyInfo.IInfoHandler; import mekanism.client.gui.element.GuiGasGauge; import mekanism.client.gui.element.GuiGasGauge.IGasInfoHandler; import mekanism.client.gui.element.GuiGauge.Type; diff --git a/src/main/java/mekanism/generators/client/gui/GuiReactorHeat.java b/src/main/java/mekanism/generators/client/gui/GuiReactorHeat.java index ba1d16d8a..94062c73b 100644 --- a/src/main/java/mekanism/generators/client/gui/GuiReactorHeat.java +++ b/src/main/java/mekanism/generators/client/gui/GuiReactorHeat.java @@ -8,10 +8,10 @@ import mekanism.api.energy.IStrictEnergyStorage; import mekanism.api.util.ListUtils; import mekanism.api.util.UnitDisplayUtils.TemperatureUnit; import mekanism.client.gui.GuiMekanism; +import mekanism.client.gui.element.GuiElement.IInfoHandler; import mekanism.client.gui.element.GuiEnergyGauge; import mekanism.client.gui.element.GuiEnergyGauge.IEnergyInfoHandler; import mekanism.client.gui.element.GuiEnergyInfo; -import mekanism.client.gui.element.GuiEnergyInfo.IInfoHandler; import mekanism.client.gui.element.GuiFluidGauge; import mekanism.client.gui.element.GuiFluidGauge.IFluidInfoHandler; import mekanism.client.gui.element.GuiGauge.Type; diff --git a/src/main/java/mekanism/generators/client/gui/GuiReactorStats.java b/src/main/java/mekanism/generators/client/gui/GuiReactorStats.java index e746ce4b3..bdd935e64 100644 --- a/src/main/java/mekanism/generators/client/gui/GuiReactorStats.java +++ b/src/main/java/mekanism/generators/client/gui/GuiReactorStats.java @@ -9,8 +9,8 @@ import mekanism.api.EnumColor; import mekanism.api.util.ListUtils; import mekanism.api.util.UnitDisplayUtils.TemperatureUnit; import mekanism.client.gui.GuiMekanism; +import mekanism.client.gui.element.GuiElement.IInfoHandler; import mekanism.client.gui.element.GuiEnergyInfo; -import mekanism.client.gui.element.GuiEnergyInfo.IInfoHandler; import mekanism.client.sound.SoundHandler; import mekanism.common.Mekanism; import mekanism.common.inventory.container.ContainerNull; diff --git a/src/main/java/mekanism/generators/client/gui/GuiSolarGenerator.java b/src/main/java/mekanism/generators/client/gui/GuiSolarGenerator.java index c93d6718f..869314402 100644 --- a/src/main/java/mekanism/generators/client/gui/GuiSolarGenerator.java +++ b/src/main/java/mekanism/generators/client/gui/GuiSolarGenerator.java @@ -4,11 +4,11 @@ import java.util.List; import mekanism.api.util.ListUtils; import mekanism.client.gui.GuiMekanism; +import mekanism.client.gui.element.GuiElement.IInfoHandler; import mekanism.client.gui.element.GuiEnergyInfo; import mekanism.client.gui.element.GuiPowerBar; import mekanism.client.gui.element.GuiRedstoneControl; import mekanism.client.gui.element.GuiSlot; -import mekanism.client.gui.element.GuiEnergyInfo.IInfoHandler; import mekanism.client.gui.element.GuiSlot.SlotOverlay; import mekanism.client.gui.element.GuiSlot.SlotType; import mekanism.common.util.LangUtils; @@ -17,11 +17,12 @@ import mekanism.common.util.MekanismUtils.ResourceType; import mekanism.generators.common.inventory.container.ContainerSolarGenerator; import mekanism.generators.common.tile.TileEntitySolarGenerator; import net.minecraft.entity.player.InventoryPlayer; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + @SideOnly(Side.CLIENT) public class GuiSolarGenerator extends GuiMekanism { @@ -39,7 +40,6 @@ public class GuiSolarGenerator extends GuiMekanism { return ListUtils.asList( LangUtils.localize("gui.producing") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.isActive ? tileEntity.getProduction() : 0) + "/t", - LangUtils.localize("gui.storing") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getEnergy()), LangUtils.localize("gui.maxOutput") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getMaxOutput()) + "/t"); } }, this, MekanismUtils.getResource(ResourceType.GUI, "GuiSolarGenerator.png"))); diff --git a/src/main/java/mekanism/generators/client/gui/GuiTurbineStats.java b/src/main/java/mekanism/generators/client/gui/GuiTurbineStats.java index 1d199b517..2bdac5b4d 100644 --- a/src/main/java/mekanism/generators/client/gui/GuiTurbineStats.java +++ b/src/main/java/mekanism/generators/client/gui/GuiTurbineStats.java @@ -6,8 +6,8 @@ import mekanism.api.EnumColor; import mekanism.api.MekanismConfig.generators; import mekanism.api.util.ListUtils; import mekanism.client.gui.GuiMekanism; +import mekanism.client.gui.element.GuiElement.IInfoHandler; import mekanism.client.gui.element.GuiEnergyInfo; -import mekanism.client.gui.element.GuiEnergyInfo.IInfoHandler; import mekanism.common.inventory.container.ContainerNull; import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; diff --git a/src/main/java/mekanism/generators/client/gui/GuiWindGenerator.java b/src/main/java/mekanism/generators/client/gui/GuiWindGenerator.java index e143c64de..54019aec3 100644 --- a/src/main/java/mekanism/generators/client/gui/GuiWindGenerator.java +++ b/src/main/java/mekanism/generators/client/gui/GuiWindGenerator.java @@ -7,11 +7,11 @@ import mekanism.api.EnumColor; import mekanism.api.MekanismConfig.generators; import mekanism.api.util.ListUtils; import mekanism.client.gui.GuiMekanism; +import mekanism.client.gui.element.GuiElement.IInfoHandler; import mekanism.client.gui.element.GuiEnergyInfo; import mekanism.client.gui.element.GuiPowerBar; import mekanism.client.gui.element.GuiRedstoneControl; import mekanism.client.gui.element.GuiSlot; -import mekanism.client.gui.element.GuiEnergyInfo.IInfoHandler; import mekanism.client.gui.element.GuiSlot.SlotOverlay; import mekanism.client.gui.element.GuiSlot.SlotType; import mekanism.common.util.LangUtils; @@ -20,11 +20,12 @@ import mekanism.common.util.MekanismUtils.ResourceType; import mekanism.generators.common.inventory.container.ContainerWindGenerator; import mekanism.generators.common.tile.TileEntityWindGenerator; import net.minecraft.entity.player.InventoryPlayer; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + @SideOnly(Side.CLIENT) public class GuiWindGenerator extends GuiMekanism { @@ -44,7 +45,6 @@ public class GuiWindGenerator extends GuiMekanism { return ListUtils.asList( LangUtils.localize("gui.producing") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.isActive ? generators.windGenerationMin*tileEntity.getMultiplier() : 0) + "/t", - LangUtils.localize("gui.storing") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getEnergy()), LangUtils.localize("gui.maxOutput") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getMaxOutput()) + "/t"); } }, this, MekanismUtils.getResource(ResourceType.GUI, "GuiWindTurbine.png"))); diff --git a/src/main/java/mekanism/generators/client/model/ModelAdvancedSolarGenerator.java b/src/main/java/mekanism/generators/client/model/ModelAdvancedSolarGenerator.java index 23a211b18..d1d9515d7 100644 --- a/src/main/java/mekanism/generators/client/model/ModelAdvancedSolarGenerator.java +++ b/src/main/java/mekanism/generators/client/model/ModelAdvancedSolarGenerator.java @@ -1,7 +1,6 @@ package mekanism.generators.client.model; import mekanism.client.render.MekanismRenderer; - import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; diff --git a/src/main/java/mekanism/generators/client/model/ModelTurbine.java b/src/main/java/mekanism/generators/client/model/ModelTurbine.java index 4258aa6c5..b5acb3ebb 100644 --- a/src/main/java/mekanism/generators/client/model/ModelTurbine.java +++ b/src/main/java/mekanism/generators/client/model/ModelTurbine.java @@ -1,10 +1,9 @@ package mekanism.generators.client.model; -import org.lwjgl.opengl.GL11; - import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; -import net.minecraft.entity.Entity; + +import org.lwjgl.opengl.GL11; public class ModelTurbine extends ModelBase { diff --git a/src/main/java/mekanism/generators/client/render/RenderAdvancedSolarGenerator.java b/src/main/java/mekanism/generators/client/render/RenderAdvancedSolarGenerator.java index 4d634eee4..036cd9aff 100644 --- a/src/main/java/mekanism/generators/client/render/RenderAdvancedSolarGenerator.java +++ b/src/main/java/mekanism/generators/client/render/RenderAdvancedSolarGenerator.java @@ -4,14 +4,14 @@ import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import mekanism.generators.client.model.ModelAdvancedSolarGenerator; import mekanism.generators.common.tile.TileEntityAdvancedSolarGenerator; - import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + @SideOnly(Side.CLIENT) public class RenderAdvancedSolarGenerator extends TileEntitySpecialRenderer { diff --git a/src/main/java/mekanism/generators/client/render/RenderBioGenerator.java b/src/main/java/mekanism/generators/client/render/RenderBioGenerator.java index 3a856510a..6b3e9a9e6 100644 --- a/src/main/java/mekanism/generators/client/render/RenderBioGenerator.java +++ b/src/main/java/mekanism/generators/client/render/RenderBioGenerator.java @@ -10,16 +10,16 @@ import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import mekanism.generators.client.model.ModelBioGenerator; import mekanism.generators.common.tile.TileEntityBioGenerator; - import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.init.Blocks; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.ForgeDirection; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + @SideOnly(Side.CLIENT) public class RenderBioGenerator extends TileEntitySpecialRenderer { diff --git a/src/main/java/mekanism/generators/client/render/RenderGasGenerator.java b/src/main/java/mekanism/generators/client/render/RenderGasGenerator.java index 9c975ed0a..a8db431d2 100644 --- a/src/main/java/mekanism/generators/client/render/RenderGasGenerator.java +++ b/src/main/java/mekanism/generators/client/render/RenderGasGenerator.java @@ -4,14 +4,14 @@ import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import mekanism.generators.client.model.ModelGasGenerator; import mekanism.generators.common.tile.TileEntityGasGenerator; - import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + @SideOnly(Side.CLIENT) public class RenderGasGenerator extends TileEntitySpecialRenderer { diff --git a/src/main/java/mekanism/generators/client/render/RenderHeatGenerator.java b/src/main/java/mekanism/generators/client/render/RenderHeatGenerator.java index 8b9866218..af366eec4 100644 --- a/src/main/java/mekanism/generators/client/render/RenderHeatGenerator.java +++ b/src/main/java/mekanism/generators/client/render/RenderHeatGenerator.java @@ -4,14 +4,14 @@ import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import mekanism.generators.client.model.ModelHeatGenerator; import mekanism.generators.common.tile.TileEntityHeatGenerator; - import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + @SideOnly(Side.CLIENT) public class RenderHeatGenerator extends TileEntitySpecialRenderer { diff --git a/src/main/java/mekanism/generators/client/render/RenderReactor.java b/src/main/java/mekanism/generators/client/render/RenderReactor.java index abd1ccaf5..f8c1ae76c 100644 --- a/src/main/java/mekanism/generators/client/render/RenderReactor.java +++ b/src/main/java/mekanism/generators/client/render/RenderReactor.java @@ -7,14 +7,14 @@ import mekanism.client.render.MekanismRenderer; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import mekanism.generators.common.tile.reactor.TileEntityReactorController; - import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + @SideOnly(Side.CLIENT) public class RenderReactor extends TileEntitySpecialRenderer { diff --git a/src/main/java/mekanism/generators/client/render/RenderSolarGenerator.java b/src/main/java/mekanism/generators/client/render/RenderSolarGenerator.java index 59a244546..e4c90d06f 100644 --- a/src/main/java/mekanism/generators/client/render/RenderSolarGenerator.java +++ b/src/main/java/mekanism/generators/client/render/RenderSolarGenerator.java @@ -4,7 +4,6 @@ import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import mekanism.generators.client.model.ModelSolarGenerator; import mekanism.generators.common.tile.TileEntitySolarGenerator; - import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; diff --git a/src/main/java/mekanism/generators/client/render/RenderWindTurbine.java b/src/main/java/mekanism/generators/client/render/RenderWindTurbine.java index 93c17e0a6..8ef68f7bc 100644 --- a/src/main/java/mekanism/generators/client/render/RenderWindTurbine.java +++ b/src/main/java/mekanism/generators/client/render/RenderWindTurbine.java @@ -5,7 +5,6 @@ import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import mekanism.generators.client.model.ModelWindTurbine; import mekanism.generators.common.tile.TileEntityWindGenerator; - import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; diff --git a/src/main/java/mekanism/generators/common/GeneratorsBlocks.java b/src/main/java/mekanism/generators/common/GeneratorsBlocks.java index 31d4ee751..3f7f63c53 100644 --- a/src/main/java/mekanism/generators/common/GeneratorsBlocks.java +++ b/src/main/java/mekanism/generators/common/GeneratorsBlocks.java @@ -4,7 +4,6 @@ import mekanism.generators.common.block.BlockGenerator; import mekanism.generators.common.block.BlockReactor; import mekanism.generators.common.item.ItemBlockGenerator; import mekanism.generators.common.item.ItemBlockReactor; - import net.minecraft.block.Block; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.common.registry.GameRegistry.ObjectHolder; diff --git a/src/main/java/mekanism/generators/common/GeneratorsCommonProxy.java b/src/main/java/mekanism/generators/common/GeneratorsCommonProxy.java index 05934f7fb..0e7c95588 100644 --- a/src/main/java/mekanism/generators/common/GeneratorsCommonProxy.java +++ b/src/main/java/mekanism/generators/common/GeneratorsCommonProxy.java @@ -5,7 +5,6 @@ import mekanism.common.Mekanism; import mekanism.common.base.IGuiProvider; import mekanism.common.inventory.container.ContainerNull; import mekanism.common.tile.TileEntityContainerBlock; -import mekanism.common.tile.TileEntityPressureDisperser; import mekanism.generators.common.inventory.container.ContainerBioGenerator; import mekanism.generators.common.inventory.container.ContainerGasGenerator; import mekanism.generators.common.inventory.container.ContainerHeatGenerator; diff --git a/src/main/java/mekanism/generators/common/inventory/container/ContainerBioGenerator.java b/src/main/java/mekanism/generators/common/inventory/container/ContainerBioGenerator.java index 0aa6bbd57..ebf9396ff 100644 --- a/src/main/java/mekanism/generators/common/inventory/container/ContainerBioGenerator.java +++ b/src/main/java/mekanism/generators/common/inventory/container/ContainerBioGenerator.java @@ -3,7 +3,6 @@ package mekanism.generators.common.inventory.container; import mekanism.common.inventory.slot.SlotEnergy.SlotCharge; import mekanism.common.util.ChargeUtils; import mekanism.generators.common.tile.TileEntityBioGenerator; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/src/main/java/mekanism/generators/common/inventory/container/ContainerGasGenerator.java b/src/main/java/mekanism/generators/common/inventory/container/ContainerGasGenerator.java index a9b0116c1..3088950f2 100644 --- a/src/main/java/mekanism/generators/common/inventory/container/ContainerGasGenerator.java +++ b/src/main/java/mekanism/generators/common/inventory/container/ContainerGasGenerator.java @@ -5,7 +5,6 @@ import mekanism.api.gas.IGasItem; import mekanism.common.inventory.slot.SlotEnergy.SlotCharge; import mekanism.common.util.ChargeUtils; import mekanism.generators.common.tile.TileEntityGasGenerator; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/src/main/java/mekanism/generators/common/inventory/container/ContainerHeatGenerator.java b/src/main/java/mekanism/generators/common/inventory/container/ContainerHeatGenerator.java index b70668dc6..2b2b465a0 100644 --- a/src/main/java/mekanism/generators/common/inventory/container/ContainerHeatGenerator.java +++ b/src/main/java/mekanism/generators/common/inventory/container/ContainerHeatGenerator.java @@ -3,7 +3,6 @@ package mekanism.generators.common.inventory.container; import mekanism.common.inventory.slot.SlotEnergy.SlotCharge; import mekanism.common.util.ChargeUtils; import mekanism.generators.common.tile.TileEntityHeatGenerator; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/src/main/java/mekanism/generators/common/inventory/container/ContainerNeutronCapture.java b/src/main/java/mekanism/generators/common/inventory/container/ContainerNeutronCapture.java index c218c4992..d45e78db6 100644 --- a/src/main/java/mekanism/generators/common/inventory/container/ContainerNeutronCapture.java +++ b/src/main/java/mekanism/generators/common/inventory/container/ContainerNeutronCapture.java @@ -3,7 +3,6 @@ package mekanism.generators.common.inventory.container; import mekanism.common.inventory.slot.SlotEnergy.SlotCharge; import mekanism.common.util.ChargeUtils; import mekanism.generators.common.tile.reactor.TileEntityReactorNeutronCapture; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/src/main/java/mekanism/generators/common/inventory/container/ContainerReactorController.java b/src/main/java/mekanism/generators/common/inventory/container/ContainerReactorController.java index 775dba5d5..ffed7e8dc 100644 --- a/src/main/java/mekanism/generators/common/inventory/container/ContainerReactorController.java +++ b/src/main/java/mekanism/generators/common/inventory/container/ContainerReactorController.java @@ -3,7 +3,6 @@ package mekanism.generators.common.inventory.container; import mekanism.common.util.MekanismUtils; import mekanism.generators.common.item.ItemHohlraum; import mekanism.generators.common.tile.reactor.TileEntityReactorController; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/src/main/java/mekanism/generators/common/inventory/container/ContainerSolarGenerator.java b/src/main/java/mekanism/generators/common/inventory/container/ContainerSolarGenerator.java index c7400fcfc..6883ce957 100644 --- a/src/main/java/mekanism/generators/common/inventory/container/ContainerSolarGenerator.java +++ b/src/main/java/mekanism/generators/common/inventory/container/ContainerSolarGenerator.java @@ -3,7 +3,6 @@ package mekanism.generators.common.inventory.container; import mekanism.common.inventory.slot.SlotEnergy.SlotCharge; import mekanism.common.util.ChargeUtils; import mekanism.generators.common.tile.TileEntitySolarGenerator; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/src/main/java/mekanism/generators/common/inventory/container/ContainerWindGenerator.java b/src/main/java/mekanism/generators/common/inventory/container/ContainerWindGenerator.java index 39002000d..21bf17c33 100644 --- a/src/main/java/mekanism/generators/common/inventory/container/ContainerWindGenerator.java +++ b/src/main/java/mekanism/generators/common/inventory/container/ContainerWindGenerator.java @@ -3,7 +3,6 @@ package mekanism.generators.common.inventory.container; import mekanism.common.inventory.slot.SlotEnergy.SlotCharge; import mekanism.common.util.ChargeUtils; import mekanism.generators.common.tile.TileEntityWindGenerator; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/src/main/java/mekanism/generators/common/tile/TileEntityAdvancedSolarGenerator.java b/src/main/java/mekanism/generators/common/tile/TileEntityAdvancedSolarGenerator.java index 4015e2170..f0db0eeaa 100644 --- a/src/main/java/mekanism/generators/common/tile/TileEntityAdvancedSolarGenerator.java +++ b/src/main/java/mekanism/generators/common/tile/TileEntityAdvancedSolarGenerator.java @@ -7,7 +7,6 @@ import mekanism.api.ISalinationSolar; import mekanism.api.MekanismConfig.generators; import mekanism.common.base.IBoundingBlock; import mekanism.common.util.MekanismUtils; - import net.minecraftforge.common.util.ForgeDirection; public class TileEntityAdvancedSolarGenerator extends TileEntitySolarGenerator implements IBoundingBlock, ISalinationSolar diff --git a/src/main/java/mekanism/generators/common/tile/TileEntityBioGenerator.java b/src/main/java/mekanism/generators/common/tile/TileEntityBioGenerator.java index cf8ef7ea3..96426d3c0 100644 --- a/src/main/java/mekanism/generators/common/tile/TileEntityBioGenerator.java +++ b/src/main/java/mekanism/generators/common/tile/TileEntityBioGenerator.java @@ -1,6 +1,10 @@ package mekanism.generators.common.tile; import io.netty.buffer.ByteBuf; + +import java.util.ArrayList; +import java.util.EnumSet; + import mekanism.api.MekanismConfig.generators; import mekanism.common.FluidSlot; import mekanism.common.MekanismItems; @@ -10,10 +14,12 @@ import mekanism.common.util.MekanismUtils; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.common.util.ForgeDirection; -import net.minecraftforge.fluids.*; - -import java.util.ArrayList; -import java.util.EnumSet; +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidContainerRegistry; +import net.minecraftforge.fluids.FluidRegistry; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.FluidTankInfo; +import net.minecraftforge.fluids.IFluidHandler; public class TileEntityBioGenerator extends TileEntityGenerator implements IFluidHandler, ISustainedData { diff --git a/src/main/java/mekanism/generators/common/tile/TileEntityGasGenerator.java b/src/main/java/mekanism/generators/common/tile/TileEntityGasGenerator.java index 63a91cd6b..04df830df 100644 --- a/src/main/java/mekanism/generators/common/tile/TileEntityGasGenerator.java +++ b/src/main/java/mekanism/generators/common/tile/TileEntityGasGenerator.java @@ -1,8 +1,18 @@ package mekanism.generators.common.tile; import io.netty.buffer.ByteBuf; + +import java.util.ArrayList; + import mekanism.api.MekanismConfig.general; -import mekanism.api.gas.*; +import mekanism.api.gas.Gas; +import mekanism.api.gas.GasRegistry; +import mekanism.api.gas.GasStack; +import mekanism.api.gas.GasTank; +import mekanism.api.gas.GasTransmission; +import mekanism.api.gas.IGasHandler; +import mekanism.api.gas.IGasItem; +import mekanism.api.gas.ITubeConnection; import mekanism.common.FuelHandler; import mekanism.common.FuelHandler.FuelGas; import mekanism.common.base.ISustainedData; @@ -12,8 +22,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.common.util.ForgeDirection; -import java.util.ArrayList; - public class TileEntityGasGenerator extends TileEntityGenerator implements IGasHandler, ITubeConnection, ISustainedData { /** The maximum amount of gas this block can store. */ diff --git a/src/main/java/mekanism/generators/common/tile/TileEntityGenerator.java b/src/main/java/mekanism/generators/common/tile/TileEntityGenerator.java index 5b830fa8c..eda83e4d0 100644 --- a/src/main/java/mekanism/generators/common/tile/TileEntityGenerator.java +++ b/src/main/java/mekanism/generators/common/tile/TileEntityGenerator.java @@ -1,8 +1,10 @@ package mekanism.generators.common.tile; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import io.netty.buffer.ByteBuf; + +import java.util.ArrayList; +import java.util.EnumSet; + import mekanism.api.Coord4D; import mekanism.api.MekanismConfig.general; import mekanism.api.Range4D; @@ -19,9 +21,8 @@ import mekanism.common.util.MekanismUtils; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.AxisAlignedBB; import net.minecraftforge.common.util.ForgeDirection; - -import java.util.ArrayList; -import java.util.EnumSet; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public abstract class TileEntityGenerator extends TileEntityNoisyElectricBlock implements IComputerIntegration, IActiveState, IHasSound, ISoundSource, IRedstoneControl { diff --git a/src/main/java/mekanism/generators/common/tile/TileEntityHeatGenerator.java b/src/main/java/mekanism/generators/common/tile/TileEntityHeatGenerator.java index b5ae01cb5..d3c05b785 100644 --- a/src/main/java/mekanism/generators/common/tile/TileEntityHeatGenerator.java +++ b/src/main/java/mekanism/generators/common/tile/TileEntityHeatGenerator.java @@ -1,11 +1,18 @@ package mekanism.generators.common.tile; import io.netty.buffer.ByteBuf; + +import java.util.ArrayList; + import mekanism.api.Coord4D; import mekanism.api.IHeatTransfer; import mekanism.api.MekanismConfig.generators; import mekanism.common.base.ISustainedData; -import mekanism.common.util.*; +import mekanism.common.util.ChargeUtils; +import mekanism.common.util.FluidContainerUtils; +import mekanism.common.util.HeatUtils; +import mekanism.common.util.MekanismUtils; +import mekanism.common.util.PipeUtils; import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; @@ -13,9 +20,14 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntityFurnace; import net.minecraftforge.common.util.ForgeDirection; -import net.minecraftforge.fluids.*; - -import java.util.ArrayList; +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidContainerRegistry; +import net.minecraftforge.fluids.FluidRegistry; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.FluidTank; +import net.minecraftforge.fluids.FluidTankInfo; +import net.minecraftforge.fluids.IFluidContainerItem; +import net.minecraftforge.fluids.IFluidHandler; public class TileEntityHeatGenerator extends TileEntityGenerator implements IFluidHandler, ISustainedData, IHeatTransfer { @@ -31,6 +43,9 @@ public class TileEntityHeatGenerator extends TileEntityGenerator implements IFlu public double heatToAbsorb = 0; public double producingEnergy; + + public double lastTransferLoss; + public double lastEnvironmentLoss; public TileEntityHeatGenerator() { @@ -121,9 +136,12 @@ public class TileEntityHeatGenerator extends TileEntityGenerator implements IFlu setActive(false); } - simulateHeat(); + double[] loss = simulateHeat(); applyTemperatureChange(); + lastTransferLoss = loss[0]; + lastEnvironmentLoss = loss[1]; + producingEnergy = getEnergy()-prev; } } @@ -246,6 +264,9 @@ public class TileEntityHeatGenerator extends TileEntityGenerator implements IFlu super.handlePacketData(dataStream); producingEnergy = dataStream.readDouble(); + + lastTransferLoss = dataStream.readDouble(); + lastEnvironmentLoss = dataStream.readDouble(); int amount = dataStream.readInt(); @@ -264,6 +285,9 @@ public class TileEntityHeatGenerator extends TileEntityGenerator implements IFlu super.getNetworkedData(data); data.add(producingEnergy); + + data.add(lastTransferLoss); + data.add(lastEnvironmentLoss); if(lavaTank.getFluid() != null) { diff --git a/src/main/java/mekanism/generators/common/tile/TileEntityWindGenerator.java b/src/main/java/mekanism/generators/common/tile/TileEntityWindGenerator.java index a40a267aa..d7c355962 100644 --- a/src/main/java/mekanism/generators/common/tile/TileEntityWindGenerator.java +++ b/src/main/java/mekanism/generators/common/tile/TileEntityWindGenerator.java @@ -1,7 +1,5 @@ package mekanism.generators.common.tile; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import mekanism.api.Coord4D; import mekanism.api.MekanismConfig.generators; import mekanism.common.base.IBoundingBlock; @@ -9,6 +7,8 @@ import mekanism.common.util.ChargeUtils; import mekanism.common.util.MekanismUtils; import net.minecraft.item.ItemStack; import net.minecraftforge.common.util.ForgeDirection; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class TileEntityWindGenerator extends TileEntityGenerator implements IBoundingBlock { diff --git a/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorBlock.java b/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorBlock.java index 327f9a876..87657110b 100644 --- a/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorBlock.java +++ b/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorBlock.java @@ -8,7 +8,6 @@ import mekanism.api.Coord4D; import mekanism.api.reactor.IFusionReactor; import mekanism.api.reactor.IReactorBlock; import mekanism.common.tile.TileEntityElectricBlock; - import net.minecraft.item.ItemStack; import net.minecraftforge.common.util.ForgeDirection; diff --git a/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorLaserFocusMatrix.java b/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorLaserFocusMatrix.java index 84d392546..48db9a701 100644 --- a/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorLaserFocusMatrix.java +++ b/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorLaserFocusMatrix.java @@ -1,7 +1,6 @@ package mekanism.generators.common.tile.reactor; import mekanism.api.lasers.ILaserReceptor; - import net.minecraftforge.common.util.ForgeDirection; public class TileEntityReactorLaserFocusMatrix extends TileEntityReactorBlock implements ILaserReceptor diff --git a/src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineValve.java b/src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineValve.java index 2075cc216..62abc5d4e 100644 --- a/src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineValve.java +++ b/src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineValve.java @@ -10,7 +10,6 @@ import java.util.EnumSet; import mekanism.api.Coord4D; import mekanism.api.MekanismConfig.general; -import mekanism.api.transmitters.ITransmitterTile; import mekanism.common.base.IEnergyWrapper; import mekanism.common.util.CableUtils; import mekanism.common.util.LangUtils; diff --git a/src/main/java/mekanism/tools/common/MekanismTools.java b/src/main/java/mekanism/tools/common/MekanismTools.java index 500e6c073..71e67e27f 100644 --- a/src/main/java/mekanism/tools/common/MekanismTools.java +++ b/src/main/java/mekanism/tools/common/MekanismTools.java @@ -1,15 +1,9 @@ package mekanism.tools.common; -import cpw.mods.fml.client.event.ConfigChangedEvent.OnConfigChangedEvent; -import cpw.mods.fml.common.FMLCommonHandler; -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.FMLInitializationEvent; -import cpw.mods.fml.common.event.FMLPreInitializationEvent; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; import io.netty.buffer.ByteBuf; + +import java.io.IOException; + import mekanism.api.MekanismConfig.tools; import mekanism.common.Mekanism; import mekanism.common.Version; @@ -25,8 +19,15 @@ import net.minecraft.item.crafting.CraftingManager; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.util.EnumHelper; import net.minecraftforge.event.entity.living.LivingSpawnEvent; - -import java.io.IOException; +import cpw.mods.fml.client.event.ConfigChangedEvent.OnConfigChangedEvent; +import cpw.mods.fml.common.FMLCommonHandler; +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.FMLInitializationEvent; +import cpw.mods.fml.common.event.FMLPreInitializationEvent; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; @Mod(modid = "MekanismTools", name = "MekanismTools", version = "9.0.0", dependencies = "required-after:Mekanism", guiFactory = "mekanism.tools.client.gui.ToolsGuiFactory") public class MekanismTools implements IModule diff --git a/src/main/java/mekanism/tools/common/ToolsItems.java b/src/main/java/mekanism/tools/common/ToolsItems.java index 0c0977b67..38dd29c8a 100644 --- a/src/main/java/mekanism/tools/common/ToolsItems.java +++ b/src/main/java/mekanism/tools/common/ToolsItems.java @@ -8,7 +8,6 @@ import mekanism.tools.item.ItemMekanismPaxel; import mekanism.tools.item.ItemMekanismPickaxe; import mekanism.tools.item.ItemMekanismShovel; import mekanism.tools.item.ItemMekanismSword; - import net.minecraft.item.Item; import net.minecraft.item.Item.ToolMaterial; import cpw.mods.fml.common.registry.GameRegistry; diff --git a/src/main/resources/assets/mekanism/gui/elements/GuiHeatInfo.png b/src/main/resources/assets/mekanism/gui/elements/GuiHeatInfo.png new file mode 100644 index 0000000000000000000000000000000000000000..97ddc2b70a3fb61e1b371540184a52fd6257b891 GIT binary patch literal 2757 zcmeH}`#;l*1I9nwnfoQej5rpl#ZYstIV`l?Z*#xREwNk*g^bO?aVbf(LTpaC-@ce6 zxvVC|G3Ofxhup~!GFsVOzW$GIKRwS6&rk2y^SoY9mZSX@2~kB+001PcEG?V?0CZ$Q zfUw|^_(WHQ002ZH%-r13%G@087#$T77Jd}~jB;{ZeM6O8WlcI_uBn}3;llOOW2;Oh z)FtxW^vdY3NK;b=krXR~2~~D5cZ2oh1ItLaW53MdvLo^QYOyS{yNwJ-d^A57IJd@`7dVPRg3T)wW;*2eG(T?-}zqiTHp2nL41>w_%m#;5StQTRvBbW#)pu zR=N({2HoN1shF;M{mKnwx1Gl@b?&^J3mSVHW0IT`7P5$(AI=nT#StNNUGqCv96s_sTX21b8f)Sd&9r3nusE}%swi)2V*VI>Eo^xW_)I6kO z_k`!KM!$ z(%9RBP!TKHsbPzBPuq~ zHC~D{?a-p-ZZx^kQ?SF?_y3Q5Fm!~e!J81rgx*E1VxUo8<kTM}FMSb#^^byKjVa zoc0Zs82mdfVO!B_CJ~wdYrD2Wxn5^|QY~EWS7`JbgE^-F6z7b%aFChPcnYO{jSr>j zl>VkH8Km;LlJC={?FP!?H-UHT4qRPbR&ErWRd$QAGwQk|bMKUS@Vx>9m+vp#x64!? zIV?GcN#W2qnd+vIOUE)=DsIyv!2CVsf2t#!omW2wO(%gphc8C1Nes%x*?i0oRBSZR zpcJjLGpk^Kytlm{ip!XY@H!!|IlYs+Q;h03CgZJr`A7MEP&LF-dZk;51mFl!p72+ow2szTO@=ZV?`RJ&k3#{Glr z@Z?JW1qBb7X9rx)O@r|O)K7+CgdH=?ssdTUXONGkj;nd|ke;ovTvFW3w*$X$&2=Vm z;B!W+(k()k1_A``gR=MAQ73Y+eUi?%=i-g;*VorK4;RS5zfuJ_kaNX*Xf(Rj#S|t^ z$kIHDAD;eOOS|zpM}BMn6o!@nZh`#$x*|*(1imF^3EUF9>p)|Gk7H7Wt_%y0Xu&}v zT1b-=K{2HZpifC##+)fE8N(OI{tj3tI@|IF?eE~(vCPW#b)(63=0fXQ`Pju2ASFc9 z#TwXMoOv43MA8pDBw9qBooDzl{n6^FE~iEGVs5l%V+t`#xxmbrDsSxLVt2mT^j&rX z)^=2_;W^W>PO@JEXHUkoK&;(?Ui{&Q^qu}$ti|$YLa>c|&@N~A2{Fq9pB2Af=2`Ml z5e%sjaq$B&tMztu$~#GDN@ANT>)W$LlbiU&`QjTsQ+kvqxA6Ou$6Akxr%+= zyv`!#j*>PZ-2Y0}i6c&gvESs6s+S z{Ed{fRZC$IVY(&lN5esQkXk1jzd-4NzOJf$=aqIEGm8L|9IOvvi->5JI))5@zz|_6 o_)qf_!p|oBU# Date: Sun, 28 Feb 2016 11:52:52 -0500 Subject: [PATCH 13/52] Continued boiler work --- .../java/mekanism/client/ClientProxy.java | 5 +++ .../client/gui/GuiThermoelectricBoiler.java | 9 +++++ .../client/render/MekanismRenderer.java | 2 + .../RenderThermoelectricBoiler.java | 39 ++++++++++++++++++ .../java/mekanism/common/CommonProxy.java | 4 ++ src/main/java/mekanism/common/Mekanism.java | 2 - .../mekanism/common/block/BlockBasic.java | 3 +- .../content/boiler/BoilerUpdateProtocol.java | 18 ++++++++- .../boiler/SynchronizedBoilerData.java | 2 + .../ContainerThermoelectricBoiler.java | 5 +++ .../common/multiblock/UpdateProtocol.java | 14 ++++++- .../common/tile/TileEntityBoilerCasing.java | 40 ++----------------- .../render/RenderIndustrialTurbine.java | 4 ++ .../tile/turbine/TileEntityTurbineCasing.java | 15 ------- 14 files changed, 105 insertions(+), 57 deletions(-) create mode 100644 src/main/java/mekanism/client/gui/GuiThermoelectricBoiler.java create mode 100644 src/main/java/mekanism/client/render/tileentity/RenderThermoelectricBoiler.java create mode 100644 src/main/java/mekanism/common/inventory/container/ContainerThermoelectricBoiler.java diff --git a/src/main/java/mekanism/client/ClientProxy.java b/src/main/java/mekanism/client/ClientProxy.java index 28454db88..7404a1112 100644 --- a/src/main/java/mekanism/client/ClientProxy.java +++ b/src/main/java/mekanism/client/ClientProxy.java @@ -101,6 +101,7 @@ import mekanism.client.render.tileentity.RenderSeismicVibrator; import mekanism.client.render.tileentity.RenderSolarNeutronActivator; import mekanism.client.render.tileentity.RenderTeleporter; import mekanism.client.render.tileentity.RenderThermalEvaporationController; +import mekanism.client.render.tileentity.RenderThermoelectricBoiler; import mekanism.common.CommonProxy; import mekanism.common.Mekanism; import mekanism.common.MekanismBlocks; @@ -123,6 +124,8 @@ import mekanism.common.tile.TileEntityAdvancedElectricMachine; import mekanism.common.tile.TileEntityAdvancedFactory; import mekanism.common.tile.TileEntityAmbientAccumulator; import mekanism.common.tile.TileEntityBin; +import mekanism.common.tile.TileEntityBoilerCasing; +import mekanism.common.tile.TileEntityBoilerValve; import mekanism.common.tile.TileEntityChargepad; import mekanism.common.tile.TileEntityChemicalCrystallizer; import mekanism.common.tile.TileEntityChemicalDissolutionChamber; @@ -336,6 +339,8 @@ public class ClientProxy extends CommonProxy GameRegistry.registerTileEntity(TileEntityOredictionificator.class, "Oredictionificator"); GameRegistry.registerTileEntity(TileEntityStructuralGlass.class, "StructuralGlass"); GameRegistry.registerTileEntity(TileEntityResistiveHeater.class, "ResistiveHeater"); + ClientRegistry.registerTileEntity(TileEntityBoilerCasing.class, "BoilerCasing", new RenderThermoelectricBoiler()); + ClientRegistry.registerTileEntity(TileEntityBoilerValve.class, "BoilerValve", new RenderThermoelectricBoiler()); } @Override diff --git a/src/main/java/mekanism/client/gui/GuiThermoelectricBoiler.java b/src/main/java/mekanism/client/gui/GuiThermoelectricBoiler.java new file mode 100644 index 000000000..b48c2421d --- /dev/null +++ b/src/main/java/mekanism/client/gui/GuiThermoelectricBoiler.java @@ -0,0 +1,9 @@ +package mekanism.client.gui; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + +@SideOnly(Side.CLIENT) +public class GuiThermoelectricBoiler { + +} diff --git a/src/main/java/mekanism/client/render/MekanismRenderer.java b/src/main/java/mekanism/client/render/MekanismRenderer.java index cf2165b7a..96ec19050 100644 --- a/src/main/java/mekanism/client/render/MekanismRenderer.java +++ b/src/main/java/mekanism/client/render/MekanismRenderer.java @@ -17,6 +17,7 @@ import mekanism.client.render.tileentity.RenderConfigurableMachine; import mekanism.client.render.tileentity.RenderDynamicTank; import mekanism.client.render.tileentity.RenderFluidTank; import mekanism.client.render.tileentity.RenderThermalEvaporationController; +import mekanism.client.render.tileentity.RenderThermoelectricBoiler; import mekanism.common.ObfuscatedNames; import mekanism.common.base.ISpecialBounds; import mekanism.common.util.MekanismUtils; @@ -143,6 +144,7 @@ public class MekanismRenderer RenderDynamicTank.resetDisplayInts(); RenderThermalEvaporationController.resetDisplayInts(); RenderFluidTank.resetDisplayInts(); + RenderThermoelectricBoiler.resetDisplayInts(); } } diff --git a/src/main/java/mekanism/client/render/tileentity/RenderThermoelectricBoiler.java b/src/main/java/mekanism/client/render/tileentity/RenderThermoelectricBoiler.java new file mode 100644 index 000000000..54a1574b8 --- /dev/null +++ b/src/main/java/mekanism/client/render/tileentity/RenderThermoelectricBoiler.java @@ -0,0 +1,39 @@ +package mekanism.client.render.tileentity; + +import java.util.HashMap; +import java.util.Map; + +import mekanism.client.render.MekanismRenderer.DisplayInteger; +import mekanism.client.render.tileentity.RenderDynamicTank.RenderData; +import mekanism.client.render.tileentity.RenderDynamicTank.ValveRenderData; +import mekanism.common.tile.TileEntityBoilerCasing; +import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; +import net.minecraft.tileentity.TileEntity; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + +@SideOnly(Side.CLIENT) +public class RenderThermoelectricBoiler extends TileEntitySpecialRenderer +{ + private static Map cachedLowerFluids = new HashMap(); + private static Map cachedUpperFluids = new HashMap(); + private static Map cachedValveFluids = new HashMap(); + + @Override + public void renderTileEntityAt(TileEntity tileEntity, double x, double y, double z, float partialTick) + { + renderAModelAt((TileEntityBoilerCasing)tileEntity, x, y, z, partialTick); + } + + public void renderAModelAt(TileEntityBoilerCasing tileEntity, double x, double y, double z, float partialTick) + { + + } + + public static void resetDisplayInts() + { + cachedLowerFluids.clear(); + cachedUpperFluids.clear(); + cachedValveFluids.clear(); + } +} diff --git a/src/main/java/mekanism/common/CommonProxy.java b/src/main/java/mekanism/common/CommonProxy.java index 27eeafe49..8e9cccd0f 100644 --- a/src/main/java/mekanism/common/CommonProxy.java +++ b/src/main/java/mekanism/common/CommonProxy.java @@ -60,6 +60,8 @@ import mekanism.common.tile.TileEntityAdvancedElectricMachine; import mekanism.common.tile.TileEntityAdvancedFactory; import mekanism.common.tile.TileEntityAmbientAccumulator; import mekanism.common.tile.TileEntityBin; +import mekanism.common.tile.TileEntityBoilerCasing; +import mekanism.common.tile.TileEntityBoilerValve; import mekanism.common.tile.TileEntityChanceMachine; import mekanism.common.tile.TileEntityChargepad; import mekanism.common.tile.TileEntityChemicalCrystallizer; @@ -196,6 +198,8 @@ public class CommonProxy implements IGuiProvider GameRegistry.registerTileEntity(TileEntityOredictionificator.class, "Oredictionificator"); GameRegistry.registerTileEntity(TileEntityStructuralGlass.class, "StructuralGlass"); GameRegistry.registerTileEntity(TileEntityResistiveHeater.class, "ResistiveHeater"); + GameRegistry.registerTileEntity(TileEntityBoilerCasing.class, "BoilerCasing"); + GameRegistry.registerTileEntity(TileEntityBoilerValve.class, "BoilerValve"); } public void handleTeleporterUpdate(PortableTeleporterMessage message) {} diff --git a/src/main/java/mekanism/common/Mekanism.java b/src/main/java/mekanism/common/Mekanism.java index df9ee73cf..7050d6db1 100644 --- a/src/main/java/mekanism/common/Mekanism.java +++ b/src/main/java/mekanism/common/Mekanism.java @@ -1116,8 +1116,6 @@ public class Mekanism GameRegistry.registerTileEntity(TileEntityEntangledBlock.class, "EntangledBlock"); GameRegistry.registerTileEntity(TileEntityPressureDisperser.class, "PressureDisperser"); GameRegistry.registerTileEntity(TileEntitySuperheatingElement.class, "SuperheatingElement"); - GameRegistry.registerTileEntity(TileEntityBoilerCasing.class, "BoilerCasing"); - GameRegistry.registerTileEntity(TileEntityBoilerValve.class, "BoilerValve"); //Load tile entities that have special renderers. proxy.registerSpecialTileEntities(); diff --git a/src/main/java/mekanism/common/block/BlockBasic.java b/src/main/java/mekanism/common/block/BlockBasic.java index 677f83ceb..803160c55 100644 --- a/src/main/java/mekanism/common/block/BlockBasic.java +++ b/src/main/java/mekanism/common/block/BlockBasic.java @@ -34,6 +34,7 @@ import mekanism.common.tile.TileEntityInductionPort; import mekanism.common.tile.TileEntityInductionProvider; import mekanism.common.tile.TileEntityPressureDisperser; import mekanism.common.tile.TileEntityStructuralGlass; +import mekanism.common.tile.TileEntitySuperheatingElement; import mekanism.common.tile.TileEntityThermalEvaporationBlock; import mekanism.common.tile.TileEntityThermalEvaporationController; import mekanism.common.tile.TileEntityThermalEvaporationValve; @@ -1004,7 +1005,7 @@ public class BlockBasic extends Block implements IBlockCTM, ICustomBlockIcon INDUCTION_PORT(BasicBlock.BASIC_BLOCK_2, 2, "InductionPort", TileEntityInductionPort.class, true), INDUCTION_CELL(BasicBlock.BASIC_BLOCK_2, 3, "InductionCell", TileEntityInductionCell.class, true), INDUCTION_PROVIDER(BasicBlock.BASIC_BLOCK_2, 4, "InductionProvider", TileEntityInductionProvider.class, true), - SUPERHEATING_ELEMENT(BasicBlock.BASIC_BLOCK_2, 5, "SuperheatingElement", null, true), + SUPERHEATING_ELEMENT(BasicBlock.BASIC_BLOCK_2, 5, "SuperheatingElement", TileEntitySuperheatingElement.class, true), PRESSURE_DISPERSER(BasicBlock.BASIC_BLOCK_2, 6, "PressureDisperser", TileEntityPressureDisperser.class, true), BOILER_CASING(BasicBlock.BASIC_BLOCK_2, 7, "BoilerCasing", TileEntityBoilerCasing.class, true), BOILER_VALVE(BasicBlock.BASIC_BLOCK_2, 8, "BoilerValve", TileEntityBoilerValve.class, true); diff --git a/src/main/java/mekanism/common/content/boiler/BoilerUpdateProtocol.java b/src/main/java/mekanism/common/content/boiler/BoilerUpdateProtocol.java index 3f527d126..821444a4c 100644 --- a/src/main/java/mekanism/common/content/boiler/BoilerUpdateProtocol.java +++ b/src/main/java/mekanism/common/content/boiler/BoilerUpdateProtocol.java @@ -51,6 +51,8 @@ public class BoilerUpdateProtocol extends UpdateProtocol @Override protected boolean canForm(SynchronizedBoilerData structure) { + System.out.println("hi"); + if(structure.volHeight >= 3) { Set dispersers = new HashSet(); @@ -75,6 +77,7 @@ public class BoilerUpdateProtocol extends UpdateProtocol //Ensure at least one disperser exists if(dispersers.size() == 0) { + System.out.println("No dispersers"); return false; } @@ -90,6 +93,7 @@ public class BoilerUpdateProtocol extends UpdateProtocol if(!(tile instanceof TileEntityPressureDisperser)) { + System.out.println("Missing disperser"); return false; } @@ -100,6 +104,7 @@ public class BoilerUpdateProtocol extends UpdateProtocol //If there are more dispersers than those on the plane found, the structure is invalid if(dispersers.size() > 0) { + System.out.println("Bad disperser"); return false; } @@ -113,6 +118,7 @@ public class BoilerUpdateProtocol extends UpdateProtocol if(elements.size() > structure.superheatingElements) { + System.out.println("Disconnected elements"); return false; } @@ -138,26 +144,36 @@ public class BoilerUpdateProtocol extends UpdateProtocol //Some air must exist for the structure to be valid if(initAir == null) { + System.out.println("No air"); return false; } + final int total = totalAir; + structure.waterVolume = new NodeCounter(new NodeChecker() { @Override public boolean isValid(Coord4D coord) { - return coord.yCoord < initDisperser.yCoord && (coord.isAirBlock(pointer.getWorldObj()) || isViableNode(coord.xCoord, coord.yCoord, coord.zCoord)); + return coord.yCoord >= structure.renderLocation.yCoord && coord.yCoord < initDisperser.yCoord && + coord.xCoord >= structure.renderLocation.xCoord && coord.xCoord <= structure.renderLocation.xCoord+structure.volLength && + coord.zCoord >= structure.renderLocation.zCoord && coord.zCoord <= structure.renderLocation.zCoord+structure.volWidth && + (coord.isAirBlock(pointer.getWorldObj()) || isViableNode(coord.xCoord, coord.yCoord, coord.zCoord)); } }).calculate(initAir); //Make sure all air blocks are connected if(totalAir > structure.waterVolume) { + System.out.println("nonconnected air"); return false; } int steamHeight = (structure.renderLocation.yCoord+structure.volHeight)-initDisperser.yCoord; structure.steamVolume = structure.volWidth*structure.volLength*steamHeight; + structure.upperRenderLocation = new Coord4D(structure.renderLocation.xCoord, structure.renderLocation.zCoord, initDisperser.yCoord+1); + System.out.println(structure.superheatingElements + " " + structure.waterVolume + " " + structure.steamVolume); + return true; } diff --git a/src/main/java/mekanism/common/content/boiler/SynchronizedBoilerData.java b/src/main/java/mekanism/common/content/boiler/SynchronizedBoilerData.java index 2e83ff67f..771187726 100644 --- a/src/main/java/mekanism/common/content/boiler/SynchronizedBoilerData.java +++ b/src/main/java/mekanism/common/content/boiler/SynchronizedBoilerData.java @@ -39,6 +39,8 @@ public class SynchronizedBoilerData extends SynchronizedData valves = new HashSet(); diff --git a/src/main/java/mekanism/common/inventory/container/ContainerThermoelectricBoiler.java b/src/main/java/mekanism/common/inventory/container/ContainerThermoelectricBoiler.java new file mode 100644 index 000000000..121340df9 --- /dev/null +++ b/src/main/java/mekanism/common/inventory/container/ContainerThermoelectricBoiler.java @@ -0,0 +1,5 @@ +package mekanism.common.inventory.container; + +public class ContainerThermoelectricBoiler { + +} diff --git a/src/main/java/mekanism/common/multiblock/UpdateProtocol.java b/src/main/java/mekanism/common/multiblock/UpdateProtocol.java index 443a81b4e..7a43bbcee 100644 --- a/src/main/java/mekanism/common/multiblock/UpdateProtocol.java +++ b/src/main/java/mekanism/common/multiblock/UpdateProtocol.java @@ -550,6 +550,11 @@ public abstract class UpdateProtocol> { iterated.add(pos); + if(!checker.shouldContinue(iterated.size())) + { + return; + } + for(ForgeDirection side : ForgeDirection.VALID_DIRECTIONS) { Coord4D coord = pos.getFromSide(side); @@ -574,8 +579,13 @@ public abstract class UpdateProtocol> } } - public static interface NodeChecker + public static abstract class NodeChecker { - public boolean isValid(Coord4D coord); + public abstract boolean isValid(Coord4D coord); + + public boolean shouldContinue(int iterated) + { + return true; + } } } diff --git a/src/main/java/mekanism/common/tile/TileEntityBoilerCasing.java b/src/main/java/mekanism/common/tile/TileEntityBoilerCasing.java index 80be3eeea..07e05e348 100644 --- a/src/main/java/mekanism/common/tile/TileEntityBoilerCasing.java +++ b/src/main/java/mekanism/common/tile/TileEntityBoilerCasing.java @@ -203,6 +203,8 @@ public class TileEntityBoilerCasing extends TileEntityMultiblock toSend = new HashSet(); for(ValveData valveData : structure.valves) @@ -255,6 +257,8 @@ public class TileEntityBoilerCasing extends TileEntityMultiblock cachedFluids = new HashMap(); diff --git a/src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineCasing.java b/src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineCasing.java index 78e1adc09..b6dec8d98 100644 --- a/src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineCasing.java +++ b/src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineCasing.java @@ -27,8 +27,6 @@ import net.minecraftforge.fluids.FluidStack; public class TileEntityTurbineCasing extends TileEntityMultiblock implements IStrictEnergyStorage { - public float prevScale; - public TileEntityTurbineCasing() { this("TurbineCasing"); @@ -44,19 +42,6 @@ public class TileEntityTurbineCasing extends TileEntityMultiblock 0.01) - { - prevScale = (9*prevScale + targetScale)/10; - } - } - } - if(!worldObj.isRemote) { if(structure != null) From 9d43e4ab49c5c4bf628e9ade5b4915eaf08dfb83 Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Sun, 28 Feb 2016 12:31:27 -0500 Subject: [PATCH 14/52] Fixed Induction Matrix issue --- .../common/content/matrix/MatrixUpdateProtocol.java | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/main/java/mekanism/common/content/matrix/MatrixUpdateProtocol.java b/src/main/java/mekanism/common/content/matrix/MatrixUpdateProtocol.java index d31e5ee80..52f482aba 100644 --- a/src/main/java/mekanism/common/content/matrix/MatrixUpdateProtocol.java +++ b/src/main/java/mekanism/common/content/matrix/MatrixUpdateProtocol.java @@ -73,7 +73,7 @@ public class MatrixUpdateProtocol extends UpdateProtocol } @Override - protected void onFormed() + public boolean isInteriorValid(SynchronizedMatrixData structure) { for(Coord4D coord : innerNodes) { @@ -81,14 +81,16 @@ public class MatrixUpdateProtocol extends UpdateProtocol if(tile instanceof TileEntityInductionCell) { - structureFound.cells.add(coord); - structureFound.storageCap += ((TileEntityInductionCell)tile).tier.maxEnergy; + structure.cells.add(coord); + structure.storageCap += ((TileEntityInductionCell)tile).tier.maxEnergy; } else if(tile instanceof TileEntityInductionProvider) { - structureFound.providers.add(coord); - structureFound.transferCap += ((TileEntityInductionProvider)tile).tier.output; + structure.providers.add(coord); + structure.transferCap += ((TileEntityInductionProvider)tile).tier.output; } } + + return true; } } From 2451ac4819d19d57db75ddd8bd91603bed922a3c Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Sun, 28 Feb 2016 12:32:36 -0500 Subject: [PATCH 15/52] Completed merge --- .../tileentity/RenderThermoelectricBoiler.java | 13 ++++++++++++- .../common/content/matrix/MatrixUpdateProtocol.java | 2 +- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/src/main/java/mekanism/client/render/tileentity/RenderThermoelectricBoiler.java b/src/main/java/mekanism/client/render/tileentity/RenderThermoelectricBoiler.java index 54a1574b8..2068093d0 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderThermoelectricBoiler.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderThermoelectricBoiler.java @@ -27,7 +27,18 @@ public class RenderThermoelectricBoiler extends TileEntitySpecialRenderer public void renderAModelAt(TileEntityBoilerCasing tileEntity, double x, double y, double z, float partialTick) { - + if(tileEntity.clientHasStructure && tileEntity.isRendering && tileEntity.structure != null) + { + if(tileEntity.structure.waterStored != null && tileEntity.structure.waterStored.amount != 0) + { + + } + + if(tileEntity.structure.steamStored != null && tileEntity.structure.steamStored.amount != 0) + { + + } + } } public static void resetDisplayInts() diff --git a/src/main/java/mekanism/common/content/matrix/MatrixUpdateProtocol.java b/src/main/java/mekanism/common/content/matrix/MatrixUpdateProtocol.java index 52f482aba..9a401ae86 100644 --- a/src/main/java/mekanism/common/content/matrix/MatrixUpdateProtocol.java +++ b/src/main/java/mekanism/common/content/matrix/MatrixUpdateProtocol.java @@ -73,7 +73,7 @@ public class MatrixUpdateProtocol extends UpdateProtocol } @Override - public boolean isInteriorValid(SynchronizedMatrixData structure) + protected boolean canForm(SynchronizedMatrixData structure) { for(Coord4D coord : innerNodes) { From c0f465d0cb278579393ed0c9a09fdf9c91cb5daa Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Sun, 28 Feb 2016 16:44:05 -0500 Subject: [PATCH 16/52] Boiler rendering and interface, still yet to do statistics --- .../java/mekanism/client/ClientProxy.java | 3 + .../client/gui/GuiThermoelectricBoiler.java | 164 ++++++++++- .../client/gui/element/GuiBoilerTab.java | 118 ++++++++ .../client/render/MekanismRenderer.java | 1 - .../RenderThermoelectricBoiler.java | 270 ++++++++++++++++++ .../java/mekanism/common/CommonProxy.java | 2 + src/main/java/mekanism/common/Mekanism.java | 3 - .../common/content/boiler/BoilerTank.java | 2 +- .../content/boiler/BoilerUpdateProtocol.java | 27 +- .../boiler/SynchronizedBoilerData.java | 40 +-- .../ContainerThermoelectricBoiler.java | 5 - .../common/tile/TileEntityBoilerCasing.java | 43 ++- .../client/gui/GuiIndustrialTurbine.java | 8 +- .../client/gui/GuiTurbineStats.java | 2 +- .../client/gui/element/GuiTurbineTab.java | 5 +- .../generators/common/FusionReactor.java | 1 + .../tile/reactor/TileEntityReactorPort.java | 1 + .../mekanism/gui/GuiThermoelectricBoiler.png | Bin 0 -> 3623 bytes .../resources/assets/mekanism/lang/en_US.lang | 2 + 19 files changed, 631 insertions(+), 66 deletions(-) create mode 100644 src/main/java/mekanism/client/gui/element/GuiBoilerTab.java delete mode 100644 src/main/java/mekanism/common/inventory/container/ContainerThermoelectricBoiler.java create mode 100644 src/main/resources/assets/mekanism/gui/GuiThermoelectricBoiler.png diff --git a/src/main/java/mekanism/client/ClientProxy.java b/src/main/java/mekanism/client/ClientProxy.java index 7404a1112..7c2869019 100644 --- a/src/main/java/mekanism/client/ClientProxy.java +++ b/src/main/java/mekanism/client/ClientProxy.java @@ -57,6 +57,7 @@ import mekanism.client.gui.GuiSideConfiguration; import mekanism.client.gui.GuiSolarNeutronActivator; import mekanism.client.gui.GuiTeleporter; import mekanism.client.gui.GuiThermalEvaporationController; +import mekanism.client.gui.GuiThermoelectricBoiler; import mekanism.client.gui.GuiTransporterConfig; import mekanism.client.gui.GuiUpgradeManagement; import mekanism.client.render.MekanismRenderer; @@ -523,6 +524,8 @@ public class ClientProxy extends CommonProxy return new GuiOredictionificator(player.inventory, (TileEntityOredictionificator)tileEntity); case 53: return new GuiResistiveHeater(player.inventory, (TileEntityResistiveHeater)tileEntity); + case 54: + return new GuiThermoelectricBoiler(player.inventory, (TileEntityBoilerCasing)tileEntity); } return null; diff --git a/src/main/java/mekanism/client/gui/GuiThermoelectricBoiler.java b/src/main/java/mekanism/client/gui/GuiThermoelectricBoiler.java index b48c2421d..a514bc9d4 100644 --- a/src/main/java/mekanism/client/gui/GuiThermoelectricBoiler.java +++ b/src/main/java/mekanism/client/gui/GuiThermoelectricBoiler.java @@ -1,9 +1,171 @@ package mekanism.client.gui; +import java.util.List; + +import mekanism.api.MekanismConfig.general; +import mekanism.api.util.ListUtils; +import mekanism.api.util.UnitDisplayUtils; +import mekanism.api.util.UnitDisplayUtils.TemperatureUnit; +import mekanism.client.gui.element.GuiBoilerTab; +import mekanism.client.gui.element.GuiElement.IInfoHandler; +import mekanism.client.gui.element.GuiHeatInfo; +import mekanism.client.gui.element.GuiRateBar; +import mekanism.client.gui.element.GuiRateBar.IRateInfoHandler; +import mekanism.client.render.MekanismRenderer; +import mekanism.common.inventory.container.ContainerFilter; +import mekanism.common.tile.TileEntityBoilerCasing; +import mekanism.common.util.LangUtils; +import mekanism.common.util.MekanismUtils; +import mekanism.common.util.MekanismUtils.ResourceType; +import mekanism.generators.client.gui.element.GuiTurbineTab.BoilerTab; +import net.minecraft.entity.player.InventoryPlayer; +import net.minecraftforge.fluids.FluidStack; + +import org.lwjgl.opengl.GL11; + import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) -public class GuiThermoelectricBoiler { +public class GuiThermoelectricBoiler extends GuiMekanism +{ + public TileEntityBoilerCasing tileEntity; + public GuiThermoelectricBoiler(InventoryPlayer inventory, TileEntityBoilerCasing tentity) + { + super(tentity, new ContainerFilter(inventory, tentity)); + tileEntity = tentity; + guiElements.add(new GuiBoilerTab(this, tileEntity, BoilerTab.STAT, 6, MekanismUtils.getResource(ResourceType.GUI, "GuiThermoelectricBoiler.png"))); + guiElements.add(new GuiRateBar(this, new IRateInfoHandler() + { + @Override + public String getTooltip() + { + return LangUtils.localize("gui.boilRate") + ": " + tileEntity.structure.lastBoilRate + " mB/t"; + } + + @Override + public double getLevel() + { + double max = (int)Math.floor(tileEntity.structure.getHeatAvailable() / tileEntity.structure.enthalpyOfVaporization); + + return (double)tileEntity.structure.lastBoilRate/max; + } + }, MekanismUtils.getResource(ResourceType.GUI, "GuiThermoelectricBoiler.png"), 24, 13)); + guiElements.add(new GuiRateBar(this, new IRateInfoHandler() + { + @Override + public String getTooltip() + { + double max = (int)Math.floor(tileEntity.structure.getHeatAvailable() / tileEntity.structure.enthalpyOfVaporization); + double cap = tileEntity.structure.superheatingElements*general.superheatingHeatTransfer; + return LangUtils.localize("gui.maxBoil") + ": " + tileEntity.structure.lastBoilRate + " mB/t"; + } + + @Override + public double getLevel() + { + double max = (int)Math.floor(tileEntity.structure.getHeatAvailable() / tileEntity.structure.enthalpyOfVaporization); + + return (double)tileEntity.structure.lastBoilRate/max; + } + }, MekanismUtils.getResource(ResourceType.GUI, "GuiThermoelectricBoiler.png"), 142, 13)); + guiElements.add(new GuiHeatInfo(new IInfoHandler() { + @Override + public List getInfo() + { + String loss = UnitDisplayUtils.getDisplayShort(tileEntity.structure.lastEnvironmentLoss, TemperatureUnit.KELVIN); + return ListUtils.asList(LangUtils.localize("gui.dissipated") + ": " + loss + "/t"); + } + }, this, MekanismUtils.getResource(ResourceType.GUI, "GuiThermoelectricBoiler.png"))); + } + + @Override + protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) + { + int xAxis = (mouseX - (width - xSize) / 2); + int yAxis = (mouseY - (height - ySize) / 2); + + fontRendererObj.drawString(tileEntity.getInventoryName(), (xSize/2)-(fontRendererObj.getStringWidth(tileEntity.getInventoryName())/2), 5, 0x404040); + + double max = (int)Math.floor(tileEntity.structure.getHeatAvailable() / tileEntity.structure.enthalpyOfVaporization); + + renderScaledText(LangUtils.localize("gui.temp") + ": " + MekanismUtils.getTemperatureDisplay(tileEntity.structure.temperature, TemperatureUnit.AMBIENT), 43, 30, 0x00CD00, 90); + renderScaledText(LangUtils.localize("gui.boilRate") + ": " + tileEntity.structure.lastBoilRate + " mB/t", 43, 39, 0x00CD00, 90); + renderScaledText(LangUtils.localize("gui.maxBoil") + ": " + max + " mB/t", 43, 48, 0x00CD00, 90); + + if(xAxis >= 7 && xAxis <= 23 && yAxis >= 14 && yAxis <= 72) + { + drawCreativeTabHoveringText(tileEntity.structure.waterStored != null ? LangUtils.localizeFluidStack(tileEntity.structure.waterStored) + ": " + tileEntity.structure.waterStored.amount + "mB" : LangUtils.localize("gui.empty"), xAxis, yAxis); + } + + if(xAxis >= 153 && xAxis <= 169 && yAxis >= 14 && yAxis <= 72) + { + drawCreativeTabHoveringText(tileEntity.structure.steamStored != null ? LangUtils.localizeFluidStack(tileEntity.structure.steamStored) + ": " + tileEntity.structure.steamStored.amount + "mB" : LangUtils.localize("gui.empty"), xAxis, yAxis); + } + + super.drawGuiContainerForegroundLayer(mouseX, mouseY); + } + + @Override + protected void drawGuiContainerBackgroundLayer(float partialTick, int mouseX, int mouseY) + { + mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.GUI, "GuiThermoelectricBoiler.png")); + GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + int guiWidth = (width - xSize) / 2; + int guiHeight = (height - ySize) / 2; + drawTexturedModalRect(guiWidth, guiHeight, 0, 0, xSize, ySize); + + if(tileEntity.getScaledWaterLevel(58) > 0) + { + displayGauge(7, 14, tileEntity.getScaledWaterLevel(58), tileEntity.structure.waterStored); + } + + if(tileEntity.getScaledSteamLevel(58) > 0) + { + displayGauge(153, 14, tileEntity.getScaledSteamLevel(58), tileEntity.structure.steamStored); + } + + super.drawGuiContainerBackgroundLayer(partialTick, mouseX, mouseY); + } + + public void displayGauge(int xPos, int yPos, int scale, FluidStack fluid) + { + if(fluid == null) + { + return; + } + + int guiWidth = (width - xSize) / 2; + int guiHeight = (height - ySize) / 2; + + int start = 0; + + while(true) + { + int renderRemaining = 0; + + if(scale > 16) + { + renderRemaining = 16; + scale -= 16; + } + else { + renderRemaining = scale; + scale = 0; + } + + mc.renderEngine.bindTexture(MekanismRenderer.getBlocksTexture()); + drawTexturedModelRectFromIcon(guiWidth + xPos, guiHeight + yPos + 58 - renderRemaining - start, fluid.getFluid().getIcon(), 16, 16 - (16 - renderRemaining)); + start+=16; + + if(renderRemaining == 0 || scale == 0) + { + break; + } + } + + mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.GUI, "GuiIndustrialTurbine.png")); + drawTexturedModalRect(guiWidth + xPos, guiHeight + yPos, 176, 0, 16, 54); + } } diff --git a/src/main/java/mekanism/client/gui/element/GuiBoilerTab.java b/src/main/java/mekanism/client/gui/element/GuiBoilerTab.java new file mode 100644 index 000000000..1105a70e7 --- /dev/null +++ b/src/main/java/mekanism/client/gui/element/GuiBoilerTab.java @@ -0,0 +1,118 @@ +package mekanism.client.gui.element; + +import mekanism.api.Coord4D; +import mekanism.client.gui.IGuiWrapper; +import mekanism.client.sound.SoundHandler; +import mekanism.common.Mekanism; +import mekanism.common.network.PacketSimpleGui.SimpleGuiMessage; +import mekanism.common.util.LangUtils; +import mekanism.common.util.MekanismUtils; +import mekanism.common.util.MekanismUtils.ResourceType; +import mekanism.generators.client.gui.element.GuiTurbineTab.BoilerTab; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.ResourceLocation; +import codechicken.lib.vec.Rectangle4i; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + +@SideOnly(Side.CLIENT) +public class GuiBoilerTab extends GuiElement +{ + private TileEntity tileEntity; + private BoilerTab tabType; + private int yPos; + + public GuiBoilerTab(IGuiWrapper gui, TileEntity tile, BoilerTab type, int y, ResourceLocation def) + { + super(type.getResource(), gui, def); + + tileEntity = tile; + tabType = type; + yPos = y; + } + + @Override + public Rectangle4i getBounds(int guiWidth, int guiHeight) + { + return new Rectangle4i(guiWidth - 26, guiHeight + yPos, 26, 26); + } + + @Override + public void renderBackground(int xAxis, int yAxis, int guiWidth, int guiHeight) + { + mc.renderEngine.bindTexture(RESOURCE); + + guiObj.drawTexturedRect(guiWidth - 26, guiHeight + yPos, 0, 0, 26, 26); + + if(xAxis >= -21 && xAxis <= -3 && yAxis >= yPos+4 && yAxis <= yPos+22) + { + guiObj.drawTexturedRect(guiWidth - 21, guiHeight + yPos+4, 26, 0, 18, 18); + } + else { + guiObj.drawTexturedRect(guiWidth - 21, guiHeight + yPos+4, 26, 18, 18, 18); + } + + mc.renderEngine.bindTexture(defaultLocation); + } + + @Override + public void renderForeground(int xAxis, int yAxis) + { + mc.renderEngine.bindTexture(RESOURCE); + + if(xAxis >= -21 && xAxis <= -3 && yAxis >= yPos+4 && yAxis <= yPos+22) + { + displayTooltip(tabType.getDesc(), xAxis, yAxis); + } + + mc.renderEngine.bindTexture(defaultLocation); + } + + @Override + public void preMouseClicked(int xAxis, int yAxis, int button) {} + + @Override + public void mouseClicked(int xAxis, int yAxis, int button) + { + if(button == 0) + { + if(xAxis >= -21 && xAxis <= -3 && yAxis >= yPos+4 && yAxis <= yPos+22) + { + tabType.openGui(tileEntity); + SoundHandler.playSound("gui.button.press"); + } + } + } + + public static enum TurbineTab + { + MAIN("GuiGasesTab.png", 54, "gui.main"), + STAT("GuiStatsTab.png", 55, "gui.stats"); + + private String path; + private int guiId; + private String desc; + + private TurbineTab(String s, int id, String s1) + { + path = s; + guiId = id; + desc = s1; + } + + public ResourceLocation getResource() + { + return MekanismUtils.getResource(ResourceType.GUI_ELEMENT, path); + } + + public void openGui(TileEntity tile) + { + Mekanism.packetHandler.sendToServer(new SimpleGuiMessage(Coord4D.get(tile), 1, guiId)); + } + + public String getDesc() + { + return LangUtils.localize(desc); + } + } +} \ No newline at end of file diff --git a/src/main/java/mekanism/client/render/MekanismRenderer.java b/src/main/java/mekanism/client/render/MekanismRenderer.java index 96ec19050..4cf2f83c6 100644 --- a/src/main/java/mekanism/client/render/MekanismRenderer.java +++ b/src/main/java/mekanism/client/render/MekanismRenderer.java @@ -111,7 +111,6 @@ public class MekanismRenderer GasRegistry.getGas("deuterium").setIcon(event.map.registerIcon("mekanism:LiquidDeuterium")); GasRegistry.getGas("tritium").setIcon(event.map.registerIcon("mekanism:LiquidTritium")); GasRegistry.getGas("fusionFuelDT").setIcon(event.map.registerIcon("mekanism:LiquidDT")); - GasRegistry.getGas("steam").setIcon(event.map.registerIcon("mekanism:LiquidSteam")); GasRegistry.getGas("lithium").setIcon(event.map.registerIcon("mekanism:LiquidLithium")); for(Gas gas : GasRegistry.getRegisteredGasses()) diff --git a/src/main/java/mekanism/client/render/tileentity/RenderThermoelectricBoiler.java b/src/main/java/mekanism/client/render/tileentity/RenderThermoelectricBoiler.java index 2068093d0..7b7f02170 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderThermoelectricBoiler.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderThermoelectricBoiler.java @@ -3,12 +3,24 @@ package mekanism.client.render.tileentity; import java.util.HashMap; import java.util.Map; +import mekanism.client.render.MekanismRenderer; import mekanism.client.render.MekanismRenderer.DisplayInteger; +import mekanism.client.render.MekanismRenderer.Model3D; import mekanism.client.render.tileentity.RenderDynamicTank.RenderData; import mekanism.client.render.tileentity.RenderDynamicTank.ValveRenderData; +import mekanism.common.content.tank.SynchronizedTankData.ValveData; +import mekanism.common.content.tank.TankUpdateProtocol; import mekanism.common.tile.TileEntityBoilerCasing; +import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; +import net.minecraft.init.Blocks; import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.World; +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidRegistry; + +import org.lwjgl.opengl.GL11; + import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -19,6 +31,9 @@ public class RenderThermoelectricBoiler extends TileEntitySpecialRenderer private static Map cachedUpperFluids = new HashMap(); private static Map cachedValveFluids = new HashMap(); + private Fluid STEAM = FluidRegistry.getFluid("steam"); + private Fluid WATER = FluidRegistry.WATER; + @Override public void renderTileEntityAt(TileEntity tileEntity, double x, double y, double z, float partialTick) { @@ -31,16 +46,271 @@ public class RenderThermoelectricBoiler extends TileEntitySpecialRenderer { if(tileEntity.structure.waterStored != null && tileEntity.structure.waterStored.amount != 0) { + RenderData data = new RenderData(); + + data.location = tileEntity.structure.renderLocation; + data.height = tileEntity.structure.volHeight; + data.length = tileEntity.structure.volLength; + data.width = tileEntity.structure.volWidth; + + bindTexture(MekanismRenderer.getBlocksTexture()); + if(data.location != null && tileEntity.structure.waterStored.getFluid() != null) + { + push(); + + GL11.glTranslated(getX(data.location.xCoord), getY(data.location.yCoord), getZ(data.location.zCoord)); + + MekanismRenderer.glowOn(tileEntity.structure.waterStored.getFluid().getLuminosity()); + MekanismRenderer.colorFluid(tileEntity.structure.waterStored.getFluid()); + + DisplayInteger[] displayList = getListAndRender(data, tileEntity.structure.waterStored.getFluid(), tileEntity.getWorldObj(), cachedLowerFluids); + + if(tileEntity.structure.waterStored.getFluid().isGaseous()) + { + GL11.glColor4f(1F, 1F, 1F, Math.min(1, ((float)tileEntity.structure.waterStored.amount / (float)tileEntity.clientWaterCapacity)+0.3F)); + displayList[getStages(data.height)-1].render(); + } + else { + displayList[Math.min(getStages(data.height)-1, (int)(tileEntity.prevWaterScale*((float)getStages(data.height)-1)))].render(); + } + + MekanismRenderer.glowOff(); + MekanismRenderer.resetColor(); + + pop(); + + for(ValveData valveData : tileEntity.valveViewing) + { + push(); + + GL11.glTranslated(getX(valveData.location.xCoord), getY(valveData.location.yCoord), getZ(valveData.location.zCoord)); + + MekanismRenderer.glowOn(tileEntity.structure.waterStored.getFluid().getLuminosity()); + + getValveDisplay(ValveRenderData.get(data, valveData), tileEntity.structure.waterStored.getFluid(), tileEntity.getWorldObj()).render(); + + MekanismRenderer.glowOff(); + MekanismRenderer.resetColor(); + + pop(); + } + } } if(tileEntity.structure.steamStored != null && tileEntity.structure.steamStored.amount != 0) { + RenderData data = new RenderData(); + + data.location = tileEntity.structure.upperRenderLocation; + data.height = tileEntity.structure.volHeight; + data.length = tileEntity.structure.volLength; + data.width = tileEntity.structure.volWidth; + + bindTexture(MekanismRenderer.getBlocksTexture()); + if(data.location != null && tileEntity.structure.steamStored.getFluid() != null) + { + push(); + + GL11.glTranslated(getX(data.location.xCoord), getY(data.location.yCoord), getZ(data.location.zCoord)); + + MekanismRenderer.glowOn(tileEntity.structure.steamStored.getFluid().getLuminosity()); + MekanismRenderer.colorFluid(tileEntity.structure.steamStored.getFluid()); + + DisplayInteger[] displayList = getListAndRender(data, tileEntity.structure.waterStored.getFluid(), tileEntity.getWorldObj(), cachedUpperFluids); + + GL11.glColor4f(1F, 1F, 1F, Math.min(1, ((float)tileEntity.structure.steamStored.amount / (float)tileEntity.clientSteamCapacity)+0.3F)); + displayList[getStages(data.height+1)-1].render(); + + MekanismRenderer.glowOff(); + MekanismRenderer.resetColor(); + + pop(); + } } } } + private void pop() + { + GL11.glPopAttrib(); + GL11.glPopMatrix(); + } + + private void push() + { + GL11.glPushMatrix(); + GL11.glPushAttrib(GL11.GL_ENABLE_BIT); + GL11.glEnable(GL11.GL_CULL_FACE); + GL11.glEnable(GL11.GL_BLEND); + GL11.glDisable(GL11.GL_LIGHTING); + GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); + } + + private DisplayInteger[] getListAndRender(RenderData data, Fluid fluid, World world, Map map) + { + if(map.containsKey(data)) + { + return map.get(data); + } + + Model3D toReturn = new Model3D(); + toReturn.baseBlock = Blocks.water; + toReturn.setTexture(fluid.getIcon()); + + final int stages = getStages(data.height); + DisplayInteger[] displays = new DisplayInteger[stages]; + + map.put(data, displays); + + for(int i = 0; i < stages; i++) + { + displays[i] = DisplayInteger.createAndStart(); + + if(fluid.getIcon() != null) + { + toReturn.minX = 0 + .01; + toReturn.minY = 0 + .01; + toReturn.minZ = 0 + .01; + + toReturn.maxX = data.length - .01; + toReturn.maxY = ((float)i/(float)stages)*(data.height-2) - .01; + toReturn.maxZ = data.width - .01; + + MekanismRenderer.renderObject(toReturn); + } + + GL11.glEndList(); + } + + return displays; + } + + private DisplayInteger getValveDisplay(ValveRenderData data, Fluid fluid, World world) + { + if(cachedValveFluids.containsKey(data)) + { + return cachedValveFluids.get(data); + } + + Model3D toReturn = new Model3D(); + toReturn.baseBlock = Blocks.water; + toReturn.setTexture(fluid.getFlowingIcon()); + + DisplayInteger display = DisplayInteger.createAndStart(); + + cachedValveFluids.put(data, display); + + switch(data.side) + { + case DOWN: + { + toReturn.minX = .3; + toReturn.minY = 1 + .01; + toReturn.minZ = .3; + + toReturn.maxX = .7; + toReturn.maxY = 1.4 + .1; + toReturn.maxZ = .7; + break; + } + case UP: + { + toReturn.minX = .3; + toReturn.minY = -(data.height-2) - .01; + toReturn.minZ = .3; + + toReturn.maxX = .7; + toReturn.maxY = -.01; + toReturn.maxZ = .7; + break; + } + case NORTH: + { + toReturn.minX = .3; + toReturn.minY = -(getValveFluidHeight(data)) + .01; + toReturn.minZ = 1 + .02; + + toReturn.maxX = .7; + toReturn.maxY = .7; + toReturn.maxZ = 1.4; + break; + } + case SOUTH: + { + toReturn.minX = .3; + toReturn.minY = -(getValveFluidHeight(data)) + .01; + toReturn.minZ = -.4; + + toReturn.maxX = .7; + toReturn.maxY = .7; + toReturn.maxZ = -.02; + break; + } + case WEST: + { + toReturn.minX = 1 + .02; + toReturn.minY = -(getValveFluidHeight(data)) + .01; + toReturn.minZ = .3; + + toReturn.maxX = 1.4; + toReturn.maxY = .7; + toReturn.maxZ = .7; + break; + } + case EAST: + { + toReturn.minX = -.4; + toReturn.minY = -(getValveFluidHeight(data)) + .01; + toReturn.minZ = .3; + + toReturn.maxX = -.02; + toReturn.maxY = .7; + toReturn.maxZ = .7; + break; + } + default: + { + break; + } + } + + if(fluid.getFlowingIcon() != null) + { + MekanismRenderer.renderObject(toReturn); + } + + display.endList(); + + return display; + } + + private int getValveFluidHeight(ValveRenderData data) + { + return data.valveLocation.yCoord - data.location.yCoord; + } + + private int getStages(int height) + { + return (height-2)*(TankUpdateProtocol.FLUID_PER_TANK/10); + } + + private double getX(int x) + { + return x - TileEntityRendererDispatcher.staticPlayerX; + } + + private double getY(int y) + { + return y - TileEntityRendererDispatcher.staticPlayerY; + } + + private double getZ(int z) + { + return z - TileEntityRendererDispatcher.staticPlayerZ; + } + public static void resetDisplayInts() { cachedLowerFluids.clear(); diff --git a/src/main/java/mekanism/common/CommonProxy.java b/src/main/java/mekanism/common/CommonProxy.java index 8e9cccd0f..81966ca01 100644 --- a/src/main/java/mekanism/common/CommonProxy.java +++ b/src/main/java/mekanism/common/CommonProxy.java @@ -541,6 +541,8 @@ public class CommonProxy implements IGuiProvider return new ContainerOredictionificator(player.inventory, (TileEntityOredictionificator)tileEntity); case 53: return new ContainerResistiveHeater(player.inventory, (TileEntityResistiveHeater)tileEntity); + case 54: + return new ContainerFilter(player.inventory, (TileEntityContainerBlock)tileEntity); } return null; diff --git a/src/main/java/mekanism/common/Mekanism.java b/src/main/java/mekanism/common/Mekanism.java index 7050d6db1..2137b0af8 100644 --- a/src/main/java/mekanism/common/Mekanism.java +++ b/src/main/java/mekanism/common/Mekanism.java @@ -72,8 +72,6 @@ import mekanism.common.recipe.inputs.ItemStackInput; import mekanism.common.recipe.machines.SmeltingRecipe; import mekanism.common.recipe.outputs.ItemStackOutput; import mekanism.common.tile.TileEntityAdvancedBoundingBlock; -import mekanism.common.tile.TileEntityBoilerCasing; -import mekanism.common.tile.TileEntityBoilerValve; import mekanism.common.tile.TileEntityBoundingBlock; import mekanism.common.tile.TileEntityCardboardBox; import mekanism.common.tile.TileEntityElectricBlock; @@ -1204,7 +1202,6 @@ public class Mekanism GasRegistry.register(new Gas("deuterium")).registerFluid(); GasRegistry.register(new Gas("tritium")).registerFluid(); GasRegistry.register(new Gas("fusionFuelDT")).registerFluid(); - GasRegistry.register(new Gas("steam")).registerFluid(); GasRegistry.register(new Gas("lithium")).registerFluid(); FluidRegistry.registerFluid(new Fluid("heavyWater")); diff --git a/src/main/java/mekanism/common/content/boiler/BoilerTank.java b/src/main/java/mekanism/common/content/boiler/BoilerTank.java index d313536cc..284926bb7 100644 --- a/src/main/java/mekanism/common/content/boiler/BoilerTank.java +++ b/src/main/java/mekanism/common/content/boiler/BoilerTank.java @@ -1,7 +1,7 @@ package mekanism.common.content.boiler; import mekanism.api.Coord4D; -import mekanism.common.content.boiler.SynchronizedBoilerData.ValveData; +import mekanism.common.content.tank.SynchronizedTankData.ValveData; import mekanism.common.tile.TileEntityBoilerCasing; import mekanism.common.util.MekanismUtils; import net.minecraftforge.fluids.FluidStack; diff --git a/src/main/java/mekanism/common/content/boiler/BoilerUpdateProtocol.java b/src/main/java/mekanism/common/content/boiler/BoilerUpdateProtocol.java index 821444a4c..ea584b75b 100644 --- a/src/main/java/mekanism/common/content/boiler/BoilerUpdateProtocol.java +++ b/src/main/java/mekanism/common/content/boiler/BoilerUpdateProtocol.java @@ -8,7 +8,7 @@ import mekanism.api.Coord4D; import mekanism.api.util.StackUtils; import mekanism.common.Mekanism; import mekanism.common.block.BlockBasic.BasicType; -import mekanism.common.content.boiler.SynchronizedBoilerData.ValveData; +import mekanism.common.content.tank.SynchronizedTankData.ValveData; import mekanism.common.multiblock.MultiblockCache; import mekanism.common.multiblock.MultiblockManager; import mekanism.common.multiblock.UpdateProtocol; @@ -108,13 +108,16 @@ public class BoilerUpdateProtocol extends UpdateProtocol return false; } - structure.superheatingElements = new NodeCounter(new NodeChecker() { - @Override - public boolean isValid(Coord4D coord) - { - return coord.getTileEntity(pointer.getWorldObj()) instanceof TileEntitySuperheatingElement; - } - }).calculate(elements.iterator().next()); + if(elements.size() > 0) + { + structure.superheatingElements = new NodeCounter(new NodeChecker() { + @Override + public boolean isValid(Coord4D coord) + { + return coord.getTileEntity(pointer.getWorldObj()) instanceof TileEntitySuperheatingElement; + } + }).calculate(elements.iterator().next()); + } if(elements.size() > structure.superheatingElements) { @@ -154,9 +157,9 @@ public class BoilerUpdateProtocol extends UpdateProtocol @Override public boolean isValid(Coord4D coord) { - return coord.yCoord >= structure.renderLocation.yCoord && coord.yCoord < initDisperser.yCoord && - coord.xCoord >= structure.renderLocation.xCoord && coord.xCoord <= structure.renderLocation.xCoord+structure.volLength && - coord.zCoord >= structure.renderLocation.zCoord && coord.zCoord <= structure.renderLocation.zCoord+structure.volWidth && + return coord.yCoord >= structure.renderLocation.yCoord-1 && coord.yCoord < initDisperser.yCoord && + coord.xCoord >= structure.renderLocation.xCoord && coord.xCoord < structure.renderLocation.xCoord+structure.volLength && + coord.zCoord >= structure.renderLocation.zCoord && coord.zCoord < structure.renderLocation.zCoord+structure.volWidth && (coord.isAirBlock(pointer.getWorldObj()) || isViableNode(coord.xCoord, coord.yCoord, coord.zCoord)); } }).calculate(initAir); @@ -168,7 +171,7 @@ public class BoilerUpdateProtocol extends UpdateProtocol return false; } - int steamHeight = (structure.renderLocation.yCoord+structure.volHeight)-initDisperser.yCoord; + int steamHeight = (structure.renderLocation.yCoord+structure.volHeight-2)-initDisperser.yCoord; structure.steamVolume = structure.volWidth*structure.volLength*steamHeight; structure.upperRenderLocation = new Coord4D(structure.renderLocation.xCoord, structure.renderLocation.zCoord, initDisperser.yCoord+1); diff --git a/src/main/java/mekanism/common/content/boiler/SynchronizedBoilerData.java b/src/main/java/mekanism/common/content/boiler/SynchronizedBoilerData.java index 771187726..a6ab23f2b 100644 --- a/src/main/java/mekanism/common/content/boiler/SynchronizedBoilerData.java +++ b/src/main/java/mekanism/common/content/boiler/SynchronizedBoilerData.java @@ -5,6 +5,8 @@ import java.util.Set; import mekanism.api.Coord4D; import mekanism.api.IHeatTransfer; +import mekanism.api.MekanismConfig.general; +import mekanism.common.content.tank.SynchronizedTankData.ValveData; import mekanism.common.multiblock.SynchronizedData; import mekanism.common.util.FluidContainerUtils.ContainerEditMode; import net.minecraft.item.ItemStack; @@ -21,6 +23,9 @@ public class SynchronizedBoilerData extends SynchronizedData valves = new HashSet(); + public double getHeatAvailable() + { + double heatAvailable = (temperature-100)*locations.size(); + return Math.min(heatAvailable, superheatingElements*general.superheatingHeatTransfer); + } + public boolean needsRenderUpdate() { if((waterStored == null && prevWater != null) || (waterStored != null && prevWater == null)) @@ -135,33 +146,4 @@ public class SynchronizedBoilerData extends SynchronizedData= 100 && structure.waterStored != null) { - double heatAvailable = (structure.temperature-100)*structure.locations.size(); - heatAvailable = Math.min(heatAvailable, structure.superheatingElements*general.superheatingHeatTransfer); + int steamAmount = structure.steamStored != null ? structure.steamStored.amount : 0; + double heatAvailable = structure.getHeatAvailable(); int amountToBoil = Math.min((int)Math.floor(heatAvailable / structure.enthalpyOfVaporization), structure.waterStored.amount); + amountToBoil = Math.min(amountToBoil, (structure.steamVolume*BoilerUpdateProtocol.STEAM_PER_TANK)-steamAmount); structure.waterStored.amount -= amountToBoil; if(structure.steamStored == null) @@ -137,6 +139,11 @@ public class TileEntityBoilerCasing extends TileEntityMultiblock@7$u4tAAzNHa)}OMZC`*<^M1*V^2{Xe?lI2plAri*zUSv&Z z#9+!Ap)MiJkR@XsTa-cXbl>xy^S*z+f82B4KiiLncEVM&F5fR zo2ewM;uqmj;~Mo0q{7GmR?)cTYn(0Xm%@c?1FdZT`YNW+GGRTJorhn3d6f-ky)1Fb zOv6A#A62M|X-?u2?j;%>y?;A_BF0zR^Y^DTA|lh=ZXFQg|%Gjr0=CcO8@n2#z8(QGrfvQfU0ru^T_Ym~b*rz+&eMDNEdTh@9D%idJ5!Z!=Z}Z!aR*xC5@QQ2OgCpI_o~KDqj)3&BxkH*)qZ^< zbWwfEJ*be?cV?fM?tttW(S>cYJ>|Pu^)F$h$_u=ub}6anMpR$UFMP9W>lGv96XJDB z$+1m>)%T#?`idgRJ1#ox_cTt3R})i?kx2F^@D-Dqr5mp4*JSs+YI>c% z*V*Y2_pPqCM)^vD@h#Ekk~??HMEiYKOXJ z>CGfUFZAmNF9`M=xOwK!2VRnuI?9=k=2?lw;&(c&@A^3;j0Cw#!P(4>dmA~L4Z! z{$7JP#pAROroL_M=q9ptqzT`9d!(AS*gIRVL)}6Sr*c1p`>qeWTrQrU_F1(N3&Rn= zOl@vVS(>0vsfOm(*Pm!>1dW$M;=7#Y6$IQoOw>mo*5cn_KF#iR#PF)`X*}WYRa#kD zc_%dMQ3heDn#UqZ9UUEz{ztdy1nB6}X4D!ZcxZ3qEEZ%iAv7lKtB2AKI3Wkyqa|LQ zv#M~KVD~MF}?G?0L-++he}`T#2rI<0!q z2POnHh9{Q8AgFb%=*y6NXshHqK~iip(LkT$;n94su}=oZM7mgpXou~N2?FYCZapQg zsW;N8I339PriBm8R}2MIix>c88kFHcqWP4j&`s$@Kvf3z-vHM`Jhyc2T-z|E>vuKm z|Emj`Qg-x}nOSnu1vJxlcR5@8eB1&BJ(>tFhi7B>&lwVdn!{gZ{uH+rT&E+IQCyYv4z5hhIZ42m)WCa7mjj3yrbDg@5L|p@Qf#?P*TYqt{+mwNDv5Xqx?kqAt2f6*x#RbWD{@?k+TrN+| z72i=veZj@iAO&2Sj*@bIs=1&TLJfp|UP|pkyj8;jzDFVeXcWA@2#D%-k|4*C&OyA6 zngXpmDVJP+Si>96LthTsH^hn~-AKQw@K?udcPx3U-!-b5LyE#b(S%kDgpWhs#%$a? zNT&`oiFCCf2)0-v@HJ*zIAWlMp8(R8=zPx%)9E9ydN!9)MLDC}P^|%po&4kOSp=F4(mbXcr zRhE^N#W|PiL-FLL2+rcO(WR06Ai)M3Oej(V-Kzn;hC%_?SijAJp1*Og1>&kWSsQ^M zX@|eZVKwYP!1}gU3SANgqf6Gaj-#>^vB2Ti5*D645P7!)A#X`lQvUh