From 0ec1e5735a5cfd4940e76d72e44bc69c7f54de30 Mon Sep 17 00:00:00 2001 From: Bufka2011 <85364803+Bufka2011@users.noreply.github.com> Date: Sun, 10 Aug 2025 18:32:07 -0600 Subject: [PATCH 01/72] rebar --- src/main/resources/assets/hbm/lang/ru_RU.lang | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/main/resources/assets/hbm/lang/ru_RU.lang b/src/main/resources/assets/hbm/lang/ru_RU.lang index 6072fa3d9..cf1ef26da 100644 --- a/src/main/resources/assets/hbm/lang/ru_RU.lang +++ b/src/main/resources/assets/hbm/lang/ru_RU.lang @@ -864,6 +864,7 @@ container.reactorBreeding=Реактор-размножитель container.reactorControl=Блок удалённого доступа к реактору container.reactorLarge=Большой ядерный реактор container.reactorResearch=Исследовательский реактор +container.rebar=Установщик арматуры container.reix=Мэйнфрейм Rei-X container.rttyController=Контроллер редстоун-радио container.rtg=РИТЭГ-генератор @@ -1979,6 +1980,7 @@ item.ammo_standard.bmg50_ap.name=.50 BMG патрон (Бронебойный) item.ammo_standard.bmg50_he.name=.50 BMG патрон (Разрывной) item.ammo_standard.bmg50_du.name=.50 BMG патрон (Обеднённый уран) item.ammo_standard.bmg50_fmj.name=.50 BMG патрон (Цельнометаллическая оболочка) +item.ammo_standard.bmg50_sm.name=.50 BMG патрон (Звёздный Металл) item.ammo_standard.bmg50_jhp.name=.50 BMG патрон (Экспансивный+) item.ammo_standard.bmg50_sp.name=.50 BMG патрон (Экспансивный) item.ammo_standard.capacitor.name=Конденсатор (Стандартный) @@ -3178,7 +3180,7 @@ item.gun_maresleg_short.name=Нога кобылы item.gun_mas36.name=Южная Звезда item.gun_minigun.name=Персональный миниган item.gun_minigun_dual.name=Двойные миниганы -item.gun_minigun_lacunae.name=Лакунай +item.gun_minigun_lacunae.name=Лакунэ item.gun_mirv.name=M42 Ядерная катапульта "Экспериментальный МИРВ" item.gun_mirv_ammo.name=Восьмиричный МИРВ (LEGACY) item.gun_missile_launcher.name=Ракетница @@ -4355,6 +4357,7 @@ item.rbmk_tool.set=РБМК соединён! item.reacher.name=Вольфрамовые хваталки item.reactor_core.name=Активная зона реактора-размножителя item.reactor_sensor.name=Дистанционный датчик реактора +item.rebar_placer.name=Установщик арматуры item.record.glass.desc=? ? ? item.record.lc.desc=Valve - Diabolic Adrenaline Guitar/Lambda Core item.record.ss.desc=Valve - Sector Sweep @@ -5440,6 +5443,7 @@ tile.concrete_colored_ext.pink.name=Бетон "Выбор строителя" - tile.concrete_colored_ext.purple.name=Бетон "Выбор строителя" - Таинственный фиолетовый tile.concrete_colored_ext.sand.name=Бетон "Выбор строителя" - Пустыня tile.concrete_pillar.name=Арматурный железобетонный столб +tile.concrete_rebar.name=Железобетон tile.concrete_slab.asphalt.name=Плита из асфальта tile.concrete_slab.concrete.name=Плита из бетонной плитки tile.concrete_slab.concrete_asbestos.name=Плита из асбестобетона @@ -6201,6 +6205,7 @@ tile.reactor_ejector.name=Выталкиватель отходов реакто tile.reactor_element.name=Реакторная камера tile.reactor_hatch.name=Люк доступа реактора tile.reactor_inserter.name=Автоматический заправщик реактора +tile.rebar.name=Арматура tile.red_barrel.name=Взрывная бочка tile.red_cable.name=Провод из красной меди tile.red_cable_classic.name=Провод из красной меди (Старый) From 9b316af586c7ade0f518afbddf973b51d92d6a8f Mon Sep 17 00:00:00 2001 From: Bufka2011 <85364803+Bufka2011@users.noreply.github.com> Date: Fri, 15 Aug 2025 11:14:49 -0600 Subject: [PATCH 02/72] Update alloy.json --- src/main/resources/assets/hbm/manual/material/alloy.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/resources/assets/hbm/manual/material/alloy.json b/src/main/resources/assets/hbm/manual/material/alloy.json index 0c583e585..f1f71dec4 100644 --- a/src/main/resources/assets/hbm/manual/material/alloy.json +++ b/src/main/resources/assets/hbm/manual/material/alloy.json @@ -3,9 +3,11 @@ "icon": ["hbm:item.ingot_advanced_alloy", 1, 0], "trigger": [["hbm:item.ingot_advanced_alloy"], ["hbm:item.powder_advanced_alloy"], ["hbm:item.plate_advanced_alloy"]], "title": { - "en_US": "Advanced Alloy" + "en_US": "Advanced Alloy", + "ru_ru": "Продвинутый сплав" }, "content": { "en_US": "Made in a [[blast furnace|Blast Furnace]] from [[steel|Steel]] and [[Minecraft grade copper|Minecraft Grade Copper]]. Makes better-than-diamond gear. Also used in some high-powered magnets for the [[fusion reactor|Fusion Reactor]] and the [[exposure chamber|Exposure Chamber]]." + "ru_RU": "Изготовлено в [[доменной печи|Blast Furnace]] из [[стали|Steel]] и [[красной меди|Minecraft Grade Copper]]. Из него делают инструменты, превосходящие алмазные. Также используется в некоторых мощных магнитах для [[термоядерного реактора|Fusion Reactor]] и [[камеры облучения|Exposure Chamber]]." } } From 8ddc169c315be40e9aa4cae53e4d37bf445c6c78 Mon Sep 17 00:00:00 2001 From: Bufka2011 <85364803+Bufka2011@users.noreply.github.com> Date: Fri, 15 Aug 2025 11:38:35 -0600 Subject: [PATCH 03/72] Update arsenic.json --- src/main/resources/assets/hbm/manual/material/arsenic.json | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/resources/assets/hbm/manual/material/arsenic.json b/src/main/resources/assets/hbm/manual/material/arsenic.json index b6bf7df40..01fe95509 100644 --- a/src/main/resources/assets/hbm/manual/material/arsenic.json +++ b/src/main/resources/assets/hbm/manual/material/arsenic.json @@ -3,9 +3,11 @@ "icon": ["hbm:item.ingot_arsenic", 1, 0], "trigger": [["hbm:item.ingot_arsenic"], ["hbm:item.nugget_arsenic"]], "title": { - "en_US": "Arsenic" + "en_US": "Arsenic", + "ru_RU": "Мышьяк" }, "content": { - "en_US": "Obtainable by treating oily scraps with [[high-performance solvent|High-Performance Solvent]] in an [[acidizer|Ore Acidizer]]. Oily scraps can be created by [[shredding|Shredder]] polluted blocks created by the [[fracking tower|Hydraulic Fracking Tower]]. Primarily used as [[arsenic bronze|Arsenic Bronze]]." + "en_US": "Obtainable by treating oily scraps with [[high-performance solvent|High-Performance Solvent]] in an [[acidizer|Ore Acidizer]]. Oily scraps can be created by [[shredding|Shredder]] polluted blocks created by the [[fracking tower|Hydraulic Fracking Tower]]. Primarily used as [[arsenic bronze|Arsenic Bronze]].", + "ru_RU": "Получается путем обработки нефтяных отходов [[высокоэффективным растворителем|High-Performance Solvent]] в [[рудном окислитиле|Ore Acidizer]]. Нефтяные отходы можно создать [[измельчением|Shredder]] загрязненных блоков, созданных [[башней гидроразрыва|Hydraulic Fracking Tower]]. В основном используется как [[мышьяковая бронза|Arsenic Bronze]]." } } From ad6c7c06a53c76381f0f62e1f8cf040f5e6c5e78 Mon Sep 17 00:00:00 2001 From: Bufka2011 <85364803+Bufka2011@users.noreply.github.com> Date: Fri, 15 Aug 2025 11:40:54 -0600 Subject: [PATCH 04/72] Update aluminium.json --- .../resources/assets/hbm/manual/material/aluminium.json | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/resources/assets/hbm/manual/material/aluminium.json b/src/main/resources/assets/hbm/manual/material/aluminium.json index 9e5732336..5a20169ae 100644 --- a/src/main/resources/assets/hbm/manual/material/aluminium.json +++ b/src/main/resources/assets/hbm/manual/material/aluminium.json @@ -3,9 +3,11 @@ "icon": ["hbm:item.ingot_aluminium", 1, 0], "trigger": [["hbm:item.ingot_aluminium"], ["hbm:item.plate_aluminium"], ["hbm:item.powder_aluminium"]], "title": { - "en_US": "Aluminium" + "en_US": "Aluminium", + "ru_RU": "Алюминий" }, "content": { - "en_US": "Common, lightweight metal. Available early on from smelting cryolite ('aluminium-bearing ore') in a [[combination oven|Combination Oven]]. Can be made later by processing [[bauxite|Bauxite]], and [[electrolyzing|Electrolysis Machine]] the resulting alumina solution.

Used in piping, general fluid handling, as part of [[gunmetal|Gunmetal]] and missile fuselages." + "en_US": "Common, lightweight metal. Available early on from smelting cryolite ('aluminium-bearing ore') in a [[combination oven|Combination Oven]]. Can be made later by processing [[bauxite|Bauxite]], and [[electrolyzing|Electrolysis Machine]] the resulting alumina solution.

Used in piping, general fluid handling, as part of [[gunmetal|Gunmetal]] and missile fuselages.", + "ru_RU": "Обычный, легкий металл. Доступен на ранних этапах от плавки криолита ('алюминиевая руда') в [[коксовой печи|Combination Oven]]. Позже может быть получен путем обработки [[боксита|Bauxite]] и [[электролиза|Electrolysis Machine]] полученного раствора глинозема.

Используется в трубах, общем обращении с жидкостями, как часть [[оружейного металла|Gunmetal]] и фюзеляжей ракет." } } From bdba1fc503e1aad87952ab7e79fecbc5508a8b3c Mon Sep 17 00:00:00 2001 From: Bufka2011 <85364803+Bufka2011@users.noreply.github.com> Date: Fri, 15 Aug 2025 11:44:20 -0600 Subject: [PATCH 05/72] Update alloy.json --- src/main/resources/assets/hbm/manual/material/alloy.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/assets/hbm/manual/material/alloy.json b/src/main/resources/assets/hbm/manual/material/alloy.json index f1f71dec4..03ef80a7a 100644 --- a/src/main/resources/assets/hbm/manual/material/alloy.json +++ b/src/main/resources/assets/hbm/manual/material/alloy.json @@ -7,7 +7,7 @@ "ru_ru": "Продвинутый сплав" }, "content": { - "en_US": "Made in a [[blast furnace|Blast Furnace]] from [[steel|Steel]] and [[Minecraft grade copper|Minecraft Grade Copper]]. Makes better-than-diamond gear. Also used in some high-powered magnets for the [[fusion reactor|Fusion Reactor]] and the [[exposure chamber|Exposure Chamber]]." + "en_US": "Made in a [[blast furnace|Blast Furnace]] from [[steel|Steel]] and [[Minecraft grade copper|Minecraft Grade Copper]]. Makes better-than-diamond gear. Also used in some high-powered magnets for the [[fusion reactor|Fusion Reactor]] and the [[exposure chamber|Exposure Chamber]].", "ru_RU": "Изготовлено в [[доменной печи|Blast Furnace]] из [[стали|Steel]] и [[красной меди|Minecraft Grade Copper]]. Из него делают инструменты, превосходящие алмазные. Также используется в некоторых мощных магнитах для [[термоядерного реактора|Fusion Reactor]] и [[камеры облучения|Exposure Chamber]]." } } From 4c67d4d0c307225b457f7c25bd433600486bfcca Mon Sep 17 00:00:00 2001 From: Bufka2011 <85364803+Bufka2011@users.noreply.github.com> Date: Fri, 15 Aug 2025 11:45:47 -0600 Subject: [PATCH 06/72] Update bscco.json --- src/main/resources/assets/hbm/manual/material/bscco.json | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/resources/assets/hbm/manual/material/bscco.json b/src/main/resources/assets/hbm/manual/material/bscco.json index 4b25d11c0..a341b55af 100644 --- a/src/main/resources/assets/hbm/manual/material/bscco.json +++ b/src/main/resources/assets/hbm/manual/material/bscco.json @@ -3,9 +3,11 @@ "icon": ["hbm:item.ingot_bscco", 1, 0], "trigger": [["hbm:item.ingot_bscco"], ["hbm:item.wire_dense", 1, 48]], "title": { - "en_US": "BSCCO" + "en_US": "BSCCO", + "ru_RU": "BSCCO" }, "content": { - "en_US": "Powerful superconductor, used in high tier circuits and coils for the [[particle accelerator|Particle Accelerator]]. Requires [[bismuth|Bismuth]], and is therefore only obtainable after building an [[RBMK]]." + "en_US": "Powerful superconductor, used in high tier circuits and coils for the [[particle accelerator|Particle Accelerator]]. Requires [[bismuth|Bismuth]], and is therefore only obtainable after building an [[RBMK]].", + "ru_RU": "Мощный сверхпроводник, используемый в высокоуровневых цепях и катушках для [[ускорителя частиц|Particle Accelerator]]. Требует [[висмута|Bismuth]], и поэтому доступен только после постройки [[РБМК|RBMK]]." } } From 5f041cde7d064d662237796f6b39dcb57a4cbd47 Mon Sep 17 00:00:00 2001 From: Bufka2011 <85364803+Bufka2011@users.noreply.github.com> Date: Fri, 15 Aug 2025 11:46:50 -0600 Subject: [PATCH 07/72] Update arsenic_bronze.json --- .../assets/hbm/manual/material/arsenic_bronze.json | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/resources/assets/hbm/manual/material/arsenic_bronze.json b/src/main/resources/assets/hbm/manual/material/arsenic_bronze.json index 450f8dd21..d53db5d12 100644 --- a/src/main/resources/assets/hbm/manual/material/arsenic_bronze.json +++ b/src/main/resources/assets/hbm/manual/material/arsenic_bronze.json @@ -3,9 +3,11 @@ "icon": ["hbm:item.ingot_arsenic_bronze", 1, 0], "trigger": [["hbm:item.ingot_arsenic_bronze"]], "title": { - "en_US": "Arsenic Bronze" + "en_US": "Arsenic Bronze", + "ru_RU": "Мышьяковая бронза" }, "content": { - "en_US": "Derivative of [[arsenic|Arsenic]] made in the [[crucible|Crucible]], therefore available only after building an [[RBMK]] due to requiring [[high-performance solvent|High-Performance Solvent]].

Fully interchangeable with [[bismuth bronze|Bismuth Bronze]]." + "en_US": "Derivative of [[arsenic|Arsenic]] made in the [[crucible|Crucible]], therefore available only after building an [[RBMK]] due to requiring [[high-performance solvent|High-Performance Solvent]].

Fully interchangeable with [[bismuth bronze|Bismuth Bronze]].", + "ru_RU": "Производное от [[мышьяка|Arsenic]], изготовленное в [[плавильне|Crucible]], поэтому доступно только после постройки [[РБМК|RBMK]] из-за требования [[высокоэффективного растворителя|High-Performance Solvent]].

Полностью взаимозаменяемо с [[висмутовой бронзой|Bismuth Bronze]]." } } From e6901d8134e4a77c28809e2e5d602fa072ab0093 Mon Sep 17 00:00:00 2001 From: Bufka2011 <85364803+Bufka2011@users.noreply.github.com> Date: Fri, 15 Aug 2025 11:47:36 -0600 Subject: [PATCH 08/72] Update bakelite.json --- src/main/resources/assets/hbm/manual/material/bakelite.json | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/resources/assets/hbm/manual/material/bakelite.json b/src/main/resources/assets/hbm/manual/material/bakelite.json index 38d2a9dd1..d5d232149 100644 --- a/src/main/resources/assets/hbm/manual/material/bakelite.json +++ b/src/main/resources/assets/hbm/manual/material/bakelite.json @@ -3,9 +3,11 @@ "icon": ["hbm:item.ingot_bakelite", 1, 0], "trigger": [["hbm:item.ingot_bakelite"], ["hbm:item.powder_bakelite"]], "title": { - "en_US": "Bakelite" + "en_US": "Bakelite", + "ru_RU": "Бакелит" }, "content": { - "en_US": "Alternative to [[polymer|Polymer]] made from [[aromatic hydrocarbons|Aromatic Hydrocarbons]] derived from [[cracked oil products|Catalytic Cracking Tower]]. Completely interchangeable in all recipes." + "en_US": "Alternative to [[polymer|Polymer]] made from [[aromatic hydrocarbons|Aromatic Hydrocarbons]] derived from [[cracked oil products|Catalytic Cracking Tower]]. Completely interchangeable in all recipes.", + "ru_RU": "Альтернатива [[полимеру|Polymer]], изготовленная из [[ароматических углеводородов|Aromatic Hydrocarbons]], полученных из [[продуктов крекинга нефти|Catalytic Cracking Tower]]. Полностью взаимозаменяема во всех рецептах." } } From af9780f57d38d5bda642caca73b0b0fc99ff0ac8 Mon Sep 17 00:00:00 2001 From: Bufka2011 <85364803+Bufka2011@users.noreply.github.com> Date: Fri, 15 Aug 2025 11:49:28 -0600 Subject: [PATCH 09/72] Update bismuth.json --- src/main/resources/assets/hbm/manual/material/bismuth.json | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/resources/assets/hbm/manual/material/bismuth.json b/src/main/resources/assets/hbm/manual/material/bismuth.json index 369e6bf60..9b3105586 100644 --- a/src/main/resources/assets/hbm/manual/material/bismuth.json +++ b/src/main/resources/assets/hbm/manual/material/bismuth.json @@ -3,9 +3,11 @@ "icon": ["hbm:item.ingot_bismuth", 1, 0], "trigger": [["hbm:item.ingot_bismuth"], ["hbm:item.billet_bismuth"], ["hbm:item.nugget_bismuth"], ["hbm:item.powder_bismuth"]], "title": { - "en_US": "Bismuth" + "en_US": "Bismuth", + "ru_RU": "Висмут" }, "content": { - "en_US": "Heavy metal, intially derived from reprocessing spent [[RBMK]] fuel in the [[SILEX]], can also be made from later stage bedrock ore processing using [[high-performance solvent|High-Performance Solvent]]. Primarily used as [[bismuth bronze|Bismuth Bronze]]." + "en_US": "Heavy metal, intially derived from reprocessing spent [[RBMK]] fuel in the [[SILEX]], can also be made from later stage bedrock ore processing using [[high-performance solvent|High-Performance Solvent]]. Primarily used as [[bismuth bronze|Bismuth Bronze]].", + "ru_RU": "Тяжелый металл, первоначально получаемый из переработки отработанного топлива [[РБМК|RBMK]] в [[SILEX]], также может быть получен из поздних стадий обработки бедроковой руды с использованием [[высокоэффективного растворителя|High-Performance Solvent]]. В основном используется в виде [[висмутовай бронзы|Bismuth Bronze]]." } } From 907d97e1bae64b9c5267f8c08a5c4ec517aafe6d Mon Sep 17 00:00:00 2001 From: Bufka2011 <85364803+Bufka2011@users.noreply.github.com> Date: Fri, 15 Aug 2025 11:50:01 -0600 Subject: [PATCH 10/72] Update bismuth_bronze.json --- .../assets/hbm/manual/material/bismuth_bronze.json | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/resources/assets/hbm/manual/material/bismuth_bronze.json b/src/main/resources/assets/hbm/manual/material/bismuth_bronze.json index fcb22393f..07167ba3d 100644 --- a/src/main/resources/assets/hbm/manual/material/bismuth_bronze.json +++ b/src/main/resources/assets/hbm/manual/material/bismuth_bronze.json @@ -3,9 +3,11 @@ "icon": ["hbm:item.ingot_bismuth_bronze", 1, 0], "trigger": [["hbm:item.ingot_bismuth_bronze"]], "title": { - "en_US": "Bismuth Bronze" + "en_US": "Bismuth Bronze", + "ru_RU": "Висмутовая бронза" }, "content": { - "en_US": "Derivative of [[bismuth|Bismuth]] made in the [[crucible|Crucible]], therefore available only after building an [[RBMK]].

Fully interchangeable with [[arsenic bronze|Arsenic Bronze]]." + "en_US": "Derivative of [[bismuth|Bismuth]] made in the [[crucible|Crucible]], therefore available only after building an [[RBMK]].

Fully interchangeable with [[arsenic bronze|Arsenic Bronze]].", + "ru_RU": "Производное от [[висмута|Bismuth]], изготовленное в [[плавильне|Crucible]], поэтому доступно только после постройки [[РБМК|RBMK]].

Полностью взаимозаменяемо с [[мышьяковой бронзой|Arsenic Bronze]]." } } From 3ddad84863e9ed3e611e9106ac2ae32cb2a1c4f3 Mon Sep 17 00:00:00 2001 From: Bufka2011 <85364803+Bufka2011@users.noreply.github.com> Date: Fri, 15 Aug 2025 11:51:11 -0600 Subject: [PATCH 11/72] Update cadmium.json --- src/main/resources/assets/hbm/manual/material/cadmium.json | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/resources/assets/hbm/manual/material/cadmium.json b/src/main/resources/assets/hbm/manual/material/cadmium.json index fb9281a02..14d06bebe 100644 --- a/src/main/resources/assets/hbm/manual/material/cadmium.json +++ b/src/main/resources/assets/hbm/manual/material/cadmium.json @@ -3,9 +3,11 @@ "icon": ["hbm:item.ingot_cadmium", 1, 0], "trigger": [["hbm:item.ingot_cadmium"], ["hbm:item.powder_cadmium"]], "title": { - "en_US": "Cadmium" + "en_US": "Cadmium", + "ru_RU": "Кадмий" }, "content": { - "en_US": "Made by treating mustard willow leaves with [[high-performance solvent|High-Performance Solvent]]. Used in [[PVC]], a lategame alternate recipe for [[rubber|Rubber]] and for [[cadmium steel|Cadmium Steel]], which acts as a [[technetium steel|Technetium Steel]] substitute." + "en_US": "Made by treating mustard willow leaves with [[high-performance solvent|High-Performance Solvent]]. Used in [[PVC]], a lategame alternate recipe for [[rubber|Rubber]] and for [[cadmium steel|Cadmium Steel]], which acts as a [[technetium steel|Technetium Steel]] substitute.", + "ru_RU": "Изготовлен путем обработки листьев горчичной ивы [[высокоэффективным растворителем|High-Performance Solvent]]. Используется в [[ПВХ|PVC]], позднеигровом альтернативном рецепте для [[резины|Rubber]] и для [[кадмиевой стали|Cadmium Steel]], которая действует как замена [[технециевой стали|Technetium Steel]]." } } From c841002f701d3e107546384b9022b53d12585f53 Mon Sep 17 00:00:00 2001 From: Bufka2011 <85364803+Bufka2011@users.noreply.github.com> Date: Fri, 15 Aug 2025 11:55:30 -0600 Subject: [PATCH 12/72] Update cadmium_steel.json --- .../resources/assets/hbm/manual/material/cadmium_steel.json | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/resources/assets/hbm/manual/material/cadmium_steel.json b/src/main/resources/assets/hbm/manual/material/cadmium_steel.json index 70cb3644b..48ce8d495 100644 --- a/src/main/resources/assets/hbm/manual/material/cadmium_steel.json +++ b/src/main/resources/assets/hbm/manual/material/cadmium_steel.json @@ -3,9 +3,11 @@ "icon": ["hbm:item.ingot_cdalloy", 1, 0], "trigger": [["hbm:item.ingot_cdalloy"]], "title": { - "en_US": "Cadmium Steel" + "en_US": "Cadmium Steel", + "ru_RU": "Кадмиевая сталь" }, "content": { - "en_US": "Corrosion-resistant alloy, made from [[steel|Steel]] and [[cadmium|Cadmium]]. Alternative to [[technetium steel|Technetium Steel]] in most recipes." + "en_US": "Corrosion-resistant alloy, made from [[steel|Steel]] and [[cadmium|Cadmium]]. Alternative to [[technetium steel|Technetium Steel]] in most recipes.", + "ru_RU": "Коррозионно-стойкий сплав, изготовленный из [[стали|Steel]] и [[кадмия|Cadmium]]. Альтернатива [[технециевой стали|Technetium Steel]] в большинстве рецептов." } } From 6def4eaac9d589e2883077c6518539d8d51e0f22 Mon Sep 17 00:00:00 2001 From: Bufka2011 <85364803+Bufka2011@users.noreply.github.com> Date: Fri, 15 Aug 2025 11:56:58 -0600 Subject: [PATCH 13/72] Update cinnabar.json --- src/main/resources/assets/hbm/manual/material/cinnabar.json | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/resources/assets/hbm/manual/material/cinnabar.json b/src/main/resources/assets/hbm/manual/material/cinnabar.json index c142e7ff9..12bd758f9 100644 --- a/src/main/resources/assets/hbm/manual/material/cinnabar.json +++ b/src/main/resources/assets/hbm/manual/material/cinnabar.json @@ -3,9 +3,11 @@ "icon": ["hbm:item.cinnebar", 1, 0], "trigger": [["hbm:item.cinnebar"]], "title": { - "en_US": "Cinnabar" + "en_US": "Cinnabar", + "ru_RU": "Киноварь" }, "content": { - "en_US": "Rare ore. Can be [[acidized|Ore Acidizer]] into 375mB worth of [[mercury|Mercury]] drops, or [[combination smelted|Combination Oven]] into 100mB of mercury and some sulfur. Mainly exists as an early means to get mercury for [[desh|Desh]] production." + "en_US": "Rare ore. Can be [[acidized|Ore Acidizer]] into 375mB worth of [[mercury|Mercury]] drops, or [[combination smelted|Combination Oven]] into 100mB of mercury and some sulfur. Mainly exists as an early means to get mercury for [[desh|Desh]] production.", + "ru_RU": "Редкая руда. Может быть [[обработана кислотой|Ore Acidizer]] в 375 мБ капель [[ртути|Mercury]] или [[переплавлена в косксовой печи|Combination Oven]] в 100 мБ ртути и немного серы. В основном используется как ранний способ получения ртути для производства [[деша|Desh]]." } } From 75dd1ea555067541e65a02e811e5fb4eea104274 Mon Sep 17 00:00:00 2001 From: Bufka2011 <85364803+Bufka2011@users.noreply.github.com> Date: Fri, 15 Aug 2025 12:10:00 -0600 Subject: [PATCH 14/72] Update coke.json --- src/main/resources/assets/hbm/manual/material/coke.json | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/resources/assets/hbm/manual/material/coke.json b/src/main/resources/assets/hbm/manual/material/coke.json index fbf8d8631..b113bd25f 100644 --- a/src/main/resources/assets/hbm/manual/material/coke.json +++ b/src/main/resources/assets/hbm/manual/material/coke.json @@ -3,9 +3,11 @@ "icon": ["hbm:item.coke", 1, 0], "trigger": [["hbm:item.coke", 1, 32767]], "title": { - "en_US": "Coke" + "en_US": "Coke", + "ru_RU": "Кокс" }, "content": { - "en_US": "High-purity carbon, has twice the burn value of coal. Can be pressed into [[graphite|Graphite]], used in various [[steel|Steel]] recipes or as a source of carbon for the [[crucible|Crucible]].

Coal coke can be made by smelting coal briquettes, or combination smelting coal in its various forms.

Lignite coke is made from the much cheaper and less powerful lignite in much the same way, despite this it has the same characteristics.

Petroleum coke is made either from non-coal tars in a [[combination oven|Combination Oven]], or by coking various types of oil in a [[coker|Coking Unit]]." + "en_US": "High-purity carbon, has twice the burn value of coal. Can be pressed into [[graphite|Graphite]], used in various [[steel|Steel]] recipes or as a source of carbon for the [[crucible|Crucible]].

Coal coke can be made by smelting coal briquettes, or combination smelting coal in its various forms.

Lignite coke is made from the much cheaper and less powerful lignite in much the same way, despite this it has the same characteristics.

Petroleum coke is made either from non-coal tars in a [[combination oven|Combination Oven]], or by coking various types of oil in a [[coker|Coking Unit]].", + "ru_RU": "Высокочистый углерод, имеет вдвое большую энергию сгорания, чем уголь. Может быть спрессован в [[графит|Graphite]], используется в различных рецептах [[стали|Steel]] или как источник углерода для [[плавильни|Crucible]].

Угольный кокс можно получить путем переплавки угольных брикетов или комбинированной переплавки угля в различных формах.

Бурый кокс изготавливается из более дешевого и менее мощного бурого угля тем же способом, но обладает теми же характеристиками.

Нефтяной кокс производится либо из неугольных смол в [[коксовой печи|Combination Oven]], либо путем коксования различных видов масла в [[коксовой установке|Coking Unit]]." } } From 0920358df496195e4afc333a6ed5d092e654f951 Mon Sep 17 00:00:00 2001 From: Bufka2011 <85364803+Bufka2011@users.noreply.github.com> Date: Fri, 15 Aug 2025 12:12:16 -0600 Subject: [PATCH 15/72] Update copper.json --- src/main/resources/assets/hbm/manual/material/copper.json | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/resources/assets/hbm/manual/material/copper.json b/src/main/resources/assets/hbm/manual/material/copper.json index e56f6d71d..e8e155732 100644 --- a/src/main/resources/assets/hbm/manual/material/copper.json +++ b/src/main/resources/assets/hbm/manual/material/copper.json @@ -3,9 +3,11 @@ "icon": ["hbm:item.ingot_copper", 1, 0], "trigger": [["hbm:item.ingot_copper"], ["hbm:item.plate_copper"], ["hbm:item.powder_copper"]], "title": { - "en_US": "Copper" + "en_US": "Copper", + "ru_RU": "Медь" }, "content": { - "en_US": "Common resource. In its raw form, mostly used as a structural material, and in things that handle high temperatures (as a heat conductor). Strongly used in various alloyed forms.

[[Minecraft grade copper|Minecraft Grade Copper]] is an alloy made from redstone that is used in almost all electrical things.

[[Advanced alloy|Advanced Alloy]] is a powerful early tool material which surpasses diamond.

[[Gunmetal]] is a vital component of many guns, as well as casings for ammunition.

[[Bismuth bronze|Bismuth Bronze]] and [[arsenic bronze|Arsenic Bronze]] are post-[[RBMK]] materials used in many late-game machines.

[[BSCCO]] is a [[bismuth|Bismuth]]-derived super conductor needed for high-tier quantum circuits and [[particle accelerator|Particle Accelerator]] coils." + "en_US": "Common resource. In its raw form, mostly used as a structural material, and in things that handle high temperatures (as a heat conductor). Strongly used in various alloyed forms.

[[Minecraft grade copper|Minecraft Grade Copper]] is an alloy made from redstone that is used in almost all electrical things.

[[Advanced alloy|Advanced Alloy]] is a powerful early tool material which surpasses diamond.

[[Gunmetal]] is a vital component of many guns, as well as casings for ammunition.

[[Bismuth bronze|Bismuth Bronze]] and [[arsenic bronze|Arsenic Bronze]] are post-[[RBMK]] materials used in many late-game machines.

[[BSCCO]] is a [[bismuth|Bismuth]]-derived super conductor needed for high-tier quantum circuits and [[particle accelerator|Particle Accelerator]] coils.", + "ru_RU": "Обычный ресурс. В чистом виде в основном используется как конструкционный материал и в вещах, работающих с высокими температурами (как теплопроводник). Широко применяется в различных сплавах.

[[Красная медь|Minecraft Grade Copper]] — это сплав, изготовленный из красного камня, используемый почти во всех электрических устройствах.

[[Продвинутый сплав|Advanced Alloy]] — мощный материал для ранних инструментов, превосходящий алмаз.

[[Оружейный металл|Gunmetal]] — важный компонент многих видов оружия, а также гильз для боеприпасов.

[[Висмутовая бронза|Bismuth Bronze]] и [[мышьяковая бронза|Arsenic Bronze]] — материалы, доступные после [[РБМК|RBMK]], используемые во многих машинах поздней игры.

[[BSCCO]] — сверхпроводник, производный от [[висмута|Bismuth]], необходимый для квантовых схем высокого уровня и катушек [[ускорителя частиц|Particle Accelerator]]." } } From f003235381bb4f2bb0d83dfa26e08426af0c044f Mon Sep 17 00:00:00 2001 From: Bufka2011 <85364803+Bufka2011@users.noreply.github.com> Date: Fri, 15 Aug 2025 12:14:15 -0600 Subject: [PATCH 16/72] Update desh.json --- src/main/resources/assets/hbm/manual/material/desh.json | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/resources/assets/hbm/manual/material/desh.json b/src/main/resources/assets/hbm/manual/material/desh.json index 4de099c5a..c0d7ddbeb 100644 --- a/src/main/resources/assets/hbm/manual/material/desh.json +++ b/src/main/resources/assets/hbm/manual/material/desh.json @@ -3,9 +3,11 @@ "icon": ["hbm:item.ingot_desh", 1, 0], "trigger": [["hbm:item.ingot_desh"], ["hbm:item.powder_desh"]], "title": { - "en_US": "Desh" + "en_US": "Desh", + "ru_RU": "Деш" }, "content": { - "en_US": "High-strength working alloy made in a [[chemical plant|Chemical Plant]]. Requires [[light oil|Light oil]] from basic [[oil|Crude Oil]] refining, [[mercury|Mercury]], a byproduct of [[centrifuging|Centrifuge]] redstone ore and desh blend, which is just [[shredded|Shredder]] rare earth ore chunks.

Used in a variety of things, especially tools and weapons. Desh tools are slow and only iron tier, but are the first available ones to be unbreakable and offer many tool abilities." + "en_US": "High-strength working alloy made in a [[chemical plant|Chemical Plant]]. Requires [[light oil|Light oil]] from basic [[oil|Crude Oil]] refining, [[mercury|Mercury]], a byproduct of [[centrifuging|Centrifuge]] redstone ore and desh blend, which is just [[shredded|Shredder]] rare earth ore chunks.

Used in a variety of things, especially tools and weapons. Desh tools are slow and only iron tier, but are the first available ones to be unbreakable and offer many tool abilities.", + "ru_RU": "Высокопрочный рабочий сплав, изготовленный на [[химической установке|Chemical Plant]]. Требует [[легкой нефти|Light oil]] из базовой переработки [[нефти|Crude Oil]], [[ртути|Mercury]], побочного продукта [[центрифугирования|Centrifuge]] красной руды, и смеси деша, которая представляет собой просто [[измельченные|Shredder]] куски редкоземельной руды.

Используется в различных вещах, особенно в инструментах и оружии. Инструменты из деша медленные и соответствуют железному уровню, но являются первыми доступными неломающимися инструментами с множеством способностей." } } From a88b7ef5dfbc5fd71ede53641f345aaed5127c0e Mon Sep 17 00:00:00 2001 From: Bufka2011 <85364803+Bufka2011@users.noreply.github.com> Date: Fri, 15 Aug 2025 12:15:33 -0600 Subject: [PATCH 17/72] Update ferrouranium.json --- .../resources/assets/hbm/manual/material/ferrouranium.json | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/resources/assets/hbm/manual/material/ferrouranium.json b/src/main/resources/assets/hbm/manual/material/ferrouranium.json index 86629c988..687434042 100644 --- a/src/main/resources/assets/hbm/manual/material/ferrouranium.json +++ b/src/main/resources/assets/hbm/manual/material/ferrouranium.json @@ -3,9 +3,11 @@ "icon": ["hbm:item.ingot_ferrouranium", 1, 0], "trigger": [["hbm:item.ingot_ferrouranium"]], "title": { - "en_US": "Ferrouranium" + "en_US": "Ferrouranium", + "ru_RU": "Ферроуран" }, "content": { - "en_US": "Alloy of [[steel|Steel]] and [[uranium-238|Uranium-238]] made in the [[crucible|Crucible]]. Mainly used in ducrete, weapon parts and high-explosive ammunition." + "en_US": "Alloy of [[steel|Steel]] and [[uranium-238|Uranium-238]] made in the [[crucible|Crucible]]. Mainly used in ducrete, weapon parts and high-explosive ammunition.", + "ru_RU": "Сплав из [[стали|Steel]] и [[урана-238|Uranium-238]], изготовленный в [[тигле|Crucible]]. В основном используется в дюкрете, деталях оружий и взрывных боеприпасах." } } From 74b0e4e929e3aed1812eb74ab3c77155ac7dcfd6 Mon Sep 17 00:00:00 2001 From: Bufka2011 <85364803+Bufka2011@users.noreply.github.com> Date: Fri, 15 Aug 2025 12:16:14 -0600 Subject: [PATCH 18/72] Update graphite.json --- src/main/resources/assets/hbm/manual/material/graphite.json | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/resources/assets/hbm/manual/material/graphite.json b/src/main/resources/assets/hbm/manual/material/graphite.json index 9d0624a78..22bcccc21 100644 --- a/src/main/resources/assets/hbm/manual/material/graphite.json +++ b/src/main/resources/assets/hbm/manual/material/graphite.json @@ -3,9 +3,11 @@ "icon": ["hbm:item.ingot_graphite", 1, 0], "trigger": [["hbm:item.ingot_graphite"]], "title": { - "en_US": "Graphite" + "en_US": "Graphite", + "ru_RU": "Графит" }, "content": { - "en_US": "Made from pressing coke. Used in nuclear reactors, graphite electrodes for the [[electric arc furnace|Electric Arc Furnace]] or as a source for carbon in various [[crucible|Crucible]] recipes." + "en_US": "Made from pressing coke. Used in nuclear reactors, graphite electrodes for the [[electric arc furnace|Electric Arc Furnace]] or as a source for carbon in various [[crucible|Crucible]] recipes.", + "ru_RU": "Изготавливается путем прессования кокса. Используется в ядерных реакторах, графитовых электродах для [[электродуговой печи|Electric Arc Furnace]] или как источник углерода в различных рецептах для [[плавильни|Crucible]]." } } From 7741330fec8dd674419778019034ff34afb46a61 Mon Sep 17 00:00:00 2001 From: Bufka2011 <85364803+Bufka2011@users.noreply.github.com> Date: Fri, 15 Aug 2025 12:16:48 -0600 Subject: [PATCH 19/72] Update gunmetal.json --- src/main/resources/assets/hbm/manual/material/gunmetal.json | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/resources/assets/hbm/manual/material/gunmetal.json b/src/main/resources/assets/hbm/manual/material/gunmetal.json index bf6ee920e..f5d89a0b1 100644 --- a/src/main/resources/assets/hbm/manual/material/gunmetal.json +++ b/src/main/resources/assets/hbm/manual/material/gunmetal.json @@ -3,9 +3,11 @@ "icon": ["hbm:item.ingot_gunmetal", 1, 0], "trigger": [["hbm:item.ingot_gunmetal"], ["hbm:item.plate_gunmetal"]], "title": { - "en_US": "Gunmetal" + "en_US": "Gunmetal", + "ru_RU": "Оружейный металл" }, "content": { - "en_US": "Alloy of [[aluminium|Aluminium]] and [[copper|Copper]]. Can be made in an anvil, or more efficiently in a [[rotary furnace|Rotary Furnace]]. Used mainly for weapon parts, as well as casings for most ammunition." + "en_US": "Alloy of [[aluminium|Aluminium]] and [[copper|Copper]]. Can be made in an anvil, or more efficiently in a [[rotary furnace|Rotary Furnace]]. Used mainly for weapon parts, as well as casings for most ammunition.", + "ru_RU": "Сплав из [[алюминия|Aluminium]] и [[меди|Copper]]. Может быть изготовлен на наковальне или более эффективно в [[роторной печи|Rotary Furnace]]. В основном используется для деталей оружия, а также для гильз большинства боеприпасов." } } From adc57e79b4211f6bcc25db2e3829977860712974 Mon Sep 17 00:00:00 2001 From: Bufka2011 <85364803+Bufka2011@users.noreply.github.com> Date: Fri, 15 Aug 2025 12:17:24 -0600 Subject: [PATCH 20/72] Update hss.json --- src/main/resources/assets/hbm/manual/material/hss.json | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/resources/assets/hbm/manual/material/hss.json b/src/main/resources/assets/hbm/manual/material/hss.json index a74dfddaf..26380d6c5 100644 --- a/src/main/resources/assets/hbm/manual/material/hss.json +++ b/src/main/resources/assets/hbm/manual/material/hss.json @@ -3,9 +3,11 @@ "icon": ["hbm:item.ingot_dura_steel", 1, 0], "trigger": [["hbm:item.ingot_dura_steel"], ["hbm:item.powder_dura_steel"], ["hbm:item.plate_dura_steel"]], "title": { - "en_US": "High-Speed Steel" + "en_US": "High-Speed Steel", + "ru_RU": "Высокоскоростная сталь" }, "content": { - "en_US": "Alloy made from [[steel|Steel]], [[tungsten|Tungsten]] and [[cobalt|Cobalt]] in a [[curcible|Crucible]]. Created as liquid metal, needs to be cast into ingot or plate shape before being usable." + "en_US": "Alloy made from [[steel|Steel]], [[tungsten|Tungsten]] and [[cobalt|Cobalt]] in a [[curcible|Crucible]]. Created as liquid metal, needs to be cast into ingot or plate shape before being usable.", + "ru_RU": "Сплав из [[стали|Steel]], [[вольфрама|Tungsten]] и [[кобальта|Cobalt]], изготовленный в [[плавильне|Crucible]]. Создается в виде жидкого металла, требует отливки в форму слитка или пластины перед использованием." } } From 10513425267a859b0174dbf8c68dff7368e372c8 Mon Sep 17 00:00:00 2001 From: Bufka2011 <85364803+Bufka2011@users.noreply.github.com> Date: Fri, 15 Aug 2025 12:18:22 -0600 Subject: [PATCH 21/72] Update latex.json --- src/main/resources/assets/hbm/manual/material/latex.json | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/resources/assets/hbm/manual/material/latex.json b/src/main/resources/assets/hbm/manual/material/latex.json index c070e21e3..b2a4a5beb 100644 --- a/src/main/resources/assets/hbm/manual/material/latex.json +++ b/src/main/resources/assets/hbm/manual/material/latex.json @@ -3,9 +3,11 @@ "icon": ["hbm:item.ingot_biorubber", 1, 0], "trigger": [["hbm:item.ingot_biorubber"], ["hbm:item.ball_resin"]], "title": { - "en_US": "Latex" + "en_US": "Latex", + "ru_RU": "Латекс" }, "content": { - "en_US": "Natural form of rubber, obtainable from dandelions or by pressing jungle wood. Can be replaced in all recipes by [[rubber|Rubber]], but not vice versa." + "en_US": "Natural form of rubber, obtainable from dandelions or by pressing jungle wood. Can be replaced in all recipes by [[rubber|Rubber]], but not vice versa.", + "ru_RU": "Натуральная форма резины, добывается из одуванчиков или путем прессования древесины джунглей. Может быть заменена во всех рецептах на [[резину|Rubber]], но не наоборот." } } From 0748abae077312fa3c6563eda98916750b29441c Mon Sep 17 00:00:00 2001 From: Bufka2011 <85364803+Bufka2011@users.noreply.github.com> Date: Fri, 15 Aug 2025 12:18:39 -0600 Subject: [PATCH 22/72] Update lead.json --- src/main/resources/assets/hbm/manual/material/lead.json | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/resources/assets/hbm/manual/material/lead.json b/src/main/resources/assets/hbm/manual/material/lead.json index 9735111c3..b4d919e1a 100644 --- a/src/main/resources/assets/hbm/manual/material/lead.json +++ b/src/main/resources/assets/hbm/manual/material/lead.json @@ -3,9 +3,11 @@ "icon": ["hbm:item.ingot_lead", 1, 0], "trigger": [["hbm:item.ingot_lead"], ["hbm:item.nugget_lead"], ["hbm:item.powder_lead"]], "title": { - "en_US": "Lead" + "en_US": "Lead", + "ru_RU": "Свинец" }, "content": { - "en_US": "Common resource. Mainly used for things that involve radiation, as well as ammunition, and as solder for many circuits." + "en_US": "Common resource. Mainly used for things that involve radiation, as well as ammunition, and as solder for many circuits.", + "ru_RU": "Обычный ресурс. В основном используется для вещей, связанных с радиацией, а также для боеприпасов и в качестве припоя для многих схем." } } From aaff82553986817dc6567e4a22704c5608c83298 Mon Sep 17 00:00:00 2001 From: Bufka2011 <85364803+Bufka2011@users.noreply.github.com> Date: Fri, 15 Aug 2025 12:20:22 -0600 Subject: [PATCH 23/72] Update mingrade.json --- src/main/resources/assets/hbm/manual/material/mingrade.json | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/resources/assets/hbm/manual/material/mingrade.json b/src/main/resources/assets/hbm/manual/material/mingrade.json index 73e1a6827..a65b8ad99 100644 --- a/src/main/resources/assets/hbm/manual/material/mingrade.json +++ b/src/main/resources/assets/hbm/manual/material/mingrade.json @@ -3,9 +3,11 @@ "icon": ["hbm:item.ingot_red_copper", 1, 0], "trigger": [["hbm:item.ingot_red_copper"], ["hbm:item.powder_red_copper"]], "title": { - "en_US": "Minecraft Grade Copper (Red Copper)" + "en_US": "Minecraft Grade Copper (Red Copper)", + "ru_RU": "Медь Minecraft (Красная медь)" }, "content": { - "en_US": "Alloy made from copper and redstone in equal parts using the [[blast furnace|Blast Furnace]]. Used in almost all things electric, commonly in wire form." + "en_US": "Alloy made from copper and redstone in equal parts using the [[blast furnace|Blast Furnace]]. Used in almost all things electric, commonly in wire form.", + "ru_RU": "Сплав, изготовленный из меди и красного камня в равных частях в [[доменной печи|Blast Furnace]]. Используется почти во всех электрических устройствах, обычно в виде проволоки." } } From 8e102c3fc8406ca1cc8106f6a6e588c20530cb0a Mon Sep 17 00:00:00 2001 From: Bufka2011 <85364803+Bufka2011@users.noreply.github.com> Date: Fri, 15 Aug 2025 12:21:07 -0600 Subject: [PATCH 24/72] Update neptunium.json --- .../resources/assets/hbm/manual/material/neptunium.json | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/resources/assets/hbm/manual/material/neptunium.json b/src/main/resources/assets/hbm/manual/material/neptunium.json index a730ab7cd..90b6c56a5 100644 --- a/src/main/resources/assets/hbm/manual/material/neptunium.json +++ b/src/main/resources/assets/hbm/manual/material/neptunium.json @@ -3,9 +3,11 @@ "icon": ["hbm:item.ingot_neptunium", 1, 0], "trigger": [["hbm:item.ingot_neptunium"], ["hbm:item.billet_neptunium"], ["hbm:item.nugget_neptunium"], ["hbm:item.powder_neptunium"]], "title": { - "en_US": "Neptunium" + "en_US": "Neptunium", + "ru_RU": "Нептуний" }, "content": { - "en_US": "Fissile isotope, usually found in spent [[uranium-235|Uranium-235]] fuel. Mostly used for nuclear reactors, either pure as high enriched neptunium fuel, or combined with [[uranium-238|Uranium-238]] as medium enriched neptunium fuel. Usable in the [[PWR]] and [[RBMK]]." + "en_US": "Fissile isotope, usually found in spent [[uranium-235|Uranium-235]] fuel. Mostly used for nuclear reactors, either pure as high enriched neptunium fuel, or combined with [[uranium-238|Uranium-238]] as medium enriched neptunium fuel. Usable in the [[PWR]] and [[RBMK]].", + "ru_RU": "Делящийся изотоп, обычно содержится в отработанном топливе [[урана-235|Uranium-235]]. В основном используется для ядерных реакторов, либо в чистом виде как высокообогащенное нептуниевое топливо, либо в сочетании с [[ураном-238|Uranium-238]] как среднеобогащенное нептуниевое топливо. Применяется в [[ВВЭР|PWR]] и [[РБМК|RBMK]]." } } From 0911ddc4231ee587463eb87a7c0da65280110ec1 Mon Sep 17 00:00:00 2001 From: Bufka2011 <85364803+Bufka2011@users.noreply.github.com> Date: Fri, 15 Aug 2025 12:24:01 -0600 Subject: [PATCH 25/72] Update plutonium-238.json --- .../resources/assets/hbm/manual/material/plutonium-238.json | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/resources/assets/hbm/manual/material/plutonium-238.json b/src/main/resources/assets/hbm/manual/material/plutonium-238.json index 74e61a1de..d770353f4 100644 --- a/src/main/resources/assets/hbm/manual/material/plutonium-238.json +++ b/src/main/resources/assets/hbm/manual/material/plutonium-238.json @@ -3,9 +3,11 @@ "icon": ["hbm:item.billet_pu238", 1, 0], "trigger": [["hbm:item.ingot_pu238"], ["hbm:item.billet_pu238"], ["hbm:item.nugget_pu238"]], "title": { - "en_US": "Plutonium-238" + "en_US": "Plutonium-238", + "ru_RU": "Плутоний-238" }, "content": { - "en_US": "Radioisotope, used mainly in [[RTGs|RTG]]. Derived from [[plutonium|Plutonium]] hexafluoride, or from various nuclear fuels, mainly ones using [[uranium-235|Uranium-235]]. Usable with [[beryllium|Beryllium]] as Pu238Be neutron sources in [[RBMKs|RBMK]].

Moderately radioactive, very hot." + "en_US": "Radioisotope, used mainly in [[RTGs|RTG]]. Derived from [[plutonium|Plutonium]] hexafluoride, or from various nuclear fuels, mainly ones using [[uranium-235|Uranium-235]]. Usable with [[beryllium|Beryllium]] as Pu238Be neutron sources in [[RBMKs|RBMK]].

Moderately radioactive, very hot.", + "ru_RU": "Радиоизотоп, в основном используется в [[РТГ|RTG]]. Получается из гексафторида [[плутония|Plutonium]] или из различных ядерных топлив, преимущественно использующих [[уран-235|Uranium-235]]. Используется с [[бериллием|Beryllium]] в нейтронных источниках Плутоний-210-Бериллий для [[РБМК|RBMK]].

Умеренно радиоактивен, очень горячий." } } From d8a627259780bcf244116b3f8c1b1179cdc27153 Mon Sep 17 00:00:00 2001 From: Bufka2011 <85364803+Bufka2011@users.noreply.github.com> Date: Fri, 15 Aug 2025 12:24:51 -0600 Subject: [PATCH 26/72] Update plutonium-239.json --- .../resources/assets/hbm/manual/material/plutonium-239.json | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/resources/assets/hbm/manual/material/plutonium-239.json b/src/main/resources/assets/hbm/manual/material/plutonium-239.json index 307242d98..b29fe03a0 100644 --- a/src/main/resources/assets/hbm/manual/material/plutonium-239.json +++ b/src/main/resources/assets/hbm/manual/material/plutonium-239.json @@ -3,9 +3,11 @@ "icon": ["hbm:item.billet_pu239", 1, 0], "trigger": [["hbm:item.ingot_pu239"], ["hbm:item.billet_pu239"], ["hbm:item.nugget_pu239"]], "title": { - "en_US": "Plutonium-239" + "en_US": "Plutonium-239", + "ru_RU": "Плутоний-239" }, "content": { - "en_US": "Primary fissile isotope of [[plutonium|Plutonium]]. Can be extracted from many spent fuels that use [[uranium-238|Uranium-238]] or directly from [[reactor-grade plutonium|Reactor-Grade Plutonium]]. Usable in high enriched fuels for various reactors, mixed with other isotopes for lower enriched fuels, or as fissile material in many nuclear bombs.

Moderately radioactive." + "en_US": "Primary fissile isotope of [[plutonium|Plutonium]]. Can be extracted from many spent fuels that use [[uranium-238|Uranium-238]] or directly from [[reactor-grade plutonium|Reactor-Grade Plutonium]]. Usable in high enriched fuels for various reactors, mixed with other isotopes for lower enriched fuels, or as fissile material in many nuclear bombs.

Moderately radioactive.", + "ru_RU": "Основной делящийся изотоп [[плутония|Plutonium]]. Может быть извлечен из многих отработанных топлив, использующих [[уран-238|Uranium-238]], или непосредственно из [[реакторного плутония|Reactor-Grade Plutonium]]. Используется в высокообогащенных топливах для различных реакторов, в смеси с другими изотопами для менее обогащенных топлив или как делящийся материал во многих ядерных бомбах.

Умеренно радиоактивен." } } From 07a6b144c8da445cdd9727083ee0d6859259754c Mon Sep 17 00:00:00 2001 From: Bufka2011 <85364803+Bufka2011@users.noreply.github.com> Date: Fri, 15 Aug 2025 12:25:18 -0600 Subject: [PATCH 27/72] Update plutonium-240.json --- .../resources/assets/hbm/manual/material/plutonium-240.json | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/resources/assets/hbm/manual/material/plutonium-240.json b/src/main/resources/assets/hbm/manual/material/plutonium-240.json index 3a024fec6..859bfd7c0 100644 --- a/src/main/resources/assets/hbm/manual/material/plutonium-240.json +++ b/src/main/resources/assets/hbm/manual/material/plutonium-240.json @@ -3,9 +3,11 @@ "icon": ["hbm:item.billet_pu240", 1, 0], "trigger": [["hbm:item.ingot_pu240"], ["hbm:item.billet_pu240"], ["hbm:item.nugget_pu240"]], "title": { - "en_US": "Plutonium-240" + "en_US": "Plutonium-240", + "ru_RU": "Плутоний-240" }, "content": { - "en_US": "Non-fissile isotope found in [[plutonium|Plutonium]] and [[reactor-grade plutonium|Reactor-Grade-Plutonium]]. Only useful when manually making reactor-grade plutonium from [[plutonium-239|Plutonium-239]] or inspecialized [[zirconium|Zirconium]] fast breeder rods for making [[plutonium-241|Plutonium-241]] in the [[RBMK]]." + "en_US": "Non-fissile isotope found in [[plutonium|Plutonium]] and [[reactor-grade plutonium|Reactor-Grade-Plutonium]]. Only useful when manually making reactor-grade plutonium from [[plutonium-239|Plutonium-239]] or inspecialized [[zirconium|Zirconium]] fast breeder rods for making [[plutonium-241|Plutonium-241]] in the [[RBMK]].", + "ru_RU": "Неделимый изотоп, содержащийся в [[плутонии|Plutonium]] и [[реакторном плутонии|Reactor-Grade-Plutonium]]. Полезен только при ручном создании реакторного плутония из [[плутония-239|Plutonium-239]] или в специализированных [[циркониевых|Zirconium]] стержнях быстрого размножения для производства [[плутония-241|Plutonium-241]] в [[РБМК|RBMK]]." } } From 2bd11fdd71250ba416adb7ea3e3866ff9c13d328 Mon Sep 17 00:00:00 2001 From: Bufka2011 <85364803+Bufka2011@users.noreply.github.com> Date: Fri, 15 Aug 2025 12:25:58 -0600 Subject: [PATCH 28/72] Update plutonium-241.json --- .../resources/assets/hbm/manual/material/plutonium-241.json | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/resources/assets/hbm/manual/material/plutonium-241.json b/src/main/resources/assets/hbm/manual/material/plutonium-241.json index 8edf8eddc..b10bb4ed9 100644 --- a/src/main/resources/assets/hbm/manual/material/plutonium-241.json +++ b/src/main/resources/assets/hbm/manual/material/plutonium-241.json @@ -3,9 +3,11 @@ "icon": ["hbm:item.billet_pu241", 1, 0], "trigger": [["hbm:item.ingot_pu241"], ["hbm:item.billet_pu241"], ["hbm:item.nugget_pu241"]], "title": { - "en_US": "Plutonium-241" + "en_US": "Plutonium-241", + "ru_RU": "Плутоний-241" }, "content": { - "en_US": "Secondary fissile isotope of [[plutonium|Plutonium]]. Can be recovered from [[plutonium-240|Plutonium-240]]-rich spent [[RBMK]] fuels, as well as certain types of [[zirconium|Zirconium]] fast breefer fuels. Only used in specialized breeding fuels and as high enriched fuel, which is more powerful than its [[plutonium-239|Plutonium-239]] counterpart. Plutonium-241 in RBMKs yields [[americium-241|Americium-241]] and [[americium-242|Americium-242]] when reprocessed.

Highly radioactive." + "en_US": "Secondary fissile isotope of [[plutonium|Plutonium]]. Can be recovered from [[plutonium-240|Plutonium-240]]-rich spent [[RBMK]] fuels, as well as certain types of [[zirconium|Zirconium]] fast breefer fuels. Only used in specialized breeding fuels and as high enriched fuel, which is more powerful than its [[plutonium-239|Plutonium-239]] counterpart. Plutonium-241 in RBMKs yields [[americium-241|Americium-241]] and [[americium-242|Americium-242]] when reprocessed.

Highly radioactive.", + "ru_RU": "Вторичный делящийся изотоп [[плутония|Plutonium]]. Может быть извлечен из отработанных топлив [[РБМК|RBMK]], богатых [[плутонием-240|Plutonium-240]], а также из определенных типов [[циркониевых|Zirconium]] топлив быстрого размножения. Используется только в специализированных топливных стержнях для размножения и как высокообогащенное топливо, которое мощнее, чем его аналог [[плутоний-239|Plutonium-239]]. Плутоний-241 в РБМК при переработке дает [[америций-241|Americium-241]] и [[америций-242|Americium-242]].

Сильно радиоактивен." } } From 96976e9fb4cf9014b566a6165e3ea9a16dbd0ec1 Mon Sep 17 00:00:00 2001 From: Bufka2011 <85364803+Bufka2011@users.noreply.github.com> Date: Fri, 15 Aug 2025 12:26:51 -0600 Subject: [PATCH 29/72] Update plutonium-rg.json --- .../resources/assets/hbm/manual/material/plutonium-rg.json | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/resources/assets/hbm/manual/material/plutonium-rg.json b/src/main/resources/assets/hbm/manual/material/plutonium-rg.json index 9164df069..75a1b4975 100644 --- a/src/main/resources/assets/hbm/manual/material/plutonium-rg.json +++ b/src/main/resources/assets/hbm/manual/material/plutonium-rg.json @@ -3,9 +3,11 @@ "icon": ["hbm:item.billet_pu_mix", 1, 0], "trigger": [["hbm:item.ingot_pu_mix"], ["hbm:item.billet_pu_mix"], ["hbm:item.nugget_pu_mix"]], "title": { - "en_US": "Reactor-Grade Plutonium" + "en_US": "Reactor-Grade Plutonium", + "ru_RU": "Плутоний реакторного качества" }, "content": { - "en_US": "Mixture of [[plutonium-239|Plutonium-239]] and [[plutonium-240|Plutonium-240]]. Common result of reprocessing many [[uranium|Uranium]]-based fuels, as well as by breeding uranium in the [[Chicago Pile]]. Usable in many reactors as medium enriched plutonium fuel.

Moderately radioactive." + "en_US": "Mixture of [[plutonium-239|Plutonium-239]] and [[plutonium-240|Plutonium-240]]. Common result of reprocessing many [[uranium|Uranium]]-based fuels, as well as by breeding uranium in the [[Chicago Pile]]. Usable in many reactors as medium enriched plutonium fuel.

Moderately radioactive.", + "ru_RU": "Смесь [[плутония-239|Plutonium-239]] и [[плутония-240|Plutonium-240]]. Обычный результат переработки многих топлив на основе [[урана|Uranium]], а также при размножении урана в [[Чикагской полленице|Chicago Pile]]. Используется во многих реакторах как среднеобогащенное плутониевое топливо.

Умеренно радиоактивен." } } From 61ab6dda7b445db1ca350bc21617ccbf2033f73d Mon Sep 17 00:00:00 2001 From: Bufka2011 <85364803+Bufka2011@users.noreply.github.com> Date: Fri, 15 Aug 2025 12:27:31 -0600 Subject: [PATCH 30/72] Update plutonium.json --- .../resources/assets/hbm/manual/material/plutonium.json | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/resources/assets/hbm/manual/material/plutonium.json b/src/main/resources/assets/hbm/manual/material/plutonium.json index 7952e22e5..719c14800 100644 --- a/src/main/resources/assets/hbm/manual/material/plutonium.json +++ b/src/main/resources/assets/hbm/manual/material/plutonium.json @@ -3,9 +3,11 @@ "icon": ["hbm:item.ingot_plutonium", 1, 0], "trigger": [["hbm:item.ingot_plutonium"], ["hbm:item.billet_plutonium"], ["hbm:item.nugget_plutonium"], ["hbm:item.powder_plutonium"]], "title": { - "en_US": "Plutonium" + "en_US": "Plutonium", + "ru_RU": "Плутоний" }, "content": { - "en_US": "Rare form of impure plutonium, composed of plutonium-238, 239 and 240. Plutonium in ore form is disabled by default. May be processed in a [[gas centrifuge|Gas Centrifuge]] in hexafluoride form, or used for certain [[cyclotron|Cyclotron]] recipes.

Moderately radioactive.

See also:
[[Plutonium-238]]
[[Plutonium-239]]
[[Plutonium-240]]
[[Plutonium-241]]" + "en_US": "Rare form of impure plutonium, composed of plutonium-238, 239 and 240. Plutonium in ore form is disabled by default. May be processed in a [[gas centrifuge|Gas Centrifuge]] in hexafluoride form, or used for certain [[cyclotron|Cyclotron]] recipes.

Moderately radioactive.

See also:
[[Plutonium-238]]
[[Plutonium-239]]
[[Plutonium-240]]
[[Plutonium-241]]", + "ru_RU": "Редкая форма нечистого плутония, состоящая из плутония-238, 239 и 240. Плутоний в рудной форме по умолчанию отключен. Может быть переработан в [[газовой центрифуге|Gas Centrifuge]] в форме гексафторида или использован для определенных рецептов [[циклотрона|Cyclotron]].

Умеренно радиоактивен.

См. также:
[[Плутоний-238|Plutonium-238]]
[[Плутоний-239|Plutonium-239]]
[[Плутоний-240|Plutonium-240]]
[[Плутоний-241|Plutonium-241]]" } } From 8c696a6f643c5565ffe6eeb49ffdb431ec955b73 Mon Sep 17 00:00:00 2001 From: Bufka2011 <85364803+Bufka2011@users.noreply.github.com> Date: Fri, 15 Aug 2025 12:28:11 -0600 Subject: [PATCH 31/72] Update polonium.json --- src/main/resources/assets/hbm/manual/material/polonium.json | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/resources/assets/hbm/manual/material/polonium.json b/src/main/resources/assets/hbm/manual/material/polonium.json index 00fac7d84..c36e74218 100644 --- a/src/main/resources/assets/hbm/manual/material/polonium.json +++ b/src/main/resources/assets/hbm/manual/material/polonium.json @@ -3,9 +3,11 @@ "icon": ["hbm:item.billet_polonium", 1, 0], "trigger": [["hbm:item.ingot_polonium"], ["hbm:item.billet_polonium"], ["hbm:item.nugget_polonium"]], "title": { - "en_US": "Polonium-210" + "en_US": "Polonium-210", + "ru_RU": "Полоний-210" }, "content": { - "en_US": "Radioisotope derived from reprocessing [[radium-226|Radium-226]] neutron sources. Usable for [[RTGs|RTG]], or with [[beryllium|Beryllium]] in Po210Be neutron sources for [[RBMKs|RBMK]].

Highly radioactive, very hot." + "en_US": "Radioisotope derived from reprocessing [[radium-226|Radium-226]] neutron sources. Usable for [[RTGs|RTG]], or with [[beryllium|Beryllium]] in Po210Be neutron sources for [[RBMKs|RBMK]].

Highly radioactive, very hot.", + "ru_RU": "Радиоизотоп, получаемый из переработки нейтронных источников [[радия-226|Radium-226]]. Используется для [[РТГ|RTG]] или с [[бериллием|Beryllium]] в нейтронных источниках Полоний-210-бериллий для [[РБМК|RBMK]].

Сильно радиоактивен, очень горячий." } } From 81f9915e54ee71df7091a4914509397e7b11099c Mon Sep 17 00:00:00 2001 From: Bufka2011 <85364803+Bufka2011@users.noreply.github.com> Date: Fri, 15 Aug 2025 12:28:38 -0600 Subject: [PATCH 32/72] Update polymer.json --- src/main/resources/assets/hbm/manual/material/polymer.json | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/resources/assets/hbm/manual/material/polymer.json b/src/main/resources/assets/hbm/manual/material/polymer.json index 1fbd464c2..9c540925b 100644 --- a/src/main/resources/assets/hbm/manual/material/polymer.json +++ b/src/main/resources/assets/hbm/manual/material/polymer.json @@ -3,9 +3,11 @@ "icon": ["hbm:item.ingot_polymer", 1, 0], "trigger": [["hbm:item.ingot_polymer"], ["hbm:item.powder_polymer"]], "title": { - "en_US": "Polymer" + "en_US": "Polymer", + "ru_RU": "Полимер" }, "content": { - "en_US": "Polymer ('Teflon') is the first available type of plastic. Requires [[petroleum gas|Petroleum Gas]] and therefore [[oil processing|Crude Oil]].

Fully interchangable with [[Bakelite]], which becomes available after [[oil cracking|Catalytic Cracking Tower]]." + "en_US": "Polymer ('Teflon') is the first available type of plastic. Requires [[petroleum gas|Petroleum Gas]] and therefore [[oil processing|Crude Oil]].

Fully interchangable with [[Bakelite]], which becomes available after [[oil cracking|Catalytic Cracking Tower]].", + "ru_RU": "Полимер ('Тефлон') — первый доступный тип пластика. Требует [[нефтяного газа|Petroleum Gas]] и, следовательно, [[переработки нефти|Crude Oil]].

Полностью взаимозаменяем с [[бакелитом|Bakelite]], который становится доступным после [[крекинга нефти|Catalytic Cracking Tower]]." } } From 37cee61269cf46670e03bfdabae367dcebfcaaa6 Mon Sep 17 00:00:00 2001 From: Bufka2011 <85364803+Bufka2011@users.noreply.github.com> Date: Fri, 15 Aug 2025 12:30:23 -0600 Subject: [PATCH 33/72] Update radium.json --- src/main/resources/assets/hbm/manual/material/radium.json | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/resources/assets/hbm/manual/material/radium.json b/src/main/resources/assets/hbm/manual/material/radium.json index 6ec2dcd92..0821eace7 100644 --- a/src/main/resources/assets/hbm/manual/material/radium.json +++ b/src/main/resources/assets/hbm/manual/material/radium.json @@ -3,9 +3,11 @@ "icon": ["hbm:item.billet_ra226", 1, 0], "trigger": [["hbm:item.ingot_ra226"], ["hbm:item.billet_ra226"], ["hbm:item.nugget_ra226"], ["hbm:item.powder_ra226"]], "title": { - "en_US": "Radium-226" + "en_US": "Radium-226", + "ru_RU": "Радий-226" }, "content": { - "en_US": "Rare radioactive material found in [[uranium|Uranium]] and [[thorium|Thorium-232]] ores, may be extracted using a [[centrifuge|Centrifuge]]. Used with [[beryllium|Beryllium]] in Ra226Be neutron sources, which are vital for kickstarting the [[Chicago Pile]], [[PWR]], [[research reactor|Research Reactor]] and [[RBMK]]. The first available neutron source, and often times the cheapest.

Moderately radioactive." + "en_US": "Rare radioactive material found in [[uranium|Uranium]] and [[thorium|Thorium-232]] ores, may be extracted using a [[centrifuge|Centrifuge]]. Used with [[beryllium|Beryllium]] in Ra226Be neutron sources, which are vital for kickstarting the [[Chicago Pile]], [[PWR]], [[research reactor|Research Reactor]] and [[RBMK]]. The first available neutron source, and often times the cheapest.

Moderately radioactive.", + "ru_RU": "Редкий радиоактивный материал, содержащийся в рудах [[урана|Uranium]] и [[тория-232|Thorium-232]], может быть извлечен с помощью [[центрифуги|Centrifuge]]. Используется с [[бериллием|Beryllium]] в нейтронных источниках Радий-226-бериллий, которые необходимы для запуска [[Чикагской поленницы|Chicago Pile]], [[ВВЭР|PWR]], [[исследовательского реактора|Research Reactor]] и [[РБМК|RBMK]]. Первый доступный нейтронный источник, часто самый дешевый.

Умеренно радиоактивен." } } From bbe87c34c3449b1962a9462525c4451979acb999 Mon Sep 17 00:00:00 2001 From: Bufka2011 <85364803+Bufka2011@users.noreply.github.com> Date: Fri, 15 Aug 2025 12:31:34 -0600 Subject: [PATCH 34/72] Update rubber.json --- src/main/resources/assets/hbm/manual/material/rubber.json | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/resources/assets/hbm/manual/material/rubber.json b/src/main/resources/assets/hbm/manual/material/rubber.json index 9db9ddc37..e317d6752 100644 --- a/src/main/resources/assets/hbm/manual/material/rubber.json +++ b/src/main/resources/assets/hbm/manual/material/rubber.json @@ -3,9 +3,11 @@ "icon": ["hbm:item.ingot_rubber", 1, 0], "trigger": [["hbm:item.ingot_rubber"]], "title": { - "en_US": "Rubber" + "en_US": "Rubber", + "ru_RU": "Резина" }, "content": { - "en_US": "Oil product, derived from [[unsaturated hydrocabons|Unsaturated Hydrocarbons]] and [[sulfur|Sulfur]]. Requires at least a [[cracking tower|Catalytic Cracking Tower]] to make. Can replace [[latex|Latex]] in every recipe." + "en_US": "Oil product, derived from [[unsaturated hydrocabons|Unsaturated Hydrocarbons]] and [[sulfur|Sulfur]]. Requires at least a [[cracking tower|Catalytic Cracking Tower]] to make. Can replace [[latex|Latex]] in every recipe.", + "ru_RU": "Продукт переработки нефти, получаемый из [[ненасыщенных углеводородов|Unsaturated Hydrocarbons]] и [[серы|Sulfur]]. Требует как минимум [[башню крекинга|Catalytic Cracking Tower]] для производства. Может заменить [[латекс|Latex]] во всех рецептах." } } From f6ce5b5ae746248af25ba5bbe9f09c3f982e1f9c Mon Sep 17 00:00:00 2001 From: Bufka2011 <85364803+Bufka2011@users.noreply.github.com> Date: Fri, 15 Aug 2025 12:33:30 -0600 Subject: [PATCH 35/72] Update silicon.json --- src/main/resources/assets/hbm/manual/material/silicon.json | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/resources/assets/hbm/manual/material/silicon.json b/src/main/resources/assets/hbm/manual/material/silicon.json index 4a6f8defd..67951240c 100644 --- a/src/main/resources/assets/hbm/manual/material/silicon.json +++ b/src/main/resources/assets/hbm/manual/material/silicon.json @@ -3,9 +3,11 @@ "icon": ["hbm:item.billet_silicon", 1, 0], "trigger": [["hbm:item.ingot_silicon"], ["hbm:item.billet_silicon"], ["hbm:item.nugget_silicon"]], "title": { - "en_US": "Silicon" + "en_US": "Silicon", + "ru_RU": "Кремний" }, "content": { - "en_US": "Important material for producing integrated circuits, and any electronics more sophisticated than an analog circuit. Created in an [[electric arc furnace|Electric Arc Furnace]] using things that contain silicon dioxide, like regular sand, nether quartz, fiberglass, flint or [[asbestos|Asbestos]]. Used primarily as wafers (i.e. billets) which are [[pressed|Burner Press]] using a circuit stamp, and then crafted into different types of microchips. Due to requiring an arc furnace, silicon is available after obtaining [[polymer|Polymer]], requiring [[oil|Crude Oil]] processing." + "en_US": "Important material for producing integrated circuits, and any electronics more sophisticated than an analog circuit. Created in an [[electric arc furnace|Electric Arc Furnace]] using things that contain silicon dioxide, like regular sand, nether quartz, fiberglass, flint or [[asbestos|Asbestos]]. Used primarily as wafers (i.e. billets) which are [[pressed|Burner Press]] using a circuit stamp, and then crafted into different types of microchips. Due to requiring an arc furnace, silicon is available after obtaining [[polymer|Polymer]], requiring [[oil|Crude Oil]] processing.", + "ru_RU": "Важный материал для производства интегральных схем и любой электроники, более сложной, чем аналоговые схемы. Производится в [[электродуговой печи|Electric Arc Furnace]] из материалов, содержащих диоксид кремния, таких как обычный песок, незер-кварц, стекловолокно, кремень или [[асбест|Asbestos]]. В основном используется в виде пластин (т.е. заготовок), которые [[прессуются|Burner Press]] с использованием штампа для схем, а затем превращаются в различные типы микросхем. Из-за необходимости в дуговой печи кремний доступен после получения [[полимера|Polymer]], что требует переработки [[нефти|Crude Oil]]." } } From 170984820931311404acfbc26a98eddcc71cbe78 Mon Sep 17 00:00:00 2001 From: Bufka2011 <85364803+Bufka2011@users.noreply.github.com> Date: Fri, 15 Aug 2025 12:34:22 -0600 Subject: [PATCH 36/72] Update sodium.json --- src/main/resources/assets/hbm/manual/material/sodium.json | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/resources/assets/hbm/manual/material/sodium.json b/src/main/resources/assets/hbm/manual/material/sodium.json index 5165042e0..6ad6ac6f7 100644 --- a/src/main/resources/assets/hbm/manual/material/sodium.json +++ b/src/main/resources/assets/hbm/manual/material/sodium.json @@ -3,9 +3,11 @@ "icon": ["hbm:item.powder_sodium", 1, 0], "trigger": [["hbm:item.powder_sodium"]], "title": { - "en_US": "Sodium" + "en_US": "Sodium", + "ru_RU": "Натрий" }, "content": { - "en_US": "Mainly derived from sodalite, a gem which is found as a [[centrifuge|Centrifuge]] byproduct of many ores. Used in liquid form as a powerful [[PWR]] coolant." + "en_US": "Mainly derived from sodalite, a gem which is found as a [[centrifuge|Centrifuge]] byproduct of many ores. Used in liquid form as a powerful [[PWR]] coolant.", + "ru_RU": "В основном добывается из содалита, драгоценного камня, который является побочным продуктом [[центрифуги|Centrifuge]] при переработке многих руд. Используется в жидкой форме как мощный охладитель для [[ВВЭР|PWR]]." } } From 84c69e7803cf2d200b3fe86ee9136ed6abfa9dfc Mon Sep 17 00:00:00 2001 From: Bufka2011 <85364803+Bufka2011@users.noreply.github.com> Date: Fri, 15 Aug 2025 12:35:04 -0600 Subject: [PATCH 37/72] Update steel.json --- src/main/resources/assets/hbm/manual/material/steel.json | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/resources/assets/hbm/manual/material/steel.json b/src/main/resources/assets/hbm/manual/material/steel.json index 113d25af1..c9260f2c5 100644 --- a/src/main/resources/assets/hbm/manual/material/steel.json +++ b/src/main/resources/assets/hbm/manual/material/steel.json @@ -3,9 +3,11 @@ "icon": ["hbm:item.ingot_steel", 1, 0], "trigger": [["hbm:item.ingot_steel"], ["hbm:item.plate_steel"], ["hbm:item.powder_steel"]], "title": { - "en_US": "Steel" + "en_US": "Steel", + "ru_RU": "Сталь" }, "content": { - "en_US": "Upgraded version of iron, basic material. Used in almost everything. Initially obtained by combining coal and iron in a [[blast furnace|Blast Furnace]]. Upgraded recipes are available later on via [[crucible|Crucible]] and [[rotary furnace|Rotary Furnace]]." + "en_US": "Upgraded version of iron, basic material. Used in almost everything. Initially obtained by combining coal and iron in a [[blast furnace|Blast Furnace]]. Upgraded recipes are available later on via [[crucible|Crucible]] and [[rotary furnace|Rotary Furnace]].", + "ru_RU": "Улучшенная версия железа, базовый материал. Используется почти во всем. Изначально получается путем комбинирования угля и железа в [[доменной печи|Blast Furnace]]. Улучшенные рецепты доступны позже через [[плавильню|Crucible]] и [[роторную печь|Rotary Furnace]]." } } From cdda91f2d83772c31e3616db52e62ba126b89176 Mon Sep 17 00:00:00 2001 From: Bufka2011 <85364803+Bufka2011@users.noreply.github.com> Date: Fri, 15 Aug 2025 12:35:44 -0600 Subject: [PATCH 38/72] Update sulfur.json --- src/main/resources/assets/hbm/manual/material/sulfur.json | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/resources/assets/hbm/manual/material/sulfur.json b/src/main/resources/assets/hbm/manual/material/sulfur.json index 32a07b988..c73d90cb5 100644 --- a/src/main/resources/assets/hbm/manual/material/sulfur.json +++ b/src/main/resources/assets/hbm/manual/material/sulfur.json @@ -3,9 +3,11 @@ "icon": ["hbm:item.sulfur", 1, 0], "trigger": [["hbm:item.sulfur"]], "title": { - "en_US": "Sulfur" + "en_US": "Sulfur", + "ru_RU": "Сера" }, "content": { - "en_US": "Common ore, found in even larger numbers in the nether. Used in a variety of things, like [[sulfuric acid|Sulfuric Acid]], [[rubber|Rubber]] and in yellowcake for [[uranium|Uranium]] hexafluoride. Can also make gunpowder, matchsticks, or act as yellow dye." + "en_US": "Common ore, found in even larger numbers in the nether. Used in a variety of things, like [[sulfuric acid|Sulfuric Acid]], [[rubber|Rubber]] and in yellowcake for [[uranium|Uranium]] hexafluoride. Can also make gunpowder, matchsticks, or act as yellow dye.", + "ru_RU": "Обычная руда, в больших количествах встречается в Незере. Используется для различных целей, таких как [[серная кислота|Sulfuric Acid]], [[резина|Rubber]] и в йеллоукейке для гексафторида [[урана|Uranium]]. Также может использоваться для изготовления пороха, спичек или в качестве желтого красителя." } } From aa5c85ade5fc151a9fb43c1953ba09b86647c425 Mon Sep 17 00:00:00 2001 From: Bufka2011 <85364803+Bufka2011@users.noreply.github.com> Date: Fri, 15 Aug 2025 12:36:10 -0600 Subject: [PATCH 39/72] Update tantalium.json --- .../resources/assets/hbm/manual/material/tantalium.json | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/resources/assets/hbm/manual/material/tantalium.json b/src/main/resources/assets/hbm/manual/material/tantalium.json index 5368737b3..196550330 100644 --- a/src/main/resources/assets/hbm/manual/material/tantalium.json +++ b/src/main/resources/assets/hbm/manual/material/tantalium.json @@ -3,9 +3,11 @@ "icon": ["hbm:item.ingot_tantalium", 1, 0], "trigger": [["hbm:item.ingot_tantalium"], ["hbm:item.powder_tantalium"], ["hbm:item.nugget_tantalium"]], "title": { - "en_US": "Tantalium" + "en_US": "Tantalium", + "ru_RU": "Тантал" }, "content": { - "en_US": "Tantalium ('Tantalum') can be ectracted out of [[coltan|Coltan]] which is only found within one specific area in the world. Used mainly for tantalium capacitors, which are crucial for the control units used by most nuclear bombs." + "en_US": "Tantalium ('Tantalum') can be ectracted out of [[coltan|Coltan]] which is only found within one specific area in the world. Used mainly for tantalium capacitors, which are crucial for the control units used by most nuclear bombs.", + "ru_RU": "Тантал ('Tantalum') добывается из [[колтана|Coltan]], который встречается только в одном определенном регионе мира. В основном используется для танталовых конденсаторов, которые критически важны для блоков управления, используемых в большинстве ядерных бомб." } } From c39854dbb419f31c23fe17838a2bdda515cdf363 Mon Sep 17 00:00:00 2001 From: Bufka2011 <85364803+Bufka2011@users.noreply.github.com> Date: Fri, 15 Aug 2025 12:36:49 -0600 Subject: [PATCH 40/72] Update technetium.json --- .../resources/assets/hbm/manual/material/technetium.json | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/resources/assets/hbm/manual/material/technetium.json b/src/main/resources/assets/hbm/manual/material/technetium.json index 97748ea2b..5eaef724f 100644 --- a/src/main/resources/assets/hbm/manual/material/technetium.json +++ b/src/main/resources/assets/hbm/manual/material/technetium.json @@ -3,9 +3,11 @@ "icon": ["hbm:item.ingot_technetium", 1, 0], "trigger": [["hbm:item.billet_technetium"], ["hbm:item.ingot_technetium"], ["hbm:item.nugget_technetium"]], "title": { - "en_US": "Technetium" + "en_US": "Technetium", + "ru_RU": "Технеций" }, "content": { - "en_US": "Synthetic metal, reprocessed from [[ZIRNOX]] or [[PWR]] fuel early on. May also be extracted from some [[RBMK]] fuels or [[bedrock ore|Bedrock Ore]] with high-performance solvent.

Primarily used for [[technetium steel|Technetium Steel]].

Moderately radioactive." + "en_US": "Synthetic metal, reprocessed from [[ZIRNOX]] or [[PWR]] fuel early on. May also be extracted from some [[RBMK]] fuels or [[bedrock ore|Bedrock Ore]] with high-performance solvent.

Primarily used for [[technetium steel|Technetium Steel]].

Moderately radioactive.", + "ru_RU": "Синтетический металл, перерабатывается из топлива [[ЦИРНОКС|ZIRNOX]] или [[ВВЭР|PWR]] на ранних стадиях. Также может быть извлечен из некоторых топлив [[РБМК|RBMK]] или [[бедроковой руды|Bedrock Ore]] с использованием высокоэффективного растворителя.

В основном используется для [[технециевой стали|Technetium Steel]].

Умеренно радиоактивен." } } From 00980d937a4209e2246d11f98f0d3754157d5877 Mon Sep 17 00:00:00 2001 From: Bufka2011 <85364803+Bufka2011@users.noreply.github.com> Date: Fri, 15 Aug 2025 12:37:24 -0600 Subject: [PATCH 41/72] Update technetium_steel.json --- .../assets/hbm/manual/material/technetium_steel.json | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/resources/assets/hbm/manual/material/technetium_steel.json b/src/main/resources/assets/hbm/manual/material/technetium_steel.json index 5f33be6c7..ac31ac861 100644 --- a/src/main/resources/assets/hbm/manual/material/technetium_steel.json +++ b/src/main/resources/assets/hbm/manual/material/technetium_steel.json @@ -3,9 +3,11 @@ "icon": ["hbm:item.ingot_tcalloy", 1, 0], "trigger": [["hbm:item.ingot_tcalloy"], ["hbm:item.powder_tcalloy"]], "title": { - "en_US": "Technetium Steel" + "en_US": "Technetium Steel", + "ru_RU": "Технециевая сталь" }, "content": { - "en_US": "Alloy made from [[steel|Steel]] and [[technetium|Technetium]]. Corrosion resistant, used in stronger fluid tanks and many advanced machines. Obtainable after either a [[ZIRNOX]] or [[PWR]] due to technetium being synthetic.

Fully interchangable with [[cadmium steel|Cadmium Steel]]." + "en_US": "Alloy made from [[steel|Steel]] and [[technetium|Technetium]]. Corrosion resistant, used in stronger fluid tanks and many advanced machines. Obtainable after either a [[ZIRNOX]] or [[PWR]] due to technetium being synthetic.

Fully interchangeable with [[cadmium steel|Cadmium Steel]].", + "ru_RU": "Сплав из [[стали|Steel]] и [[технеция|Technetium]]. Устойчив к коррозии, используется в более прочных резервуарах для жидкостей и во многих продвинутых машинах. Доступен после [[ЦИРНОКС|ZIRNOX]] или [[ВВЭР|PWR]], так как технеций является синтетическим.

Полностью взаимозаменяем с [[кадмиевой сталью|Cadmium Steel]]." } } From a4b49633c6adaac005cb34917cd1a7d2838e0a82 Mon Sep 17 00:00:00 2001 From: Bufka2011 <85364803+Bufka2011@users.noreply.github.com> Date: Fri, 15 Aug 2025 12:38:13 -0600 Subject: [PATCH 42/72] Update thorium.json --- src/main/resources/assets/hbm/manual/material/thorium.json | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/resources/assets/hbm/manual/material/thorium.json b/src/main/resources/assets/hbm/manual/material/thorium.json index 1812f13e7..be512e7cc 100644 --- a/src/main/resources/assets/hbm/manual/material/thorium.json +++ b/src/main/resources/assets/hbm/manual/material/thorium.json @@ -3,9 +3,11 @@ "icon": ["hbm:item.billet_th232", 1, 0], "trigger": [["hbm:item.ingot_th232"], ["hbm:item.billet_th232"], ["hbm:item.nugget_th232"], ["hbm:item.powder_thorium"]], "title": { - "en_US": "Thorium-232" + "en_US": "Thorium-232", + "ru_RU": "Торий-232" }, "content": { - "en_US": "Fertile (i.e. can be bred) isotope which yields [[uranium-233|Uranium-233]]. Can either be irradiated in an [[RBMK]] to produce [[thorium fuel|Thorium Fuel]] or combined with uranium-233. Thorium-derived fuels are generally cost-effective but not very powerful. Also usable in [[liquid thorium salt|Liquid Thorium Salt]], a powerful [[PWR]] coolant (turning it into a molten salt reactor) which yields tons of uranium-233 quickly.

Slightly radioactive." + "en_US": "Fertile (i.e. can be bred) isotope which yields [[uranium-233|Uranium-233]]. Can either be irradiated in an [[RBMK]] to produce [[thorium fuel|Thorium Fuel]] or combined with uranium-233. Thorium-derived fuels are generally cost-effective but not very powerful. Also usable in [[liquid thorium salt|Liquid Thorium Salt]], a powerful [[PWR]] coolant (turning it into a molten salt reactor) which yields tons of uranium-233 quickly.

Slightly radioactive.", + "ru_RU": "Фертильный (т.е. пригодный для размножения) изотоп, дающий [[уран-233|Uranium-233]]. Может быть облучен в [[РБМК|RBMK]] для производства [[ториевого топлива|Thorium Fuel]] или комбинирован с ураном-233. Топлива, производные от тория, обычно экономичны, но не очень мощные. Также используется в [[жидкой ториевой соли|Liquid Thorium Salt]], мощном охладителе [[ВВЭР|PWR]], превращающем его в реактор на расплавленных солях, который быстро производит большое количество урана-233.

Слабо радиоактивен." } } From 4c162e9f37e8fe074a083670c38ffde82ab11446 Mon Sep 17 00:00:00 2001 From: Bufka2011 <85364803+Bufka2011@users.noreply.github.com> Date: Fri, 15 Aug 2025 12:39:07 -0600 Subject: [PATCH 43/72] Update uranium-233.json --- .../resources/assets/hbm/manual/material/uranium-233.json | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/resources/assets/hbm/manual/material/uranium-233.json b/src/main/resources/assets/hbm/manual/material/uranium-233.json index 1852de4c2..e0ab24b7d 100644 --- a/src/main/resources/assets/hbm/manual/material/uranium-233.json +++ b/src/main/resources/assets/hbm/manual/material/uranium-233.json @@ -3,9 +3,11 @@ "icon": ["hbm:item.billet_u233", 1, 0], "trigger": [["hbm:item.ingot_u233"], ["hbm:item.billet_u233"], ["hbm:item.nugget_u233"]], "title": { - "en_US": "Uranium-233" + "en_US": "Uranium-233", + "ru_RU": "Уран-233" }, "content": { - "en_US": "Artificial type of fissile uranium (i.e. reactor capable), created by reprocessing [[thorium-based fuels|Thorium Fuel]]. High enriched uranium-233 fuel is generally more powerful than fuel derived from [[uranium-235|Uranium-235]].

Moderately radioactive." + "en_US": "Artificial type of fissile uranium (i.e. reactor capable), created by reprocessing [[thorium-based fuels|Thorium Fuel]]. High enriched uranium-233 fuel is generally more powerful than fuel derived from [[uranium-235|Uranium-235]].

Moderately radioactive.", + "ru_RU": "Искусственный тип делящегося урана (т.е. пригодного для реакторов), получаемый путем переработки [[ториевых топлив|Thorium Fuel]]. Высокообогащенное топливо урана-233, как правило, мощнее, чем топливо, полученное из [[урана-235|Uranium-235]].

Умеренно радиоактивен." } } From b8fa2a67d798e50a9056b513fb5d48fdd48fdbec Mon Sep 17 00:00:00 2001 From: Bufka2011 <85364803+Bufka2011@users.noreply.github.com> Date: Fri, 15 Aug 2025 12:40:04 -0600 Subject: [PATCH 44/72] Update uranium-235.json --- .../resources/assets/hbm/manual/material/uranium-235.json | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/resources/assets/hbm/manual/material/uranium-235.json b/src/main/resources/assets/hbm/manual/material/uranium-235.json index 361c97c72..b9a75efc1 100644 --- a/src/main/resources/assets/hbm/manual/material/uranium-235.json +++ b/src/main/resources/assets/hbm/manual/material/uranium-235.json @@ -3,9 +3,11 @@ "icon": ["hbm:item.billet_u235", 1, 0], "trigger": [["hbm:item.ingot_u235"], ["hbm:item.billet_u235"], ["hbm:item.nugget_u235"]], "title": { - "en_US": "Uranium-235" + "en_US": "Uranium-235", + "ru_RU": "Уран-235" }, "content": { - "en_US": "Enriched uranium. Fissile, usable in some reactors directly as high enriched fuel, or mixed back with [[uranium-238|Uranium-238]] for medium enriched uranium fuels. Weapons grade. Created initially by processing [[uranium hexafluuoride|Uranium Hexafluoride]] in a cascade of four [[gas centrifuges|Gas Centriuge]], available later on by separating [[natural uranium|Uranium]] via [[SILEX]].

Moderately radioactive." + "en_US": "Enriched uranium. Fissile, usable in some reactors directly as high enriched fuel, or mixed back with [[uranium-238|Uranium-238]] for medium enriched uranium fuels. Weapons grade. Created initially by processing [[uranium hexafluuoride|Uranium Hexafluoride]] in a cascade of four [[gas centrifuges|Gas Centriuge]], available later on by separating [[natural uranium|Uranium]] via [[SILEX]].

Moderately radioactive.", + "ru_RU": "Обогащенный уран. Делящийся, используется в некоторых реакторах непосредственно как высокообогащенное топливо или смешивается с [[ураном-238|Uranium-238]] для среднеобогащенных урановых топлив. Оружейное качество. Изначально создается путем переработки [[гексафторида урана|Uranium Hexafluoride]] в каскаде из четырех [[газовых центрифуг|Gas Centrifuge]], позже доступен через разделение [[натурального урана|Uranium]] с помощью [[SILEX]].

Умеренно радиоактивен." } } From 2546cf79b7163c60a8bbcea5ae08bf80b0c431e3 Mon Sep 17 00:00:00 2001 From: Bufka2011 <85364803+Bufka2011@users.noreply.github.com> Date: Fri, 15 Aug 2025 12:40:41 -0600 Subject: [PATCH 45/72] Update uranium-238.json --- .../resources/assets/hbm/manual/material/uranium-238.json | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/resources/assets/hbm/manual/material/uranium-238.json b/src/main/resources/assets/hbm/manual/material/uranium-238.json index bef789d01..ca87770e1 100644 --- a/src/main/resources/assets/hbm/manual/material/uranium-238.json +++ b/src/main/resources/assets/hbm/manual/material/uranium-238.json @@ -3,9 +3,11 @@ "icon": ["hbm:item.billet_u238", 1, 0], "trigger": [["hbm:item.ingot_u238"], ["hbm:item.billet_u238"], ["hbm:item.nugget_u238"]], "title": { - "en_US": "Uranium-238" + "en_US": "Uranium-238", + "ru_RU": "Уран-238" }, "content": { - "en_US": "Depleted uranium, not fissile (i.e. not directly reactor-usable). Primarily a byproduct from enriching [[uranium|Uranium]]. Used in [[ferrouranium|Ferrouranium]], for [[depleted uranium ammo|Depleted Uranium Ammo]] and for certain low-enriched fuels. Fuels that contain uranium-238 typically yield useful [[plutonium-239|Plutonium-239]] when reprocessing.

Slightly radioactive." + "en_US": "Depleted uranium, not fissile (i.e. not directly reactor-usable). Primarily a byproduct from enriching [[uranium|Uranium]]. Used in [[ferrouranium|Ferrouranium]], for [[depleted uranium ammo|Depleted Uranium Ammo]] and for certain low-enriched fuels. Fuels that contain uranium-238 typically yield useful [[plutonium-239|Plutonium-239]] when reprocessing.

Slightly radioactive.", + "ru_RU": "Истощенный уран, не делящийся (т.е. не пригоден для прямого использования в реакторах). В основном является побочным продуктом обогащения [[урана|Uranium]]. Используется в [[ферроурание|Ferrouranium]], для [[боеприпасов с истощенным ураном|Depleted Uranium Ammo]] и для некоторых низкообогащенных топлив. Топлива, содержащие уран-238, при переработке обычно дают полезный [[плутоний-239|Plutonium-239]].

Слабо радиоактивен." } } From 563defd5f167a8bf81187cb68123ced56f5d6413 Mon Sep 17 00:00:00 2001 From: Bufka2011 <85364803+Bufka2011@users.noreply.github.com> Date: Fri, 15 Aug 2025 12:41:27 -0600 Subject: [PATCH 46/72] Update uranium.json --- src/main/resources/assets/hbm/manual/material/uranium.json | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/resources/assets/hbm/manual/material/uranium.json b/src/main/resources/assets/hbm/manual/material/uranium.json index 3c34cc07e..cfeec2dfc 100644 --- a/src/main/resources/assets/hbm/manual/material/uranium.json +++ b/src/main/resources/assets/hbm/manual/material/uranium.json @@ -3,9 +3,11 @@ "icon": ["hbm:item.ingot_uranium", 1, 0], "trigger": [["hbm:item.ingot_uranium"], ["hbm:item.billet_uranium"], ["hbm:item.nugget_uranium"], ["hbm:item.powder_uranium"], ["hbm:tile.ore_uranium"]], "title": { - "en_US": "Uranium" + "en_US": "Uranium", + "ru_RU": "Уран" }, "content": { - "en_US": "Natural uranium, slightly radioactive. Not very fissile on its own, can be enriched by turning it into [[uranium hexafluoride|Uranium Hexafluoride]] and processing it in [[gas centrifuges|Gas Centrifuge]]. [[ZIRNOX]], [[RBMK]] and [[Chigago Pile]] may use natural uranium as fuel without enrichment.

See also:
[[Uranium-233]]
[[Uranium-235]]
[[Uranium-238]]" + "en_US": "Natural uranium, slightly radioactive. Not very fissile on its own, can be enriched by turning it into [[uranium hexafluoride|Uranium Hexafluoride]] and processing it in [[gas centrifuges|Gas Centrifuge]]. [[ZIRNOX]], [[RBMK]] and [[Chigago Pile]] may use natural uranium as fuel without enrichment.

See also:
[[Uranium-233]]
[[Uranium-235]]
[[Uranium-238]]", + "ru_RU": "Натуральный уран, слабо радиоактивен. Сам по себе не очень делящийся, может быть обогащен путем превращения в [[гексафторид урана|Uranium Hexafluoride]] и переработки в [[газовых центрифугах|Gas Centrifuge]]. [[ЦИРНОКС|ZIRNOX]], [[РБМК|RBMK]] и [[Чикагская поленница|Chicago Pile]] могут использовать натуральный уран как топливо без обогащения.

См. также:
[[Уран-233|Uranium-233]]
[[Уран-235|Uranium-235]]
[[Уран-238|Uranium-238]]" } } From 458ee0a90e3488e3e8a00596c1927a8fb4580259 Mon Sep 17 00:00:00 2001 From: Bufka2011 <85364803+Bufka2011@users.noreply.github.com> Date: Fri, 15 Aug 2025 12:42:02 -0600 Subject: [PATCH 47/72] Update weaponsteel.json --- .../resources/assets/hbm/manual/material/weaponsteel.json | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/resources/assets/hbm/manual/material/weaponsteel.json b/src/main/resources/assets/hbm/manual/material/weaponsteel.json index 87d951ce6..52e5c11ed 100644 --- a/src/main/resources/assets/hbm/manual/material/weaponsteel.json +++ b/src/main/resources/assets/hbm/manual/material/weaponsteel.json @@ -3,9 +3,11 @@ "icon": ["hbm:item.ingot_weaponsteel", 1, 0], "trigger": [["hbm:item.ingot_weaponsteel"], ["hbm:item.plate_weaponsteel"]], "title": { - "en_US": "Weapon Steel" + "en_US": "Weapon Steel", + "ru_RU": "Оружейная сталь" }, "content": { - "en_US": "High-purity version of [[steel|Steel]] made in a [[rotary furnace|Rotary Furnace]]. Requires [[coker gas|Coker Gas]], and therefore a [[coker unit|Coker Unit]]. Used in many mid-game weapons, weapon modifications and missile warheads." + "en_US": "High-purity version of [[steel|Steel]] made in a [[rotary furnace|Rotary Furnace]]. Requires [[coker gas|Coker Gas]], and therefore a [[coker unit|Coker Unit]]. Used in many mid-game weapons, weapon modifications and missile warheads.", + "ru_RU": "Высококачественная версия [[стали|Steel]], изготовленная в [[роторной печи|Rotary Furnace]]. Требует [[коксовый газ|Coker Gas]] и, следовательно, [[коксовую установку|Coker Unit]]. Используется во многих оружиях среднего этапа игры, модификациях оружия и боеголовках ракет." } } From 4750b0eba2e80aae35bc004ba74fd8f3d489f918 Mon Sep 17 00:00:00 2001 From: Bufka2011 <85364803+Bufka2011@users.noreply.github.com> Date: Fri, 15 Aug 2025 12:45:41 -0600 Subject: [PATCH 48/72] Update aluminium.json --- src/main/resources/assets/hbm/manual/material/aluminium.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/assets/hbm/manual/material/aluminium.json b/src/main/resources/assets/hbm/manual/material/aluminium.json index 5a20169ae..9590844ad 100644 --- a/src/main/resources/assets/hbm/manual/material/aluminium.json +++ b/src/main/resources/assets/hbm/manual/material/aluminium.json @@ -8,6 +8,6 @@ }, "content": { "en_US": "Common, lightweight metal. Available early on from smelting cryolite ('aluminium-bearing ore') in a [[combination oven|Combination Oven]]. Can be made later by processing [[bauxite|Bauxite]], and [[electrolyzing|Electrolysis Machine]] the resulting alumina solution.

Used in piping, general fluid handling, as part of [[gunmetal|Gunmetal]] and missile fuselages.", - "ru_RU": "Обычный, легкий металл. Доступен на ранних этапах от плавки криолита ('алюминиевая руда') в [[коксовой печи|Combination Oven]]. Позже может быть получен путем обработки [[боксита|Bauxite]] и [[электролиза|Electrolysis Machine]] полученного раствора глинозема.

Используется в трубах, общем обращении с жидкостями, как часть [[оружейного металла|Gunmetal]] и фюзеляжей ракет." + "ru_RU": "Обычный, легкий металл. Доступен на ранних этапах от плавки криолита ('алюминиевая руда') в [[коксовой печи|Combination Oven]]. Позже может быть получен путём обработки [[боксита|Bauxite]] и [[электролиза|Electrolysis Machine]] полученного раствора глинозема.

Используется в трубах, общем обращении с жидкостями, как часть [[оружейного металла|Gunmetal]] и фюзеляжей ракет." } } From 470f950b1a35956479cd6df15a570f50c9c9cfad Mon Sep 17 00:00:00 2001 From: Bufka2011 <85364803+Bufka2011@users.noreply.github.com> Date: Fri, 15 Aug 2025 12:46:08 -0600 Subject: [PATCH 49/72] Update aluminium.json --- src/main/resources/assets/hbm/manual/material/aluminium.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/assets/hbm/manual/material/aluminium.json b/src/main/resources/assets/hbm/manual/material/aluminium.json index 9590844ad..8bdf151bc 100644 --- a/src/main/resources/assets/hbm/manual/material/aluminium.json +++ b/src/main/resources/assets/hbm/manual/material/aluminium.json @@ -8,6 +8,6 @@ }, "content": { "en_US": "Common, lightweight metal. Available early on from smelting cryolite ('aluminium-bearing ore') in a [[combination oven|Combination Oven]]. Can be made later by processing [[bauxite|Bauxite]], and [[electrolyzing|Electrolysis Machine]] the resulting alumina solution.

Used in piping, general fluid handling, as part of [[gunmetal|Gunmetal]] and missile fuselages.", - "ru_RU": "Обычный, легкий металл. Доступен на ранних этапах от плавки криолита ('алюминиевая руда') в [[коксовой печи|Combination Oven]]. Позже может быть получен путём обработки [[боксита|Bauxite]] и [[электролиза|Electrolysis Machine]] полученного раствора глинозема.

Используется в трубах, общем обращении с жидкостями, как часть [[оружейного металла|Gunmetal]] и фюзеляжей ракет." + "ru_RU": "Обычный, легкий металл. Доступен на ранних этапах от плавки криолита ('алюминиевая руда') в [[коксовой печи|Combination Oven]]. Позже может быть получен путём обработки [[боксита|Bauxite]] и [[электролиза|Electrolysis Machine]] полученного раствора глинозёма.

Используется в трубах, общем обращении с жидкостями, как часть [[оружейного металла|Gunmetal]] и фюзеляжей ракет." } } From 9b412c726d107601986408efba0f64828e9febaf Mon Sep 17 00:00:00 2001 From: Bufka2011 <85364803+Bufka2011@users.noreply.github.com> Date: Fri, 15 Aug 2025 12:48:35 -0600 Subject: [PATCH 50/72] Update cinnabar.json --- src/main/resources/assets/hbm/manual/material/cinnabar.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/assets/hbm/manual/material/cinnabar.json b/src/main/resources/assets/hbm/manual/material/cinnabar.json index 12bd758f9..bb721bf6f 100644 --- a/src/main/resources/assets/hbm/manual/material/cinnabar.json +++ b/src/main/resources/assets/hbm/manual/material/cinnabar.json @@ -8,6 +8,6 @@ }, "content": { "en_US": "Rare ore. Can be [[acidized|Ore Acidizer]] into 375mB worth of [[mercury|Mercury]] drops, or [[combination smelted|Combination Oven]] into 100mB of mercury and some sulfur. Mainly exists as an early means to get mercury for [[desh|Desh]] production.", - "ru_RU": "Редкая руда. Может быть [[обработана кислотой|Ore Acidizer]] в 375 мБ капель [[ртути|Mercury]] или [[переплавлена в косксовой печи|Combination Oven]] в 100 мБ ртути и немного серы. В основном используется как ранний способ получения ртути для производства [[деша|Desh]]." + "ru_RU": "Редкая руда. Может быть [[обработана кислотой|Ore Acidizer]] в 375 мБ капель [[ртути|Mercury]] или [[переплавлена в коксовой печи|Combination Oven]] в 100 мБ ртути и немного серы. В основном используется как ранний способ получения ртути для производства [[деша|Desh]]." } } From 9ff54c2495c46d2700407df271d7c5dbbd4aba30 Mon Sep 17 00:00:00 2001 From: Bufka2011 <85364803+Bufka2011@users.noreply.github.com> Date: Fri, 15 Aug 2025 12:49:51 -0600 Subject: [PATCH 51/72] Update coke.json --- src/main/resources/assets/hbm/manual/material/coke.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/assets/hbm/manual/material/coke.json b/src/main/resources/assets/hbm/manual/material/coke.json index b113bd25f..ffc79a820 100644 --- a/src/main/resources/assets/hbm/manual/material/coke.json +++ b/src/main/resources/assets/hbm/manual/material/coke.json @@ -8,6 +8,6 @@ }, "content": { "en_US": "High-purity carbon, has twice the burn value of coal. Can be pressed into [[graphite|Graphite]], used in various [[steel|Steel]] recipes or as a source of carbon for the [[crucible|Crucible]].

Coal coke can be made by smelting coal briquettes, or combination smelting coal in its various forms.

Lignite coke is made from the much cheaper and less powerful lignite in much the same way, despite this it has the same characteristics.

Petroleum coke is made either from non-coal tars in a [[combination oven|Combination Oven]], or by coking various types of oil in a [[coker|Coking Unit]].", - "ru_RU": "Высокочистый углерод, имеет вдвое большую энергию сгорания, чем уголь. Может быть спрессован в [[графит|Graphite]], используется в различных рецептах [[стали|Steel]] или как источник углерода для [[плавильни|Crucible]].

Угольный кокс можно получить путем переплавки угольных брикетов или комбинированной переплавки угля в различных формах.

Бурый кокс изготавливается из более дешевого и менее мощного бурого угля тем же способом, но обладает теми же характеристиками.

Нефтяной кокс производится либо из неугольных смол в [[коксовой печи|Combination Oven]], либо путем коксования различных видов масла в [[коксовой установке|Coking Unit]]." + "ru_RU": "Высокочистый углерод, имеет вдвое большую энергию сгорания, чем уголь. Может быть спрессован в [[графит|Graphite]], используется в различных рецептах [[стали|Steel]] или как источник углерода для [[плавильни|Crucible]].

Угольный кокс можно получить путем переплавки угольных брикетов или комбинированной переплавки угля в различных формах.

Бурый кокс изготавливается из более дешёвого и менее мощного бурого угля тем же способом, но обладает теми же характеристиками.

Нефтяной кокс производится либо из неугольных смол в [[коксовой печи|Combination Oven]], либо путем коксования различных видов масла в [[коксовой установке|Coking Unit]]." } } From c99f647e156c6f5ba2e83c459ed43042c2d7c8b9 Mon Sep 17 00:00:00 2001 From: Bufka2011 <85364803+Bufka2011@users.noreply.github.com> Date: Fri, 15 Aug 2025 12:55:42 -0600 Subject: [PATCH 52/72] Update desh.json --- src/main/resources/assets/hbm/manual/material/desh.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/assets/hbm/manual/material/desh.json b/src/main/resources/assets/hbm/manual/material/desh.json index c0d7ddbeb..a34e741c7 100644 --- a/src/main/resources/assets/hbm/manual/material/desh.json +++ b/src/main/resources/assets/hbm/manual/material/desh.json @@ -8,6 +8,6 @@ }, "content": { "en_US": "High-strength working alloy made in a [[chemical plant|Chemical Plant]]. Requires [[light oil|Light oil]] from basic [[oil|Crude Oil]] refining, [[mercury|Mercury]], a byproduct of [[centrifuging|Centrifuge]] redstone ore and desh blend, which is just [[shredded|Shredder]] rare earth ore chunks.

Used in a variety of things, especially tools and weapons. Desh tools are slow and only iron tier, but are the first available ones to be unbreakable and offer many tool abilities.", - "ru_RU": "Высокопрочный рабочий сплав, изготовленный на [[химической установке|Chemical Plant]]. Требует [[легкой нефти|Light oil]] из базовой переработки [[нефти|Crude Oil]], [[ртути|Mercury]], побочного продукта [[центрифугирования|Centrifuge]] красной руды, и смеси деша, которая представляет собой просто [[измельченные|Shredder]] куски редкоземельной руды.

Используется в различных вещах, особенно в инструментах и оружии. Инструменты из деша медленные и соответствуют железному уровню, но являются первыми доступными неломающимися инструментами с множеством способностей." + "ru_RU": "Высокопрочный рабочий сплав, изготовленный на [[химической установке|Chemical Plant]]. Требует [[легкой нефти|Light oil]] из базовой переработки [[нефти|Crude Oil]], [[ртути|Mercury]], побочного продукта [[центрифугирования|Centrifuge]] красной руды, и смеси деша, которая представляет собой просто [[измельчённые|Shredder]] куски редкоземельной руды.

Используется в различных вещах, особенно в инструментах и оружии. Инструменты из деша медленные и соответствуют железному уровню, но являются первыми доступными неломающимися инструментами с множеством способностей." } } From 9da95bbff3753eeeafc8faeeb05a1bc01efd417f Mon Sep 17 00:00:00 2001 From: Bufka2011 <85364803+Bufka2011@users.noreply.github.com> Date: Fri, 15 Aug 2025 12:57:05 -0600 Subject: [PATCH 53/72] Update mingrade.json --- src/main/resources/assets/hbm/manual/material/mingrade.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/assets/hbm/manual/material/mingrade.json b/src/main/resources/assets/hbm/manual/material/mingrade.json index a65b8ad99..fe1732da5 100644 --- a/src/main/resources/assets/hbm/manual/material/mingrade.json +++ b/src/main/resources/assets/hbm/manual/material/mingrade.json @@ -8,6 +8,6 @@ }, "content": { "en_US": "Alloy made from copper and redstone in equal parts using the [[blast furnace|Blast Furnace]]. Used in almost all things electric, commonly in wire form.", - "ru_RU": "Сплав, изготовленный из меди и красного камня в равных частях в [[доменной печи|Blast Furnace]]. Используется почти во всех электрических устройствах, обычно в виде проволоки." + "ru_RU": "Сплав, изготовленный из меди и красного камня в равных частях в [[доменной печи|Blast Furnace]]. Используется почти во всех электрических устройствах, обычно в виде проводов." } } From 2ad1c2121d00fcc1a6fb85ef8833197e67b6f7a9 Mon Sep 17 00:00:00 2001 From: Bufka2011 <85364803+Bufka2011@users.noreply.github.com> Date: Fri, 15 Aug 2025 12:58:10 -0600 Subject: [PATCH 54/72] Update neptunium.json --- src/main/resources/assets/hbm/manual/material/neptunium.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/assets/hbm/manual/material/neptunium.json b/src/main/resources/assets/hbm/manual/material/neptunium.json index 90b6c56a5..a68c7adb9 100644 --- a/src/main/resources/assets/hbm/manual/material/neptunium.json +++ b/src/main/resources/assets/hbm/manual/material/neptunium.json @@ -8,6 +8,6 @@ }, "content": { "en_US": "Fissile isotope, usually found in spent [[uranium-235|Uranium-235]] fuel. Mostly used for nuclear reactors, either pure as high enriched neptunium fuel, or combined with [[uranium-238|Uranium-238]] as medium enriched neptunium fuel. Usable in the [[PWR]] and [[RBMK]].", - "ru_RU": "Делящийся изотоп, обычно содержится в отработанном топливе [[урана-235|Uranium-235]]. В основном используется для ядерных реакторов, либо в чистом виде как высокообогащенное нептуниевое топливо, либо в сочетании с [[ураном-238|Uranium-238]] как среднеобогащенное нептуниевое топливо. Применяется в [[ВВЭР|PWR]] и [[РБМК|RBMK]]." + "ru_RU": "Делящийся изотоп, обычно содержится в отработанном топливе [[урана-235|Uranium-235]]. В основном используется для ядерных реакторов, либо в чистом виде как высокообогащённое нептуниевое топливо, либо в сочетании с [[ураном-238|Uranium-238]] как среднеобогащённое нептуниевое топливо. Применяется в [[ВВЭР|PWR]] и [[РБМК|RBMK]]." } } From 997ed75b791f1cd86519b61bb93a51a188c5b6ec Mon Sep 17 00:00:00 2001 From: Bufka2011 <85364803+Bufka2011@users.noreply.github.com> Date: Fri, 15 Aug 2025 12:58:42 -0600 Subject: [PATCH 55/72] Update plutonium-239.json --- .../resources/assets/hbm/manual/material/plutonium-239.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/assets/hbm/manual/material/plutonium-239.json b/src/main/resources/assets/hbm/manual/material/plutonium-239.json index b29fe03a0..f64b725f8 100644 --- a/src/main/resources/assets/hbm/manual/material/plutonium-239.json +++ b/src/main/resources/assets/hbm/manual/material/plutonium-239.json @@ -8,6 +8,6 @@ }, "content": { "en_US": "Primary fissile isotope of [[plutonium|Plutonium]]. Can be extracted from many spent fuels that use [[uranium-238|Uranium-238]] or directly from [[reactor-grade plutonium|Reactor-Grade Plutonium]]. Usable in high enriched fuels for various reactors, mixed with other isotopes for lower enriched fuels, or as fissile material in many nuclear bombs.

Moderately radioactive.", - "ru_RU": "Основной делящийся изотоп [[плутония|Plutonium]]. Может быть извлечен из многих отработанных топлив, использующих [[уран-238|Uranium-238]], или непосредственно из [[реакторного плутония|Reactor-Grade Plutonium]]. Используется в высокообогащенных топливах для различных реакторов, в смеси с другими изотопами для менее обогащенных топлив или как делящийся материал во многих ядерных бомбах.

Умеренно радиоактивен." + "ru_RU": "Основной делящийся изотоп [[плутония|Plutonium]]. Может быть извлечен из многих отработанных топлив, использующих [[уран-238|Uranium-238]], или непосредственно из [[реакторного плутония|Reactor-Grade Plutonium]]. Используется в высокообогащённых топливах для различных реакторов, в смеси с другими изотопами для менее обогащённых топлив или как делящийся материал во многих ядерных бомбах.

Умеренно радиоактивен." } } From de4a35900203ded4632c0bc426d6a22ec2c89b43 Mon Sep 17 00:00:00 2001 From: Bufka2011 <85364803+Bufka2011@users.noreply.github.com> Date: Fri, 15 Aug 2025 12:59:18 -0600 Subject: [PATCH 56/72] Update plutonium-241.json --- .../resources/assets/hbm/manual/material/plutonium-241.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/assets/hbm/manual/material/plutonium-241.json b/src/main/resources/assets/hbm/manual/material/plutonium-241.json index b10bb4ed9..096b8864c 100644 --- a/src/main/resources/assets/hbm/manual/material/plutonium-241.json +++ b/src/main/resources/assets/hbm/manual/material/plutonium-241.json @@ -8,6 +8,6 @@ }, "content": { "en_US": "Secondary fissile isotope of [[plutonium|Plutonium]]. Can be recovered from [[plutonium-240|Plutonium-240]]-rich spent [[RBMK]] fuels, as well as certain types of [[zirconium|Zirconium]] fast breefer fuels. Only used in specialized breeding fuels and as high enriched fuel, which is more powerful than its [[plutonium-239|Plutonium-239]] counterpart. Plutonium-241 in RBMKs yields [[americium-241|Americium-241]] and [[americium-242|Americium-242]] when reprocessed.

Highly radioactive.", - "ru_RU": "Вторичный делящийся изотоп [[плутония|Plutonium]]. Может быть извлечен из отработанных топлив [[РБМК|RBMK]], богатых [[плутонием-240|Plutonium-240]], а также из определенных типов [[циркониевых|Zirconium]] топлив быстрого размножения. Используется только в специализированных топливных стержнях для размножения и как высокообогащенное топливо, которое мощнее, чем его аналог [[плутоний-239|Plutonium-239]]. Плутоний-241 в РБМК при переработке дает [[америций-241|Americium-241]] и [[америций-242|Americium-242]].

Сильно радиоактивен." + "ru_RU": "Вторичный делящийся изотоп [[плутония|Plutonium]]. Может быть извлечен из отработанных топлив [[РБМК|RBMK]], богатых [[плутонием-240|Plutonium-240]], а также из определенных типов [[циркониевых|Zirconium]] топлив быстрого размножения. Используется только в специализированных топливных стержнях для размножения и как высокообогащённое топливо, которое мощнее, чем его аналог [[плутоний-239|Plutonium-239]]. Плутоний-241 в РБМК при переработке дает [[америций-241|Americium-241]] и [[америций-242|Americium-242]].

Сильно радиоактивен." } } From 098ecd3791fe35c7c5bd0384c8e8a0fa02adf480 Mon Sep 17 00:00:00 2001 From: Bufka2011 <85364803+Bufka2011@users.noreply.github.com> Date: Fri, 15 Aug 2025 12:59:44 -0600 Subject: [PATCH 57/72] Update plutonium-rg.json --- src/main/resources/assets/hbm/manual/material/plutonium-rg.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/assets/hbm/manual/material/plutonium-rg.json b/src/main/resources/assets/hbm/manual/material/plutonium-rg.json index 75a1b4975..c5cb2f1a4 100644 --- a/src/main/resources/assets/hbm/manual/material/plutonium-rg.json +++ b/src/main/resources/assets/hbm/manual/material/plutonium-rg.json @@ -8,6 +8,6 @@ }, "content": { "en_US": "Mixture of [[plutonium-239|Plutonium-239]] and [[plutonium-240|Plutonium-240]]. Common result of reprocessing many [[uranium|Uranium]]-based fuels, as well as by breeding uranium in the [[Chicago Pile]]. Usable in many reactors as medium enriched plutonium fuel.

Moderately radioactive.", - "ru_RU": "Смесь [[плутония-239|Plutonium-239]] и [[плутония-240|Plutonium-240]]. Обычный результат переработки многих топлив на основе [[урана|Uranium]], а также при размножении урана в [[Чикагской полленице|Chicago Pile]]. Используется во многих реакторах как среднеобогащенное плутониевое топливо.

Умеренно радиоактивен." + "ru_RU": "Смесь [[плутония-239|Plutonium-239]] и [[плутония-240|Plutonium-240]]. Обычный результат переработки многих топлив на основе [[урана|Uranium]], а также при размножении урана в [[Чикагской полленице|Chicago Pile]]. Используется во многих реакторах как среднеобогащённое плутониевое топливо.

Умеренно радиоактивен." } } From 9b7332a047020c528cdd1b58e463917f28339977 Mon Sep 17 00:00:00 2001 From: Bufka2011 <85364803+Bufka2011@users.noreply.github.com> Date: Fri, 15 Aug 2025 13:00:32 -0600 Subject: [PATCH 58/72] Update radium.json --- src/main/resources/assets/hbm/manual/material/radium.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/assets/hbm/manual/material/radium.json b/src/main/resources/assets/hbm/manual/material/radium.json index 0821eace7..331d37adc 100644 --- a/src/main/resources/assets/hbm/manual/material/radium.json +++ b/src/main/resources/assets/hbm/manual/material/radium.json @@ -8,6 +8,6 @@ }, "content": { "en_US": "Rare radioactive material found in [[uranium|Uranium]] and [[thorium|Thorium-232]] ores, may be extracted using a [[centrifuge|Centrifuge]]. Used with [[beryllium|Beryllium]] in Ra226Be neutron sources, which are vital for kickstarting the [[Chicago Pile]], [[PWR]], [[research reactor|Research Reactor]] and [[RBMK]]. The first available neutron source, and often times the cheapest.

Moderately radioactive.", - "ru_RU": "Редкий радиоактивный материал, содержащийся в рудах [[урана|Uranium]] и [[тория-232|Thorium-232]], может быть извлечен с помощью [[центрифуги|Centrifuge]]. Используется с [[бериллием|Beryllium]] в нейтронных источниках Радий-226-бериллий, которые необходимы для запуска [[Чикагской поленницы|Chicago Pile]], [[ВВЭР|PWR]], [[исследовательского реактора|Research Reactor]] и [[РБМК|RBMK]]. Первый доступный нейтронный источник, часто самый дешевый.

Умеренно радиоактивен." + "ru_RU": "Редкий радиоактивный материал, содержащийся в рудах [[урана|Uranium]] и [[тория-232|Thorium-232]], может быть извлечён с помощью [[центрифуги|Centrifuge]]. Используется с [[бериллием|Beryllium]] в нейтронных источниках Радий-226-бериллий, которые необходимы для запуска [[Чикагской поленницы|Chicago Pile]], [[ВВЭР|PWR]], [[исследовательского реактора|Research Reactor]] и [[РБМК|RBMK]]. Первый доступный нейтронный источник, часто самый дешевый.

Умеренно радиоактивен." } } From 9a47ec30f42013159ee104a55ee599e49a7b5d1f Mon Sep 17 00:00:00 2001 From: Bufka2011 <85364803+Bufka2011@users.noreply.github.com> Date: Fri, 15 Aug 2025 13:03:46 -0600 Subject: [PATCH 59/72] Update sulfur.json --- src/main/resources/assets/hbm/manual/material/sulfur.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/assets/hbm/manual/material/sulfur.json b/src/main/resources/assets/hbm/manual/material/sulfur.json index c73d90cb5..7d9b5915b 100644 --- a/src/main/resources/assets/hbm/manual/material/sulfur.json +++ b/src/main/resources/assets/hbm/manual/material/sulfur.json @@ -8,6 +8,6 @@ }, "content": { "en_US": "Common ore, found in even larger numbers in the nether. Used in a variety of things, like [[sulfuric acid|Sulfuric Acid]], [[rubber|Rubber]] and in yellowcake for [[uranium|Uranium]] hexafluoride. Can also make gunpowder, matchsticks, or act as yellow dye.", - "ru_RU": "Обычная руда, в больших количествах встречается в Незере. Используется для различных целей, таких как [[серная кислота|Sulfuric Acid]], [[резина|Rubber]] и в йеллоукейке для гексафторида [[урана|Uranium]]. Также может использоваться для изготовления пороха, спичек или в качестве желтого красителя." + "ru_RU": "Обычная руда, в больших количествах встречается в Незере. Используется для различных целей, таких как [[серная кислота|Sulfuric Acid]], [[резина|Rubber]] и в йеллоукейке для гексафторида [[урана|Uranium]]. Также может использоваться для изготовления пороха, спичек или в качестве жёлтого красителя." } } From 74bd23d76ea11ba2f6fa840b3e9c16af85d7a49f Mon Sep 17 00:00:00 2001 From: Bufka2011 <85364803+Bufka2011@users.noreply.github.com> Date: Fri, 15 Aug 2025 13:07:16 -0600 Subject: [PATCH 60/72] Update uranium-233.json --- src/main/resources/assets/hbm/manual/material/uranium-233.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/assets/hbm/manual/material/uranium-233.json b/src/main/resources/assets/hbm/manual/material/uranium-233.json index e0ab24b7d..d1802f419 100644 --- a/src/main/resources/assets/hbm/manual/material/uranium-233.json +++ b/src/main/resources/assets/hbm/manual/material/uranium-233.json @@ -8,6 +8,6 @@ }, "content": { "en_US": "Artificial type of fissile uranium (i.e. reactor capable), created by reprocessing [[thorium-based fuels|Thorium Fuel]]. High enriched uranium-233 fuel is generally more powerful than fuel derived from [[uranium-235|Uranium-235]].

Moderately radioactive.", - "ru_RU": "Искусственный тип делящегося урана (т.е. пригодного для реакторов), получаемый путем переработки [[ториевых топлив|Thorium Fuel]]. Высокообогащенное топливо урана-233, как правило, мощнее, чем топливо, полученное из [[урана-235|Uranium-235]].

Умеренно радиоактивен." + "ru_RU": "Искусственный тип делящегося урана (т.е. пригодного для реакторов), получаемый путём переработки [[ториевых топлив|Thorium Fuel]]. Высокообогащенное топливо урана-233, как правило, мощнее, чем топливо, полученное из [[урана-235|Uranium-235]].

Умеренно радиоактивен." } } From ed67caa19c3b89727e6f74971f335395368c0756 Mon Sep 17 00:00:00 2001 From: Bufka2011 <85364803+Bufka2011@users.noreply.github.com> Date: Fri, 15 Aug 2025 13:08:48 -0600 Subject: [PATCH 61/72] Update arsenic.json --- src/main/resources/assets/hbm/manual/material/arsenic.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/assets/hbm/manual/material/arsenic.json b/src/main/resources/assets/hbm/manual/material/arsenic.json index 01fe95509..d54f92d25 100644 --- a/src/main/resources/assets/hbm/manual/material/arsenic.json +++ b/src/main/resources/assets/hbm/manual/material/arsenic.json @@ -8,6 +8,6 @@ }, "content": { "en_US": "Obtainable by treating oily scraps with [[high-performance solvent|High-Performance Solvent]] in an [[acidizer|Ore Acidizer]]. Oily scraps can be created by [[shredding|Shredder]] polluted blocks created by the [[fracking tower|Hydraulic Fracking Tower]]. Primarily used as [[arsenic bronze|Arsenic Bronze]].", - "ru_RU": "Получается путем обработки нефтяных отходов [[высокоэффективным растворителем|High-Performance Solvent]] в [[рудном окислитиле|Ore Acidizer]]. Нефтяные отходы можно создать [[измельчением|Shredder]] загрязненных блоков, созданных [[башней гидроразрыва|Hydraulic Fracking Tower]]. В основном используется как [[мышьяковая бронза|Arsenic Bronze]]." + "ru_RU": "Получается путём обработки нефтяных отходов [[высокоэффективным растворителем|High-Performance Solvent]] в [[рудном окислитиле|Ore Acidizer]]. Нефтяные отходы можно создать [[измельчением|Shredder]] загрязненных блоков, созданных [[башней гидроразрыва|Hydraulic Fracking Tower]]. В основном используется как [[мышьяковая бронза|Arsenic Bronze]]." } } From 792dff062e22252e145136e3baa8145c6e06695e Mon Sep 17 00:00:00 2001 From: Bufka2011 <85364803+Bufka2011@users.noreply.github.com> Date: Fri, 15 Aug 2025 13:09:10 -0600 Subject: [PATCH 62/72] Update cadmium.json --- src/main/resources/assets/hbm/manual/material/cadmium.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/assets/hbm/manual/material/cadmium.json b/src/main/resources/assets/hbm/manual/material/cadmium.json index 14d06bebe..0de201080 100644 --- a/src/main/resources/assets/hbm/manual/material/cadmium.json +++ b/src/main/resources/assets/hbm/manual/material/cadmium.json @@ -8,6 +8,6 @@ }, "content": { "en_US": "Made by treating mustard willow leaves with [[high-performance solvent|High-Performance Solvent]]. Used in [[PVC]], a lategame alternate recipe for [[rubber|Rubber]] and for [[cadmium steel|Cadmium Steel]], which acts as a [[technetium steel|Technetium Steel]] substitute.", - "ru_RU": "Изготовлен путем обработки листьев горчичной ивы [[высокоэффективным растворителем|High-Performance Solvent]]. Используется в [[ПВХ|PVC]], позднеигровом альтернативном рецепте для [[резины|Rubber]] и для [[кадмиевой стали|Cadmium Steel]], которая действует как замена [[технециевой стали|Technetium Steel]]." + "ru_RU": "Изготовлен путём обработки листьев горчичной ивы [[высокоэффективным растворителем|High-Performance Solvent]]. Используется в [[ПВХ|PVC]], позднеигровом альтернативном рецепте для [[резины|Rubber]] и для [[кадмиевой стали|Cadmium Steel]], которая действует как замена [[технециевой стали|Technetium Steel]]." } } From 85895f7ce88eedcf4cc1b1ef2e3391269a470995 Mon Sep 17 00:00:00 2001 From: Bufka2011 <85364803+Bufka2011@users.noreply.github.com> Date: Fri, 15 Aug 2025 13:09:37 -0600 Subject: [PATCH 63/72] Update coke.json --- src/main/resources/assets/hbm/manual/material/coke.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/assets/hbm/manual/material/coke.json b/src/main/resources/assets/hbm/manual/material/coke.json index ffc79a820..234ab7588 100644 --- a/src/main/resources/assets/hbm/manual/material/coke.json +++ b/src/main/resources/assets/hbm/manual/material/coke.json @@ -8,6 +8,6 @@ }, "content": { "en_US": "High-purity carbon, has twice the burn value of coal. Can be pressed into [[graphite|Graphite]], used in various [[steel|Steel]] recipes or as a source of carbon for the [[crucible|Crucible]].

Coal coke can be made by smelting coal briquettes, or combination smelting coal in its various forms.

Lignite coke is made from the much cheaper and less powerful lignite in much the same way, despite this it has the same characteristics.

Petroleum coke is made either from non-coal tars in a [[combination oven|Combination Oven]], or by coking various types of oil in a [[coker|Coking Unit]].", - "ru_RU": "Высокочистый углерод, имеет вдвое большую энергию сгорания, чем уголь. Может быть спрессован в [[графит|Graphite]], используется в различных рецептах [[стали|Steel]] или как источник углерода для [[плавильни|Crucible]].

Угольный кокс можно получить путем переплавки угольных брикетов или комбинированной переплавки угля в различных формах.

Бурый кокс изготавливается из более дешёвого и менее мощного бурого угля тем же способом, но обладает теми же характеристиками.

Нефтяной кокс производится либо из неугольных смол в [[коксовой печи|Combination Oven]], либо путем коксования различных видов масла в [[коксовой установке|Coking Unit]]." + "ru_RU": "Высокочистый углерод, имеет вдвое большую энергию сгорания, чем уголь. Может быть спрессован в [[графит|Graphite]], используется в различных рецептах [[стали|Steel]] или как источник углерода для [[плавильни|Crucible]].

Угольный кокс можно получить путём переплавки угольных брикетов или комбинированной переплавки угля в различных формах.

Бурый кокс изготавливается из более дешёвого и менее мощного бурого угля тем же способом, но обладает теми же характеристиками.

Нефтяной кокс производится либо из неугольных смол в [[коксовой печи|Combination Oven]], либо путём коксования различных видов масла в [[коксовой установке|Coking Unit]]." } } From ffd83ebef395992caea088d3b21c71b1ca2e1169 Mon Sep 17 00:00:00 2001 From: Bufka2011 <85364803+Bufka2011@users.noreply.github.com> Date: Fri, 15 Aug 2025 13:09:55 -0600 Subject: [PATCH 64/72] Update graphite.json --- src/main/resources/assets/hbm/manual/material/graphite.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/assets/hbm/manual/material/graphite.json b/src/main/resources/assets/hbm/manual/material/graphite.json index 22bcccc21..1876c53fa 100644 --- a/src/main/resources/assets/hbm/manual/material/graphite.json +++ b/src/main/resources/assets/hbm/manual/material/graphite.json @@ -8,6 +8,6 @@ }, "content": { "en_US": "Made from pressing coke. Used in nuclear reactors, graphite electrodes for the [[electric arc furnace|Electric Arc Furnace]] or as a source for carbon in various [[crucible|Crucible]] recipes.", - "ru_RU": "Изготавливается путем прессования кокса. Используется в ядерных реакторах, графитовых электродах для [[электродуговой печи|Electric Arc Furnace]] или как источник углерода в различных рецептах для [[плавильни|Crucible]]." + "ru_RU": "Изготавливается путём прессования кокса. Используется в ядерных реакторах, графитовых электродах для [[электродуговой печи|Electric Arc Furnace]] или как источник углерода в различных рецептах для [[плавильни|Crucible]]." } } From 8ef85c4d04e9dd840766bda8e96e6d6600040309 Mon Sep 17 00:00:00 2001 From: Bufka2011 <85364803+Bufka2011@users.noreply.github.com> Date: Fri, 15 Aug 2025 13:10:12 -0600 Subject: [PATCH 65/72] Update latex.json --- src/main/resources/assets/hbm/manual/material/latex.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/assets/hbm/manual/material/latex.json b/src/main/resources/assets/hbm/manual/material/latex.json index b2a4a5beb..b5795bd32 100644 --- a/src/main/resources/assets/hbm/manual/material/latex.json +++ b/src/main/resources/assets/hbm/manual/material/latex.json @@ -8,6 +8,6 @@ }, "content": { "en_US": "Natural form of rubber, obtainable from dandelions or by pressing jungle wood. Can be replaced in all recipes by [[rubber|Rubber]], but not vice versa.", - "ru_RU": "Натуральная форма резины, добывается из одуванчиков или путем прессования древесины джунглей. Может быть заменена во всех рецептах на [[резину|Rubber]], но не наоборот." + "ru_RU": "Натуральная форма резины, добывается из одуванчиков или путём прессования древесины джунглей. Может быть заменена во всех рецептах на [[резину|Rubber]], но не наоборот." } } From eaadc3661839720c77b64e76fb507be8c738ca14 Mon Sep 17 00:00:00 2001 From: Bufka2011 <85364803+Bufka2011@users.noreply.github.com> Date: Fri, 15 Aug 2025 13:10:29 -0600 Subject: [PATCH 66/72] Update steel.json --- src/main/resources/assets/hbm/manual/material/steel.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/assets/hbm/manual/material/steel.json b/src/main/resources/assets/hbm/manual/material/steel.json index c9260f2c5..83c6f8867 100644 --- a/src/main/resources/assets/hbm/manual/material/steel.json +++ b/src/main/resources/assets/hbm/manual/material/steel.json @@ -8,6 +8,6 @@ }, "content": { "en_US": "Upgraded version of iron, basic material. Used in almost everything. Initially obtained by combining coal and iron in a [[blast furnace|Blast Furnace]]. Upgraded recipes are available later on via [[crucible|Crucible]] and [[rotary furnace|Rotary Furnace]].", - "ru_RU": "Улучшенная версия железа, базовый материал. Используется почти во всем. Изначально получается путем комбинирования угля и железа в [[доменной печи|Blast Furnace]]. Улучшенные рецепты доступны позже через [[плавильню|Crucible]] и [[роторную печь|Rotary Furnace]]." + "ru_RU": "Улучшенная версия железа, базовый материал. Используется почти во всем. Изначально получается путём комбинирования угля и железа в [[доменной печи|Blast Furnace]]. Улучшенные рецепты доступны позже через [[плавильню|Crucible]] и [[роторную печь|Rotary Furnace]]." } } From 9e2f116a32955783ad67ebc292e45eb51350a4fe Mon Sep 17 00:00:00 2001 From: Bufka2011 <85364803+Bufka2011@users.noreply.github.com> Date: Fri, 15 Aug 2025 13:10:48 -0600 Subject: [PATCH 67/72] Update uranium-235.json --- src/main/resources/assets/hbm/manual/material/uranium-235.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/assets/hbm/manual/material/uranium-235.json b/src/main/resources/assets/hbm/manual/material/uranium-235.json index b9a75efc1..56b101d67 100644 --- a/src/main/resources/assets/hbm/manual/material/uranium-235.json +++ b/src/main/resources/assets/hbm/manual/material/uranium-235.json @@ -8,6 +8,6 @@ }, "content": { "en_US": "Enriched uranium. Fissile, usable in some reactors directly as high enriched fuel, or mixed back with [[uranium-238|Uranium-238]] for medium enriched uranium fuels. Weapons grade. Created initially by processing [[uranium hexafluuoride|Uranium Hexafluoride]] in a cascade of four [[gas centrifuges|Gas Centriuge]], available later on by separating [[natural uranium|Uranium]] via [[SILEX]].

Moderately radioactive.", - "ru_RU": "Обогащенный уран. Делящийся, используется в некоторых реакторах непосредственно как высокообогащенное топливо или смешивается с [[ураном-238|Uranium-238]] для среднеобогащенных урановых топлив. Оружейное качество. Изначально создается путем переработки [[гексафторида урана|Uranium Hexafluoride]] в каскаде из четырех [[газовых центрифуг|Gas Centrifuge]], позже доступен через разделение [[натурального урана|Uranium]] с помощью [[SILEX]].

Умеренно радиоактивен." + "ru_RU": "Обогащенный уран. Делящийся, используется в некоторых реакторах непосредственно как высокообогащенное топливо или смешивается с [[ураном-238|Uranium-238]] для среднеобогащенных урановых топлив. Оружейное качество. Изначально создается путём переработки [[гексафторида урана|Uranium Hexafluoride]] в каскаде из четырех [[газовых центрифуг|Gas Centrifuge]], позже доступен через разделение [[натурального урана|Uranium]] с помощью [[SILEX]].

Умеренно радиоактивен." } } From 2db923173a1304d50f0805cedb85c28168a97cf8 Mon Sep 17 00:00:00 2001 From: Bufka2011 <85364803+Bufka2011@users.noreply.github.com> Date: Fri, 15 Aug 2025 13:11:05 -0600 Subject: [PATCH 68/72] Update uranium.json --- src/main/resources/assets/hbm/manual/material/uranium.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/assets/hbm/manual/material/uranium.json b/src/main/resources/assets/hbm/manual/material/uranium.json index cfeec2dfc..89ab05f6b 100644 --- a/src/main/resources/assets/hbm/manual/material/uranium.json +++ b/src/main/resources/assets/hbm/manual/material/uranium.json @@ -8,6 +8,6 @@ }, "content": { "en_US": "Natural uranium, slightly radioactive. Not very fissile on its own, can be enriched by turning it into [[uranium hexafluoride|Uranium Hexafluoride]] and processing it in [[gas centrifuges|Gas Centrifuge]]. [[ZIRNOX]], [[RBMK]] and [[Chigago Pile]] may use natural uranium as fuel without enrichment.

See also:
[[Uranium-233]]
[[Uranium-235]]
[[Uranium-238]]", - "ru_RU": "Натуральный уран, слабо радиоактивен. Сам по себе не очень делящийся, может быть обогащен путем превращения в [[гексафторид урана|Uranium Hexafluoride]] и переработки в [[газовых центрифугах|Gas Centrifuge]]. [[ЦИРНОКС|ZIRNOX]], [[РБМК|RBMK]] и [[Чикагская поленница|Chicago Pile]] могут использовать натуральный уран как топливо без обогащения.

См. также:
[[Уран-233|Uranium-233]]
[[Уран-235|Uranium-235]]
[[Уран-238|Uranium-238]]" + "ru_RU": "Натуральный уран, слабо радиоактивен. Сам по себе не очень делящийся, может быть обогащен путём превращения в [[гексафторид урана|Uranium Hexafluoride]] и переработки в [[газовых центрифугах|Gas Centrifuge]]. [[ЦИРНОКС|ZIRNOX]], [[РБМК|RBMK]] и [[Чикагская поленница|Chicago Pile]] могут использовать натуральный уран как топливо без обогащения.

См. также:
[[Уран-233|Uranium-233]]
[[Уран-235|Uranium-235]]
[[Уран-238|Uranium-238]]" } } From d669c4372e2ee49858bc43b9f41115dcdb671897 Mon Sep 17 00:00:00 2001 From: abel1502 Date: Sun, 17 Aug 2025 12:03:09 +0300 Subject: [PATCH 69/72] Fix buzzsaw not replanting wheat occasionally --- .../hbm/tileentity/machine/TileEntityMachineAutosaw.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineAutosaw.java b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineAutosaw.java index f88c37ac3..7763e5ee7 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineAutosaw.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineAutosaw.java @@ -305,6 +305,14 @@ public class TileEntityMachineAutosaw extends TileEntityLoadedBase implements IB entityItem.delayBeforeCanPickup = 10; worldObj.spawnEntityInWorld(entityItem); } + + // Apparently, until 1.14 full-grown wheat could sometimes drop no seeds at all + // This is a quick and dirty workaround for that. + if (b == Blocks.wheat && !replanted) { + replacementBlock = b; + replacementMeta = 0; + replanted = true; + } } worldObj.setBlock(x, y, z, replacementBlock, replacementMeta, 3); From bee95f9065cf3cfd7cef676dbd7a30d3cb0b5b98 Mon Sep 17 00:00:00 2001 From: Bob Date: Sun, 17 Aug 2025 17:55:28 +0200 Subject: [PATCH 70/72] scrungus --- changelog | 7 +++++-- .../recipes/loader/SerializableRecipe.java | 2 +- .../com/hbm/itempool/ItemPoolsComponent.java | 12 ++++++++---- .../weapon/sedna/factory/XFactory12ga.java | 4 ++-- .../hbm/textures/models/trinkets/hundun.png | Bin 1336 -> 3240 bytes 5 files changed, 16 insertions(+), 9 deletions(-) diff --git a/changelog b/changelog index a06979124..c910a8ca3 100644 --- a/changelog +++ b/changelog @@ -1,11 +1,13 @@ ## Changed * QMAW now has buttons for returning to previously viewed pages -* QMAW file detection now includes subfolders to `manual` +* QMAW file detection now includes subfolders to `manual` in folder-based packs (which already worked in zip packs and the mod's jar file) * OpenComputers integration for the ZIRNOX should now return values in °C and bar instead of unexplained weird internal units * The sodium and strontium autogen ingots now have their correct hazard tags * Pattern matchers, like the one used on the automatic crafting table, no longer care about NBT data of an item * This means that RBMK fuel rods can now be automatically disassembled without the depletion number having to be a 100% match * Due to the way the RBMK uncrafting handler works, a single autocrafter now correctly supports RBMK fuel of one type of any depletion level, yielding the correct recycling pellets +* Blueprint folders have been added to more loot pools, making them less rare +* Replaced the winnie the pooh plushie with hundun ## Fixed * Fixed QMAW not working at all @@ -14,4 +16,5 @@ * Fixed chunkloading transport drones getting stuck due to off-by-one rounding errors * Fixed shift-click handling on the electric arc furnace not working with upgrades, and putting electrodes in the wrong slot * Fixed issue with the load order where custom fluids wouldn't work properly for fluid loading/unloading and in custom recipes -* Fixed balefire bomb not rendering the egg when fully loaded \ No newline at end of file +* Fixed balefire bomb not rendering the egg when fully loaded +* Fixed selenium steel 12ga casings having the wrong color \ No newline at end of file diff --git a/src/main/java/com/hbm/inventory/recipes/loader/SerializableRecipe.java b/src/main/java/com/hbm/inventory/recipes/loader/SerializableRecipe.java index 80567014d..2770da7c7 100644 --- a/src/main/java/com/hbm/inventory/recipes/loader/SerializableRecipe.java +++ b/src/main/java/com/hbm/inventory/recipes/loader/SerializableRecipe.java @@ -123,7 +123,7 @@ public abstract class SerializableRecipe { Reader reader = new InputStreamReader(stream); recipe.readRecipeStream(reader); recipe.modified = true; - } catch(IOException ex) { + } catch(Throwable ex) { MainRegistry.logger.error("Failed to reset synced recipe stream", ex); } } else if(recFile.exists() && recFile.isFile()) { diff --git a/src/main/java/com/hbm/itempool/ItemPoolsComponent.java b/src/main/java/com/hbm/itempool/ItemPoolsComponent.java index 8f1a78633..1e4600988 100644 --- a/src/main/java/com/hbm/itempool/ItemPoolsComponent.java +++ b/src/main/java/com/hbm/itempool/ItemPoolsComponent.java @@ -109,7 +109,8 @@ public class ItemPoolsComponent { weighted(ModItems.can_mrsugar, 0, 1, 2, 2), weighted(ModItems.cap_nuka, 0, 1, 16, 2), weighted(ModItems.book_guide, 3, 1, 1, 1), - weighted(ModBlocks.deco_computer, 0, 1, 1, 1) + weighted(ModBlocks.deco_computer, 0, 1, 1, 1), + weighted(ModItems.blueprint_folder, 0, 1, 1, 1) }; }}; @@ -158,7 +159,8 @@ public class ItemPoolsComponent { weighted(ModItems.powder_bromine, 0, 1, 1, 1), weighted(ModItems.powder_cobalt, 0, 1, 1, 1), weighted(ModItems.powder_neodymium, 0, 1, 1, 1), - weighted(ModItems.powder_boron, 0, 1, 1, 1) + weighted(ModItems.powder_boron, 0, 1, 1, 1), + weighted(ModItems.blueprint_folder, 1, 1, 1, 1) }; }}; @@ -186,7 +188,9 @@ public class ItemPoolsComponent { weighted(Items.paper, 0, 1, 6, 7), weighted(Items.clock, 0, 1, 1, 3), weighted(Items.book, 0, 1, 5, 10), - weighted(Items.experience_bottle, 0, 1, 3, 1) + weighted(Items.experience_bottle, 0, 1, 3, 1), + weighted(ModItems.blueprint_folder, 0, 1, 1, 1), + weighted(ModItems.blueprint_folder, 1, 1, 1, 1) }; }}; @@ -222,7 +226,7 @@ public class ItemPoolsComponent { weighted(ModItems.pellet_rtg_weak,0, 0, 1, 1), }; }}; - + new ItemPool(POOL_REPAIR_MATERIALS) {{ this.pool = new WeightedRandomChestContent[] { weighted(ModItems.ingot_aluminium, 0, 2, 8, 3), diff --git a/src/main/java/com/hbm/items/weapon/sedna/factory/XFactory12ga.java b/src/main/java/com/hbm/items/weapon/sedna/factory/XFactory12ga.java index 44f9d046f..c70d33501 100644 --- a/src/main/java/com/hbm/items/weapon/sedna/factory/XFactory12ga.java +++ b/src/main/java/com/hbm/items/weapon/sedna/factory/XFactory12ga.java @@ -271,8 +271,8 @@ public class XFactory12ga { g12_phosphorus = new BulletConfig().setItem(EnumAmmo.G12_PHOSPHORUS).setCasing(EnumCasingType.BUCKSHOT_ADVANCED, 6).setProjectiles(8).setDamage(1F/8F).setSpread(magnumSpread).setRicochetAngle(15).setCasing(new SpentCasing(CasingType.SHOTGUN).setColor(0x910001, SpentCasing.COLOR_CASE_12GA).setScale(0.75F).register("12GA_PHOSPHORUS")) .setOnImpact((bullet, mop) -> { if(mop.entityHit != null && mop.entityHit instanceof EntityLivingBase) { HbmLivingProps data = HbmLivingProps.getData((EntityLivingBase) mop.entityHit); if(data.phosphorus < 300) data.phosphorus = 300; } }); //g12_anthrax = new BulletConfig().setItem(EnumAmmo.G12_ANTHRAX).setProjectiles(8).setDamage(1F/8F).setSpread(0.015F).setRicochetAngle(15).setCasing(new SpentCasing(CasingType.SHOTGUN).setColor(0x749300, SpentCasing.COLOR_CASE_12GA).setScale(0.75F).register("12GA_ANTHRAX")); - g12_equestrian_bj = new BulletConfig().setItem(EnumAmmoSecret.G12_EQUESTRIAN).setDamage(0F).setOnImpact(LAMBDA_BOAT).setCasing(new SpentCasing(CasingType.SHOTGUN).setColor(SpentCasing.COLOR_CASE_EQUESTRIAN, SpentCasing.COLOR_CASE_12GA).setScale(0.75F).register("12gaEquestrianBJ")); - g12_equestrian_tkr = new BulletConfig().setItem(EnumAmmoSecret.G12_EQUESTRIAN).setDamage(0F).setCasing(new SpentCasing(CasingType.SHOTGUN).setColor(SpentCasing.COLOR_CASE_EQUESTRIAN, SpentCasing.COLOR_CASE_12GA).setScale(0.75F).register("12gaEquestrianTKR")); + g12_equestrian_bj = new BulletConfig().setItem(EnumAmmoSecret.G12_EQUESTRIAN).setDamage(0F).setOnImpact(LAMBDA_BOAT).setCasing(new SpentCasing(CasingType.SHOTGUN).setColor(0xB52B2B, SpentCasing.COLOR_CASE_EQUESTRIAN).setScale(0.75F).register("12gaEquestrianBJ")); + g12_equestrian_tkr = new BulletConfig().setItem(EnumAmmoSecret.G12_EQUESTRIAN).setDamage(0F).setCasing(new SpentCasing(CasingType.SHOTGUN).setColor(0xB52B2B, SpentCasing.COLOR_CASE_EQUESTRIAN).setScale(0.75F).register("12gaEquestrianTKR")); BulletConfig[] all = new BulletConfig[] {g12_bp, g12_bp_magnum, g12_bp_slug, g12, g12_slug, g12_flechette, g12_magnum, g12_explosive, g12_phosphorus}; diff --git a/src/main/resources/assets/hbm/textures/models/trinkets/hundun.png b/src/main/resources/assets/hbm/textures/models/trinkets/hundun.png index 70bf3b41ac40518fd407ed9e49c36f0326b127e1..ab600170cdf0a4dad27b1d005d397327eafa9c19 100644 GIT binary patch delta 3221 zcmV;G3~KYZ3aA;7Gk*+UNkl*Ufh@{ z3>`k;q`BYZ`MPJ!UApSE`ux)SA9?_=ZE!1=D=QfN@%K`Fj;!frg|4sr1x!(QSJ7MO z(OzebZG&4k6+I6K1i=BEq}MvS9jV@`MVz@<_9kZ*yvdmbBkjVOU3XUj0KJ8t;9R98 z(rPZka%BaMlYgDCwo1m;4GXT@;Ba%BbE z2DfI${IvAAM4R?gTht`5J^?sm&aDk1KhlRE-uRo}a08f}S@5dmMf~is5u%vOUks#2jQnFHV}JMgZa`&V4Zfq^e2s0igFsPk#mdCYpd~0Acknue0(CmMbd& z8cy40pyvS|XQ*T@@0VkBxNjz)?yjPU5~fE+fg6qXYIzYyyDPExO2(?LXQ$;g(g(=ed6JM{MA0o_X~#a`<{kWJ z$37I@5`bnWZs_m6UFYF7ES97er_M(9?>+H!90?;x_01VqcUQ4z{C|)$cj>C9v-fe1pw2uL-4f8<7{j4b z?KG|k|GwpGU-)CV7R#ER1}CA9{ecXkfE#a|#qNi40D#_OdDJJXP3Je>IE#J1NIwa< z`sUKlnNMHnp7BEt0Nk3o?D6r$Tpja?KEICA09-vwOczG|lMRzrn_U6`3=HQor56RM z5q~&LqkzZ>u=}ALdXMFif1n=#P>0X-`~&^SztE5BodxWkjD63c7Eq~g zlJ>Y6KY&uTZsa46HlS;u43*} z|4YkFJOTii`*d}q{}GdCw1hq5ha9frRbylb$4!9B9B|)(+P{14n%^nnbDph~d5Y!A z3W_LUxwZn-5ZLUHYR{UUCB$j~`Z85^G>fd8q(QXfR`MkC`Mq?m`z-vvkH^LUY=21Q zKzO_=Wj$RO4Ww8~X?3kJHY<9zVU!0j3Ak_8x6`V%a z^lYN56&tHV+>-5dVHC$6?zdJSz_V|rwE&Yd3!X|cqZkm!oUG~DL`!P{T#a(5a`c2C z%*g;`emH}2xvXc3qAAiN8KY!UL8IT|8!<%ot4FJJWH0dWZ7Lrhs!nD52_kaEyk4tu1dRZZr51?YYlzv;xCsohigB-x2!v`GdC*}jd ztG|6Obd>%7kBFUxt*#bwyMI40oC}UwM*(s&s@4mrU#_>yu^eYEmP64&+V{?yURKDY z9w5pDko40e$OhBIikKOlLAa0{&6Xf zJ1@E=t<)1p%5{rD)TWyR9HfzK*=F1H)1sv)Kv#6Zj~raZtInkvn7ee<+cSR1p^Tq| zjP+#{0O&P<1WBVU$$zv>KP|Kqz$D>A*SZxs?)2##KprI!xCYQI7E#9 zsG#ny;=;g#O;LbqBEqEds@@2ol}iEsZ=ua9&7OGoYGyKy#Xy5F})}!*obP)UV$O(c!z6RVrGV0bBHK zqXW=OzJID+rGh26RC0AlJ^{}Zl0!$yp?5!+O|@HDR}v<_4PaW|C0=SI?@An^Z8u-MLYMq) z9*PRc`!va^>(ns^&-qUe`+fm7A^{#Pm==xbqJI%7`CJ3(95kXKWA&n23T$=AQG+_R zw@u#$nks@?u{|pLFWX46pWHH!X^aMGUvijuyXo_2$(QdSmQetA0*|^S<1dz^_2^*5 z57pKdkuNZ*EQH6~rf&;P6Cg?48Mgs5)K+MOl?Sh1$Ay6hQLnAypxZbvqGXg%BHEn! z0DqKK!Eu_5GmNWf{*x|6lrZ#|uUXDqECuhImy*(D4;8n)5z z%v|u+-D~(uVOOGe;E@K`1W{YVR1A=rIDd|$cGxz38)&&ANR^M5*RoA#-yO%nSO1*D zx_dX#dr;M{N)yN^fYk4DWu+-6uiCfAOUUJT>Cs2gfAg)kLlwcT(zk`oHGq_SI_i>3 z>+W527Ip>4B=5j&J~@QCl|cF(0CKM4_5glN4H{=mO0JH+ZckuR`nJ%r2GF%d)qe}B z&rlkWq;iLf4KCX*SUWefX{H(y^D8d zE_eWxOkY>@KlkwCq35((QKNfbxd$-rH;aSc^AmY`9sQ(x0(JClA#olcX@6&77oMEI z0sxrm7zO|w*|`2IeCZ$mY8IHE#eeyo2OHM_rrZ`jk!7fsgTG1iC6x65j^ki*X2Gk? zF2VCWr0HM7XYc^@53ZxrX-Itk;5q<*f^7HhV4>0(Tzm7gP2+8$T3*D72BH?6V1#v-VA*pB7zYZ+Mu- z8JV^p0AByZ_h^6hovlsR+XvSp`)wmX(r0zgo^ASR(PRSTe*UccHydo%+-w9!Tzt>eE$1o@Xl!49EW00000NkvXX Hu0mjfP02he delta 1302 zcmV+x1?l>z8Mq3NGk*l{NklF>4e-6vyAn6^bAd4nmqhB&IZtLI@T%Vl6`O z6Qt3gL`%sfBG^Pxf);)Pi3G8ox08D_|9NkA=aPVd!_Do~bj~0~XQq=f@6U66-8Bw3w|~>3*T>hT{yWOrqoPrD z10wlI0kRI103^0$o!v@0!26w(tZ_Fd&y^kts*zq+xqL%7QRiq~y~%EE6rgSn$H!?i(PTQF; zhU?&I_Gk|}BU8}%@*QAgDjWT(kx0=tlMSIrwko7jG8t-n0BXm#B+19;lVky%^^Jk` zXXkk4a;^@6DLVa7Pg_OowLqWy0}x~Zvh&9l#^GRXzklzzv%W#z39z$OWq|*kq)g`+ zCI!G?MUcsx1sD}zY+-!h>!Kr2qH?S%n8F>Q2*acR*x4;bMj+yVJQ)B$jt+3Jwy*63 z9L~p3N97ou0+>dmtpb#_w}NCGmszp^A?+uJqI^YJ=D;-i0cckLhDiZ9@HP!J-N~a0 z2yN%yB7bwWOMA9dwi1|!K~5f>nNGxy%Qn@G2KO8*({4_bUh}tUPoB;p-%X9`fY z)BynOE-t0wC(rrMUcBo0T?R^9lsJh2d~kkVbc#?^Da8A*<9$&cb_MXs`68>~TD=@b zyv+ir*j-#og~ONc-R{2l`CS%EbY8E*h3Aj^Vt)lZLd(W3SMNS0wMPZ30{Afc<y=TpuFFURZXG9pgF+DEd?}wE|GvqoVdxfb3k=4W&Vd!0o~PJ0xwPwnu^U=K)O7 zZEMQP4a0R}8-Zly66j1<9`_#lV zFs6aL*nR-MJS!IpPO<=BMuCvrJngYL*MF6L4jMSh&csCGu_wD(*Cs5$s6u<=@iKcrXZ6f=+J%P6NxqpZX z5IB7bfY$*`&kLB|-<{(D0FI%ztOnQ5PhRV}PSGII)Lzqh0^1!=wtE6y#|%ysU@qN) zxpb>=Il@Q6op=6%ubDH~lgj`AR%NUJ)Nnty@B6+0_8<_CY+aqMJkQs(4DLO9KJEz= z#2_$moTPzIzWo6JfJc{37bI&&j^c`ItBb1P;3boWJ-m8v(1R zZWRE2|6EP;o*$v7as?3cJw7gq?mP3-fB!>AR}K~96G51=^;IFhLS6nAZJV!EuPc=+ zfE?*lM*Vpl8@lsriAv_>I@NK=RIUIV2$`4VUhWiCwJQ>dMEv3}8p}e@3lB01b^rhX M07*qoM6N<$f=JkPa{vGU From be03467f659aaf30f13616ac0f49944ce9f68a00 Mon Sep 17 00:00:00 2001 From: Bob Date: Sun, 17 Aug 2025 23:09:50 +0200 Subject: [PATCH 71/72] slunkus the great, lord of death --- changelog | 7 ++++++- gradle.properties | 2 +- src/main/java/com/hbm/blocks/ModBlocks.java | 5 ++--- .../java/com/hbm/blocks/generic/BlockCrate.java | 12 +++--------- src/main/java/com/hbm/lib/RefStrings.java | 2 +- .../assets/hbm/manual/material/tantalium.json | 2 +- .../hbm/textures/blocks/trapdoor_steel.png | Bin 790 -> 446 bytes .../assets/hbm/textures/items/fluid_barrel.png | Bin 305 -> 355 bytes .../hbm/textures/items/fluid_barrel_overlay.png | Bin 208 -> 175 bytes 9 files changed, 14 insertions(+), 16 deletions(-) diff --git a/changelog b/changelog index c910a8ca3..377222992 100644 --- a/changelog +++ b/changelog @@ -8,6 +8,9 @@ * Due to the way the RBMK uncrafting handler works, a single autocrafter now correctly supports RBMK fuel of one type of any depletion level, yielding the correct recycling pellets * Blueprint folders have been added to more loot pools, making them less rare * Replaced the winnie the pooh plushie with hundun +* Retextured the universal fluid tanks and barrels again +* Updated steel trapdoor texture +* Removed the old hexafluoride tanks from the creative tab ## Fixed * Fixed QMAW not working at all @@ -17,4 +20,6 @@ * Fixed shift-click handling on the electric arc furnace not working with upgrades, and putting electrodes in the wrong slot * Fixed issue with the load order where custom fluids wouldn't work properly for fluid loading/unloading and in custom recipes * Fixed balefire bomb not rendering the egg when fully loaded -* Fixed selenium steel 12ga casings having the wrong color \ No newline at end of file +* Fixed selenium steel 12ga casings having the wrong color +* Fixed the buzzsaw sometimes not replanting crops +* Scrungus \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index fcfc33a9b..394982cb6 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ mod_version=1.0.27 # Empty build number makes a release type -mod_build_number=5418 +mod_build_number=5425 credits=HbMinecraft,\ \ rodolphito (explosion algorithms),\ diff --git a/src/main/java/com/hbm/blocks/ModBlocks.java b/src/main/java/com/hbm/blocks/ModBlocks.java index 87269420e..d30f6b619 100644 --- a/src/main/java/com/hbm/blocks/ModBlocks.java +++ b/src/main/java/com/hbm/blocks/ModBlocks.java @@ -1825,9 +1825,8 @@ public class ModBlocks { machine_rotary_furnace = new MachineRotaryFurnace(Material.iron).setBlockName("machine_rotary_furnace").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":brick_fire"); machine_crystallizer = new MachineCrystallizer(Material.iron).setBlockName("machine_crystallizer").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":machine_crystallizer"); - machine_uf6_tank = new MachineUF6Tank(Material.iron).setBlockName("machine_uf6_tank").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab); - - machine_puf6_tank = new MachinePuF6Tank(Material.iron).setBlockName("machine_puf6_tank").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab); + machine_uf6_tank = new MachineUF6Tank(Material.iron).setBlockName("machine_uf6_tank").setHardness(5.0F).setResistance(10.0F).setCreativeTab(null); + machine_puf6_tank = new MachinePuF6Tank(Material.iron).setBlockName("machine_puf6_tank").setHardness(5.0F).setResistance(10.0F).setCreativeTab(null); machine_reactor_breeding = new MachineReactorBreeding(Material.iron).setBlockName("machine_reactor").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":machine_reactor"); diff --git a/src/main/java/com/hbm/blocks/generic/BlockCrate.java b/src/main/java/com/hbm/blocks/generic/BlockCrate.java index e24a62d78..abfebe1d1 100644 --- a/src/main/java/com/hbm/blocks/generic/BlockCrate.java +++ b/src/main/java/com/hbm/blocks/generic/BlockCrate.java @@ -5,6 +5,7 @@ import java.util.List; import java.util.Random; import com.hbm.blocks.ModBlocks; +import com.hbm.interfaces.Spaghetti; import com.hbm.items.weapon.sedna.factory.GunFactory.EnumAmmoSecret; import com.hbm.items.ModItems; @@ -16,6 +17,7 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.world.World; +@Spaghetti("this is implemented in the most braindead fucking way imaginable") // TODO: rework this unholy abomination using configurable loot pools public class BlockCrate extends BlockFalling { List crateList; @@ -69,22 +71,16 @@ public class BlockCrate extends BlockFalling { // Lead Crate BlockCrate.addToListWithWeight(leadList, ModItems.ingot_uranium, 10); - // BlockCrate.addToListWithWeight(leadList, ModItems.ingot_u235, 5); BlockCrate.addToListWithWeight(leadList, ModItems.ingot_u238, 8); BlockCrate.addToListWithWeight(leadList, ModItems.ingot_plutonium, 7); - // BlockCrate.addToListWithWeight(leadList, ModItems.ingot_pu238, 5); - // BlockCrate.addToListWithWeight(leadList, ModItems.ingot_pu239, 4); BlockCrate.addToListWithWeight(leadList, ModItems.ingot_pu240, 6); BlockCrate.addToListWithWeight(leadList, ModItems.ingot_neptunium, 7); BlockCrate.addToListWithWeight(leadList, ModItems.ingot_uranium_fuel, 8); BlockCrate.addToListWithWeight(leadList, ModItems.ingot_plutonium_fuel, 7); BlockCrate.addToListWithWeight(leadList, ModItems.ingot_mox_fuel, 6); BlockCrate.addToListWithWeight(leadList, ModItems.nugget_uranium, 10); - // BlockCrate.addToListWithWeight(leadList, ModItems.nugget_u235, 5); BlockCrate.addToListWithWeight(leadList, ModItems.nugget_u238, 8); BlockCrate.addToListWithWeight(leadList, ModItems.nugget_plutonium, 7); - // BlockCrate.addToListWithWeight(leadList, ModItems.nugget_pu238, 5); - // BlockCrate.addToListWithWeight(leadList, ModItems.nugget_pu239, 4); BlockCrate.addToListWithWeight(leadList, ModItems.nugget_pu240, 6); BlockCrate.addToListWithWeight(leadList, ModItems.nugget_neptunium, 7); BlockCrate.addToListWithWeight(leadList, ModItems.nugget_uranium_fuel, 8); @@ -96,7 +92,6 @@ public class BlockCrate extends BlockFalling { BlockCrate.addToListWithWeight(leadList, ModItems.cell_puf6, 8); BlockCrate.addToListWithWeight(leadList, ModItems.pellet_rtg, 6); BlockCrate.addToListWithWeight(leadList, ModItems.pellet_rtg_weak, 7); - BlockCrate.addToListWithWeight(leadList, ModItems.tritium_deuterium_cake, 5); BlockCrate.addToListWithWeight(leadList, ModItems.powder_yellowcake, 10); // Metal Crate @@ -110,14 +105,13 @@ public class BlockCrate extends BlockFalling { BlockCrate.addToListWithWeight(metalList, Item.getItemFromBlock(ModBlocks.machine_battery), 8); BlockCrate.addToListWithWeight(metalList, Item.getItemFromBlock(ModBlocks.machine_lithium_battery), 5); BlockCrate.addToListWithWeight(metalList, Item.getItemFromBlock(ModBlocks.machine_electric_furnace_off), 8); - BlockCrate.addToListWithWeight(metalList, Item.getItemFromBlock(ModBlocks.machine_assembler), 10); + BlockCrate.addToListWithWeight(metalList, Item.getItemFromBlock(ModBlocks.machine_assembly_machine), 10); BlockCrate.addToListWithWeight(metalList, Item.getItemFromBlock(ModBlocks.machine_fluidtank), 7); BlockCrate.addToListWithWeight(metalList, ModItems.centrifuge_element, 6); BlockCrate.addToListWithWeight(metalList, ModItems.motor, 8); BlockCrate.addToListWithWeight(metalList, ModItems.coil_tungsten, 7); BlockCrate.addToListWithWeight(metalList, ModItems.photo_panel, 3); BlockCrate.addToListWithWeight(metalList, ModItems.coil_copper, 10); - BlockCrate.addToListWithWeight(metalList, ModItems.tank_steel, 9); BlockCrate.addToListWithWeight(metalList, ModItems.blade_titanium, 3); BlockCrate.addToListWithWeight(metalList, ModItems.piston_selenium, 6); diff --git a/src/main/java/com/hbm/lib/RefStrings.java b/src/main/java/com/hbm/lib/RefStrings.java index 34f6c299c..b182de6f7 100644 --- a/src/main/java/com/hbm/lib/RefStrings.java +++ b/src/main/java/com/hbm/lib/RefStrings.java @@ -3,7 +3,7 @@ package com.hbm.lib; public class RefStrings { public static final String MODID = "hbm"; public static final String NAME = "Hbm's Nuclear Tech Mod"; - public static final String VERSION = "1.0.27 BETA (5418)"; + public static final String VERSION = "1.0.27 BETA (5425)"; //HBM's Beta Naming Convention: //V T (X) //V -> next release version diff --git a/src/main/resources/assets/hbm/manual/material/tantalium.json b/src/main/resources/assets/hbm/manual/material/tantalium.json index 196550330..e3d0ee9c2 100644 --- a/src/main/resources/assets/hbm/manual/material/tantalium.json +++ b/src/main/resources/assets/hbm/manual/material/tantalium.json @@ -7,7 +7,7 @@ "ru_RU": "Тантал" }, "content": { - "en_US": "Tantalium ('Tantalum') can be ectracted out of [[coltan|Coltan]] which is only found within one specific area in the world. Used mainly for tantalium capacitors, which are crucial for the control units used by most nuclear bombs.", + "en_US": "Tantalium ('Tantalum') can be extracted out of [[coltan|Coltan]] which is only found within one specific area in the world. Used mainly for tantalium capacitors, which are crucial for the control units used by most nuclear bombs.", "ru_RU": "Тантал ('Tantalum') добывается из [[колтана|Coltan]], который встречается только в одном определенном регионе мира. В основном используется для танталовых конденсаторов, которые критически важны для блоков управления, используемых в большинстве ядерных бомб." } } diff --git a/src/main/resources/assets/hbm/textures/blocks/trapdoor_steel.png b/src/main/resources/assets/hbm/textures/blocks/trapdoor_steel.png index 23ed483c9f7729883c786aa7848c48f285ba3537..ec80cd8e007f6e10b75f7be63907ae4820da43a4 100644 GIT binary patch delta 421 zcmV;W0b2f+2EGH3BYyw{b3#c}2nYxWdo81+e#uoc%-oTyfK|HoNxB?%148C*?0aayT3S5RqIILfEVUnx^6Lc;LOqCF-x&i~W8NKv5LT^ZYdinCF=oBOwHwh#(@= zbLQ3Dt{tES(dnzm?Wh5llB^2*X7uyPA|){k?=1mNpAW&cpFDVHpz+l8cCk2 z{y1@(CWc{P97nF#Yo_eI|0QQFVHk!VBQ;HfwU)MRGmB)`PZK3HP4k|Ds%AakMwg(f zEX%U#g{tC=F^C9NRdK)HH@B*4eoP?*thIS9A{b-dMjpCcF8SpDebRpb{>arM#%M+= P00000NkvXXu0mjfI5Eh^ delta 767 zcmVH_m#Kqgef526_Qc97MTwT3gr15)<+D$yuGrv#Y=lTBn z&37O?kvB}Yas*7vbK>JMZDw{(t9hcD2#qw;rW>w3nHWp*?|*u~A*AYcpX&Ahy+2p| zV%jwzR4Y7W*p4SG(=f5@*@`!WTaBE)D7-Hmb!0%{3#F$5epH+d_*Jo!jE_QC_0+Ou zoGN1@=a|C1!d+&*X#C8hz9f>irV~;-WOw2cXPg)sDT*wS$D>cGC7J#0>;LvmQ4o(I zZ<`eyab(GfH-9Q>QM#t3W<*cRlV?Tc{yR@MGdK`*kHnzr!S`Rfp=Jv{H+}!(!1q57 zq2eCStdhSVISs#wzFE?`_MmAEPR>hOY8y`1q5aO*9sOIXkR8rs;Q1IDW})Q@>gI#2 ze$F|%h2*OIqD$D>g&w)zwD1M(mS_QJK}voA000SaNPk�XT000XT0n*)m`~Uy} zPf0{UR5;6>lhKZXFc3uttQf&432%M^|NlWeX$Zy#R0t?wPP5Y#boXIzVp=+L+nIaE zAkXtjelU)sUBfW6dsaX8dcDLL<8pwBqDYR%qYT5~l6_(j1a3b~lRO>|+3j}r`*b>q z>HA*lx_`C-pO_?xODxNBR-sl0*KD_2o6KRBW$uDFj^%tli^dO!gNyC=d%0e(_EDpy zcU>n-K%@mq_kk8X2-mDuE8$1-5+t>4JJScO*K1Lp@e}+qpU%$ zLSXeRRvRssVIZMtnve3(;G4yW3C9f*H~LekPysia%|{H5b%7!I%|^9~)_faPH@F5{ x)bFaQoQSH8R&lvp?6+?tdpk%)QOJM)(r;~L+{vGC7Q_Gm002ovPDHLkV1l$&atHtb diff --git a/src/main/resources/assets/hbm/textures/items/fluid_barrel.png b/src/main/resources/assets/hbm/textures/items/fluid_barrel.png index fdc4318612fa761aed083d119c28fc133ed9d215..d3f440a4b383be28aeb52d7510637dd50f408c95 100644 GIT binary patch delta 339 zcmV-Z0j&P90^$p5$hK`)fTAciPHT-Z25T+P=QGg!#$qqjT7M&@49tZP0PEf)Fz`YE zDJA0Ki%cz~yoQ2uu$Rj4@Q(c1({DY~v>7zXBf-gw`euL(Tnc@9#%Ltx+qaict(bN^4^@#%K> zFoh#NZs1{pcuWdjEQFx0>+cDaQdCt15KO^2$23ieL9$HO>vgr(a=+g(#%%xK^?Cs$ l%XGM+0O#|0-JfHj#~*c8pi1?5T($rJ002ovPDHLkV1flEm6QMg delta 289 zcmaFNw2^6oWIZzj1A~Sxe=v|@EDmyaVpw-h<|UBBlJ4m1$iT3%pZiZDE08Z2;1l8+ z85!x|;80v#tgWrx)6=tH!2%y2pIy6lUA}x7sAS^Z)9Zm0S4ogx@P8O!*mOqcJW!Og zz$3Dlfr0NZ2s0kfUy%Y7%<-&uaSYK2F6|5CJD|Yf+^x{}JHBG=i+|USwCr=x_GWHzV=8wj0;t^|@Kk?rY z3p0N)&18;P_f73ezf*JKIKN1Te7rBxzDnF?D@$bZtp}5V7W1V>c&7RKGH6KwIUGO? S0+)h8QVgE1elF{r5}E)ufoQ(~ diff --git a/src/main/resources/assets/hbm/textures/items/fluid_barrel_overlay.png b/src/main/resources/assets/hbm/textures/items/fluid_barrel_overlay.png index 518122010d2046d12f05a8818cded6184e8ccec2..7a1e2b4245899c7a2f3a6a9e84b35a68e05328e0 100644 GIT binary patch delta 130 zcmV-|0Db?^0j~j&G<#-AL_t(IjqQ-J4S+BV1Rul>nbOl_piB{W?mttQiijYHf{-W> zSNU!I+cNO;J~2k$>v_~j(n-3iHvMh@N#9Ua9L)f*^a4T%NGVmFbG{dFW;C;AHvEGt kx)+pEYAqtu(`8>}1%Ngyh`j|%@c;k-07*qoM6N<$f|f=$`v3p{ delta 164 zcmV;V09*gB0nh=EG=GOlL_t(IjqQ=K4Z|=D1Yd!d)jTS=iwgD{K1QekRb5qdz4cAU2o1gytjGa?x!Wp?9A-@zK6EW233s`RRsWuNX&chOX;>K zkMLD+IbjZ*VP>xjJ|zl>C|zwKB519l)|w72J)4+0K5^V`W*rz~fQT0V4{!(4_(jYF Sy0`!U0000 Date: Mon, 18 Aug 2025 16:35:50 +0200 Subject: [PATCH 72/72] the glunch --- changelog | 25 +- gradle.properties | 2 +- .../com/hbm/handler/BobmazonOfferFactory.java | 3 + .../hbm/handler/DispenserBehaviorHandler.java | 313 ++++++++++++++++++ src/main/java/com/hbm/lib/RefStrings.java | 2 +- src/main/java/com/hbm/main/ClientProxy.java | 2 + src/main/java/com/hbm/main/MainRegistry.java | 313 +----------------- 7 files changed, 326 insertions(+), 334 deletions(-) create mode 100644 src/main/java/com/hbm/handler/DispenserBehaviorHandler.java diff --git a/changelog b/changelog index 377222992..d3d8a6554 100644 --- a/changelog +++ b/changelog @@ -1,25 +1,6 @@ ## Changed -* QMAW now has buttons for returning to previously viewed pages -* QMAW file detection now includes subfolders to `manual` in folder-based packs (which already worked in zip packs and the mod's jar file) -* OpenComputers integration for the ZIRNOX should now return values in °C and bar instead of unexplained weird internal units -* The sodium and strontium autogen ingots now have their correct hazard tags -* Pattern matchers, like the one used on the automatic crafting table, no longer care about NBT data of an item - * This means that RBMK fuel rods can now be automatically disassembled without the depletion number having to be a 100% match - * Due to the way the RBMK uncrafting handler works, a single autocrafter now correctly supports RBMK fuel of one type of any depletion level, yielding the correct recycling pellets -* Blueprint folders have been added to more loot pools, making them less rare -* Replaced the winnie the pooh plushie with hundun -* Retextured the universal fluid tanks and barrels again -* Updated steel trapdoor texture -* Removed the old hexafluoride tanks from the creative tab +* Blueprint folders can now be bought on bobmazon (64 for blue recipes, 256 for beige ones) ## Fixed -* Fixed QMAW not working at all -* Potentially fixed a bug where proxy tile entities would reference unloaded core tile entities which would cause bizarre item voiding/duping issues in rare cases -* Fixed fusion reactor automation being able to remove items other than the breeding output slot -* Fixed chunkloading transport drones getting stuck due to off-by-one rounding errors -* Fixed shift-click handling on the electric arc furnace not working with upgrades, and putting electrodes in the wrong slot -* Fixed issue with the load order where custom fluids wouldn't work properly for fluid loading/unloading and in custom recipes -* Fixed balefire bomb not rendering the egg when fully loaded -* Fixed selenium steel 12ga casings having the wrong color -* Fixed the buzzsaw sometimes not replanting crops -* Scrungus \ No newline at end of file +* Fixed the QMAW loader crashing servers + * Oops \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index 394982cb6..03457ea9b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ mod_version=1.0.27 # Empty build number makes a release type -mod_build_number=5425 +mod_build_number=5426 credits=HbMinecraft,\ \ rodolphito (explosion algorithms),\ diff --git a/src/main/java/com/hbm/handler/BobmazonOfferFactory.java b/src/main/java/com/hbm/handler/BobmazonOfferFactory.java index e0b3c4560..e53b5f603 100644 --- a/src/main/java/com/hbm/handler/BobmazonOfferFactory.java +++ b/src/main/java/com/hbm/handler/BobmazonOfferFactory.java @@ -39,6 +39,9 @@ public class BobmazonOfferFactory { standard.add(new Offer(new ItemStack(ModItems.gun_kit_1, 1), Requirement.ASSEMBLY, 16)); standard.add(new Offer(new ItemStack(ModItems.geiger_counter, 1), Requirement.NONE, 16)); standard.add(new Offer(new ItemStack(ModItems.matchstick, 16), Requirement.STEEL, 2)); + //blueprints + standard.add(new Offer(new ItemStack(ModItems.blueprint_folder, 1, 0), Requirement.ASSEMBLY, 64)); + standard.add(new Offer(new ItemStack(ModItems.blueprint_folder, 1, 1), Requirement.OIL, 256)); //plants standard.add(new Offer(new ItemStack(Blocks.sapling, 1, 3), Requirement.STEEL, 12, 9)); standard.add(new Offer(new ItemStack(ModBlocks.plant_flower, 1, EnumFlowerType.FOXGLOVE.ordinal()), Requirement.STEEL, 16, 5)); diff --git a/src/main/java/com/hbm/handler/DispenserBehaviorHandler.java b/src/main/java/com/hbm/handler/DispenserBehaviorHandler.java new file mode 100644 index 000000000..b6fba216b --- /dev/null +++ b/src/main/java/com/hbm/handler/DispenserBehaviorHandler.java @@ -0,0 +1,313 @@ +package com.hbm.handler; + +import com.hbm.entity.grenade.EntityGrenadeASchrab; +import com.hbm.entity.grenade.EntityGrenadeBlackHole; +import com.hbm.entity.grenade.EntityGrenadeBreach; +import com.hbm.entity.grenade.EntityGrenadeBurst; +import com.hbm.entity.grenade.EntityGrenadeCloud; +import com.hbm.entity.grenade.EntityGrenadeCluster; +import com.hbm.entity.grenade.EntityGrenadeDynamite; +import com.hbm.entity.grenade.EntityGrenadeElectric; +import com.hbm.entity.grenade.EntityGrenadeFire; +import com.hbm.entity.grenade.EntityGrenadeFlare; +import com.hbm.entity.grenade.EntityGrenadeFrag; +import com.hbm.entity.grenade.EntityGrenadeGas; +import com.hbm.entity.grenade.EntityGrenadeGascan; +import com.hbm.entity.grenade.EntityGrenadeGeneric; +import com.hbm.entity.grenade.EntityGrenadeIFBouncy; +import com.hbm.entity.grenade.EntityGrenadeIFBrimstone; +import com.hbm.entity.grenade.EntityGrenadeIFConcussion; +import com.hbm.entity.grenade.EntityGrenadeIFGeneric; +import com.hbm.entity.grenade.EntityGrenadeIFHE; +import com.hbm.entity.grenade.EntityGrenadeIFHopwire; +import com.hbm.entity.grenade.EntityGrenadeIFImpact; +import com.hbm.entity.grenade.EntityGrenadeIFIncendiary; +import com.hbm.entity.grenade.EntityGrenadeIFMystery; +import com.hbm.entity.grenade.EntityGrenadeIFNull; +import com.hbm.entity.grenade.EntityGrenadeIFSpark; +import com.hbm.entity.grenade.EntityGrenadeIFSticky; +import com.hbm.entity.grenade.EntityGrenadeIFToxic; +import com.hbm.entity.grenade.EntityGrenadeImpactGeneric; +import com.hbm.entity.grenade.EntityGrenadeLemon; +import com.hbm.entity.grenade.EntityGrenadeMIRV; +import com.hbm.entity.grenade.EntityGrenadeMk2; +import com.hbm.entity.grenade.EntityGrenadeNuclear; +import com.hbm.entity.grenade.EntityGrenadeNuke; +import com.hbm.entity.grenade.EntityGrenadePC; +import com.hbm.entity.grenade.EntityGrenadePlasma; +import com.hbm.entity.grenade.EntityGrenadePoison; +import com.hbm.entity.grenade.EntityGrenadePulse; +import com.hbm.entity.grenade.EntityGrenadeSchrabidium; +import com.hbm.entity.grenade.EntityGrenadeShrapnel; +import com.hbm.entity.grenade.EntityGrenadeSmart; +import com.hbm.entity.grenade.EntityGrenadeStrong; +import com.hbm.entity.grenade.EntityGrenadeTau; +import com.hbm.entity.grenade.EntityGrenadeZOMG; +import com.hbm.entity.grenade.EntityWastePearl; +import com.hbm.items.ModItems; +import com.hbm.items.tool.ItemFertilizer; +import com.hbm.items.weapon.ItemGenericGrenade; + +import net.minecraft.block.BlockDispenser; +import net.minecraft.dispenser.BehaviorDefaultDispenseItem; +import net.minecraft.dispenser.BehaviorProjectileDispense; +import net.minecraft.dispenser.IBlockSource; +import net.minecraft.dispenser.IPosition; +import net.minecraft.entity.IProjectile; +import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumFacing; +import net.minecraft.world.World; + +public class DispenserBehaviorHandler { + + public static void init() { + + BlockDispenser.dispenseBehaviorRegistry.putObject(ModItems.grenade_generic, new BehaviorProjectileDispense() { + protected IProjectile getProjectileEntity(World world, IPosition position) { + return new EntityGrenadeGeneric(world, position.getX(), position.getY(), position.getZ()); + } + }); + BlockDispenser.dispenseBehaviorRegistry.putObject(ModItems.grenade_strong, new BehaviorProjectileDispense() { + protected IProjectile getProjectileEntity(World world, IPosition position) { + return new EntityGrenadeStrong(world, position.getX(), position.getY(), position.getZ()); + } + }); + BlockDispenser.dispenseBehaviorRegistry.putObject(ModItems.grenade_frag, new BehaviorProjectileDispense() { + protected IProjectile getProjectileEntity(World world, IPosition position) { + return new EntityGrenadeFrag(world, position.getX(), position.getY(), position.getZ()); + } + }); + BlockDispenser.dispenseBehaviorRegistry.putObject(ModItems.grenade_fire, new BehaviorProjectileDispense() { + protected IProjectile getProjectileEntity(World world, IPosition position) { + return new EntityGrenadeFire(world, position.getX(), position.getY(), position.getZ()); + } + }); + BlockDispenser.dispenseBehaviorRegistry.putObject(ModItems.grenade_cluster, new BehaviorProjectileDispense() { + protected IProjectile getProjectileEntity(World world, IPosition position) { + return new EntityGrenadeCluster(world, position.getX(), position.getY(), position.getZ()); + } + }); + BlockDispenser.dispenseBehaviorRegistry.putObject(ModItems.grenade_flare, new BehaviorProjectileDispense() { + protected IProjectile getProjectileEntity(World world, IPosition position) { + return new EntityGrenadeFlare(world, position.getX(), position.getY(), position.getZ()); + } + }); + BlockDispenser.dispenseBehaviorRegistry.putObject(ModItems.grenade_electric, new BehaviorProjectileDispense() { + protected IProjectile getProjectileEntity(World world, IPosition position) { + return new EntityGrenadeElectric(world, position.getX(), position.getY(), position.getZ()); + } + }); + BlockDispenser.dispenseBehaviorRegistry.putObject(ModItems.grenade_poison, new BehaviorProjectileDispense() { + protected IProjectile getProjectileEntity(World world, IPosition position) { + return new EntityGrenadePoison(world, position.getX(), position.getY(), position.getZ()); + } + }); + BlockDispenser.dispenseBehaviorRegistry.putObject(ModItems.grenade_gas, new BehaviorProjectileDispense() { + protected IProjectile getProjectileEntity(World world, IPosition position) { + return new EntityGrenadeGas(world, position.getX(), position.getY(), position.getZ()); + } + }); + BlockDispenser.dispenseBehaviorRegistry.putObject(ModItems.grenade_schrabidium, new BehaviorProjectileDispense() { + protected IProjectile getProjectileEntity(World world, IPosition position) { + return new EntityGrenadeSchrabidium(world, position.getX(), position.getY(), position.getZ()); + } + }); + BlockDispenser.dispenseBehaviorRegistry.putObject(ModItems.grenade_nuke, new BehaviorProjectileDispense() { + protected IProjectile getProjectileEntity(World world, IPosition position) { + return new EntityGrenadeNuke(world, position.getX(), position.getY(), position.getZ()); + } + }); + BlockDispenser.dispenseBehaviorRegistry.putObject(ModItems.grenade_nuclear, new BehaviorProjectileDispense() { + protected IProjectile getProjectileEntity(World world, IPosition position) { + return new EntityGrenadeNuclear(world, position.getX(), position.getY(), position.getZ()); + } + }); + BlockDispenser.dispenseBehaviorRegistry.putObject(ModItems.grenade_pulse, new BehaviorProjectileDispense() { + protected IProjectile getProjectileEntity(World world, IPosition position) { + return new EntityGrenadePulse(world, position.getX(), position.getY(), position.getZ()); + } + }); + BlockDispenser.dispenseBehaviorRegistry.putObject(ModItems.grenade_plasma, new BehaviorProjectileDispense() { + protected IProjectile getProjectileEntity(World world, IPosition position) { + return new EntityGrenadePlasma(world, position.getX(), position.getY(), position.getZ()); + } + }); + BlockDispenser.dispenseBehaviorRegistry.putObject(ModItems.grenade_tau, new BehaviorProjectileDispense() { + protected IProjectile getProjectileEntity(World world, IPosition position) { + return new EntityGrenadeTau(world, position.getX(), position.getY(), position.getZ()); + } + }); + BlockDispenser.dispenseBehaviorRegistry.putObject(ModItems.grenade_lemon, new BehaviorProjectileDispense() { + protected IProjectile getProjectileEntity(World world, IPosition position) { + return new EntityGrenadeLemon(world, position.getX(), position.getY(), position.getZ()); + } + }); + BlockDispenser.dispenseBehaviorRegistry.putObject(ModItems.grenade_mk2, new BehaviorProjectileDispense() { + protected IProjectile getProjectileEntity(World world, IPosition position) { + return new EntityGrenadeMk2(world, position.getX(), position.getY(), position.getZ()); + } + }); + BlockDispenser.dispenseBehaviorRegistry.putObject(ModItems.grenade_aschrab, new BehaviorProjectileDispense() { + protected IProjectile getProjectileEntity(World world, IPosition position) { + return new EntityGrenadeASchrab(world, position.getX(), position.getY(), position.getZ()); + } + }); + BlockDispenser.dispenseBehaviorRegistry.putObject(ModItems.grenade_zomg, new BehaviorProjectileDispense() { + protected IProjectile getProjectileEntity(World world, IPosition position) { + return new EntityGrenadeZOMG(world, position.getX(), position.getY(), position.getZ()); + } + }); + BlockDispenser.dispenseBehaviorRegistry.putObject(ModItems.grenade_shrapnel, new BehaviorProjectileDispense() { + protected IProjectile getProjectileEntity(World world, IPosition position) { + return new EntityGrenadeShrapnel(world, position.getX(), position.getY(), position.getZ()); + } + }); + BlockDispenser.dispenseBehaviorRegistry.putObject(ModItems.grenade_black_hole, new BehaviorProjectileDispense() { + protected IProjectile getProjectileEntity(World world, IPosition position) { + return new EntityGrenadeBlackHole(world, position.getX(), position.getY(), position.getZ()); + } + }); + BlockDispenser.dispenseBehaviorRegistry.putObject(ModItems.grenade_gascan, new BehaviorProjectileDispense() { + protected IProjectile getProjectileEntity(World world, IPosition position) { + return new EntityGrenadeGascan(world, position.getX(), position.getY(), position.getZ()); + } + }); + BlockDispenser.dispenseBehaviorRegistry.putObject(ModItems.grenade_cloud, new BehaviorProjectileDispense() { + protected IProjectile getProjectileEntity(World world, IPosition position) { + return new EntityGrenadeCloud(world, position.getX(), position.getY(), position.getZ()); + } + }); + BlockDispenser.dispenseBehaviorRegistry.putObject(ModItems.grenade_pink_cloud, new BehaviorProjectileDispense() { + protected IProjectile getProjectileEntity(World world, IPosition position) { + return new EntityGrenadePC(world, position.getX(), position.getY(), position.getZ()); + } + }); + BlockDispenser.dispenseBehaviorRegistry.putObject(ModItems.grenade_smart, new BehaviorProjectileDispense() { + protected IProjectile getProjectileEntity(World world, IPosition position) { + return new EntityGrenadeSmart(world, position.getX(), position.getY(), position.getZ()); + } + }); + BlockDispenser.dispenseBehaviorRegistry.putObject(ModItems.grenade_mirv, new BehaviorProjectileDispense() { + protected IProjectile getProjectileEntity(World world, IPosition position) { + return new EntityGrenadeMIRV(world, position.getX(), position.getY(), position.getZ()); + } + }); + BlockDispenser.dispenseBehaviorRegistry.putObject(ModItems.grenade_breach, new BehaviorProjectileDispense() { + protected IProjectile getProjectileEntity(World world, IPosition position) { + return new EntityGrenadeBreach(world, position.getX(), position.getY(), position.getZ()); + } + }); + BlockDispenser.dispenseBehaviorRegistry.putObject(ModItems.grenade_burst, new BehaviorProjectileDispense() { + protected IProjectile getProjectileEntity(World world, IPosition position) { + return new EntityGrenadeBurst(world, position.getX(), position.getY(), position.getZ()); + } + }); + BlockDispenser.dispenseBehaviorRegistry.putObject(ModItems.grenade_if_generic, new BehaviorProjectileDispense() { + protected IProjectile getProjectileEntity(World world, IPosition position) { + return new EntityGrenadeIFGeneric(world, position.getX(), position.getY(), position.getZ()); + } + }); + BlockDispenser.dispenseBehaviorRegistry.putObject(ModItems.grenade_if_he, new BehaviorProjectileDispense() { + protected IProjectile getProjectileEntity(World world, IPosition position) { + return new EntityGrenadeIFHE(world, position.getX(), position.getY(), position.getZ()); + } + }); + BlockDispenser.dispenseBehaviorRegistry.putObject(ModItems.grenade_if_bouncy, new BehaviorProjectileDispense() { + protected IProjectile getProjectileEntity(World world, IPosition position) { + return new EntityGrenadeIFBouncy(world, position.getX(), position.getY(), position.getZ()); + } + }); + BlockDispenser.dispenseBehaviorRegistry.putObject(ModItems.grenade_if_sticky, new BehaviorProjectileDispense() { + protected IProjectile getProjectileEntity(World world, IPosition position) { + return new EntityGrenadeIFSticky(world, position.getX(), position.getY(), position.getZ()); + } + }); + BlockDispenser.dispenseBehaviorRegistry.putObject(ModItems.grenade_if_impact, new BehaviorProjectileDispense() { + protected IProjectile getProjectileEntity(World world, IPosition position) { + return new EntityGrenadeIFImpact(world, position.getX(), position.getY(), position.getZ()); + } + }); + BlockDispenser.dispenseBehaviorRegistry.putObject(ModItems.grenade_if_incendiary, new BehaviorProjectileDispense() { + protected IProjectile getProjectileEntity(World world, IPosition position) { + return new EntityGrenadeIFIncendiary(world, position.getX(), position.getY(), position.getZ()); + } + }); + BlockDispenser.dispenseBehaviorRegistry.putObject(ModItems.grenade_if_toxic, new BehaviorProjectileDispense() { + protected IProjectile getProjectileEntity(World world, IPosition position) { + return new EntityGrenadeIFToxic(world, position.getX(), position.getY(), position.getZ()); + } + }); + BlockDispenser.dispenseBehaviorRegistry.putObject(ModItems.grenade_if_concussion, new BehaviorProjectileDispense() { + protected IProjectile getProjectileEntity(World world, IPosition position) { + return new EntityGrenadeIFConcussion(world, position.getX(), position.getY(), position.getZ()); + } + }); + BlockDispenser.dispenseBehaviorRegistry.putObject(ModItems.grenade_if_brimstone, new BehaviorProjectileDispense() { + protected IProjectile getProjectileEntity(World world, IPosition position) { + return new EntityGrenadeIFBrimstone(world, position.getX(), position.getY(), position.getZ()); + } + }); + BlockDispenser.dispenseBehaviorRegistry.putObject(ModItems.grenade_if_mystery, new BehaviorProjectileDispense() { + protected IProjectile getProjectileEntity(World world, IPosition position) { + return new EntityGrenadeIFMystery(world, position.getX(), position.getY(), position.getZ()); + } + }); + BlockDispenser.dispenseBehaviorRegistry.putObject(ModItems.grenade_if_spark, new BehaviorProjectileDispense() { + protected IProjectile getProjectileEntity(World world, IPosition position) { + return new EntityGrenadeIFSpark(world, position.getX(), position.getY(), position.getZ()); + } + }); + BlockDispenser.dispenseBehaviorRegistry.putObject(ModItems.grenade_if_hopwire, new BehaviorProjectileDispense() { + protected IProjectile getProjectileEntity(World world, IPosition position) { + return new EntityGrenadeIFHopwire(world, position.getX(), position.getY(), position.getZ()); + } + }); + BlockDispenser.dispenseBehaviorRegistry.putObject(ModItems.grenade_if_null, new BehaviorProjectileDispense() { + protected IProjectile getProjectileEntity(World world, IPosition position) { + return new EntityGrenadeIFNull(world, position.getX(), position.getY(), position.getZ()); + } + }); + BlockDispenser.dispenseBehaviorRegistry.putObject(ModItems.nuclear_waste_pearl, new BehaviorProjectileDispense() { + protected IProjectile getProjectileEntity(World world, IPosition position) { + return new EntityWastePearl(world, position.getX(), position.getY(), position.getZ()); + } + }); + BlockDispenser.dispenseBehaviorRegistry.putObject(ModItems.stick_dynamite, new BehaviorProjectileDispense() { + protected IProjectile getProjectileEntity(World world, IPosition position) { + return new EntityGrenadeDynamite(world, position.getX(), position.getY(), position.getZ()); + } + }); + BlockDispenser.dispenseBehaviorRegistry.putObject(ModItems.grenade_kyiv, new BehaviorProjectileDispense() { + protected IProjectile getProjectileEntity(World world, IPosition position) { + return new EntityGrenadeImpactGeneric(world, position.getX(), position.getY(), position.getZ()).setType((ItemGenericGrenade) ModItems.grenade_kyiv); + } + }); + BlockDispenser.dispenseBehaviorRegistry.putObject(ModItems.stick_dynamite_fishing, new BehaviorProjectileDispense() { + protected IProjectile getProjectileEntity(World world, IPosition position) { + return new EntityGrenadeImpactGeneric(world, position.getX(), position.getY(), position.getZ()).setType((ItemGenericGrenade) ModItems.stick_dynamite_fishing); + } + }); + + BlockDispenser.dispenseBehaviorRegistry.putObject(ModItems.powder_fertilizer, new BehaviorDefaultDispenseItem() { + + private boolean dispenseSound = true; + @Override protected ItemStack dispenseStack(IBlockSource source, ItemStack stack) { + + EnumFacing facing = BlockDispenser.func_149937_b(source.getBlockMetadata()); + World world = source.getWorld(); + int x = source.getXInt() + facing.getFrontOffsetX(); + int y = source.getYInt() + facing.getFrontOffsetY(); + int z = source.getZInt() + facing.getFrontOffsetZ(); + this.dispenseSound = ItemFertilizer.useFertillizer(stack, world, x, y, z); + return stack; + } + @Override protected void playDispenseSound(IBlockSource source) { + if(this.dispenseSound) { + source.getWorld().playAuxSFX(1000, source.getXInt(), source.getYInt(), source.getZInt(), 0); + } else { + source.getWorld().playAuxSFX(1001, source.getXInt(), source.getYInt(), source.getZInt(), 0); + } + } + }); + } +} diff --git a/src/main/java/com/hbm/lib/RefStrings.java b/src/main/java/com/hbm/lib/RefStrings.java index b182de6f7..b5f8b7af2 100644 --- a/src/main/java/com/hbm/lib/RefStrings.java +++ b/src/main/java/com/hbm/lib/RefStrings.java @@ -3,7 +3,7 @@ package com.hbm.lib; public class RefStrings { public static final String MODID = "hbm"; public static final String NAME = "Hbm's Nuclear Tech Mod"; - public static final String VERSION = "1.0.27 BETA (5425)"; + public static final String VERSION = "1.0.27 BETA (5426)"; //HBM's Beta Naming Convention: //V T (X) //V -> next release version diff --git a/src/main/java/com/hbm/main/ClientProxy.java b/src/main/java/com/hbm/main/ClientProxy.java index 370772b1d..ef36a2084 100644 --- a/src/main/java/com/hbm/main/ClientProxy.java +++ b/src/main/java/com/hbm/main/ClientProxy.java @@ -145,6 +145,8 @@ public class ClientProxy extends ServerProxy { @Override public void registerPreRenderInfo() { AdvancedModelLoader.registerModelHandler(new HmfModelLoader()); + + QMAWLoader.registerModFileURL(FMLCommonHandler.instance().findContainerFor(RefStrings.MODID).getSource()); } /** Runs right after item and block init */ diff --git a/src/main/java/com/hbm/main/MainRegistry.java b/src/main/java/com/hbm/main/MainRegistry.java index d8e10dac7..0db237afe 100644 --- a/src/main/java/com/hbm/main/MainRegistry.java +++ b/src/main/java/com/hbm/main/MainRegistry.java @@ -9,15 +9,11 @@ import com.hbm.config.*; import com.hbm.crafting.RodRecipes; import com.hbm.creativetabs.*; import com.hbm.entity.EntityMappings; -import com.hbm.entity.grenade.*; import com.hbm.entity.logic.IChunkLoader; import com.hbm.entity.mob.siege.SiegeTier; import com.hbm.handler.*; import com.hbm.handler.ae2.AE2CompatHandler; -import com.hbm.handler.imc.IMCBlastFurnace; -import com.hbm.handler.imc.IMCCentrifuge; -import com.hbm.handler.imc.IMCCrystallizer; -import com.hbm.handler.imc.IMCHandler; +import com.hbm.handler.imc.*; import com.hbm.handler.microblocks.MicroBlocksCompatHandler; import com.hbm.handler.neutron.NeutronHandler; import com.hbm.handler.pollution.PollutionHandler; @@ -33,14 +29,11 @@ import com.hbm.inventory.recipes.anvil.AnvilRecipes; import com.hbm.inventory.recipes.loader.SerializableRecipe; import com.hbm.items.ItemEnums.EnumAchievementType; import com.hbm.items.ModItems; -import com.hbm.items.tool.ItemFertilizer; -import com.hbm.items.weapon.ItemGenericGrenade; import com.hbm.items.weapon.sedna.mods.WeaponModManager; import com.hbm.lib.HbmWorld; import com.hbm.lib.RefStrings; import com.hbm.packet.PacketDispatcher; import com.hbm.potion.HbmPotion; -import com.hbm.qmaw.QMAWLoader; import com.hbm.saveddata.satellites.Satellite; import com.hbm.tileentity.TileMappings; import com.hbm.tileentity.bomb.TileEntityLaunchPadBase; @@ -64,13 +57,7 @@ import cpw.mods.fml.common.event.FMLMissingMappingsEvent.MissingMapping; import cpw.mods.fml.common.network.NetworkRegistry; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; -import net.minecraft.block.BlockDispenser; import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.dispenser.BehaviorDefaultDispenseItem; -import net.minecraft.dispenser.BehaviorProjectileDispense; -import net.minecraft.dispenser.IBlockSource; -import net.minecraft.dispenser.IPosition; -import net.minecraft.entity.IProjectile; import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.item.Item.ToolMaterial; @@ -81,7 +68,6 @@ import net.minecraft.stats.StatBase; import net.minecraft.stats.StatBasic; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ChatComponentTranslation; -import net.minecraft.util.EnumFacing; import net.minecraft.util.WeightedRandomChestContent; import net.minecraft.world.World; import net.minecraftforge.common.AchievementPage; @@ -254,8 +240,6 @@ public class MainRegistry { @EventHandler public void PreLoad(FMLPreInitializationEvent PreEvent) { CrashHelper.init(); - - QMAWLoader.registerModFileURL(FMLCommonHandler.instance().findContainerFor(RefStrings.MODID).getSource()); startupTime = System.currentTimeMillis(); configDir = PreEvent.getModConfigurationDirectory(); @@ -373,299 +357,8 @@ public class MainRegistry { } } }); - - BlockDispenser.dispenseBehaviorRegistry.putObject(ModItems.grenade_generic, new BehaviorProjectileDispense() { - - protected IProjectile getProjectileEntity(World p_82499_1_, IPosition p_82499_2_) { - return new EntityGrenadeGeneric(p_82499_1_, p_82499_2_.getX(), p_82499_2_.getY(), p_82499_2_.getZ()); - } - }); - BlockDispenser.dispenseBehaviorRegistry.putObject(ModItems.grenade_strong, new BehaviorProjectileDispense() { - - protected IProjectile getProjectileEntity(World p_82499_1_, IPosition p_82499_2_) { - return new EntityGrenadeStrong(p_82499_1_, p_82499_2_.getX(), p_82499_2_.getY(), p_82499_2_.getZ()); - } - }); - BlockDispenser.dispenseBehaviorRegistry.putObject(ModItems.grenade_frag, new BehaviorProjectileDispense() { - - protected IProjectile getProjectileEntity(World p_82499_1_, IPosition p_82499_2_) { - return new EntityGrenadeFrag(p_82499_1_, p_82499_2_.getX(), p_82499_2_.getY(), p_82499_2_.getZ()); - } - }); - BlockDispenser.dispenseBehaviorRegistry.putObject(ModItems.grenade_fire, new BehaviorProjectileDispense() { - - protected IProjectile getProjectileEntity(World p_82499_1_, IPosition p_82499_2_) { - return new EntityGrenadeFire(p_82499_1_, p_82499_2_.getX(), p_82499_2_.getY(), p_82499_2_.getZ()); - } - }); - BlockDispenser.dispenseBehaviorRegistry.putObject(ModItems.grenade_cluster, new BehaviorProjectileDispense() { - - protected IProjectile getProjectileEntity(World p_82499_1_, IPosition p_82499_2_) { - return new EntityGrenadeCluster(p_82499_1_, p_82499_2_.getX(), p_82499_2_.getY(), p_82499_2_.getZ()); - } - }); - BlockDispenser.dispenseBehaviorRegistry.putObject(ModItems.grenade_flare, new BehaviorProjectileDispense() { - - protected IProjectile getProjectileEntity(World p_82499_1_, IPosition p_82499_2_) { - return new EntityGrenadeFlare(p_82499_1_, p_82499_2_.getX(), p_82499_2_.getY(), p_82499_2_.getZ()); - } - }); - BlockDispenser.dispenseBehaviorRegistry.putObject(ModItems.grenade_electric, new BehaviorProjectileDispense() { - - protected IProjectile getProjectileEntity(World p_82499_1_, IPosition p_82499_2_) { - return new EntityGrenadeElectric(p_82499_1_, p_82499_2_.getX(), p_82499_2_.getY(), p_82499_2_.getZ()); - } - }); - BlockDispenser.dispenseBehaviorRegistry.putObject(ModItems.grenade_poison, new BehaviorProjectileDispense() { - - protected IProjectile getProjectileEntity(World p_82499_1_, IPosition p_82499_2_) { - return new EntityGrenadePoison(p_82499_1_, p_82499_2_.getX(), p_82499_2_.getY(), p_82499_2_.getZ()); - } - }); - BlockDispenser.dispenseBehaviorRegistry.putObject(ModItems.grenade_gas, new BehaviorProjectileDispense() { - - protected IProjectile getProjectileEntity(World p_82499_1_, IPosition p_82499_2_) { - return new EntityGrenadeGas(p_82499_1_, p_82499_2_.getX(), p_82499_2_.getY(), p_82499_2_.getZ()); - } - }); - BlockDispenser.dispenseBehaviorRegistry.putObject(ModItems.grenade_schrabidium, new BehaviorProjectileDispense() { - - protected IProjectile getProjectileEntity(World p_82499_1_, IPosition p_82499_2_) { - return new EntityGrenadeSchrabidium(p_82499_1_, p_82499_2_.getX(), p_82499_2_.getY(), p_82499_2_.getZ()); - } - }); - BlockDispenser.dispenseBehaviorRegistry.putObject(ModItems.grenade_nuke, new BehaviorProjectileDispense() { - - protected IProjectile getProjectileEntity(World p_82499_1_, IPosition p_82499_2_) { - return new EntityGrenadeNuke(p_82499_1_, p_82499_2_.getX(), p_82499_2_.getY(), p_82499_2_.getZ()); - } - }); - BlockDispenser.dispenseBehaviorRegistry.putObject(ModItems.grenade_nuclear, new BehaviorProjectileDispense() { - - protected IProjectile getProjectileEntity(World p_82499_1_, IPosition p_82499_2_) { - return new EntityGrenadeNuclear(p_82499_1_, p_82499_2_.getX(), p_82499_2_.getY(), p_82499_2_.getZ()); - } - }); - BlockDispenser.dispenseBehaviorRegistry.putObject(ModItems.grenade_pulse, new BehaviorProjectileDispense() { - - protected IProjectile getProjectileEntity(World p_82499_1_, IPosition p_82499_2_) { - return new EntityGrenadePulse(p_82499_1_, p_82499_2_.getX(), p_82499_2_.getY(), p_82499_2_.getZ()); - } - }); - BlockDispenser.dispenseBehaviorRegistry.putObject(ModItems.grenade_plasma, new BehaviorProjectileDispense() { - - protected IProjectile getProjectileEntity(World p_82499_1_, IPosition p_82499_2_) { - return new EntityGrenadePlasma(p_82499_1_, p_82499_2_.getX(), p_82499_2_.getY(), p_82499_2_.getZ()); - } - }); - BlockDispenser.dispenseBehaviorRegistry.putObject(ModItems.grenade_tau, new BehaviorProjectileDispense() { - - protected IProjectile getProjectileEntity(World p_82499_1_, IPosition p_82499_2_) { - return new EntityGrenadeTau(p_82499_1_, p_82499_2_.getX(), p_82499_2_.getY(), p_82499_2_.getZ()); - } - }); - BlockDispenser.dispenseBehaviorRegistry.putObject(ModItems.grenade_lemon, new BehaviorProjectileDispense() { - - protected IProjectile getProjectileEntity(World p_82499_1_, IPosition p_82499_2_) { - return new EntityGrenadeLemon(p_82499_1_, p_82499_2_.getX(), p_82499_2_.getY(), p_82499_2_.getZ()); - } - }); - BlockDispenser.dispenseBehaviorRegistry.putObject(ModItems.grenade_mk2, new BehaviorProjectileDispense() { - - protected IProjectile getProjectileEntity(World p_82499_1_, IPosition p_82499_2_) { - return new EntityGrenadeMk2(p_82499_1_, p_82499_2_.getX(), p_82499_2_.getY(), p_82499_2_.getZ()); - } - }); - BlockDispenser.dispenseBehaviorRegistry.putObject(ModItems.grenade_aschrab, new BehaviorProjectileDispense() { - - protected IProjectile getProjectileEntity(World p_82499_1_, IPosition p_82499_2_) { - return new EntityGrenadeASchrab(p_82499_1_, p_82499_2_.getX(), p_82499_2_.getY(), p_82499_2_.getZ()); - } - }); - BlockDispenser.dispenseBehaviorRegistry.putObject(ModItems.grenade_zomg, new BehaviorProjectileDispense() { - - protected IProjectile getProjectileEntity(World p_82499_1_, IPosition p_82499_2_) { - return new EntityGrenadeZOMG(p_82499_1_, p_82499_2_.getX(), p_82499_2_.getY(), p_82499_2_.getZ()); - } - }); - BlockDispenser.dispenseBehaviorRegistry.putObject(ModItems.grenade_shrapnel, new BehaviorProjectileDispense() { - - protected IProjectile getProjectileEntity(World p_82499_1_, IPosition p_82499_2_) { - return new EntityGrenadeShrapnel(p_82499_1_, p_82499_2_.getX(), p_82499_2_.getY(), p_82499_2_.getZ()); - } - }); - BlockDispenser.dispenseBehaviorRegistry.putObject(ModItems.grenade_black_hole, new BehaviorProjectileDispense() { - - protected IProjectile getProjectileEntity(World p_82499_1_, IPosition p_82499_2_) { - return new EntityGrenadeBlackHole(p_82499_1_, p_82499_2_.getX(), p_82499_2_.getY(), p_82499_2_.getZ()); - } - }); - BlockDispenser.dispenseBehaviorRegistry.putObject(ModItems.grenade_gascan, new BehaviorProjectileDispense() { - - protected IProjectile getProjectileEntity(World p_82499_1_, IPosition p_82499_2_) { - return new EntityGrenadeGascan(p_82499_1_, p_82499_2_.getX(), p_82499_2_.getY(), p_82499_2_.getZ()); - } - }); - BlockDispenser.dispenseBehaviorRegistry.putObject(ModItems.grenade_cloud, new BehaviorProjectileDispense() { - - protected IProjectile getProjectileEntity(World p_82499_1_, IPosition p_82499_2_) { - return new EntityGrenadeCloud(p_82499_1_, p_82499_2_.getX(), p_82499_2_.getY(), p_82499_2_.getZ()); - } - }); - BlockDispenser.dispenseBehaviorRegistry.putObject(ModItems.grenade_pink_cloud, new BehaviorProjectileDispense() { - - protected IProjectile getProjectileEntity(World p_82499_1_, IPosition p_82499_2_) { - return new EntityGrenadePC(p_82499_1_, p_82499_2_.getX(), p_82499_2_.getY(), p_82499_2_.getZ()); - } - }); - BlockDispenser.dispenseBehaviorRegistry.putObject(ModItems.grenade_smart, new BehaviorProjectileDispense() { - - protected IProjectile getProjectileEntity(World p_82499_1_, IPosition p_82499_2_) { - return new EntityGrenadeSmart(p_82499_1_, p_82499_2_.getX(), p_82499_2_.getY(), p_82499_2_.getZ()); - } - }); - BlockDispenser.dispenseBehaviorRegistry.putObject(ModItems.grenade_mirv, new BehaviorProjectileDispense() { - - protected IProjectile getProjectileEntity(World p_82499_1_, IPosition p_82499_2_) { - return new EntityGrenadeMIRV(p_82499_1_, p_82499_2_.getX(), p_82499_2_.getY(), p_82499_2_.getZ()); - } - }); - BlockDispenser.dispenseBehaviorRegistry.putObject(ModItems.grenade_breach, new BehaviorProjectileDispense() { - - protected IProjectile getProjectileEntity(World p_82499_1_, IPosition p_82499_2_) { - return new EntityGrenadeBreach(p_82499_1_, p_82499_2_.getX(), p_82499_2_.getY(), p_82499_2_.getZ()); - } - }); - BlockDispenser.dispenseBehaviorRegistry.putObject(ModItems.grenade_burst, new BehaviorProjectileDispense() { - - protected IProjectile getProjectileEntity(World p_82499_1_, IPosition p_82499_2_) { - return new EntityGrenadeBurst(p_82499_1_, p_82499_2_.getX(), p_82499_2_.getY(), p_82499_2_.getZ()); - } - }); - BlockDispenser.dispenseBehaviorRegistry.putObject(ModItems.grenade_if_generic, new BehaviorProjectileDispense() { - - protected IProjectile getProjectileEntity(World p_82499_1_, IPosition p_82499_2_) { - return new EntityGrenadeIFGeneric(p_82499_1_, p_82499_2_.getX(), p_82499_2_.getY(), p_82499_2_.getZ()); - } - }); - BlockDispenser.dispenseBehaviorRegistry.putObject(ModItems.grenade_if_he, new BehaviorProjectileDispense() { - - protected IProjectile getProjectileEntity(World p_82499_1_, IPosition p_82499_2_) { - return new EntityGrenadeIFHE(p_82499_1_, p_82499_2_.getX(), p_82499_2_.getY(), p_82499_2_.getZ()); - } - }); - BlockDispenser.dispenseBehaviorRegistry.putObject(ModItems.grenade_if_bouncy, new BehaviorProjectileDispense() { - - protected IProjectile getProjectileEntity(World p_82499_1_, IPosition p_82499_2_) { - return new EntityGrenadeIFBouncy(p_82499_1_, p_82499_2_.getX(), p_82499_2_.getY(), p_82499_2_.getZ()); - } - }); - BlockDispenser.dispenseBehaviorRegistry.putObject(ModItems.grenade_if_sticky, new BehaviorProjectileDispense() { - - protected IProjectile getProjectileEntity(World p_82499_1_, IPosition p_82499_2_) { - return new EntityGrenadeIFSticky(p_82499_1_, p_82499_2_.getX(), p_82499_2_.getY(), p_82499_2_.getZ()); - } - }); - BlockDispenser.dispenseBehaviorRegistry.putObject(ModItems.grenade_if_impact, new BehaviorProjectileDispense() { - - protected IProjectile getProjectileEntity(World p_82499_1_, IPosition p_82499_2_) { - return new EntityGrenadeIFImpact(p_82499_1_, p_82499_2_.getX(), p_82499_2_.getY(), p_82499_2_.getZ()); - } - }); - BlockDispenser.dispenseBehaviorRegistry.putObject(ModItems.grenade_if_incendiary, new BehaviorProjectileDispense() { - - protected IProjectile getProjectileEntity(World p_82499_1_, IPosition p_82499_2_) { - return new EntityGrenadeIFIncendiary(p_82499_1_, p_82499_2_.getX(), p_82499_2_.getY(), p_82499_2_.getZ()); - } - }); - BlockDispenser.dispenseBehaviorRegistry.putObject(ModItems.grenade_if_toxic, new BehaviorProjectileDispense() { - - protected IProjectile getProjectileEntity(World p_82499_1_, IPosition p_82499_2_) { - return new EntityGrenadeIFToxic(p_82499_1_, p_82499_2_.getX(), p_82499_2_.getY(), p_82499_2_.getZ()); - } - }); - BlockDispenser.dispenseBehaviorRegistry.putObject(ModItems.grenade_if_concussion, new BehaviorProjectileDispense() { - - protected IProjectile getProjectileEntity(World p_82499_1_, IPosition p_82499_2_) { - return new EntityGrenadeIFConcussion(p_82499_1_, p_82499_2_.getX(), p_82499_2_.getY(), p_82499_2_.getZ()); - } - }); - BlockDispenser.dispenseBehaviorRegistry.putObject(ModItems.grenade_if_brimstone, new BehaviorProjectileDispense() { - - protected IProjectile getProjectileEntity(World p_82499_1_, IPosition p_82499_2_) { - return new EntityGrenadeIFBrimstone(p_82499_1_, p_82499_2_.getX(), p_82499_2_.getY(), p_82499_2_.getZ()); - } - }); - BlockDispenser.dispenseBehaviorRegistry.putObject(ModItems.grenade_if_mystery, new BehaviorProjectileDispense() { - - protected IProjectile getProjectileEntity(World p_82499_1_, IPosition p_82499_2_) { - return new EntityGrenadeIFMystery(p_82499_1_, p_82499_2_.getX(), p_82499_2_.getY(), p_82499_2_.getZ()); - } - }); - BlockDispenser.dispenseBehaviorRegistry.putObject(ModItems.grenade_if_spark, new BehaviorProjectileDispense() { - - protected IProjectile getProjectileEntity(World p_82499_1_, IPosition p_82499_2_) { - return new EntityGrenadeIFSpark(p_82499_1_, p_82499_2_.getX(), p_82499_2_.getY(), p_82499_2_.getZ()); - } - }); - BlockDispenser.dispenseBehaviorRegistry.putObject(ModItems.grenade_if_hopwire, new BehaviorProjectileDispense() { - - protected IProjectile getProjectileEntity(World p_82499_1_, IPosition p_82499_2_) { - return new EntityGrenadeIFHopwire(p_82499_1_, p_82499_2_.getX(), p_82499_2_.getY(), p_82499_2_.getZ()); - } - }); - BlockDispenser.dispenseBehaviorRegistry.putObject(ModItems.grenade_if_null, new BehaviorProjectileDispense() { - - protected IProjectile getProjectileEntity(World p_82499_1_, IPosition p_82499_2_) { - return new EntityGrenadeIFNull(p_82499_1_, p_82499_2_.getX(), p_82499_2_.getY(), p_82499_2_.getZ()); - } - }); - BlockDispenser.dispenseBehaviorRegistry.putObject(ModItems.nuclear_waste_pearl, new BehaviorProjectileDispense() { - - protected IProjectile getProjectileEntity(World world, IPosition position) { - return new EntityWastePearl(world, position.getX(), position.getY(), position.getZ()); - } - }); - BlockDispenser.dispenseBehaviorRegistry.putObject(ModItems.stick_dynamite, new BehaviorProjectileDispense() { - - protected IProjectile getProjectileEntity(World world, IPosition position) { - return new EntityGrenadeDynamite(world, position.getX(), position.getY(), position.getZ()); - } - }); - BlockDispenser.dispenseBehaviorRegistry.putObject(ModItems.grenade_kyiv, new BehaviorProjectileDispense() { - - protected IProjectile getProjectileEntity(World world, IPosition position) { - return new EntityGrenadeImpactGeneric(world, position.getX(), position.getY(), position.getZ()).setType((ItemGenericGrenade) ModItems.grenade_kyiv); - } - }); - BlockDispenser.dispenseBehaviorRegistry.putObject(ModItems.stick_dynamite_fishing, new BehaviorProjectileDispense() { - - protected IProjectile getProjectileEntity(World world, IPosition position) { - return new EntityGrenadeImpactGeneric(world, position.getX(), position.getY(), position.getZ()).setType((ItemGenericGrenade) ModItems.stick_dynamite_fishing); - } - }); - BlockDispenser.dispenseBehaviorRegistry.putObject(ModItems.powder_fertilizer, new BehaviorDefaultDispenseItem() { - - private boolean dispenseSound = true; - @Override protected ItemStack dispenseStack(IBlockSource source, ItemStack stack) { - - EnumFacing facing = BlockDispenser.func_149937_b(source.getBlockMetadata()); - World world = source.getWorld(); - int x = source.getXInt() + facing.getFrontOffsetX(); - int y = source.getYInt() + facing.getFrontOffsetY(); - int z = source.getZInt() + facing.getFrontOffsetZ(); - this.dispenseSound = ItemFertilizer.useFertillizer(stack, world, x, y, z); - return stack; - } - @Override protected void playDispenseSound(IBlockSource source) { - if(this.dispenseSound) { - source.getWorld().playAuxSFX(1000, source.getXInt(), source.getYInt(), source.getZInt(), 0); - } else { - source.getWorld().playAuxSFX(1001, source.getXInt(), source.getYInt(), source.getZInt(), 0); - } - } - }); - + + DispenserBehaviorHandler.init(); MicroBlocksCompatHandler.preInit(); }