From e64a537511e356c400cd9621ae11c8a313faffb5 Mon Sep 17 00:00:00 2001 From: shedaniel Date: Mon, 5 Oct 2020 22:09:38 +0800 Subject: [PATCH 01/16] Unbad netherite translation in zh_tw.json --- .../assets/astromine/lang/zh_tw.json | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/astromine-core/src/main/resources/assets/astromine/lang/zh_tw.json b/astromine-core/src/main/resources/assets/astromine/lang/zh_tw.json index ea065e61f..e880850c3 100644 --- a/astromine-core/src/main/resources/assets/astromine/lang/zh_tw.json +++ b/astromine-core/src/main/resources/assets/astromine/lang/zh_tw.json @@ -248,11 +248,11 @@ "item.astromine.lapis_dust": "青金石粉", "item.astromine.diamond_dust": "鑽石粉", "item.astromine.emerald_dust": "綠寶石粉", - "item.astromine.netherite_dust": "下界合金粉", + "item.astromine.netherite_dust": "獄髓粉", "item.astromine.coal_dust": "煤炭粉", "item.astromine.charcoal_dust": "木炭粉", "item.astromine.quartz_dust": "石英粉", - "item.astromine.raw_netherite_dust": "下界合金粉", + "item.astromine.raw_netherite_dust": "遠古遺骸粉", "item.astromine.asterite_dust": "彗晶粉", "item.astromine.stellum_dust": "辰耀粉", "item.astromine.galaxium_dust": "星玉粉", @@ -274,11 +274,11 @@ "item.astromine.lapis_tiny_dust": "小堆青金石粉", "item.astromine.diamond_tiny_dust": "小堆鑽石粉", "item.astromine.emerald_tiny_dust": "小堆綠寶石粉", - "item.astromine.netherite_tiny_dust": "小堆下界合金粉", + "item.astromine.netherite_tiny_dust": "小堆獄髓粉", "item.astromine.coal_tiny_dust": "小堆煤炭粉", "item.astromine.charcoal_tiny_dust": "小堆木炭粉", "item.astromine.quartz_tiny_dust": "小堆石英粉", - "item.astromine.raw_netherite_tiny_dust": "小堆Raw 下界合金粉", + "item.astromine.raw_netherite_tiny_dust": "小堆遠古遺骸粉", "item.astromine.asterite_tiny_dust": "小堆彗晶粉", "item.astromine.stellum_tiny_dust": "小堆辰耀粉", "item.astromine.galaxium_tiny_dust": "小堆星玉粉", @@ -296,7 +296,7 @@ "item.astromine.iron_plates": "鐵板", "item.astromine.metite_plates": "隕鐵板", "item.astromine.gold_plates": "金板", - "item.astromine.netherite_plates": "下界合金板", + "item.astromine.netherite_plates": "獄髓板", "item.astromine.stellum_plates": "辰耀板", "item.astromine.univite_plates": "寰宇板", "item.astromine.tin_plates": "錫板", @@ -312,7 +312,7 @@ "item.astromine.iron_gear": "鐵齒輪", "item.astromine.metite_gear": "隕鐵齒輪", "item.astromine.gold_gear": "金齒輪", - "item.astromine.netherite_gear": "下界合金齒輪", + "item.astromine.netherite_gear": "獄髓齒輪", "item.astromine.stellum_gear": "辰耀齒輪", "item.astromine.univite_gear": "寰宇齒輪", "item.astromine.tin_gear": "錫齒輪", @@ -344,13 +344,13 @@ "item.astromine.diamond_fragment": "鑽石碎片", "item.astromine.emerald_fragment": "綠寶石碎片", "item.astromine.quartz_fragment": "石英碎片", - "item.astromine.raw_netherite_fragment": "Raw 下界合金碎片", + "item.astromine.raw_netherite_fragment": "遠古遺骸碎片", "item.astromine.asterite": "彗晶", "item.astromine.galaxium": "星玉", "item.astromine.metite_nugget": "隕鐵粒", "item.astromine.stellum_nugget": "辰耀粒", "item.astromine.univite_nugget": "寰宇粒", - "item.astromine.netherite_nugget": "下界合金粒", + "item.astromine.netherite_nugget": "獄髓粒", "item.astromine.tin_nugget": "錫粒", "item.astromine.copper_nugget": "銅粒", "item.astromine.silver_nugget": "銀粒", @@ -510,8 +510,8 @@ "item.astromine.golden_mining_tool": "金採掘鎬", "item.astromine.diamond_mattock": "鑽石鶴嘴鋤", "item.astromine.diamond_mining_tool": "鑽石採掘鎬", - "item.astromine.netherite_mattock": "下界合金鶴嘴鋤", - "item.astromine.netherite_mining_tool": "下界合金採掘鎬", + "item.astromine.netherite_mattock": "獄髓鶴嘴鋤", + "item.astromine.netherite_mining_tool": "獄髓採掘鎬", "item.astromine.tin_helmet": "錫頭盔", "item.astromine.tin_chestplate": "錫胸甲", "item.astromine.tin_leggings": "錫護腿", From 52d7406a9fe0d6d8397638146827e700e63b68f6 Mon Sep 17 00:00:00 2001 From: shedaniel Date: Mon, 5 Oct 2020 22:53:14 +0800 Subject: [PATCH 02/16] Possibly prevent crash, hopefully, please work --- .../entity/AltarPedestalBlockEntity.java | 32 +++++++++++-------- 1 file changed, 18 insertions(+), 14 deletions(-) diff --git a/astromine-discoveries/src/main/java/com/github/chainmailstudios/astromine/discoveries/common/block/entity/AltarPedestalBlockEntity.java b/astromine-discoveries/src/main/java/com/github/chainmailstudios/astromine/discoveries/common/block/entity/AltarPedestalBlockEntity.java index 03a952485..7469fa63f 100644 --- a/astromine-discoveries/src/main/java/com/github/chainmailstudios/astromine/discoveries/common/block/entity/AltarPedestalBlockEntity.java +++ b/astromine-discoveries/src/main/java/com/github/chainmailstudios/astromine/discoveries/common/block/entity/AltarPedestalBlockEntity.java @@ -24,8 +24,11 @@ package com.github.chainmailstudios.astromine.discoveries.common.block.entity; +import com.github.chainmailstudios.astromine.common.component.inventory.ItemInventoryComponent; +import com.github.chainmailstudios.astromine.common.component.inventory.SimpleItemInventoryComponent; +import com.github.chainmailstudios.astromine.common.component.inventory.compatibility.ItemInventoryFromInventoryComponent; +import com.github.chainmailstudios.astromine.discoveries.registry.AstromineDiscoveriesBlockEntityTypes; import net.fabricmc.fabric.api.block.entity.BlockEntityClientSerializable; - import net.minecraft.block.BlockState; import net.minecraft.block.entity.BlockEntity; import net.minecraft.nbt.CompoundTag; @@ -35,11 +38,6 @@ import net.minecraft.util.Tickable; import net.minecraft.util.math.BlockPos; -import com.github.chainmailstudios.astromine.common.component.inventory.ItemInventoryComponent; -import com.github.chainmailstudios.astromine.common.component.inventory.SimpleItemInventoryComponent; -import com.github.chainmailstudios.astromine.common.component.inventory.compatibility.ItemInventoryFromInventoryComponent; -import com.github.chainmailstudios.astromine.discoveries.registry.AstromineDiscoveriesBlockEntityTypes; - public class AltarPedestalBlockEntity extends BlockEntity implements ItemInventoryFromInventoryComponent, Tickable, BlockEntityClientSerializable { public BlockPos parent; private int spinAge; @@ -80,13 +78,16 @@ public void tick() { if (parent != null) { AltarBlockEntity blockEntity = (AltarBlockEntity) world.getBlockEntity(parent); - spinAge += blockEntity.craftingTicks / 5; - lastSpinAddition += blockEntity.craftingTicks / 5; - - int velX = pos.getX() - parent.getX(); - int velY = pos.getY() - parent.getY(); - int velZ = pos.getZ() - parent.getZ(); - world.addParticle(ParticleTypes.ENCHANT, parent.getX() + 0.5, parent.getY() + 1.8, parent.getZ() + 0.5, velX, velY - 1.3, velZ); + if (blockEntity == null) onRemove(); + else { + spinAge += blockEntity.craftingTicks / 5; + lastSpinAddition += blockEntity.craftingTicks / 5; + + int velX = pos.getX() - parent.getX(); + int velY = pos.getY() - parent.getY(); + int velZ = pos.getZ() - parent.getZ(); + world.addParticle(ParticleTypes.ENCHANT, parent.getX() + 0.5, parent.getY() + 1.8, parent.getZ() + 0.5, velX, velY - 1.3, velZ); + } } } @@ -132,7 +133,10 @@ public CompoundTag toTag(CompoundTag tag) { public void onRemove() { if (parent != null) { AltarBlockEntity blockEntity = (AltarBlockEntity) world.getBlockEntity(parent); - blockEntity.onRemove(); + if (blockEntity != null) { + blockEntity.onRemove(); + } } + parent = null; } } From 655b5017d9f71ee68f81a94d9a5694bab9aa97d9 Mon Sep 17 00:00:00 2001 From: Shnupbups Date: Tue, 6 Oct 2020 02:14:17 +1100 Subject: [PATCH 03/16] how did this happen --- .../src/main/resources/assets/astromine/lang/en_us.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/astromine-core/src/main/resources/assets/astromine/lang/en_us.json b/astromine-core/src/main/resources/assets/astromine/lang/en_us.json index 59f448e91..1037beea5 100644 --- a/astromine-core/src/main/resources/assets/astromine/lang/en_us.json +++ b/astromine-core/src/main/resources/assets/astromine/lang/en_us.json @@ -471,7 +471,7 @@ "item.astromine.rose_gold_hammer": "Rose Gold Hammer", "item.astromine.rose_gold_excavator": "Rose Gold Excavator", "item.astromine.sterling_silver_pickaxe": "Sterling Silver Pickaxe", - "item.astromine.sterling_silver_axe": "Sterling Silver Silverver Axe", + "item.astromine.sterling_silver_axe": "Sterling Silver Axe", "item.astromine.sterling_silver_shovel": "Sterling Silver Shovel", "item.astromine.sterling_silver_hoe": "Sterling Silver Hoe", "item.astromine.sterling_silver_sword": "Sterling Silver Sword", From 2ce14331e89ac72bddc722e8154ec2cf23dbc9e8 Mon Sep 17 00:00:00 2001 From: shedaniel Date: Tue, 6 Oct 2020 20:44:08 +0800 Subject: [PATCH 04/16] Update translations --- .../assets/astromine/lang/zh_cn.json | 4 +- .../assets/astromine/lang/zh_tw.json | 163 ++++++++++++++---- 2 files changed, 132 insertions(+), 35 deletions(-) diff --git a/astromine-core/src/main/resources/assets/astromine/lang/zh_cn.json b/astromine-core/src/main/resources/assets/astromine/lang/zh_cn.json index 6aac47e64..b87f48270 100644 --- a/astromine-core/src/main/resources/assets/astromine/lang/zh_cn.json +++ b/astromine-core/src/main/resources/assets/astromine/lang/zh_cn.json @@ -1019,7 +1019,7 @@ "advancements.astromine.get_gear.description": "制作一块齿轮", "advancements.astromine.get_plates.title": "这块锭是平的", "advancements.astromine.get_plates.description": "制作金属板", - "advancements.astromine.get_rose_gold_ingot.title": "粉粉嫩嫩，可可爱爱", + "advancements.astromine.get_rose_gold_ingot.title": "红粉佳人", "advancements.astromine.get_rose_gold_ingot.description": "获取玫瑰金锭", "advancements.astromine.get_basic_circuit.title": "电路创作家", "advancements.astromine.get_basic_circuit.description": "制作一块基础芯片", @@ -1027,4 +1027,4 @@ "advancements.astromine.get_advanced_circuit.description": "制作一块高级芯片", "advancements.astromine.get_elite_circuit.title": "新 超级电路创作家U 豪华版", "advancements.astromine.get_elite_circuit.description": "制作一块精良芯片" -} +} \ No newline at end of file diff --git a/astromine-core/src/main/resources/assets/astromine/lang/zh_tw.json b/astromine-core/src/main/resources/assets/astromine/lang/zh_tw.json index e880850c3..771ce987c 100644 --- a/astromine-core/src/main/resources/assets/astromine/lang/zh_tw.json +++ b/astromine-core/src/main/resources/assets/astromine/lang/zh_tw.json @@ -2,6 +2,10 @@ "block.minecraft.empty": "空", "entity.astromine.super_space_slime": "啫喱子：超級太空史萊姆", "entity.astromine.space_slime": "太空史萊姆", + "entity.astromine.primitive_rocket": "原始火箭", + "text.astromine.rocket.disassemble_empty_fuel": "火箭一瞬意外解體：沒有裝載燃料！", + "text.astromine.rocket.disassemble_collision": "火箭一瞬意外解體：受到了遮擋！", + "text.astromine.rocket.disassemble_invalid_fuel": "火箭一瞬意外解體：裝載了錯誤的燃料！", "text.astromine.message.holographic_connection_successful": "已成功連線 %s 與 %s 的投影機。", "text.astromine.message.holographic_connection_failed": "在 %s 和 %s 的投影機連線失敗。", "text.astromine.message.holographic_connection_clear": "已清除選定的投影器 ！", @@ -34,6 +38,9 @@ "text.astromine.siding.down": "下", "text.astromine.siding.north": "前", "text.astromine.siding.south": "後", + "text.astromine.rocket.launch": "發射", + "text.astromine.rocket.destroy": "§c摧毀！！", + "text.astromine.rocket.fuel_status": "燃料可供飛行時長：%s", "item.astromine.primitive_machine_chassis": "原始機械外殼", "item.astromine.basic_machine_chassis": "基礎機械外殼", "item.astromine.advanced_machine_chassis": "高階機械外殼", @@ -48,15 +55,20 @@ "item.astromine.fire_extinguisher": "滅火器", "item.astromine.holographic_connector": "全息聯結器", "item.astromine.holographic_bridge_projector": "全息橋投影器", + "item.astromine.primitive_rocket_fuel_tank": "原始火箭燃料倉", + "item.astromine.primitive_rocket_hull": "原始火箭艙體", + "item.astromine.primitive_rocket_plating": "原始火箭艙板", + "item.astromine.primitive_rocket_booster": "原始火箭推進器", "itemGroup.astromine.core": "天體礦工：核心", + "itemGroup.astromine.discoveries": "天體礦工：探索", "itemGroup.astromine.foundations": "天體礦工：基礎", "itemGroup.astromine.transportations": "天體礦工：運輸", "itemGroup.astromine.technologies": "天體礦工：科技", "block.astromine.electrolyzer": "電解機", "block.astromine.fluid_mixer": "液體混合機", "block.astromine.creative_capacitor": "創造模式電容器", - "block.astromine.creative_tank": "創造模式液體罐", "block.astromine.creative_buffer": "創造模式快取器", + "block.astromine.primitive_buffer": "原始快取器", "block.astromine.basic_buffer": "基礎快取器", "block.astromine.advanced_buffer": "高階快取器", "block.astromine.elite_buffer": "精良快取器", @@ -78,7 +90,7 @@ "block.astromine.advanced_triturator": "高階磨粉機", "block.astromine.elite_triturator": "精良磨粉機", "block.astromine.primitive_electric_smelter": "原始電動熔爐", - "block.astromine.basic_electric_smelter": "基礎電爐", + "block.astromine.basic_electric_smelter": "基礎電動熔爐", "block.astromine.advanced_electric_smelter": "高階電動熔爐", "block.astromine.elite_electric_smelter": "精良電動熔爐", "block.astromine.primitive_alloy_smelter": "原始合金爐", @@ -106,7 +118,8 @@ "block.astromine.basic_capacitor": "基礎電容器", "block.astromine.advanced_capacitor": "高階電容器", "block.astromine.elite_capacitor": "精良電容器", - "block.astromine.item_displayer": "物品顯示器", + "block.astromine.airlock": "氣閥門", + "block.astromine.altar_pedestal": "祭壇底座", "block.astromine.altar": "祭壇", "item.astromine.tin_wire": "錫絲", "item.astromine.copper_wire": "銅絲", @@ -115,7 +128,11 @@ "item.astromine.gold_wire": "金絲", "item.astromine.steel_wire": "鋼絲", "item.astromine.electrum_wire": "琥珀金絲", - "block.astromine.tank": "儲液罐", + "block.astromine.primitive_tank": "原始液體罐", + "block.astromine.basic_tank": "基礎液體罐", + "block.astromine.advanced_tank": "高階液體罐", + "block.astromine.elite_tank": "精良液體罐", + "block.astromine.creative_tank": "創造模式液體罐", "block.astromine.fluid_extractor": "液體提取機", "block.astromine.fluid_inserter": "液體放置機", "block.astromine.block_breaker": "方塊粉碎機", @@ -126,17 +143,18 @@ "block.astromine.moon_stone": "月石", "block.astromine.blazing_asteroid_stone": "熾熱小行星石", "block.astromine.meteor_stone": "隕星石", - "block.astromine.tin_ore": "錫礦石", - "block.astromine.copper_ore": "銅礦石", - "block.astromine.silver_ore": "銀礦石", - "block.astromine.lead_ore": "鉛礦石", - "block.astromine.asteroid_metite_ore": "小行星隕鐵礦石", - "block.astromine.meteor_metite_ore": "隕星隕鐵礦石", + "block.astromine.tin_ore": "錫礦", + "block.astromine.copper_ore": "銅礦", + "block.astromine.silver_ore": "銀礦", + "block.astromine.lead_ore": "鉛礦", + "block.astromine.asteroid_metite_ore": "小行星隕鐵礦", + "block.astromine.meteor_metite_ore": "隕星隕鐵礦", "block.astromine.asterite_block": "彗晶塊", "block.astromine.galaxium_block": "星玉塊", "block.astromine.metite_block": "隕鐵塊", "block.astromine.stellum_block": "辰耀塊", "block.astromine.univite_block": "寰宇塊", + "block.astromine.lunum_block": "鈅銀方塊", "block.astromine.tin_block": "錫塊", "block.astromine.copper_block": "銅塊", "block.astromine.silver_block": "銀塊", @@ -147,20 +165,22 @@ "block.astromine.rose_gold_block": "玫瑰金塊", "block.astromine.sterling_silver_block": "紋銀塊", "block.astromine.fools_gold_block": "黃鐵塊", - "block.astromine.asteroid_coal_ore": "小行星煤礦石", - "block.astromine.asteroid_iron_ore": "小行星鐵礦石", - "block.astromine.asteroid_gold_ore": "小行星金礦石", - "block.astromine.asteroid_redstone_ore": "小行星紅石礦石", - "block.astromine.asteroid_lapis_ore": "小行星青金石礦石", - "block.astromine.asteroid_diamond_ore": "小行星鑽石礦石", - "block.astromine.asteroid_asterite_ore": "小行星彗晶礦石", - "block.astromine.asteroid_stellum_ore": "小行星辰耀礦石", - "block.astromine.asteroid_galaxium_ore": "小行星星玉礦石", - "block.astromine.asteroid_emerald_ore": "小行星綠寶石礦石", - "block.astromine.asteroid_tin_ore": "小行星錫礦石", - "block.astromine.asteroid_copper_ore": "小行星銅礦石", - "block.astromine.asteroid_silver_ore": "小行星銀礦石", - "block.astromine.asteroid_lead_ore": "小行星鉛礦石", + "block.astromine.meteoric_steel_block": "隕鐵方塊", + "block.astromine.asteroid_coal_ore": "小行星煤礦", + "block.astromine.asteroid_iron_ore": "小行星鐵礦", + "block.astromine.asteroid_gold_ore": "小行星金礦", + "block.astromine.asteroid_redstone_ore": "小行星紅石礦", + "block.astromine.asteroid_lapis_ore": "小行星青金石礦", + "block.astromine.asteroid_diamond_ore": "小行星鑽石礦", + "block.astromine.asteroid_asterite_ore": "小行星彗晶礦", + "block.astromine.asteroid_stellum_ore": "小行星辰耀礦", + "block.astromine.asteroid_galaxium_ore": "小行星星玉礦", + "block.astromine.asteroid_emerald_ore": "小行星綠寶石礦", + "block.astromine.asteroid_tin_ore": "小行星錫礦", + "block.astromine.asteroid_copper_ore": "小行星銅礦", + "block.astromine.asteroid_silver_ore": "小行星銀礦", + "block.astromine.asteroid_lead_ore": "小行星鉛礦", + "block.astromine.moon_lunum_ore": "鈅銀礦", "block.astromine.meteor_stone_slab": "隕石臺階", "block.astromine.meteor_stone_stairs": "隕石樓梯", "block.astromine.meteor_stone_wall": "隕石牆", @@ -257,6 +277,7 @@ "item.astromine.stellum_dust": "辰耀粉", "item.astromine.galaxium_dust": "星玉粉", "item.astromine.univite_dust": "寰宇粉", + "item.astromine.lunum_dust": "鈅銀粉", "item.astromine.tin_dust": "錫粉", "item.astromine.copper_dust": "銅粉", "item.astromine.silver_dust": "銀粉", @@ -267,6 +288,7 @@ "item.astromine.rose_gold_dust": "玫瑰金粉", "item.astromine.sterling_silver_dust": "紋銀粉", "item.astromine.fools_gold_dust": "黃鐵粉", + "item.astromine.meteoric_steel_dust": "隕鐵粉", "item.astromine.redstone_tiny_dust": "小堆紅石粉", "item.astromine.iron_tiny_dust": "小堆鐵粉", "item.astromine.metite_tiny_dust": "小堆隕鐵粉", @@ -283,6 +305,7 @@ "item.astromine.stellum_tiny_dust": "小堆辰耀粉", "item.astromine.galaxium_tiny_dust": "小堆星玉粉", "item.astromine.univite_tiny_dust": "小堆寰宇粉", + "item.astromine.lunum_tiny_dust": "小堆鈅銀粉", "item.astromine.tin_tiny_dust": "小堆錫粉", "item.astromine.copper_tiny_dust": "小堆銅粉", "item.astromine.silver_tiny_dust": "小堆銀粉", @@ -293,6 +316,8 @@ "item.astromine.rose_gold_tiny_dust": "小堆玫瑰金粉", "item.astromine.sterling_silver_tiny_dust": "小堆紋銀粉", "item.astromine.fools_gold_tiny_dust": "小堆黃鐵粉", + "item.astromine.glowstone_tiny_dust": "小堆螢石粉", + "item.astromine.meteoric_steel_tiny_dust": "小堆隕鋼粉", "item.astromine.iron_plates": "鐵板", "item.astromine.metite_plates": "隕鐵板", "item.astromine.gold_plates": "金板", @@ -309,6 +334,8 @@ "item.astromine.rose_gold_plates": "玫瑰金板", "item.astromine.sterling_silver_plates": "紋銀板", "item.astromine.fools_gold_plates": "黃鐵板", + "item.astromine.lunum_plates": "鈅銀板", + "item.astromine.meteoric_steel_plates": "隕鋼板", "item.astromine.iron_gear": "鐵齒輪", "item.astromine.metite_gear": "隕鐵齒輪", "item.astromine.gold_gear": "金齒輪", @@ -325,11 +352,14 @@ "item.astromine.rose_gold_gear": "玫瑰金齒輪", "item.astromine.sterling_silver_gear": "紋銀齒輪", "item.astromine.fools_gold_gear": "黃鐵齒輪", + "item.astromine.lunum_gear": "鈅銀齒輪", + "item.astromine.meteoric_steel_gear": "隕鋼齒輪", "item.astromine.basic_circuit": "基礎晶片", "item.astromine.advanced_circuit": "高階晶片", "item.astromine.elite_circuit": "精良晶片", "item.astromine.metite_ingot": "隕鐵錠", "item.astromine.stellum_ingot": "辰耀錠", + "item.astromine.lunum_ingot": "鈅銀錠", "item.astromine.tin_ingot": "錫錠", "item.astromine.copper_ingot": "銅錠", "item.astromine.silver_ingot": "銀錠", @@ -340,6 +370,8 @@ "item.astromine.rose_gold_ingot": "玫瑰金錠", "item.astromine.sterling_silver_ingot": "紋銀錠", "item.astromine.fools_gold_ingot": "黃鐵錠", + "item.astromine.meteoric_steel_ingot": "隕鐵錠", + "item.astromine.univite_ingot": "寰宇錠", "item.astromine.galaxium_fragment": "星玉碎片", "item.astromine.diamond_fragment": "鑽石碎片", "item.astromine.emerald_fragment": "綠寶石碎片", @@ -350,6 +382,7 @@ "item.astromine.metite_nugget": "隕鐵粒", "item.astromine.stellum_nugget": "辰耀粒", "item.astromine.univite_nugget": "寰宇粒", + "item.astromine.lunum_nugget": "鈅銀粒", "item.astromine.netherite_nugget": "獄髓粒", "item.astromine.tin_nugget": "錫粒", "item.astromine.copper_nugget": "銅粒", @@ -361,7 +394,7 @@ "item.astromine.rose_gold_nugget": "玫瑰金粉", "item.astromine.sterling_silver_nugget": "紋銀粒", "item.astromine.fools_gold_nugget": "黃鐵粒", - "item.astromine.univite_ingot": "寰宇錠", + "item.astromine.meteoric_steel_nugget": "隕鋼粒", "item.astromine.basic_drill": "基礎鑽機", "item.astromine.advanced_drill": "高階鑽機", "item.astromine.elite_drill": "精良鑽機", @@ -500,6 +533,24 @@ "item.astromine.univite_mining_tool": "寰宇採掘鎬", "item.astromine.univite_hammer": "寰宇槌", "item.astromine.univite_excavator": "寰宇挖掘鏟", + "item.astromine.lunum_pickaxe": "鈅銀鎬", + "item.astromine.lunum_axe": "鈅銀斧", + "item.astromine.lunum_shovel": "鈅銀鏟", + "item.astromine.lunum_hoe": "鈅銀鋤", + "item.astromine.lunum_sword": "鈅銀劍", + "item.astromine.lunum_mattock": "鈅銀鶴嘴鋤", + "item.astromine.lunum_mining_tool": "鈅銀採掘鎬", + "item.astromine.lunum_hammer": "鈅銀槌", + "item.astromine.lunum_excavator": "鈅銀挖掘鏟", + "item.astromine.meteoric_steel_pickaxe": "隕鋼鎬", + "item.astromine.meteoric_steel_axe": "隕鋼斧", + "item.astromine.meteoric_steel_shovel": "隕鋼鏟", + "item.astromine.meteoric_steel_hoe": "隕鋼鋤", + "item.astromine.meteoric_steel_sword": "隕鋼劍", + "item.astromine.meteoric_steel_mattock": "隕鋼鶴嘴鋤", + "item.astromine.meteoric_steel_mining_tool": "隕鋼採掘鎬", + "item.astromine.meteoric_steel_hammer": "隕鋼槌", + "item.astromine.meteoric_steel_excavator": "隕鋼挖掘鏟", "item.astromine.wooden_mattock": "木鶴嘴鋤", "item.astromine.wooden_mining_tool": "木採掘鎬", "item.astromine.stone_mattock": "石鶴嘴鋤", @@ -572,6 +623,14 @@ "item.astromine.univite_chestplate": "寰宇胸甲", "item.astromine.univite_leggings": "寰宇護腿", "item.astromine.univite_boots": "寰宇靴子", + "item.astromine.lunum_helmet": "鈅銀頭盔", + "item.astromine.lunum_chestplate": "鈅銀胸甲", + "item.astromine.lunum_leggings": "鈅銀護腿", + "item.astromine.lunum_boots": "鈅銀靴子", + "item.astromine.meteoric_steel_helmet": "隕鋼頭盔", + "item.astromine.meteoric_steel_chestplate": "隕鋼胸甲", + "item.astromine.meteoric_steel_leggings": "隕鋼護腿", + "item.astromine.meteoric_steel_boots": "隕鋼靴子", "item.astromine.space_suit_helmet": "宇航頭盔", "item.astromine.space_suit_chestplate": "宇航胸甲", "item.astromine.space_suit_leggings": "宇航護腿", @@ -582,7 +641,15 @@ "item.astromine.manual": "天體礦工手冊", "item.astromine.yeast": "酵母", "item.astromine.rocket": "火箭", + "item.astromine.copper_wrench": "銅扳手", "item.astromine.bronze_wrench": "黃銅扳手", + "item.astromine.steel_wrench": "鋼扳手", + "item.astromine.rose_gold_apple": "玫瑰金蘋果", + "item.astromine.fools_gold_apple": "白痴的金蘋果", + "item.astromine.lead_apple": "鉛蘋果", + "item.astromine.basic_machine_upgrade_kit": "基礎機器升級包", + "item.astromine.advanced_machine_upgrade_kit": "高階機器升級包", + "item.astromine.elite_machine_upgrade_kit": "精良機器升級包", "item.astromine.gravity_gauntlet": "重力手套", "item.minecraft.potion.effect.rocket_fuel": "火箭燃料瓶", "item.minecraft.splash_potion.effect.rocket_fuel": "噴濺型火箭燃料瓶", @@ -620,7 +687,7 @@ "text.astromine.patchouli.astronautics.title": "航天學", "text.astromine.patchouli.astronautics.description": "從美夢到成真。", "text.astromine.patchouli.components.title": "元件", - "text.astromine.patchouli.components.description": "製作物品以助你一臂之力。", + "text.astromine.patchouli.components.description": "製作物品以助您一臂之力。", "text.astromine.patchouli.creatures.title": "生物", "text.astromine.patchouli.creatures.description": "那些遠超我們想象的東西。", "text.astromine.patchouli.gadgets.title": "小工具", @@ -901,7 +968,7 @@ "advancements.astromine.root.title": "天體礦工", "advancements.astromine.root.description": "飛向宇宙，浩瀚無垠", "advancements.astromine.underestimate_metite.title": "別太小看外星礦石了啊！", - "advancements.astromine.underestimate_metite.description": "以不夠格的鎬子挖取隕鐵礦石（你需要下界合金！）", + "advancements.astromine.underestimate_metite.description": "以不夠格的鎬子挖取隕鐵礦（您需要獄髓！）", "advancements.astromine.enter_space.title": "最後的邊境", "advancements.astromine.enter_space.description": "進入太空", "advancements.astromine.fall_to_earth.title": "跌落神壇", @@ -915,13 +982,13 @@ "advancements.astromine.get_meteor_stone.title": "（太空）石器時代", "advancements.astromine.get_meteor_stone.description": "用足夠強的鎬子挖取隕星石", "advancements.astromine.get_metite_ingot.title": "星降的金屬", - "advancements.astromine.get_metite_ingot.description": "獲取隕鐵", + "advancements.astromine.get_metite_ingot.description": "取得隕鐵", "advancements.astromine.get_stellum_ingot.title": "一閃一閃亮晶晶", - "advancements.astromine.get_stellum_ingot.description": "獲得辰耀錠", + "advancements.astromine.get_stellum_ingot.description": "取得辰耀錠", "advancements.astromine.get_galaxium.title": "滄海遺珠", - "advancements.astromine.get_galaxium.description": "獲取星玉", + "advancements.astromine.get_galaxium.description": "取得星玉", "advancements.astromine.get_univite_ingot.title": "寰宇說：同性戀有人權", - "advancements.astromine.get_univite_ingot.description": "獲取寰宇錠", + "advancements.astromine.get_univite_ingot.description": "取得寰宇錠", "advancements.astromine.get_univite_armor.title": "彩虹護體", "advancements.astromine.get_univite_armor.description": "獲取全套寰宇盔甲", "advancements.astromine.get_space_suit.title": "準備啟航", @@ -929,5 +996,35 @@ "advancements.astromine.launch_rocket.title": "蕪湖，起飛！", "advancements.astromine.launch_rocket.description": "發射火箭", "advancements.astromine.tricked_piglin.title": "丟人！", - "advancements.astromine.tricked_piglin.description": "使用黃鐵詐騙豬靈" -} + "advancements.astromine.tricked_piglin.description": "使用黃鐵詐騙豬靈", + "advancements.astromine.get_bronze_ingot.title": "榮獲季軍", + "advancements.astromine.get_bronze_ingot.description": "取得青銅錠", + "advancements.astromine.get_fools_gold_ingot.title": "愚人之金", + "advancements.astromine.get_fools_gold_ingot.description": "取得黃鐵錠", + "advancements.astromine.get_steel_ingot.title": "鋼鐵雄心", + "advancements.astromine.get_steel_ingot.description": "取得鋼錠", + "advancements.astromine.get_sterling_silver_ingot.title": "豈止于銀", + "advancements.astromine.get_sterling_silver_ingot.description": "取得紋銀錠", + "advancements.astromine.get_chassis.title": "機械之心", + "advancements.astromine.get_chassis.description": "製作一個機械外殼", + "advancements.astromine.get_alloy_smelter.title": "齊「鑫」協力", + "advancements.astromine.get_alloy_smelter.description": "製作一台合金爐", + "advancements.astromine.get_electric_smelter.title": "「熱」門「焦」點 2：世無二出的奇蹟", + "advancements.astromine.get_electric_smelter.description": "製作一台電動熔爐", + "advancements.astromine.get_presser.title": "壓制（物理）", + "advancements.astromine.get_presser.description": "製作一台壓力機", + "advancements.astromine.get_triturator.title": "莫非這不是磨粉機？", + "advancements.astromine.get_triturator.description": "製作一台磨粉機", + "advancements.astromine.get_gear.title": "磨人的小東西……", + "advancements.astromine.get_gear.description": "製作一個齒輪", + "advancements.astromine.get_plates.title": "錠平論", + "advancements.astromine.get_plates.description": "製作金屬板", + "advancements.astromine.get_rose_gold_ingot.title": "紅粉佳人", + "advancements.astromine.get_rose_gold_ingot.description": "取得玫瑰金錠", + "advancements.astromine.get_basic_circuit.title": "電路創作家", + "advancements.astromine.get_basic_circuit.description": "製造一塊基礎晶片", + "advancements.astromine.get_advanced_circuit.title": "超級電路創作家", + "advancements.astromine.get_advanced_circuit.description": "製造一塊高階晶片", + "advancements.astromine.get_elite_circuit.title": "新 超級電路創作家U 豪華版", + "advancements.astromine.get_elite_circuit.description": "製作一塊精良晶片" +} \ No newline at end of file From 3ff12c36e150fa42197bd2638bd415d0b4bcc64e Mon Sep 17 00:00:00 2001 From: Shnupbups Date: Sun, 11 Oct 2020 00:29:00 +1100 Subject: [PATCH 05/16] update deps pog --- gradle.properties | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/gradle.properties b/gradle.properties index a4c37e5be..9bf9fe566 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,10 +3,10 @@ org.gradle.jvmargs=-Xmx4G ignoreRemapSrc=false # Fabric minecraft_version=1.16.3 -mappings_version=1.16.3+build.17 -loader_version=0.10.0+build.208 +mappings_version=1.16.3+build.31 +loader_version=0.10.1+build.209 # Fabric API -api_version=0.22.0+build.408-1.16 +api_version=0.23.0+build.410-1.16 # Mod mod_name=astromine mod_version=1.10.7 @@ -31,10 +31,10 @@ kotlin_version=1.4.0 joml_version=1.9.25 maybe_data_version=0446d26 # Conveniences -rei_version=5.5.0 +rei_version=5.6.1 modmenu_version=1.14.6+build.31 databreaker_version=0.2.6 -tech_reborn_version=3.5.4+build.124 -reborn_core_version=4.4.2+build.73 +tech_reborn_version=3.5.4+build.129 +reborn_core_version=4.4.2+build.75 wrenchable_version=1.0.0+1.16.1 ae2_version=8.1.0-alpha.10 \ No newline at end of file From c20ec195b705a5dd1b99ce81f1e3daeafe9573c9 Mon Sep 17 00:00:00 2001 From: vini2003 Date: Sat, 10 Oct 2020 10:39:11 -0300 Subject: [PATCH 06/16] Fix Mixin naming; stop rockets exploding. --- .../common/entity/GravityEntity.java | 8 +-- .../common/entity/base/ComponentEntity.java | 4 +- .../mixin/AbstractMinecartEntityMixin.java | 4 +- .../mixin/BiomeLayerSamplerMixin.java | 4 +- .../astromine/mixin/BossBarHudMixin.java | 2 +- .../astromine/mixin/BucketItemMixin.java | 6 +- .../mixin/ClientRecipeBookMixin.java | 2 +- .../mixin/DiggerEnchantmentTargetMixin.java | 2 +- .../astromine/mixin/EggEntityMixin.java | 2 +- .../astromine/mixin/EntityMixin.java | 51 +++++++-------- .../mixin/FishingBobberEntityMixin.java | 2 +- .../astromine/mixin/GravityEntityMixin.java | 4 +- .../astromine/mixin/HoneyBlockMixin.java | 2 +- .../astromine/mixin/ItemEntityMixin.java | 4 +- .../astromine/mixin/LivingEntityMixin.java | 8 +-- .../astromine/mixin/PiglinBrainMixin.java | 8 +-- .../astromine/mixin/PiglinEntityMixin.java | 2 +- .../mixin/ServerChunkManagerMixin.java | 2 +- .../astromine/mixin/ServerWorldMixin.java | 2 +- .../astromine/mixin/SkyPropertiesMixin.java | 2 +- .../astromine/mixin/SquidEntityMixin.java | 2 +- .../mixin/StepAndDestroyBlockGoalMixin.java | 2 +- .../astromine/mixin/WorldChunkMixin.java | 63 ++++++++++--------- .../astromine/mixin/WorldRendererMixin.java | 4 +- .../common/entity/PrimitiveRocketEntity.java | 2 +- .../common/entity/base/RocketEntity.java | 19 +++--- gradle.properties | 2 +- 27 files changed, 107 insertions(+), 108 deletions(-) diff --git a/astromine-core/src/main/java/com/github/chainmailstudios/astromine/common/entity/GravityEntity.java b/astromine-core/src/main/java/com/github/chainmailstudios/astromine/common/entity/GravityEntity.java index 9d2352c3d..ebd37f5a1 100644 --- a/astromine-core/src/main/java/com/github/chainmailstudios/astromine/common/entity/GravityEntity.java +++ b/astromine-core/src/main/java/com/github/chainmailstudios/astromine/common/entity/GravityEntity.java @@ -29,13 +29,13 @@ import com.github.chainmailstudios.astromine.common.registry.GravityRegistry; public interface GravityEntity { - default double getGravityMultiplier() { + default double astromine_getGravityMultiplier() { return 1.0d; } - double getGravity(); + double astromine_getGravity(); - default double getGravity(World world) { - return GravityRegistry.INSTANCE.get(world.getRegistryKey()) * getGravityMultiplier(); + default double astromine_getGravity(World world) { + return GravityRegistry.INSTANCE.get(world.getRegistryKey()) * astromine_getGravityMultiplier(); } } diff --git a/astromine-core/src/main/java/com/github/chainmailstudios/astromine/common/entity/base/ComponentEntity.java b/astromine-core/src/main/java/com/github/chainmailstudios/astromine/common/entity/base/ComponentEntity.java index 75e4d1ad7..b1dea88b3 100644 --- a/astromine-core/src/main/java/com/github/chainmailstudios/astromine/common/entity/base/ComponentEntity.java +++ b/astromine-core/src/main/java/com/github/chainmailstudios/astromine/common/entity/base/ComponentEntity.java @@ -24,6 +24,8 @@ package com.github.chainmailstudios.astromine.common.entity.base; +import dev.onyxstudios.cca.mixin.entity.common.MixinEntity; +import nerdhub.cardinal.components.api.component.ComponentProvider; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityType; import net.minecraft.nbt.CompoundTag; @@ -36,7 +38,7 @@ public ComponentEntity(EntityType type, World world) { @Override protected void writeCustomDataToTag(CompoundTag tag) { - + } @Override diff --git a/astromine-core/src/main/java/com/github/chainmailstudios/astromine/mixin/AbstractMinecartEntityMixin.java b/astromine-core/src/main/java/com/github/chainmailstudios/astromine/mixin/AbstractMinecartEntityMixin.java index 7246ac6c3..68e5b6847 100644 --- a/astromine-core/src/main/java/com/github/chainmailstudios/astromine/mixin/AbstractMinecartEntityMixin.java +++ b/astromine-core/src/main/java/com/github/chainmailstudios/astromine/mixin/AbstractMinecartEntityMixin.java @@ -36,11 +36,11 @@ public abstract class AbstractMinecartEntityMixin implements GravityEntity { @ModifyConstant(method = "tick()V", constant = @Constant(doubleValue = -0.04D)) double getGravity(double original) { - return -this.getGravity(); + return -this.astromine_getGravity(); } @Override - public double getGravityMultiplier() { + public double astromine_getGravityMultiplier() { return 0.5; } } diff --git a/astromine-core/src/main/java/com/github/chainmailstudios/astromine/mixin/BiomeLayerSamplerMixin.java b/astromine-core/src/main/java/com/github/chainmailstudios/astromine/mixin/BiomeLayerSamplerMixin.java index c5cb2203a..37e3a3ef9 100644 --- a/astromine-core/src/main/java/com/github/chainmailstudios/astromine/mixin/BiomeLayerSamplerMixin.java +++ b/astromine-core/src/main/java/com/github/chainmailstudios/astromine/mixin/BiomeLayerSamplerMixin.java @@ -47,7 +47,7 @@ public class BiomeLayerSamplerMixin { private int storedLastBiomeId; @Inject(method = "sample", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/biome/BuiltinBiomes;fromRawId(I)Lnet/minecraft/util/registry/RegistryKey;", ordinal = 0), locals = LocalCapture.CAPTURE_FAILHARD) - private void storeVariables(Registry registry, int i, int j, CallbackInfoReturnable cir, int k) { + private void astromine_storeVariables(Registry registry, int i, int j, CallbackInfoReturnable cir, int k) { this.registry = registry; storedLastBiomeId = k; } @@ -63,7 +63,7 @@ private RegistryKey modifyBiome(RegistryKey original) { } @Inject(method = "sample", at = @At("RETURN")) - private void removeStoredVariables(Registry registry, int i, int j, CallbackInfoReturnable cir) { + private void astromine_removeStoredVariables(Registry registry, int i, int j, CallbackInfoReturnable cir) { this.registry = null; } } diff --git a/astromine-core/src/main/java/com/github/chainmailstudios/astromine/mixin/BossBarHudMixin.java b/astromine-core/src/main/java/com/github/chainmailstudios/astromine/mixin/BossBarHudMixin.java index 3b6801c52..070883068 100644 --- a/astromine-core/src/main/java/com/github/chainmailstudios/astromine/mixin/BossBarHudMixin.java +++ b/astromine-core/src/main/java/com/github/chainmailstudios/astromine/mixin/BossBarHudMixin.java @@ -58,7 +58,7 @@ public abstract class BossBarHudMixin extends DrawableHelper { private MinecraftClient client; @Inject(method = "renderBossBar", at = @At("HEAD"), cancellable = true) - private void renderCustomBossBar(MatrixStack matrices, int i, int j, BossBar bossBar, CallbackInfo ci) { + private void astromine_renderCustomBossBar(MatrixStack matrices, int i, int j, BossBar bossBar, CallbackInfo ci) { if (bossBar instanceof ClientBossBar && bossBar.getName() instanceof TranslatableText && ((TranslatableText) bossBar.getName()).getKey().contains("super_space_slim")) { this.client.getTextureManager().bindTexture(CUSTOM_BAR_TEX); diff --git a/astromine-core/src/main/java/com/github/chainmailstudios/astromine/mixin/BucketItemMixin.java b/astromine-core/src/main/java/com/github/chainmailstudios/astromine/mixin/BucketItemMixin.java index 7ed19723d..4ab8435d6 100644 --- a/astromine-core/src/main/java/com/github/chainmailstudios/astromine/mixin/BucketItemMixin.java +++ b/astromine-core/src/main/java/com/github/chainmailstudios/astromine/mixin/BucketItemMixin.java @@ -57,8 +57,8 @@ public class BucketItemMixin { public Fluid fluid; @Inject(at = @At("HEAD"), method = "use(Lnet/minecraft/world/World;Lnet/minecraft/entity/player/PlayerEntity;Lnet/minecraft/util/Hand;)Lnet/minecraft/util/TypedActionResult;", cancellable = true) - void onUse(World world, PlayerEntity user, Hand hand, CallbackInfoReturnable> cir) { - BlockHitResult result = raycast(world, user, fluid == Fluids.EMPTY ? RaycastContext.FluidHandling.SOURCE_ONLY : RaycastContext.FluidHandling.NONE); + void astromine_use(World world, PlayerEntity user, Hand hand, CallbackInfoReturnable> cir) { + BlockHitResult result = astromine_Raycast(world, user, fluid == Fluids.EMPTY ? RaycastContext.FluidHandling.SOURCE_ONLY : RaycastContext.FluidHandling.NONE); if (result.getType() == HitResult.Type.BLOCK) { BlockState state = world.getBlockState(result.getBlockPos()); @@ -78,7 +78,7 @@ void onUse(World world, PlayerEntity user, Hand hand, CallbackInfoReturnable recipe, CallbackInfoReturnable cir) { + private static void astromine_getGroupForRecipe(Recipe recipe, CallbackInfoReturnable cir) { if (recipe.getType() instanceof AstromineRecipeType) cir.setReturnValue(RecipeBookGroup.UNKNOWN); } diff --git a/astromine-core/src/main/java/com/github/chainmailstudios/astromine/mixin/DiggerEnchantmentTargetMixin.java b/astromine-core/src/main/java/com/github/chainmailstudios/astromine/mixin/DiggerEnchantmentTargetMixin.java index 09f80a864..82e22ee26 100644 --- a/astromine-core/src/main/java/com/github/chainmailstudios/astromine/mixin/DiggerEnchantmentTargetMixin.java +++ b/astromine-core/src/main/java/com/github/chainmailstudios/astromine/mixin/DiggerEnchantmentTargetMixin.java @@ -42,7 +42,7 @@ @Mixin(targets = { "net/minecraft/enchantment/EnchantmentTarget$12" }) public class DiggerEnchantmentTargetMixin { @Inject(at = @At("HEAD"), method = "isAcceptableItem(Lnet/minecraft/item/Item;)Z", cancellable = true) - public void makeMultiToolEnchantable(Item item, CallbackInfoReturnable cir) { + public void astromine_makeMultiToolEnchantable(Item item, CallbackInfoReturnable cir) { if (item instanceof DiggerTool) cir.setReturnValue(true); } diff --git a/astromine-core/src/main/java/com/github/chainmailstudios/astromine/mixin/EggEntityMixin.java b/astromine-core/src/main/java/com/github/chainmailstudios/astromine/mixin/EggEntityMixin.java index d64ff1af9..d0171a23e 100644 --- a/astromine-core/src/main/java/com/github/chainmailstudios/astromine/mixin/EggEntityMixin.java +++ b/astromine-core/src/main/java/com/github/chainmailstudios/astromine/mixin/EggEntityMixin.java @@ -36,6 +36,6 @@ public abstract class EggEntityMixin implements GravityEntity { @ModifyConstant(method = "handleStatus(B)V", constant = @Constant(doubleValue = 0.08D)) double getGravity(double original) { - return this.getGravity(); + return this.astromine_getGravity(); } } diff --git a/astromine-core/src/main/java/com/github/chainmailstudios/astromine/mixin/EntityMixin.java b/astromine-core/src/main/java/com/github/chainmailstudios/astromine/mixin/EntityMixin.java index 4dd561c5d..95ac39e13 100644 --- a/astromine-core/src/main/java/com/github/chainmailstudios/astromine/mixin/EntityMixin.java +++ b/astromine-core/src/main/java/com/github/chainmailstudios/astromine/mixin/EntityMixin.java @@ -26,9 +26,9 @@ import net.fabricmc.fabric.api.network.ServerSidePacketRegistry; +import net.minecraft.nbt.CompoundTag; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; -import org.spongepowered.asm.mixin.Unique; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.ModifyVariable; @@ -62,11 +62,10 @@ public abstract class EntityMixin implements GravityEntity { @Shadow public World world; - int lastY = 0; - @Unique - Entity lastVehicle = null; - @Unique - TeleportTarget nextTeleportTarget = null; + + private int astromine_lastY = 0; + private Entity astromine_lastVehicle = null; + private TeleportTarget astromine_nextTeleportTarget = null; private World astromine_lastWorld = null; @Shadow @@ -74,30 +73,30 @@ public abstract class EntityMixin implements GravityEntity { @ModifyVariable(at = @At("HEAD"), method = "handleFallDamage(FF)Z", index = 1) float getDamageMultiplier(float damageMultiplier) { - return (float) (damageMultiplier * getGravity() * getGravity()); + return (float) (damageMultiplier * astromine_getGravity() * astromine_getGravity()); } @Override - public double getGravity() { + public double astromine_getGravity() { World world = ((Entity) (Object) this).world; - return getGravity(world); + return astromine_getGravity(world); } @Inject(at = @At("HEAD"), method = "tickNetherPortal()V") - void onTick(CallbackInfo callbackInformation) { + void astromine_tickNetherPortal(CallbackInfo callbackInformation) { Entity entity = (Entity) (Object) this; - if ((int) entity.getPos().getY() != lastY && !entity.world.isClient && entity.getVehicle() == null) { - lastY = (int) entity.getPos().getY(); + if ((int) entity.getPos().getY() != astromine_lastY && !entity.world.isClient && entity.getVehicle() == null) { + astromine_lastY = (int) entity.getPos().getY(); int bottomPortal = DimensionLayerRegistry.INSTANCE.getLevel(DimensionLayerRegistry.Type.BOTTOM, entity.world.getRegistryKey()); int topPortal = DimensionLayerRegistry.INSTANCE.getLevel(DimensionLayerRegistry.Type.TOP, entity.world.getRegistryKey()); - if (lastY <= bottomPortal && bottomPortal != Integer.MIN_VALUE) { + if (astromine_lastY <= bottomPortal && bottomPortal != Integer.MIN_VALUE) { RegistryKey worldKey = RegistryKey.of(Registry.DIMENSION, DimensionLayerRegistry.INSTANCE.getDimension(DimensionLayerRegistry.Type.BOTTOM, entity.world.getRegistryKey()).getValue()); astromine_teleport(entity, worldKey, DimensionLayerRegistry.Type.BOTTOM); - } else if (lastY >= topPortal && topPortal != Integer.MIN_VALUE) { + } else if (astromine_lastY >= topPortal && topPortal != Integer.MIN_VALUE) { RegistryKey worldKey = RegistryKey.of(Registry.DIMENSION, DimensionLayerRegistry.INSTANCE.getDimension(DimensionLayerRegistry.Type.TOP, entity.world.getRegistryKey()).getValue()); astromine_teleport(entity, worldKey, DimensionLayerRegistry.Type.TOP); @@ -105,12 +104,10 @@ void onTick(CallbackInfo callbackInformation) { } if (entity.getVehicle() != null) - lastVehicle = null; - if (lastVehicle != null) { - if (lastVehicle.getEntityWorld().getRegistryKey().equals(entity.getEntityWorld().getRegistryKey())) { - entity.startRiding(lastVehicle); - lastVehicle = null; - } + astromine_lastVehicle = null; + if (astromine_lastVehicle != null) { + entity.startRiding(astromine_lastVehicle); + astromine_lastVehicle = null; } } @@ -124,7 +121,7 @@ void astromine_teleport(Entity entity, RegistryKey destinationKey, Dimens entries.add(entry.copy()); } - nextTeleportTarget = DimensionLayerRegistry.INSTANCE.getPlacer(type, entity.world.getRegistryKey()).placeEntity(entity); + astromine_nextTeleportTarget = DimensionLayerRegistry.INSTANCE.getPlacer(type, entity.world.getRegistryKey()).placeEntity(entity); Entity newEntity = entity.moveToWorld(serverWorld); for (DataTracker.Entry entry : entries) { @@ -132,20 +129,20 @@ void astromine_teleport(Entity entity, RegistryKey destinationKey, Dimens } for (Entity existingEntity : existingPassengers) { - ((EntityMixin) (Object) existingEntity).lastVehicle = newEntity; + ((EntityMixin) (Object) existingEntity).astromine_lastVehicle = newEntity; } } @Inject(method = "getTeleportTarget", at = @At("HEAD"), cancellable = true) - protected void getTeleportTarget(ServerWorld destination, CallbackInfoReturnable cir) { - if (nextTeleportTarget != null) { - cir.setReturnValue(nextTeleportTarget); - nextTeleportTarget = null; + protected void astromine_getTeleportTarget(ServerWorld destination, CallbackInfoReturnable cir) { + if (astromine_nextTeleportTarget != null) { + cir.setReturnValue(astromine_nextTeleportTarget); + astromine_nextTeleportTarget = null; } } @Inject(at = @At("HEAD"), method = "tick()V") - void onThing(CallbackInfo ci) { + void astromine_tick(CallbackInfo ci) { // TODO Make this sync all visible chunks around the player. if (AstromineCommonCallbacks.atmosphereTickCounter == AstromineConfig.get().gasTickRate && ((Entity) (Object) this) instanceof ServerPlayerEntity && world != astromine_lastWorld) { astromine_lastWorld = world; diff --git a/astromine-core/src/main/java/com/github/chainmailstudios/astromine/mixin/FishingBobberEntityMixin.java b/astromine-core/src/main/java/com/github/chainmailstudios/astromine/mixin/FishingBobberEntityMixin.java index 2e286e510..d56c56d1c 100644 --- a/astromine-core/src/main/java/com/github/chainmailstudios/astromine/mixin/FishingBobberEntityMixin.java +++ b/astromine-core/src/main/java/com/github/chainmailstudios/astromine/mixin/FishingBobberEntityMixin.java @@ -36,6 +36,6 @@ public abstract class FishingBobberEntityMixin implements GravityEntity { @ModifyConstant(method = "use(Lnet/minecraft/item/ItemStack;)I", constant = @Constant(doubleValue = 0.08D)) double getGravity(double original) { - return this.getGravity(); + return this.astromine_getGravity(); } } diff --git a/astromine-core/src/main/java/com/github/chainmailstudios/astromine/mixin/GravityEntityMixin.java b/astromine-core/src/main/java/com/github/chainmailstudios/astromine/mixin/GravityEntityMixin.java index e1bfce1cb..b3325a3e2 100644 --- a/astromine-core/src/main/java/com/github/chainmailstudios/astromine/mixin/GravityEntityMixin.java +++ b/astromine-core/src/main/java/com/github/chainmailstudios/astromine/mixin/GravityEntityMixin.java @@ -38,11 +38,11 @@ public abstract class GravityEntityMixin implements GravityEntity { @ModifyConstant(method = "tick()V", constant = @Constant(doubleValue = -0.04D)) double getGravity(double original) { - return -this.getGravity(); + return -this.astromine_getGravity(); } @Override - public double getGravityMultiplier() { + public double astromine_getGravityMultiplier() { return 0.5d; } } diff --git a/astromine-core/src/main/java/com/github/chainmailstudios/astromine/mixin/HoneyBlockMixin.java b/astromine-core/src/main/java/com/github/chainmailstudios/astromine/mixin/HoneyBlockMixin.java index c90f34037..1a546bbf1 100644 --- a/astromine-core/src/main/java/com/github/chainmailstudios/astromine/mixin/HoneyBlockMixin.java +++ b/astromine-core/src/main/java/com/github/chainmailstudios/astromine/mixin/HoneyBlockMixin.java @@ -38,6 +38,6 @@ public class HoneyBlockMixin { @ModifyConstant(method = "isSliding(Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/entity/Entity;)Z", constant = @Constant(doubleValue = -0.08D)) double getGravity(double original, BlockPos pos, Entity entity) { - return -((GravityEntity) entity).getGravity(); + return -((GravityEntity) entity).astromine_getGravity(); } } diff --git a/astromine-core/src/main/java/com/github/chainmailstudios/astromine/mixin/ItemEntityMixin.java b/astromine-core/src/main/java/com/github/chainmailstudios/astromine/mixin/ItemEntityMixin.java index ea8486813..a16bfc6a2 100644 --- a/astromine-core/src/main/java/com/github/chainmailstudios/astromine/mixin/ItemEntityMixin.java +++ b/astromine-core/src/main/java/com/github/chainmailstudios/astromine/mixin/ItemEntityMixin.java @@ -36,11 +36,11 @@ public abstract class ItemEntityMixin implements GravityEntity { @ModifyConstant(method = "tick()V", constant = @Constant(doubleValue = -0.04D)) double getGravity(double original) { - return -this.getGravity(); + return -this.astromine_getGravity(); } @Override - public double getGravityMultiplier() { + public double astromine_getGravityMultiplier() { return 0.5d; } } diff --git a/astromine-core/src/main/java/com/github/chainmailstudios/astromine/mixin/LivingEntityMixin.java b/astromine-core/src/main/java/com/github/chainmailstudios/astromine/mixin/LivingEntityMixin.java index dcdc579d0..c9e315d82 100644 --- a/astromine-core/src/main/java/com/github/chainmailstudios/astromine/mixin/LivingEntityMixin.java +++ b/astromine-core/src/main/java/com/github/chainmailstudios/astromine/mixin/LivingEntityMixin.java @@ -80,15 +80,15 @@ public abstract class LivingEntityMixin implements GravityEntity { @ModifyConstant(method = "travel(Lnet/minecraft/util/math/Vec3d;)V", constant = @Constant(doubleValue = 0.08D, ordinal = 0)) private double modifyGravity(double original) { - return getGravity(); + return astromine_getGravity(); } - public double getGravityMultiplier() { + public double astromine_getGravityMultiplier() { return getAttributeValue(AstromineAttributes.GRAVITY_MULTIPLIER); } @Inject(at = @At("HEAD"), method = "tick()V") - void onTick(CallbackInfo callbackInformation) { + void astromine_tick(CallbackInfo callbackInformation) { Entity entity = (Entity) (Object) this; if (entity.world.isClient) return; @@ -203,7 +203,7 @@ void onTick(CallbackInfo callbackInformation) { } @Inject(at = @At("RETURN"), method = "createLivingAttributes()Lnet/minecraft/entity/attribute/DefaultAttributeContainer$Builder;") - private static void createLivingAttributesInject(CallbackInfoReturnable cir) { + private static void astromine_createLivingAttributes(CallbackInfoReturnable cir) { cir.getReturnValue().add(AstromineAttributes.GRAVITY_MULTIPLIER); } } diff --git a/astromine-core/src/main/java/com/github/chainmailstudios/astromine/mixin/PiglinBrainMixin.java b/astromine-core/src/main/java/com/github/chainmailstudios/astromine/mixin/PiglinBrainMixin.java index c5ac7c69a..86b4e8af9 100644 --- a/astromine-core/src/main/java/com/github/chainmailstudios/astromine/mixin/PiglinBrainMixin.java +++ b/astromine-core/src/main/java/com/github/chainmailstudios/astromine/mixin/PiglinBrainMixin.java @@ -51,27 +51,27 @@ @Mixin(PiglinBrain.class) public abstract class PiglinBrainMixin { @Inject(method = "acceptsForBarter(Lnet/minecraft/item/Item;)Z", at = @At("RETURN"), cancellable = true) - private static void acceptsForBarterInject(Item item, CallbackInfoReturnable cir) { + private static void astromine_acceptsForBarter(Item item, CallbackInfoReturnable cir) { if (item.isIn(AstromineTags.PIGLIN_BARTERING_ITEMS)) { cir.setReturnValue(true); } } @Inject(method = "wearsGoldArmor(Lnet/minecraft/entity/LivingEntity;)Z", at = @At(value = "INVOKE_ASSIGN", target = "Lnet/minecraft/item/ItemStack;getItem()Lnet/minecraft/item/Item;"), cancellable = true, locals = LocalCapture.CAPTURE_FAILHARD) - private static void wearsGoldArmorInject(LivingEntity entity, CallbackInfoReturnable cir, Iterable iterable, Iterator iterator, ItemStack stack, Item item) { + private static void astromine_wearsGoldArmor(LivingEntity entity, CallbackInfoReturnable cir, Iterable iterable, Iterator iterator, ItemStack stack, Item item) { if (item.isIn(AstromineTags.PIGLIN_SAFE_ARMOR)) { cir.setReturnValue(true); } } @Redirect(method = "loot(Lnet/minecraft/entity/mob/PiglinEntity;Lnet/minecraft/entity/ItemEntity;)V", at = @At(value = "INVOKE", target = "Lnet/minecraft/item/ItemStack;getItem()Lnet/minecraft/item/Item;")) - private static Item lootRedirect(ItemStack stack) { + private static Item astromine_loot(ItemStack stack) { Item item = stack.getItem(); return item.isIn(AstromineTags.PIGLIN_LOVED_NUGGETS) ? Items.GOLD_NUGGET : item; } @Inject(method = "consumeOffHandItem(Lnet/minecraft/entity/mob/PiglinEntity;Z)V", at = @At(value = "INVOKE_ASSIGN", target = "Lnet/minecraft/entity/mob/PiglinBrain;acceptsForBarter(Lnet/minecraft/item/Item;)Z"), locals = LocalCapture.CAPTURE_FAILHARD) - private static void triggerCriterion(PiglinEntity entity, boolean bl, CallbackInfo ci, ItemStack stack, boolean bl2) { + private static void astromine_consumeOffHandItem(PiglinEntity entity, boolean bl, CallbackInfo ci, ItemStack stack, boolean bl2) { if (bl && bl2 && stack.getItem().isIn(AstromineTags.TRICKS_PIGLINS)) { Optional optional = entity.getBrain().getOptionalMemory(MemoryModuleType.NEAREST_VISIBLE_PLAYER); if (optional.isPresent() && optional.get() instanceof ServerPlayerEntity) { diff --git a/astromine-core/src/main/java/com/github/chainmailstudios/astromine/mixin/PiglinEntityMixin.java b/astromine-core/src/main/java/com/github/chainmailstudios/astromine/mixin/PiglinEntityMixin.java index 721033d2b..36e17804f 100644 --- a/astromine-core/src/main/java/com/github/chainmailstudios/astromine/mixin/PiglinEntityMixin.java +++ b/astromine-core/src/main/java/com/github/chainmailstudios/astromine/mixin/PiglinEntityMixin.java @@ -39,7 +39,7 @@ @Mixin(PiglinEntity.class) public class PiglinEntityMixin { @Inject(method = "equipToOffHand(Lnet/minecraft/item/ItemStack;)V", at = @At("HEAD"), cancellable = true) - public void equipToOffHandInject(ItemStack stack, CallbackInfo ci) { + public void astromine_equipToOffHand(ItemStack stack, CallbackInfo ci) { if (stack.getItem().isIn(AstromineTags.PIGLIN_BARTERING_ITEMS)) { ((MobEntity) (Object) this).equipStack(EquipmentSlot.OFFHAND, stack); ((MobEntity) (Object) this).updateDropChances(EquipmentSlot.OFFHAND); diff --git a/astromine-core/src/main/java/com/github/chainmailstudios/astromine/mixin/ServerChunkManagerMixin.java b/astromine-core/src/main/java/com/github/chainmailstudios/astromine/mixin/ServerChunkManagerMixin.java index 221e1f260..148e42710 100644 --- a/astromine-core/src/main/java/com/github/chainmailstudios/astromine/mixin/ServerChunkManagerMixin.java +++ b/astromine-core/src/main/java/com/github/chainmailstudios/astromine/mixin/ServerChunkManagerMixin.java @@ -46,7 +46,7 @@ @Mixin(ServerChunkManager.class) public class ServerChunkManagerMixin { @Inject(method = "", at = @At("RETURN")) - private void handleConstructor(ServerWorld world, LevelStorage.Session session, DataFixer dataFixer, StructureManager structureManager, Executor workerExecutor, ChunkGenerator chunkGenerator, int viewDistance, boolean bl, + private void astromine_init(ServerWorld world, LevelStorage.Session session, DataFixer dataFixer, StructureManager structureManager, Executor workerExecutor, ChunkGenerator chunkGenerator, int viewDistance, boolean bl, WorldGenerationProgressListener worldGenerationProgressListener, Supplier supplier, CallbackInfo ci) { ServerChunkManagerCallback.EVENT.invoker().handle((ServerChunkManager) (Object) this); } diff --git a/astromine-core/src/main/java/com/github/chainmailstudios/astromine/mixin/ServerWorldMixin.java b/astromine-core/src/main/java/com/github/chainmailstudios/astromine/mixin/ServerWorldMixin.java index e2598397d..51ecb5952 100644 --- a/astromine-core/src/main/java/com/github/chainmailstudios/astromine/mixin/ServerWorldMixin.java +++ b/astromine-core/src/main/java/com/github/chainmailstudios/astromine/mixin/ServerWorldMixin.java @@ -35,7 +35,7 @@ @Mixin(ServerWorld.class) public class ServerWorldMixin { @Inject(method = "tickChunk", at = @At("HEAD")) - private void tickChunk(WorldChunk chunk, int randomTickSpeed, CallbackInfo ci) { + private void astromine_tickChunk(WorldChunk chunk, int randomTickSpeed, CallbackInfo ci) { ServerChunkTickCallback.EVENT.invoker().tickChunk((ServerWorld) (Object) this, chunk); } } diff --git a/astromine-core/src/main/java/com/github/chainmailstudios/astromine/mixin/SkyPropertiesMixin.java b/astromine-core/src/main/java/com/github/chainmailstudios/astromine/mixin/SkyPropertiesMixin.java index 37cfd5b25..34eda10f7 100644 --- a/astromine-core/src/main/java/com/github/chainmailstudios/astromine/mixin/SkyPropertiesMixin.java +++ b/astromine-core/src/main/java/com/github/chainmailstudios/astromine/mixin/SkyPropertiesMixin.java @@ -49,7 +49,7 @@ public class SkyPropertiesMixin { private static Object2ObjectMap BY_IDENTIFIER; @Inject(method = "", at = @At("RETURN")) - private static void init(CallbackInfo info) { + private static void astromine_init(CallbackInfo info) { SkyPropertiesCallback.EVENT.invoker().handle(BY_IDENTIFIER); } } diff --git a/astromine-core/src/main/java/com/github/chainmailstudios/astromine/mixin/SquidEntityMixin.java b/astromine-core/src/main/java/com/github/chainmailstudios/astromine/mixin/SquidEntityMixin.java index d8cf73a42..980549066 100644 --- a/astromine-core/src/main/java/com/github/chainmailstudios/astromine/mixin/SquidEntityMixin.java +++ b/astromine-core/src/main/java/com/github/chainmailstudios/astromine/mixin/SquidEntityMixin.java @@ -36,6 +36,6 @@ public abstract class SquidEntityMixin implements GravityEntity { @ModifyConstant(method = "tickMovement()V", constant = @Constant(doubleValue = 0.08D)) double getGravity(double original) { - return this.getGravity(); + return this.astromine_getGravity(); } } diff --git a/astromine-core/src/main/java/com/github/chainmailstudios/astromine/mixin/StepAndDestroyBlockGoalMixin.java b/astromine-core/src/main/java/com/github/chainmailstudios/astromine/mixin/StepAndDestroyBlockGoalMixin.java index 6cbdf80e2..452266b57 100644 --- a/astromine-core/src/main/java/com/github/chainmailstudios/astromine/mixin/StepAndDestroyBlockGoalMixin.java +++ b/astromine-core/src/main/java/com/github/chainmailstudios/astromine/mixin/StepAndDestroyBlockGoalMixin.java @@ -43,6 +43,6 @@ public class StepAndDestroyBlockGoalMixin { @ModifyConstant(method = "tick()V", constant = @Constant(doubleValue = 0.08D)) double getGravity(double original) { - return ((GravityEntity) stepAndDestroyMob).getGravity(); + return ((GravityEntity) stepAndDestroyMob).astromine_getGravity(); } } diff --git a/astromine-core/src/main/java/com/github/chainmailstudios/astromine/mixin/WorldChunkMixin.java b/astromine-core/src/main/java/com/github/chainmailstudios/astromine/mixin/WorldChunkMixin.java index 3614e34a5..f2f1b659b 100644 --- a/astromine-core/src/main/java/com/github/chainmailstudios/astromine/mixin/WorldChunkMixin.java +++ b/astromine-core/src/main/java/com/github/chainmailstudios/astromine/mixin/WorldChunkMixin.java @@ -49,16 +49,21 @@ public class WorldChunkMixin implements WorldChunkAccess { @Shadow @Final private ChunkSection[] sections; - private WorldChunk east, west, north, south; - private Runnable unload; + + private WorldChunk astromine_east; + private WorldChunk astromine_west; + private WorldChunk astromine_north; + private WorldChunk astromine_south; + + private Runnable astromine_unload; @Override public void astromine_addUnloadListener(Runnable runnable) { - if (this.unload == null) { - this.unload = runnable; + if (this.astromine_unload == null) { + this.astromine_unload = runnable; } else { - Runnable run = this.unload; - this.unload = () -> { + Runnable run = this.astromine_unload; + this.astromine_unload = () -> { run.run(); runnable.run(); }; @@ -67,33 +72,33 @@ public void astromine_addUnloadListener(Runnable runnable) { @Override public void astromine_runUnloadListeners() { - if (this.unload != null) { - this.unload.run(); + if (this.astromine_unload != null) { + this.astromine_unload.run(); } } @Override public void astromine_attachEast(WorldChunk chunk) { - this.east = chunk; - ((WorldChunkAccess) chunk).astromine_addUnloadListener(() -> this.east = null); + this.astromine_east = chunk; + ((WorldChunkAccess) chunk).astromine_addUnloadListener(() -> this.astromine_east = null); } @Override public void astromine_attachWest(WorldChunk chunk) { - this.west = chunk; - ((WorldChunkAccess) chunk).astromine_addUnloadListener(() -> this.west = null); + this.astromine_west = chunk; + ((WorldChunkAccess) chunk).astromine_addUnloadListener(() -> this.astromine_west = null); } @Override public void astromine_attachNorth(WorldChunk chunk) { - this.north = chunk; - ((WorldChunkAccess) chunk).astromine_addUnloadListener(() -> this.north = null); + this.astromine_north = chunk; + ((WorldChunkAccess) chunk).astromine_addUnloadListener(() -> this.astromine_north = null); } @Override public void astromine_attachSouth(WorldChunk chunk) { - this.south = chunk; - ((WorldChunkAccess) chunk).astromine_addUnloadListener(() -> this.south = null); + this.astromine_south = chunk; + ((WorldChunkAccess) chunk).astromine_addUnloadListener(() -> this.astromine_south = null); } @Override @@ -104,11 +109,11 @@ public void astromine_removeSubchunk(int subchunk) { @Override public WorldChunk astromine_east() { - WorldChunk chunk = this.east; + WorldChunk chunk = this.astromine_east; if (chunk == null) { ChunkPos pos = this.pos; - chunk = this.east = this.world.getChunk(pos.x + 1, pos.z); - ((WorldChunkAccess) chunk).astromine_addUnloadListener(() -> this.east = null); + chunk = this.astromine_east = this.world.getChunk(pos.x + 1, pos.z); + ((WorldChunkAccess) chunk).astromine_addUnloadListener(() -> this.astromine_east = null); ((WorldChunkAccess) chunk).astromine_attachWest((WorldChunk) (Object) this); } @@ -117,11 +122,11 @@ public WorldChunk astromine_east() { @Override public WorldChunk astromine_west() { - WorldChunk chunk = this.west; + WorldChunk chunk = this.astromine_west; if (chunk == null) { ChunkPos pos = this.pos; - chunk = this.west = this.world.getChunk(pos.x - 1, pos.z); - ((WorldChunkAccess) chunk).astromine_addUnloadListener(() -> this.west = null); + chunk = this.astromine_west = this.world.getChunk(pos.x - 1, pos.z); + ((WorldChunkAccess) chunk).astromine_addUnloadListener(() -> this.astromine_west = null); ((WorldChunkAccess) chunk).astromine_attachEast((WorldChunk) (Object) this); } @@ -130,11 +135,11 @@ public WorldChunk astromine_west() { @Override public WorldChunk astromine_north() { - WorldChunk chunk = this.north; + WorldChunk chunk = this.astromine_north; if (chunk == null) { ChunkPos pos = this.pos; - chunk = this.north = this.world.getChunk(pos.x, pos.z - 1); - ((WorldChunkAccess) chunk).astromine_addUnloadListener(() -> this.north = null); + chunk = this.astromine_north = this.world.getChunk(pos.x, pos.z - 1); + ((WorldChunkAccess) chunk).astromine_addUnloadListener(() -> this.astromine_north = null); ((WorldChunkAccess) chunk).astromine_attachSouth((WorldChunk) (Object) this); } @@ -143,11 +148,11 @@ public WorldChunk astromine_north() { @Override public WorldChunk astromine_south() { - WorldChunk chunk = this.south; + WorldChunk chunk = this.astromine_south; if (chunk == null) { ChunkPos pos = this.pos; - chunk = this.south = this.world.getChunk(pos.x, pos.z + 1); - ((WorldChunkAccess) chunk).astromine_addUnloadListener(() -> this.south = null); + chunk = this.astromine_south = this.world.getChunk(pos.x, pos.z + 1); + ((WorldChunkAccess) chunk).astromine_addUnloadListener(() -> this.astromine_south = null); ((WorldChunkAccess) chunk).astromine_attachNorth((WorldChunk) (Object) this); } @@ -155,7 +160,7 @@ public WorldChunk astromine_south() { } @Inject(method = "setLoadedToWorld", at = @At("RETURN")) - private void serialize(boolean loaded, CallbackInfo ci) { + private void astromine_setLoadedToWorld(boolean loaded, CallbackInfo ci) { if (!loaded) { // if unloading this.astromine_runUnloadListeners(); } diff --git a/astromine-core/src/main/java/com/github/chainmailstudios/astromine/mixin/WorldRendererMixin.java b/astromine-core/src/main/java/com/github/chainmailstudios/astromine/mixin/WorldRendererMixin.java index 30671428b..534ea5fa7 100644 --- a/astromine-core/src/main/java/com/github/chainmailstudios/astromine/mixin/WorldRendererMixin.java +++ b/astromine-core/src/main/java/com/github/chainmailstudios/astromine/mixin/WorldRendererMixin.java @@ -71,7 +71,7 @@ public abstract class WorldRendererMixin { private BufferBuilderStorage bufferBuilders; @Inject(at = @At("HEAD"), method = "renderSky(Lnet/minecraft/client/util/math/MatrixStack;F)V", cancellable = true) - void onRenderSky(MatrixStack matrices, float tickDelta, CallbackInfo callbackInformation) { + void astromine_renderSky(MatrixStack matrices, float tickDelta, CallbackInfo callbackInformation) { Skybox skybox = SkyboxRegistry.INSTANCE.get(this.client.world.getRegistryKey()); if (skybox != null) { @@ -82,7 +82,7 @@ void onRenderSky(MatrixStack matrices, float tickDelta, CallbackInfo callbackInf @Inject(at = @At(value = "HEAD", target = "Lnet/minecraft/client/render/WorldRenderer;checkEmpty(Lnet/minecraft/client/util/math/MatrixStack;)V"), method = "render(Lnet/minecraft/client/util/math/MatrixStack;FJZLnet/minecraft/client/render/Camera;Lnet/minecraft/client/render/GameRenderer;Lnet/minecraft/client/render/LightmapTextureManager;Lnet/minecraft/util/math/Matrix4f;)V") - void onRender(MatrixStack matrices, float tickDelta, long limitTime, boolean renderBlockOutline, Camera camera, GameRenderer gameRenderer, LightmapTextureManager lightmapTextureManager, Matrix4f matrix4f, CallbackInfo ci) { + void astromine_render(MatrixStack matrices, float tickDelta, long limitTime, boolean renderBlockOutline, Camera camera, GameRenderer gameRenderer, LightmapTextureManager lightmapTextureManager, Matrix4f matrix4f, CallbackInfo ci) { Vec3d cameraPosition = camera.getPos(); float cX = (float) cameraPosition.x; diff --git a/astromine-discoveries/src/main/java/com/github/chainmailstudios/astromine/discoveries/common/entity/PrimitiveRocketEntity.java b/astromine-discoveries/src/main/java/com/github/chainmailstudios/astromine/discoveries/common/entity/PrimitiveRocketEntity.java index 4fe6e8268..379da94e0 100644 --- a/astromine-discoveries/src/main/java/com/github/chainmailstudios/astromine/discoveries/common/entity/PrimitiveRocketEntity.java +++ b/astromine-discoveries/src/main/java/com/github/chainmailstudios/astromine/discoveries/common/entity/PrimitiveRocketEntity.java @@ -90,7 +90,7 @@ protected Collection createExplosionRemains() { @Override protected Function createAccelerationFunction() { - return entity -> new Vector3d(0D, getY() / 1024D / 4D / 3D, 0D); + return entity -> new Vector3d(0D, 0.000025 / (getY() / 1024D), 0D); } @Override diff --git a/astromine-discoveries/src/main/java/com/github/chainmailstudios/astromine/discoveries/common/entity/base/RocketEntity.java b/astromine-discoveries/src/main/java/com/github/chainmailstudios/astromine/discoveries/common/entity/base/RocketEntity.java index 0a7ab5d15..1c47930ba 100644 --- a/astromine-discoveries/src/main/java/com/github/chainmailstudios/astromine/discoveries/common/entity/base/RocketEntity.java +++ b/astromine-discoveries/src/main/java/com/github/chainmailstudios/astromine/discoveries/common/entity/base/RocketEntity.java @@ -109,10 +109,8 @@ public void tick() { if (fuelPredicate.test(tank) || tank.isEmpty()) { tank.minus(consumptionFunction.apply(this)); - if (tank.isEmpty()) { - if (world.isClient) { - this.world.getPlayers().forEach(player -> player.sendMessage(new TranslatableText("text.astromine.rocket.disassemble_empty_fuel").formatted(Formatting.RED), false)); - } + if (tank.isEmpty() && !world.isClient) { + this.world.getPlayers().forEach(player -> player.sendMessage(new TranslatableText("text.astromine.rocket.disassemble_empty_fuel").formatted(Formatting.RED), false)); this.tryDisassemble(); } else { @@ -134,17 +132,13 @@ public void tick() { } } - if (BlockPos.Mutable.method_29715(getBoundingBox()).anyMatch(pos -> world.getBlockState(pos).isFullCube(world, pos))) { - if (world.isClient) { - this.world.getPlayers().forEach(player -> player.sendMessage(new TranslatableText("text.astromine.rocket.disassemble_collision").formatted(Formatting.RED), false)); - } + if (BlockPos.Mutable.method_29715(getBoundingBox()).anyMatch(pos -> world.getBlockState(pos).isFullCube(world, pos)) && !world.isClient) { + this.world.getPlayers().forEach(player -> player.sendMessage(new TranslatableText("text.astromine.rocket.disassemble_collision").formatted(Formatting.RED), false)); this.tryDisassemble(); } - } else { - if (world.isClient) { - this.world.getPlayers().forEach(player -> player.sendMessage(new TranslatableText("text.astromine.rocket.disassemble_invalid_fuel").formatted(Formatting.RED), false)); - } + } else if (!world.isClient) { + this.world.getPlayers().forEach(player -> player.sendMessage(new TranslatableText("text.astromine.rocket.disassemble_invalid_fuel").formatted(Formatting.RED), false)); this.tryDisassemble(); } @@ -203,6 +197,7 @@ private FluidVolume getTank() { public void tryDisassemble() { this.tryExplode(); this.explosionRemains.forEach(stack -> ItemScatterer.spawn(world, getX(), getY(), getZ(), stack.copy())); + this.getPassengersDeep().forEach(Entity::stopRiding); this.remove(); } diff --git a/gradle.properties b/gradle.properties index a4c37e5be..d3f60b61e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -9,7 +9,7 @@ loader_version=0.10.0+build.208 api_version=0.22.0+build.408-1.16 # Mod mod_name=astromine -mod_version=1.10.7 +mod_version=1.11.0 mod_group=com.github.chainmailstudios.astromine version_meta=fabric-1.16.3 # CurseForge From 13982b961745620a9c77a00921adbf939f3db8d3 Mon Sep 17 00:00:00 2001 From: Shnupbups Date: Sun, 11 Oct 2020 01:06:19 +1100 Subject: [PATCH 07/16] things switch to using Piglib for piglin stuff optimised imports and reformat code spotless apply --- .../entrypoint/DatagenInitializer.java | 14 +- .../SimpleBlockItemModelGenerator.java | 1 - .../SimpleBlockItemModelStateGenerator.java | 3 - .../onetime/BlastingRecipeGenerator.java | 3 +- .../onetime/Crafting3x3RecipeGenerator.java | 1 - .../ShapedCraftingRecipeGenerator.java | 4 +- .../ShapelessCraftingRecipeGenerator.java | 2 - .../onetime/SlabCraftingRecipeGenerator.java | 1 - .../onetime/SmeltingRecipeGenerator.java | 3 +- .../StairsCraftingRecipeGenerator.java | 1 - .../onetime/StonecuttingRecipeGenerator.java | 4 +- .../onetime/WallCraftingRecipeGenerator.java | 1 - .../onetime/base/CookingRecipeGenerator.java | 1 - .../base/EnergyProcessingRecipeGenerator.java | 1 - .../base/SimpleProcessingRecipeGenerator.java | 1 - .../set/ShapedCraftingSetRecipeGenerator.java | 14 +- .../ShapelessCraftingSetRecipeGenerator.java | 2 - .../datagen/material/MaterialEntry.java | 3 +- .../astromine/AstromineCommon.java | 9 +- .../AstromineRoughlyEnoughItemsPlugin.java | 4 +- .../screen/base/BladeHandledScreen.java | 5 +- .../ComponentBlockEntityHandledScreen.java | 5 +- ...nentEntityFluidInventoryHandledScreen.java | 5 +- .../entity/ComponentEntityHandledScreen.java | 5 +- .../common/block/base/BlockWithEntity.java | 5 +- .../common/block/base/CableBlock.java | 7 +- ...HorizontalFacingTieredBlockWithEntity.java | 3 +- .../entity/base/ComponentBlockEntity.java | 13 +- .../base/ComponentEnergyBlockEntity.java | 9 +- .../base/ComponentEnergyFluidBlockEntity.java | 4 +- .../ComponentEnergyInventoryBlockEntity.java | 6 +- .../base/ComponentFluidBlockEntity.java | 4 +- .../ComponentFluidInventoryBlockEntity.java | 7 +- .../base/ComponentInventoryBlockEntity.java | 6 +- .../callback/ServerChunkTickCallback.java | 1 + .../component/SidedComponentProvider.java | 8 +- .../entity/BlockEntityTransferComponent.java | 7 +- .../inventory/EnergyInventoryComponent.java | 32 +-- .../inventory/FluidInventoryComponent.java | 2 +- .../inventory/ItemInventoryComponent.java | 2 +- .../SimpleEnergyInventoryComponent.java | 3 +- .../SimpleFluidInventoryComponent.java | 10 +- .../SimpleItemInventoryComponent.java | 2 +- .../world/ChunkAtmosphereComponent.java | 54 ++--- .../base/ComponentFluidInventoryEntity.java | 2 +- .../astromine/common/item/DrillItem.java | 13 +- .../common/item/base/BaseVolumeBlockItem.java | 3 +- .../common/item/base/BaseVolumeItem.java | 3 +- .../common/item/base/EnergyVolumeItem.java | 13 +- .../common/item/base/FluidVolumeItem.java | 10 +- .../lba/LibBlockAttributesCompatibility.java | 2 +- .../network/type/EnergyNetworkType.java | 5 +- .../common/network/type/FluidNetworkType.java | 2 +- .../base/block/BlockStateScreenHandler.java | 5 +- ...ntBlockEntityEnergyFluidScreenHandler.java | 8 +- ...entBlockEntityEnergyItemScreenHandler.java | 8 +- ...mponentBlockEntityEnergyScreenHandler.java | 8 +- .../ComponentBlockEntityScreenHandler.java | 20 +- .../common/utilities/EnergyUtilities.java | 5 +- .../common/utilities/ExplosionUtilities.java | 3 +- .../common/utilities/data/Holder.java | 8 +- .../common/volume/energy/EnergyVolume.java | 53 ++--- .../volume/energy/InfiniteEnergyVolume.java | 3 +- .../volume/energy/WrappedEnergyVolume.java | 1 + .../common/volume/fluid/FluidVolume.java | 69 +++---- .../volume/fluid/InfiniteFluidVolume.java | 13 +- .../common/volume/fraction/Fraction.java | 184 +++++++++--------- .../common/volume/handler/FluidHandler.java | 153 +++++++-------- .../common/volume/handler/ItemHandler.java | 111 +++++------ .../volume/handler/TransferHandler.java | 15 +- .../widget/blade/EnergyVerticalBarWidget.java | 2 +- .../widget/blade/FluidVerticalBarWidget.java | 6 +- .../astromine/mixin/AbstractBlockMixin.java | 24 +-- .../astromine/mixin/BucketItemMixin.java | 56 +++--- .../astromine/mixin/LivingEntityMixin.java | 25 ++- .../astromine/mixin/PiglinBrainMixin.java | 26 --- .../astromine/mixin/PiglinEntityMixin.java | 49 ----- .../astromine/mixin/ServerWorldMixin.java | 8 +- .../astromine/registry/AstromineBlocks.java | 4 +- .../registry/AstromineCommonCallbacks.java | 24 ++- .../astromine/registry/AstromineItems.java | 7 +- .../astromine/registry/AstromineTags.java | 3 - .../client/AstromineClientCallbacks.java | 11 +- .../assets/astromine/lang/en_us.json | 2 +- .../src/main/resources/astromine.mixins.json | 8 +- ...romineDiscoveriesModelStateGenerators.java | 8 +- .../AstromineDiscoveriesRecipeGenerators.java | 2 +- .../model/PrimitiveRocketEntityModel.java | 3 +- .../entity/PrimitiveRocketEntityRenderer.java | 5 +- .../client/screen/RocketHandledScreen.java | 4 +- .../entity/AltarPedestalBlockEntity.java | 13 +- .../common/entity/PrimitiveRocketEntity.java | 26 +-- .../common/entity/base/RocketEntity.java | 36 ++-- .../screenhandler/RocketScreenHandler.java | 11 +- .../world/decorator/MoonOreDecorator.java | 13 +- .../common/world/feature/MoonLakeFeature.java | 10 +- .../common/world/feature/MoonOreFeature.java | 16 +- .../glacios/GlaciosChunkGenerator.java | 16 +- .../generation/moon/MoonChunkGenerator.java | 8 +- .../space/EarthSpaceChunkGenerator.java | 2 +- .../client/BuiltinModelItemRendererMixin.java | 2 +- .../AstromineDiscoveriesCommonCallbacks.java | 2 +- .../AstromineDiscoveriesCommonPackets.java | 8 +- .../AstromineDiscoveriesDecorators.java | 6 +- .../AstromineDiscoveriesEntityTypes.java | 2 +- .../AstromineDiscoveriesScreenHandlers.java | 2 +- .../AstromineDiscoveriesClientCallbacks.java | 2 +- .../AstromineDiscoveriesClientModels.java | 20 +- .../AstromineDiscoveriesEntityRenderers.java | 2 +- .../tag/BeaconBaseTagGenerator.java | 1 - .../tag/BeaconPaymentTagGenerator.java | 3 - .../tag/CarbonDustTagGenerator.java | 1 - .../tag/PiglinArmorTagGenerator.java | 5 +- .../tag/PiglinBarterTagGenerator.java | 5 +- .../tag/PiglinNuggetTagGenerator.java | 5 +- ...romineFoundationsModelStateGenerators.java | 2 - .../AstromineFoundationsRecipeGenerators.java | 2 - .../tags/items/piglin_bartering_items.json | 0 .../tags/items/piglin_loved_nuggets.json | 0 .../tags/items/piglin_safe_armor.json | 0 .../AstromineFoundationsCommon.java | 8 +- .../common/world/feature/CrudeOilFeature.java | 15 +- .../AstromineFoundationsFeatures.java | 8 +- ...romineTechnologiesLootTableGenerators.java | 159 ++++++++------- ...omineTechnologiesModelStateGenerators.java | 8 +- ...AstromineTechnologiesRecipeGenerators.java | 5 +- .../onetime/TrituratingRecipeGenerator.java | 2 - .../set/PressingSetRecipeGenerator.java | 6 +- .../set/TrituratingSetRecipeGenerator.java | 5 +- ...eTechnologiesRoughlyEnoughItemsPlugin.java | 12 +- .../rei/SimpleTransferRecipeDisplay.java | 3 +- .../alloysmelting/AlloySmeltingDisplay.java | 10 +- .../ElectricSmeltingCategory.java | 2 +- .../ElectricSmeltingDisplay.java | 6 +- .../electrolyzing/ElectrolyzingDisplay.java | 6 +- .../rei/fluidmixing/FluidMixingDisplay.java | 4 +- .../generating/LiquidGeneratingDisplay.java | 4 +- .../generating/SolidGeneratingDisplay.java | 2 +- .../client/rei/pressing/PressingCategory.java | 14 +- .../client/rei/pressing/PressingDisplay.java | 2 +- .../client/rei/refining/RefiningCategory.java | 12 +- .../client/rei/refining/RefiningDisplay.java | 8 +- .../rei/triturating/TrituratingCategory.java | 14 +- .../rei/triturating/TrituratingDisplay.java | 4 +- .../client/screen/RefineryHandledScreen.java | 5 +- .../common/block/AirlockBlock.java | 12 +- .../common/block/BlockBreakerBlock.java | 7 +- .../common/block/BlockPlacerBlock.java | 7 +- .../common/block/BufferBlock.java | 7 +- .../common/block/FluidExtractorBlock.java | 7 +- .../common/block/FluidInserterBlock.java | 7 +- .../HolographicBridgeProjectorBlock.java | 7 +- .../common/block/LiquidGeneratorBlock.java | 7 +- .../common/block/NuclearWarheadBlock.java | 5 +- .../common/block/RefineryBlock.java | 7 +- .../technologies/common/block/TankBlock.java | 2 +- .../block/entity/AlloySmelterBlockEntity.java | 11 +- .../block/entity/BlockBreakerBlockEntity.java | 23 +-- .../block/entity/BlockPlacerBlockEntity.java | 15 +- .../block/entity/BufferBlockEntity.java | 2 +- .../block/entity/CapacitorBlockEntity.java | 7 +- .../entity/ElectricSmelterBlockEntity.java | 15 +- .../block/entity/ElectrolyzerBlockEntity.java | 11 +- .../entity/FluidExtractorBlockEntity.java | 15 +- .../entity/FluidInserterBlockEntity.java | 13 +- .../block/entity/FluidMixerBlockEntity.java | 11 +- .../entity/LiquidGeneratorBlockEntity.java | 14 +- .../block/entity/PresserBlockEntity.java | 13 +- .../block/entity/RefineryBlockEntity.java | 11 +- .../entity/SolidGeneratorBlockEntity.java | 16 +- .../common/block/entity/TankBlockEntity.java | 13 +- .../block/entity/TrituratorBlockEntity.java | 13 +- .../common/block/entity/VentBlockEntity.java | 9 +- .../common/item/GravityGauntletItem.java | 10 +- .../common/recipe/ElectrolyzingRecipe.java | 26 +-- .../common/recipe/FluidMixingRecipe.java | 26 +-- .../common/recipe/LiquidGeneratingRecipe.java | 26 +-- .../common/recipe/PressingRecipe.java | 16 +- .../common/recipe/RefiningRecipe.java | 44 +++-- .../common/recipe/TrituratingRecipe.java | 14 +- ...mineTechnologiesServerContainerPlugin.java | 19 +- .../ElectrolyzerScreenHandler.java | 7 +- .../FluidMixerScreenHandler.java | 4 +- .../screenhandler/RefineryScreenHandler.java | 5 +- .../registry/AstromineTechnologiesItems.java | 7 +- ...stromineTechnologiesRecipeSerializers.java | 11 +- .../AstromineTechnologiesClientCallbacks.java | 6 +- .../astromine/recipes/advanced_buffer.json | 20 +- .../data/astromine/recipes/advanced_tank.json | 20 +- .../data/astromine/recipes/basic_buffer.json | 20 +- .../data/astromine/recipes/basic_tank.json | 20 +- .../data/astromine/recipes/elite_buffer.json | 20 +- .../data/astromine/recipes/elite_tank.json | 10 +- .../astromine/recipes/primitive_buffer.json | 20 +- .../astromine/recipes/primitive_tank.json | 20 +- .../common/block/CatwalkBlock.java | 9 +- .../common/block/CatwalkStairsBlock.java | 12 +- .../common/block/ConveyorBlock.java | 14 +- .../common/block/InserterBlock.java | 10 +- .../common/block/VerticalConveyorBlock.java | 16 +- build.gradle | 6 +- dependencies.gradle | 6 +- gradle.properties | 4 +- 203 files changed, 1314 insertions(+), 1241 deletions(-) delete mode 100644 astromine-core/src/main/java/com/github/chainmailstudios/astromine/mixin/PiglinEntityMixin.java rename astromine-foundations/src/generated/resources/data/{astromine => piglib}/tags/items/piglin_bartering_items.json (100%) rename astromine-foundations/src/generated/resources/data/{astromine => piglib}/tags/items/piglin_loved_nuggets.json (100%) rename astromine-foundations/src/generated/resources/data/{astromine => piglib}/tags/items/piglin_safe_armor.json (100%) diff --git a/astromine-core/src/datagen/java/com/github/chainmailstudios/astromine/datagen/entrypoint/DatagenInitializer.java b/astromine-core/src/datagen/java/com/github/chainmailstudios/astromine/datagen/entrypoint/DatagenInitializer.java index ec5207c23..9fe0301c3 100644 --- a/astromine-core/src/datagen/java/com/github/chainmailstudios/astromine/datagen/entrypoint/DatagenInitializer.java +++ b/astromine-core/src/datagen/java/com/github/chainmailstudios/astromine/datagen/entrypoint/DatagenInitializer.java @@ -1,8 +1,18 @@ package com.github.chainmailstudios.astromine.datagen.entrypoint; import com.github.chainmailstudios.astromine.AstromineCommon; -import com.github.chainmailstudios.astromine.datagen.registry.*; -import me.shedaniel.cloth.api.datagen.v1.*; +import com.github.chainmailstudios.astromine.datagen.registry.AstromineLootTableGenerators; +import com.github.chainmailstudios.astromine.datagen.registry.AstromineMaterialSets; +import com.github.chainmailstudios.astromine.datagen.registry.AstromineModelStateGenerators; +import com.github.chainmailstudios.astromine.datagen.registry.AstromineRecipeGenerators; +import com.github.chainmailstudios.astromine.datagen.registry.AstromineTagGenerators; +import com.github.chainmailstudios.astromine.datagen.registry.AstromineWorldGenGenerators; +import me.shedaniel.cloth.api.datagen.v1.DataGeneratorHandler; +import me.shedaniel.cloth.api.datagen.v1.LootTableData; +import me.shedaniel.cloth.api.datagen.v1.ModelStateData; +import me.shedaniel.cloth.api.datagen.v1.RecipeData; +import me.shedaniel.cloth.api.datagen.v1.TagData; +import me.shedaniel.cloth.api.datagen.v1.WorldGenData; import java.nio.file.Path; import java.nio.file.Paths; diff --git a/astromine-core/src/datagen/java/com/github/chainmailstudios/astromine/datagen/generator/modelstate/onetime/SimpleBlockItemModelGenerator.java b/astromine-core/src/datagen/java/com/github/chainmailstudios/astromine/datagen/generator/modelstate/onetime/SimpleBlockItemModelGenerator.java index 9efcaa243..055efa600 100644 --- a/astromine-core/src/datagen/java/com/github/chainmailstudios/astromine/datagen/generator/modelstate/onetime/SimpleBlockItemModelGenerator.java +++ b/astromine-core/src/datagen/java/com/github/chainmailstudios/astromine/datagen/generator/modelstate/onetime/SimpleBlockItemModelGenerator.java @@ -1,7 +1,6 @@ package com.github.chainmailstudios.astromine.datagen.generator.modelstate.onetime; import net.minecraft.block.Block; -import net.minecraft.data.client.model.ModelIds; import me.shedaniel.cloth.api.datagen.v1.ModelStateData; diff --git a/astromine-core/src/datagen/java/com/github/chainmailstudios/astromine/datagen/generator/modelstate/onetime/SimpleBlockItemModelStateGenerator.java b/astromine-core/src/datagen/java/com/github/chainmailstudios/astromine/datagen/generator/modelstate/onetime/SimpleBlockItemModelStateGenerator.java index 8a284177b..dbf342625 100644 --- a/astromine-core/src/datagen/java/com/github/chainmailstudios/astromine/datagen/generator/modelstate/onetime/SimpleBlockItemModelStateGenerator.java +++ b/astromine-core/src/datagen/java/com/github/chainmailstudios/astromine/datagen/generator/modelstate/onetime/SimpleBlockItemModelStateGenerator.java @@ -5,9 +5,6 @@ import me.shedaniel.cloth.api.datagen.v1.ModelStateData; -import java.util.Arrays; -import java.util.List; - public class SimpleBlockItemModelStateGenerator extends GenericBlockModelStateGenerator { public SimpleBlockItemModelStateGenerator(Block... blocks) { super(blocks); diff --git a/astromine-core/src/datagen/java/com/github/chainmailstudios/astromine/datagen/generator/recipe/onetime/BlastingRecipeGenerator.java b/astromine-core/src/datagen/java/com/github/chainmailstudios/astromine/datagen/generator/recipe/onetime/BlastingRecipeGenerator.java index b70e9c764..108672e91 100644 --- a/astromine-core/src/datagen/java/com/github/chainmailstudios/astromine/datagen/generator/recipe/onetime/BlastingRecipeGenerator.java +++ b/astromine-core/src/datagen/java/com/github/chainmailstudios/astromine/datagen/generator/recipe/onetime/BlastingRecipeGenerator.java @@ -5,7 +5,6 @@ import net.minecraft.item.ItemConvertible; import net.minecraft.recipe.Ingredient; import net.minecraft.util.Identifier; -import net.minecraft.util.registry.Registry; import com.github.chainmailstudios.astromine.datagen.generator.recipe.onetime.base.CookingRecipeGenerator; import me.shedaniel.cloth.api.datagen.v1.RecipeData; @@ -26,7 +25,7 @@ public BlastingRecipeGenerator(Ingredient input, ItemConvertible output) { @Override public Identifier getRecipeId() { Identifier id = super.getRecipeId(); - return new Identifier(id.getNamespace(), id.getPath()+"_from_blasting"); + return new Identifier(id.getNamespace(), id.getPath() + "_from_blasting"); } @Override diff --git a/astromine-core/src/datagen/java/com/github/chainmailstudios/astromine/datagen/generator/recipe/onetime/Crafting3x3RecipeGenerator.java b/astromine-core/src/datagen/java/com/github/chainmailstudios/astromine/datagen/generator/recipe/onetime/Crafting3x3RecipeGenerator.java index ac7fdcf39..6b64cc060 100644 --- a/astromine-core/src/datagen/java/com/github/chainmailstudios/astromine/datagen/generator/recipe/onetime/Crafting3x3RecipeGenerator.java +++ b/astromine-core/src/datagen/java/com/github/chainmailstudios/astromine/datagen/generator/recipe/onetime/Crafting3x3RecipeGenerator.java @@ -2,7 +2,6 @@ import net.minecraft.item.ItemConvertible; import net.minecraft.recipe.Ingredient; -import net.minecraft.util.Identifier; public class Crafting3x3RecipeGenerator extends ShapedCraftingRecipeGenerator { public Crafting3x3RecipeGenerator(ItemConvertible output, Ingredient input) { diff --git a/astromine-core/src/datagen/java/com/github/chainmailstudios/astromine/datagen/generator/recipe/onetime/ShapedCraftingRecipeGenerator.java b/astromine-core/src/datagen/java/com/github/chainmailstudios/astromine/datagen/generator/recipe/onetime/ShapedCraftingRecipeGenerator.java index e1714b63c..1df3c2e06 100644 --- a/astromine-core/src/datagen/java/com/github/chainmailstudios/astromine/datagen/generator/recipe/onetime/ShapedCraftingRecipeGenerator.java +++ b/astromine-core/src/datagen/java/com/github/chainmailstudios/astromine/datagen/generator/recipe/onetime/ShapedCraftingRecipeGenerator.java @@ -4,8 +4,6 @@ import net.minecraft.data.server.recipe.ShapedRecipeJsonFactory; import net.minecraft.item.ItemConvertible; import net.minecraft.recipe.Ingredient; -import net.minecraft.util.Identifier; -import net.minecraft.util.registry.Registry; import com.github.chainmailstudios.astromine.datagen.generator.recipe.onetime.base.OneTimeRecipeGenerator; import me.shedaniel.cloth.api.datagen.v1.RecipeData; @@ -35,7 +33,7 @@ public ShapedCraftingRecipeGenerator addIngredient(char c, Ingredient ingredient @Override public void generate(RecipeData recipes) { if (ingredients.size() == 0) throw new IllegalStateException("recipe must have at least one ingredient"); - else if(pattern.length == 0) throw new IllegalStateException("recipe must have a pattern"); + else if (pattern.length == 0) throw new IllegalStateException("recipe must have a pattern"); else { ShapedRecipeJsonFactory factory = ShapedRecipeJsonFactory .create(output, outputCount) diff --git a/astromine-core/src/datagen/java/com/github/chainmailstudios/astromine/datagen/generator/recipe/onetime/ShapelessCraftingRecipeGenerator.java b/astromine-core/src/datagen/java/com/github/chainmailstudios/astromine/datagen/generator/recipe/onetime/ShapelessCraftingRecipeGenerator.java index 38cfc9353..fbdc7191b 100644 --- a/astromine-core/src/datagen/java/com/github/chainmailstudios/astromine/datagen/generator/recipe/onetime/ShapelessCraftingRecipeGenerator.java +++ b/astromine-core/src/datagen/java/com/github/chainmailstudios/astromine/datagen/generator/recipe/onetime/ShapelessCraftingRecipeGenerator.java @@ -4,8 +4,6 @@ import net.minecraft.data.server.recipe.ShapelessRecipeJsonFactory; import net.minecraft.item.ItemConvertible; import net.minecraft.recipe.Ingredient; -import net.minecraft.util.Identifier; -import net.minecraft.util.registry.Registry; import com.github.chainmailstudios.astromine.datagen.generator.recipe.onetime.base.OneTimeRecipeGenerator; import me.shedaniel.cloth.api.datagen.v1.RecipeData; diff --git a/astromine-core/src/datagen/java/com/github/chainmailstudios/astromine/datagen/generator/recipe/onetime/SlabCraftingRecipeGenerator.java b/astromine-core/src/datagen/java/com/github/chainmailstudios/astromine/datagen/generator/recipe/onetime/SlabCraftingRecipeGenerator.java index d036440d8..825e65d1b 100644 --- a/astromine-core/src/datagen/java/com/github/chainmailstudios/astromine/datagen/generator/recipe/onetime/SlabCraftingRecipeGenerator.java +++ b/astromine-core/src/datagen/java/com/github/chainmailstudios/astromine/datagen/generator/recipe/onetime/SlabCraftingRecipeGenerator.java @@ -2,7 +2,6 @@ import net.minecraft.item.ItemConvertible; import net.minecraft.recipe.Ingredient; -import net.minecraft.util.Identifier; public class SlabCraftingRecipeGenerator extends ShapedCraftingRecipeGenerator { public SlabCraftingRecipeGenerator(ItemConvertible output, Ingredient base) { diff --git a/astromine-core/src/datagen/java/com/github/chainmailstudios/astromine/datagen/generator/recipe/onetime/SmeltingRecipeGenerator.java b/astromine-core/src/datagen/java/com/github/chainmailstudios/astromine/datagen/generator/recipe/onetime/SmeltingRecipeGenerator.java index c5d6506e2..e5bbd8f62 100644 --- a/astromine-core/src/datagen/java/com/github/chainmailstudios/astromine/datagen/generator/recipe/onetime/SmeltingRecipeGenerator.java +++ b/astromine-core/src/datagen/java/com/github/chainmailstudios/astromine/datagen/generator/recipe/onetime/SmeltingRecipeGenerator.java @@ -5,7 +5,6 @@ import net.minecraft.item.ItemConvertible; import net.minecraft.recipe.Ingredient; import net.minecraft.util.Identifier; -import net.minecraft.util.registry.Registry; import com.github.chainmailstudios.astromine.datagen.generator.recipe.onetime.base.CookingRecipeGenerator; import me.shedaniel.cloth.api.datagen.v1.RecipeData; @@ -26,7 +25,7 @@ public SmeltingRecipeGenerator(Ingredient input, ItemConvertible output) { @Override public Identifier getRecipeId() { Identifier id = super.getRecipeId(); - return new Identifier(id.getNamespace(), id.getPath()+"_from_smelting"); + return new Identifier(id.getNamespace(), id.getPath() + "_from_smelting"); } @Override diff --git a/astromine-core/src/datagen/java/com/github/chainmailstudios/astromine/datagen/generator/recipe/onetime/StairsCraftingRecipeGenerator.java b/astromine-core/src/datagen/java/com/github/chainmailstudios/astromine/datagen/generator/recipe/onetime/StairsCraftingRecipeGenerator.java index 08c11afce..708b04c4e 100644 --- a/astromine-core/src/datagen/java/com/github/chainmailstudios/astromine/datagen/generator/recipe/onetime/StairsCraftingRecipeGenerator.java +++ b/astromine-core/src/datagen/java/com/github/chainmailstudios/astromine/datagen/generator/recipe/onetime/StairsCraftingRecipeGenerator.java @@ -2,7 +2,6 @@ import net.minecraft.item.ItemConvertible; import net.minecraft.recipe.Ingredient; -import net.minecraft.util.Identifier; public class StairsCraftingRecipeGenerator extends ShapedCraftingRecipeGenerator { public StairsCraftingRecipeGenerator(ItemConvertible output, Ingredient base) { diff --git a/astromine-core/src/datagen/java/com/github/chainmailstudios/astromine/datagen/generator/recipe/onetime/StonecuttingRecipeGenerator.java b/astromine-core/src/datagen/java/com/github/chainmailstudios/astromine/datagen/generator/recipe/onetime/StonecuttingRecipeGenerator.java index 3be1f5742..1c46ee432 100644 --- a/astromine-core/src/datagen/java/com/github/chainmailstudios/astromine/datagen/generator/recipe/onetime/StonecuttingRecipeGenerator.java +++ b/astromine-core/src/datagen/java/com/github/chainmailstudios/astromine/datagen/generator/recipe/onetime/StonecuttingRecipeGenerator.java @@ -4,9 +4,7 @@ import net.minecraft.data.server.recipe.SingleItemRecipeJsonFactory; import net.minecraft.item.ItemConvertible; import net.minecraft.recipe.Ingredient; -import net.minecraft.recipe.StonecuttingRecipe; import net.minecraft.util.Identifier; -import net.minecraft.util.registry.Registry; import com.github.chainmailstudios.astromine.datagen.generator.recipe.onetime.base.OneTimeRecipeGenerator; import me.shedaniel.cloth.api.datagen.v1.RecipeData; @@ -31,7 +29,7 @@ public String getGeneratorName() { @Override public Identifier getRecipeId() { Identifier id = super.getRecipeId(); - return new Identifier(id.getNamespace(), id.getPath()+"_from_stonecutting"); + return new Identifier(id.getNamespace(), id.getPath() + "_from_stonecutting"); } @Override diff --git a/astromine-core/src/datagen/java/com/github/chainmailstudios/astromine/datagen/generator/recipe/onetime/WallCraftingRecipeGenerator.java b/astromine-core/src/datagen/java/com/github/chainmailstudios/astromine/datagen/generator/recipe/onetime/WallCraftingRecipeGenerator.java index 31624fb46..891711d56 100644 --- a/astromine-core/src/datagen/java/com/github/chainmailstudios/astromine/datagen/generator/recipe/onetime/WallCraftingRecipeGenerator.java +++ b/astromine-core/src/datagen/java/com/github/chainmailstudios/astromine/datagen/generator/recipe/onetime/WallCraftingRecipeGenerator.java @@ -2,7 +2,6 @@ import net.minecraft.item.ItemConvertible; import net.minecraft.recipe.Ingredient; -import net.minecraft.util.Identifier; public class WallCraftingRecipeGenerator extends ShapedCraftingRecipeGenerator { public WallCraftingRecipeGenerator(ItemConvertible output, Ingredient base) { diff --git a/astromine-core/src/datagen/java/com/github/chainmailstudios/astromine/datagen/generator/recipe/onetime/base/CookingRecipeGenerator.java b/astromine-core/src/datagen/java/com/github/chainmailstudios/astromine/datagen/generator/recipe/onetime/base/CookingRecipeGenerator.java index d55095349..bdb33ae40 100644 --- a/astromine-core/src/datagen/java/com/github/chainmailstudios/astromine/datagen/generator/recipe/onetime/base/CookingRecipeGenerator.java +++ b/astromine-core/src/datagen/java/com/github/chainmailstudios/astromine/datagen/generator/recipe/onetime/base/CookingRecipeGenerator.java @@ -2,7 +2,6 @@ import net.minecraft.item.ItemConvertible; import net.minecraft.recipe.Ingredient; -import net.minecraft.util.Identifier; public abstract class CookingRecipeGenerator extends SimpleProcessingRecipeGenerator { public final float experience; diff --git a/astromine-core/src/datagen/java/com/github/chainmailstudios/astromine/datagen/generator/recipe/onetime/base/EnergyProcessingRecipeGenerator.java b/astromine-core/src/datagen/java/com/github/chainmailstudios/astromine/datagen/generator/recipe/onetime/base/EnergyProcessingRecipeGenerator.java index a34d97d3e..4880bddf4 100644 --- a/astromine-core/src/datagen/java/com/github/chainmailstudios/astromine/datagen/generator/recipe/onetime/base/EnergyProcessingRecipeGenerator.java +++ b/astromine-core/src/datagen/java/com/github/chainmailstudios/astromine/datagen/generator/recipe/onetime/base/EnergyProcessingRecipeGenerator.java @@ -2,7 +2,6 @@ import net.minecraft.item.ItemConvertible; import net.minecraft.recipe.Ingredient; -import net.minecraft.util.Identifier; public abstract class EnergyProcessingRecipeGenerator extends SimpleProcessingRecipeGenerator { public final int energyConsumed; diff --git a/astromine-core/src/datagen/java/com/github/chainmailstudios/astromine/datagen/generator/recipe/onetime/base/SimpleProcessingRecipeGenerator.java b/astromine-core/src/datagen/java/com/github/chainmailstudios/astromine/datagen/generator/recipe/onetime/base/SimpleProcessingRecipeGenerator.java index 2cf51174d..2fa6da10d 100644 --- a/astromine-core/src/datagen/java/com/github/chainmailstudios/astromine/datagen/generator/recipe/onetime/base/SimpleProcessingRecipeGenerator.java +++ b/astromine-core/src/datagen/java/com/github/chainmailstudios/astromine/datagen/generator/recipe/onetime/base/SimpleProcessingRecipeGenerator.java @@ -2,7 +2,6 @@ import net.minecraft.item.ItemConvertible; import net.minecraft.recipe.Ingredient; -import net.minecraft.util.Identifier; public abstract class SimpleProcessingRecipeGenerator extends OneTimeRecipeGenerator { public final Ingredient input; diff --git a/astromine-core/src/datagen/java/com/github/chainmailstudios/astromine/datagen/generator/recipe/set/ShapedCraftingSetRecipeGenerator.java b/astromine-core/src/datagen/java/com/github/chainmailstudios/astromine/datagen/generator/recipe/set/ShapedCraftingSetRecipeGenerator.java index bb6afb254..93d1d0768 100644 --- a/astromine-core/src/datagen/java/com/github/chainmailstudios/astromine/datagen/generator/recipe/set/ShapedCraftingSetRecipeGenerator.java +++ b/astromine-core/src/datagen/java/com/github/chainmailstudios/astromine/datagen/generator/recipe/set/ShapedCraftingSetRecipeGenerator.java @@ -9,7 +9,6 @@ import com.github.chainmailstudios.astromine.datagen.material.MaterialSet; import me.shedaniel.cloth.api.datagen.v1.RecipeData; -import java.util.Arrays; import java.util.HashMap; import java.util.Map; @@ -39,7 +38,7 @@ public void addType(char c, MaterialItemType type) { @Override public void generate(RecipeData recipes, MaterialSet set) { - if(pattern.length == 0) throw new IllegalStateException("recipe must have a pattern"); + if (pattern.length == 0) throw new IllegalStateException("recipe must have a pattern"); else { ShapedRecipeJsonFactory factory = ShapedRecipeJsonFactory .create(set.getItem(output), outputCount) @@ -47,8 +46,8 @@ public void generate(RecipeData recipes, MaterialSet set) { for (String s : pattern) { factory.pattern(s); } - if(patternContains('#')) factory.input('#', set.getIngredient(input)); - if(patternContains('I')) factory.input('I', set.getItem(input)); + if (patternContains('#')) factory.input('#', set.getIngredient(input)); + if (patternContains('I')) factory.input('I', set.getItem(input)); ingredients.forEach(factory::input); types.forEach((c, type) -> factory.input(c, set.getIngredient(type))); factory.offerTo(recipes, getRecipeId(set)); @@ -56,9 +55,10 @@ public void generate(RecipeData recipes, MaterialSet set) { } public boolean patternContains(char c) { - for(String s:pattern) { - if(s.contains(String.valueOf(c))) return true; - } return false; + for (String s : pattern) { + if (s.contains(String.valueOf(c))) return true; + } + return false; } @Override diff --git a/astromine-core/src/datagen/java/com/github/chainmailstudios/astromine/datagen/generator/recipe/set/ShapelessCraftingSetRecipeGenerator.java b/astromine-core/src/datagen/java/com/github/chainmailstudios/astromine/datagen/generator/recipe/set/ShapelessCraftingSetRecipeGenerator.java index b6b1d445a..1adef756b 100644 --- a/astromine-core/src/datagen/java/com/github/chainmailstudios/astromine/datagen/generator/recipe/set/ShapelessCraftingSetRecipeGenerator.java +++ b/astromine-core/src/datagen/java/com/github/chainmailstudios/astromine/datagen/generator/recipe/set/ShapelessCraftingSetRecipeGenerator.java @@ -11,9 +11,7 @@ import java.util.ArrayList; import java.util.Arrays; -import java.util.HashMap; import java.util.List; -import java.util.Map; public class ShapelessCraftingSetRecipeGenerator extends CraftingSetRecipeGenerator { public final List ingredients; diff --git a/astromine-core/src/datagen/java/com/github/chainmailstudios/astromine/datagen/material/MaterialEntry.java b/astromine-core/src/datagen/java/com/github/chainmailstudios/astromine/datagen/material/MaterialEntry.java index abba61230..523a329c1 100644 --- a/astromine-core/src/datagen/java/com/github/chainmailstudios/astromine/datagen/material/MaterialEntry.java +++ b/astromine-core/src/datagen/java/com/github/chainmailstudios/astromine/datagen/material/MaterialEntry.java @@ -61,7 +61,8 @@ public Ingredient asIngredient() { @Override public Item asItem() { Item item = Registry.ITEM.get(itemId); - if(item.equals(Items.AIR)) throw new InvalidIdentifierException("oh fuck entry "+this.getItemId()+" returned air"); + if (item.equals(Items.AIR)) + throw new InvalidIdentifierException("oh fuck entry " + this.getItemId() + " returned air"); return item; } diff --git a/astromine-core/src/main/java/com/github/chainmailstudios/astromine/AstromineCommon.java b/astromine-core/src/main/java/com/github/chainmailstudios/astromine/AstromineCommon.java index 8f55a7d11..486be1bca 100644 --- a/astromine-core/src/main/java/com/github/chainmailstudios/astromine/AstromineCommon.java +++ b/astromine-core/src/main/java/com/github/chainmailstudios/astromine/AstromineCommon.java @@ -24,15 +24,18 @@ package com.github.chainmailstudios.astromine; -import blue.endless.jankson.Jankson; -import com.github.chainmailstudios.astromine.registry.*; -import com.google.gson.Gson; import net.fabricmc.api.ModInitializer; import net.fabricmc.loader.api.FabricLoader; + import net.minecraft.util.Identifier; + +import blue.endless.jankson.Jankson; +import com.github.chainmailstudios.astromine.registry.*; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import com.google.gson.Gson; + public class AstromineCommon implements ModInitializer { public static final String LOG_ID = "Astromine"; public static final String MOD_ID = "astromine"; diff --git a/astromine-core/src/main/java/com/github/chainmailstudios/astromine/client/rei/AstromineRoughlyEnoughItemsPlugin.java b/astromine-core/src/main/java/com/github/chainmailstudios/astromine/client/rei/AstromineRoughlyEnoughItemsPlugin.java index 6461decb5..0b1a690d3 100644 --- a/astromine-core/src/main/java/com/github/chainmailstudios/astromine/client/rei/AstromineRoughlyEnoughItemsPlugin.java +++ b/astromine-core/src/main/java/com/github/chainmailstudios/astromine/client/rei/AstromineRoughlyEnoughItemsPlugin.java @@ -24,7 +24,6 @@ package com.github.chainmailstudios.astromine.client.rei; -import com.github.chainmailstudios.astromine.common.utilities.NumberUtilities; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; @@ -43,9 +42,10 @@ import com.github.chainmailstudios.astromine.AstromineCommon; import com.github.chainmailstudios.astromine.client.render.sprite.SpriteRenderer; -import com.github.chainmailstudios.astromine.common.volume.fraction.Fraction; import com.github.chainmailstudios.astromine.common.utilities.FluidUtilities; +import com.github.chainmailstudios.astromine.common.utilities.NumberUtilities; import com.github.chainmailstudios.astromine.common.volume.fluid.FluidVolume; +import com.github.chainmailstudios.astromine.common.volume.fraction.Fraction; import me.shedaniel.math.Point; import me.shedaniel.math.Rectangle; import me.shedaniel.rei.api.EntryStack; diff --git a/astromine-core/src/main/java/com/github/chainmailstudios/astromine/client/screen/base/BladeHandledScreen.java b/astromine-core/src/main/java/com/github/chainmailstudios/astromine/client/screen/base/BladeHandledScreen.java index 8c3916bb0..77e913a3a 100644 --- a/astromine-core/src/main/java/com/github/chainmailstudios/astromine/client/screen/base/BladeHandledScreen.java +++ b/astromine-core/src/main/java/com/github/chainmailstudios/astromine/client/screen/base/BladeHandledScreen.java @@ -24,11 +24,12 @@ package com.github.chainmailstudios.astromine.client.screen.base; -import com.github.vini2003.blade.client.handler.BaseHandledScreen; -import com.github.vini2003.blade.common.handler.BaseScreenHandler; import net.minecraft.client.util.math.MatrixStack; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.text.Text; + +import com.github.vini2003.blade.client.handler.BaseHandledScreen; +import com.github.vini2003.blade.common.handler.BaseScreenHandler; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/astromine-core/src/main/java/com/github/chainmailstudios/astromine/client/screen/base/block/ComponentBlockEntityHandledScreen.java b/astromine-core/src/main/java/com/github/chainmailstudios/astromine/client/screen/base/block/ComponentBlockEntityHandledScreen.java index 82477ba25..a7e85773d 100644 --- a/astromine-core/src/main/java/com/github/chainmailstudios/astromine/client/screen/base/block/ComponentBlockEntityHandledScreen.java +++ b/astromine-core/src/main/java/com/github/chainmailstudios/astromine/client/screen/base/block/ComponentBlockEntityHandledScreen.java @@ -24,11 +24,12 @@ package com.github.chainmailstudios.astromine.client.screen.base.block; +import net.minecraft.entity.player.PlayerInventory; +import net.minecraft.text.Text; + import com.github.chainmailstudios.astromine.client.screen.base.BladeHandledScreen; import com.github.chainmailstudios.astromine.common.screenhandler.base.block.ComponentBlockEntityScreenHandler; import com.github.vini2003.blade.common.handler.BaseScreenHandler; -import net.minecraft.entity.player.PlayerInventory; -import net.minecraft.text.Text; public class ComponentBlockEntityHandledScreen extends BladeHandledScreen { public ComponentBlockEntityHandledScreen(BaseScreenHandler handler, PlayerInventory inventory, Text title) { diff --git a/astromine-core/src/main/java/com/github/chainmailstudios/astromine/client/screen/base/entity/ComponentEntityFluidInventoryHandledScreen.java b/astromine-core/src/main/java/com/github/chainmailstudios/astromine/client/screen/base/entity/ComponentEntityFluidInventoryHandledScreen.java index 9e90ad330..3abf58c7e 100644 --- a/astromine-core/src/main/java/com/github/chainmailstudios/astromine/client/screen/base/entity/ComponentEntityFluidInventoryHandledScreen.java +++ b/astromine-core/src/main/java/com/github/chainmailstudios/astromine/client/screen/base/entity/ComponentEntityFluidInventoryHandledScreen.java @@ -24,11 +24,12 @@ package com.github.chainmailstudios.astromine.client.screen.base.entity; -import com.github.chainmailstudios.astromine.common.screenhandler.base.entity.ComponentEntityFluidInventoryScreenHandler; -import com.github.vini2003.blade.common.handler.BaseScreenHandler; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.text.Text; +import com.github.chainmailstudios.astromine.common.screenhandler.base.entity.ComponentEntityFluidInventoryScreenHandler; +import com.github.vini2003.blade.common.handler.BaseScreenHandler; + public abstract class ComponentEntityFluidInventoryHandledScreen extends ComponentEntityHandledScreen { public ComponentEntityFluidInventoryHandledScreen(BaseScreenHandler handler, PlayerInventory inventory, Text title) { super(handler, inventory, title); diff --git a/astromine-core/src/main/java/com/github/chainmailstudios/astromine/client/screen/base/entity/ComponentEntityHandledScreen.java b/astromine-core/src/main/java/com/github/chainmailstudios/astromine/client/screen/base/entity/ComponentEntityHandledScreen.java index e4bee7a5f..1232e6bbb 100644 --- a/astromine-core/src/main/java/com/github/chainmailstudios/astromine/client/screen/base/entity/ComponentEntityHandledScreen.java +++ b/astromine-core/src/main/java/com/github/chainmailstudios/astromine/client/screen/base/entity/ComponentEntityHandledScreen.java @@ -24,11 +24,12 @@ package com.github.chainmailstudios.astromine.client.screen.base.entity; +import net.minecraft.entity.player.PlayerInventory; +import net.minecraft.text.Text; + import com.github.chainmailstudios.astromine.client.screen.base.BladeHandledScreen; import com.github.chainmailstudios.astromine.common.screenhandler.base.entity.ComponentEntityScreenHandler; import com.github.vini2003.blade.common.handler.BaseScreenHandler; -import net.minecraft.entity.player.PlayerInventory; -import net.minecraft.text.Text; public class ComponentEntityHandledScreen extends BladeHandledScreen { public ComponentEntityHandledScreen(BaseScreenHandler handler, PlayerInventory inventory, Text title) { diff --git a/astromine-core/src/main/java/com/github/chainmailstudios/astromine/common/block/base/BlockWithEntity.java b/astromine-core/src/main/java/com/github/chainmailstudios/astromine/common/block/base/BlockWithEntity.java index b079c0f99..2b4e5a27e 100644 --- a/astromine-core/src/main/java/com/github/chainmailstudios/astromine/common/block/base/BlockWithEntity.java +++ b/astromine-core/src/main/java/com/github/chainmailstudios/astromine/common/block/base/BlockWithEntity.java @@ -24,8 +24,6 @@ package com.github.chainmailstudios.astromine.common.block.base; -import com.github.chainmailstudios.astromine.common.item.base.EnergyVolumeItem; -import com.github.chainmailstudios.astromine.common.item.base.FluidVolumeItem; import net.fabricmc.fabric.api.screenhandler.v1.ExtendedScreenHandlerFactory; import net.minecraft.block.AbstractBlock; @@ -57,6 +55,9 @@ import net.minecraft.world.BlockView; import net.minecraft.world.World; +import com.github.chainmailstudios.astromine.common.item.base.EnergyVolumeItem; +import com.github.chainmailstudios.astromine.common.item.base.FluidVolumeItem; + import java.util.List; public abstract class BlockWithEntity extends Block implements BlockEntityProvider { diff --git a/astromine-core/src/main/java/com/github/chainmailstudios/astromine/common/block/base/CableBlock.java b/astromine-core/src/main/java/com/github/chainmailstudios/astromine/common/block/base/CableBlock.java index 0b6c32b23..6486d3d72 100644 --- a/astromine-core/src/main/java/com/github/chainmailstudios/astromine/common/block/base/CableBlock.java +++ b/astromine-core/src/main/java/com/github/chainmailstudios/astromine/common/block/base/CableBlock.java @@ -24,7 +24,12 @@ package com.github.chainmailstudios.astromine.common.block.base; -import net.minecraft.block.*; +import net.minecraft.block.AbstractBlock; +import net.minecraft.block.Block; +import net.minecraft.block.BlockState; +import net.minecraft.block.Blocks; +import net.minecraft.block.ShapeContext; +import net.minecraft.block.Waterloggable; import net.minecraft.entity.LivingEntity; import net.minecraft.fluid.FluidState; import net.minecraft.fluid.Fluids; diff --git a/astromine-core/src/main/java/com/github/chainmailstudios/astromine/common/block/base/WrenchableHorizontalFacingTieredBlockWithEntity.java b/astromine-core/src/main/java/com/github/chainmailstudios/astromine/common/block/base/WrenchableHorizontalFacingTieredBlockWithEntity.java index 1eba0cf44..06f1479ad 100644 --- a/astromine-core/src/main/java/com/github/chainmailstudios/astromine/common/block/base/WrenchableHorizontalFacingTieredBlockWithEntity.java +++ b/astromine-core/src/main/java/com/github/chainmailstudios/astromine/common/block/base/WrenchableHorizontalFacingTieredBlockWithEntity.java @@ -24,7 +24,6 @@ package com.github.chainmailstudios.astromine.common.block.base; -import com.github.chainmailstudios.astromine.AstromineCommon; import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.block.entity.BlockEntity; @@ -43,6 +42,8 @@ import net.minecraft.util.registry.Registry; import net.minecraft.world.World; +import com.github.chainmailstudios.astromine.AstromineCommon; + import java.util.Locale; import java.util.Optional; import java.util.Random; diff --git a/astromine-core/src/main/java/com/github/chainmailstudios/astromine/common/block/entity/base/ComponentBlockEntity.java b/astromine-core/src/main/java/com/github/chainmailstudios/astromine/common/block/entity/base/ComponentBlockEntity.java index 3daa104b3..6f336d4f9 100644 --- a/astromine-core/src/main/java/com/github/chainmailstudios/astromine/common/block/entity/base/ComponentBlockEntity.java +++ b/astromine-core/src/main/java/com/github/chainmailstudios/astromine/common/block/entity/base/ComponentBlockEntity.java @@ -24,8 +24,6 @@ package com.github.chainmailstudios.astromine.common.block.entity.base; -import com.github.chainmailstudios.astromine.common.block.base.BlockWithEntity; -import com.github.chainmailstudios.astromine.common.utilities.capability.inventory.ExtendedComponentSidedInventoryProvider; import net.fabricmc.fabric.api.block.entity.BlockEntityClientSerializable; import net.fabricmc.fabric.api.network.PacketContext; @@ -46,12 +44,14 @@ import alexiil.mc.lib.attributes.item.ItemExtractable; import alexiil.mc.lib.attributes.item.ItemInsertable; import com.github.chainmailstudios.astromine.AstromineCommon; +import com.github.chainmailstudios.astromine.common.block.base.BlockWithEntity; import com.github.chainmailstudios.astromine.common.block.transfer.TransferType; import com.github.chainmailstudios.astromine.common.component.SidedComponentProvider; import com.github.chainmailstudios.astromine.common.component.block.entity.BlockEntityTransferComponent; import com.github.chainmailstudios.astromine.common.component.inventory.FluidInventoryComponent; import com.github.chainmailstudios.astromine.common.packet.PacketConsumer; import com.github.chainmailstudios.astromine.common.utilities.TransportUtilities; +import com.github.chainmailstudios.astromine.common.utilities.capability.inventory.ExtendedComponentSidedInventoryProvider; import com.github.chainmailstudios.astromine.common.volume.fluid.FluidVolume; import com.github.chainmailstudios.astromine.registry.AstromineComponentTypes; import nerdhub.cardinal.components.api.ComponentRegistry; @@ -72,19 +72,14 @@ import java.util.stream.Collectors; public abstract class ComponentBlockEntity extends net.minecraft.block.entity.BlockEntity implements SidedComponentProvider, PacketConsumer, BlockEntityClientSerializable, Tickable { + public static final Identifier TRANSFER_UPDATE_PACKET = AstromineCommon.identifier("transfer_update_packet"); protected final BlockEntityTransferComponent transferComponent = new BlockEntityTransferComponent(); - protected final Map, Component> allComponents = Maps.newHashMap(); - protected final Map> allHandlers = Maps.newHashMap(); - - protected boolean skipInventory = true; - public boolean isActive = false; public boolean[] activity = { false, false, false, false, false }; - - public static final Identifier TRANSFER_UPDATE_PACKET = AstromineCommon.identifier("transfer_update_packet"); + protected boolean skipInventory = true; public ComponentBlockEntity(BlockEntityType type) { super(type); diff --git a/astromine-core/src/main/java/com/github/chainmailstudios/astromine/common/block/entity/base/ComponentEnergyBlockEntity.java b/astromine-core/src/main/java/com/github/chainmailstudios/astromine/common/block/entity/base/ComponentEnergyBlockEntity.java index d34ca5eb8..05523dd26 100644 --- a/astromine-core/src/main/java/com/github/chainmailstudios/astromine/common/block/entity/base/ComponentEnergyBlockEntity.java +++ b/astromine-core/src/main/java/com/github/chainmailstudios/astromine/common/block/entity/base/ComponentEnergyBlockEntity.java @@ -24,19 +24,16 @@ package com.github.chainmailstudios.astromine.common.block.entity.base; -import com.github.chainmailstudios.astromine.common.component.inventory.EnergyInventoryComponent; -import com.github.chainmailstudios.astromine.common.utilities.capability.energy.ExtendedEnergyProvider; - import net.minecraft.block.Block; import net.minecraft.block.entity.BlockEntityType; +import com.github.chainmailstudios.astromine.common.component.inventory.EnergyInventoryComponent; +import com.github.chainmailstudios.astromine.common.utilities.capability.energy.ExtendedEnergyProvider; import com.github.chainmailstudios.astromine.registry.AstromineComponentTypes; public abstract class ComponentEnergyBlockEntity extends ComponentBlockEntity implements ExtendedEnergyProvider { protected final EnergyInventoryComponent energyComponent = createEnergyComponent(); - protected abstract EnergyInventoryComponent createEnergyComponent(); - public ComponentEnergyBlockEntity(Block energyBlock, BlockEntityType type) { super(type); @@ -44,6 +41,8 @@ public ComponentEnergyBlockEntity(Block energyBlock, BlockEntityType type) { addComponent(AstromineComponentTypes.ENERGY_INVENTORY_COMPONENT, energyComponent); } + protected abstract EnergyInventoryComponent createEnergyComponent(); + @Override public EnergyInventoryComponent getEnergyComponent() { return energyComponent; diff --git a/astromine-core/src/main/java/com/github/chainmailstudios/astromine/common/block/entity/base/ComponentEnergyFluidBlockEntity.java b/astromine-core/src/main/java/com/github/chainmailstudios/astromine/common/block/entity/base/ComponentEnergyFluidBlockEntity.java index 9460685bd..a58131867 100644 --- a/astromine-core/src/main/java/com/github/chainmailstudios/astromine/common/block/entity/base/ComponentEnergyFluidBlockEntity.java +++ b/astromine-core/src/main/java/com/github/chainmailstudios/astromine/common/block/entity/base/ComponentEnergyFluidBlockEntity.java @@ -36,8 +36,6 @@ public abstract class ComponentEnergyFluidBlockEntity extends ComponentEnergyBlockEntity implements SidedComponentProvider, BlockEntityClientSerializable { protected final FluidInventoryComponent fluidComponent = createFluidComponent(); - protected abstract FluidInventoryComponent createFluidComponent(); - public ComponentEnergyFluidBlockEntity(Block energyBlock, BlockEntityType type) { super(energyBlock, type); @@ -45,6 +43,8 @@ public ComponentEnergyFluidBlockEntity(Block energyBlock, BlockEntityType typ fluidComponent.dispatchConsumers(); } + protected abstract FluidInventoryComponent createFluidComponent(); + public FluidInventoryComponent getFluidComponent() { return fluidComponent; } diff --git a/astromine-core/src/main/java/com/github/chainmailstudios/astromine/common/block/entity/base/ComponentEnergyInventoryBlockEntity.java b/astromine-core/src/main/java/com/github/chainmailstudios/astromine/common/block/entity/base/ComponentEnergyInventoryBlockEntity.java index 09663f99b..3c10217a4 100644 --- a/astromine-core/src/main/java/com/github/chainmailstudios/astromine/common/block/entity/base/ComponentEnergyInventoryBlockEntity.java +++ b/astromine-core/src/main/java/com/github/chainmailstudios/astromine/common/block/entity/base/ComponentEnergyInventoryBlockEntity.java @@ -24,24 +24,24 @@ package com.github.chainmailstudios.astromine.common.block.entity.base; -import com.github.chainmailstudios.astromine.common.utilities.capability.inventory.ExtendedComponentSidedInventoryProvider; import net.minecraft.block.Block; import net.minecraft.block.entity.BlockEntityType; import com.github.chainmailstudios.astromine.common.component.inventory.ItemInventoryComponent; +import com.github.chainmailstudios.astromine.common.utilities.capability.inventory.ExtendedComponentSidedInventoryProvider; import com.github.chainmailstudios.astromine.registry.AstromineComponentTypes; public abstract class ComponentEnergyInventoryBlockEntity extends ComponentEnergyBlockEntity implements ExtendedComponentSidedInventoryProvider { protected final ItemInventoryComponent itemComponent = createItemComponent(); - protected abstract ItemInventoryComponent createItemComponent(); - public ComponentEnergyInventoryBlockEntity(Block energyBlock, BlockEntityType type) { super(energyBlock, type); addComponent(AstromineComponentTypes.ITEM_INVENTORY_COMPONENT, itemComponent); } + protected abstract ItemInventoryComponent createItemComponent(); + public ItemInventoryComponent getItemComponent() { return itemComponent; } diff --git a/astromine-core/src/main/java/com/github/chainmailstudios/astromine/common/block/entity/base/ComponentFluidBlockEntity.java b/astromine-core/src/main/java/com/github/chainmailstudios/astromine/common/block/entity/base/ComponentFluidBlockEntity.java index 22f99361f..f9446570b 100644 --- a/astromine-core/src/main/java/com/github/chainmailstudios/astromine/common/block/entity/base/ComponentFluidBlockEntity.java +++ b/astromine-core/src/main/java/com/github/chainmailstudios/astromine/common/block/entity/base/ComponentFluidBlockEntity.java @@ -35,8 +35,6 @@ public abstract class ComponentFluidBlockEntity extends ComponentBlockEntity implements SidedComponentProvider, BlockEntityClientSerializable { protected final FluidInventoryComponent fluidComponent = createFluidComponent(); - protected abstract FluidInventoryComponent createFluidComponent(); - public ComponentFluidBlockEntity(BlockEntityType type) { super(type); @@ -44,6 +42,8 @@ public ComponentFluidBlockEntity(BlockEntityType type) { fluidComponent.dispatchConsumers(); } + protected abstract FluidInventoryComponent createFluidComponent(); + public FluidInventoryComponent getFluidComponent() { return fluidComponent; } diff --git a/astromine-core/src/main/java/com/github/chainmailstudios/astromine/common/block/entity/base/ComponentFluidInventoryBlockEntity.java b/astromine-core/src/main/java/com/github/chainmailstudios/astromine/common/block/entity/base/ComponentFluidInventoryBlockEntity.java index baaf00243..1328ccbda 100644 --- a/astromine-core/src/main/java/com/github/chainmailstudios/astromine/common/block/entity/base/ComponentFluidInventoryBlockEntity.java +++ b/astromine-core/src/main/java/com/github/chainmailstudios/astromine/common/block/entity/base/ComponentFluidInventoryBlockEntity.java @@ -24,16 +24,15 @@ package com.github.chainmailstudios.astromine.common.block.entity.base; +import net.minecraft.block.entity.BlockEntityType; + import com.github.chainmailstudios.astromine.common.component.inventory.ItemInventoryComponent; import com.github.chainmailstudios.astromine.common.utilities.capability.inventory.ExtendedComponentSidedInventoryProvider; import com.github.chainmailstudios.astromine.registry.AstromineComponentTypes; -import net.minecraft.block.entity.BlockEntityType; public abstract class ComponentFluidInventoryBlockEntity extends ComponentFluidBlockEntity implements ExtendedComponentSidedInventoryProvider { protected final ItemInventoryComponent itemComponent = createItemComponent(); - protected abstract ItemInventoryComponent createItemComponent(); - public ComponentFluidInventoryBlockEntity(BlockEntityType type) { super(type); @@ -41,6 +40,8 @@ public ComponentFluidInventoryBlockEntity(BlockEntityType type) { itemComponent.dispatchConsumers(); } + protected abstract ItemInventoryComponent createItemComponent(); + public ItemInventoryComponent getItemComponent() { return itemComponent; } diff --git a/astromine-core/src/main/java/com/github/chainmailstudios/astromine/common/block/entity/base/ComponentInventoryBlockEntity.java b/astromine-core/src/main/java/com/github/chainmailstudios/astromine/common/block/entity/base/ComponentInventoryBlockEntity.java index fae254a8f..c674a92bb 100644 --- a/astromine-core/src/main/java/com/github/chainmailstudios/astromine/common/block/entity/base/ComponentInventoryBlockEntity.java +++ b/astromine-core/src/main/java/com/github/chainmailstudios/astromine/common/block/entity/base/ComponentInventoryBlockEntity.java @@ -24,23 +24,23 @@ package com.github.chainmailstudios.astromine.common.block.entity.base; -import com.github.chainmailstudios.astromine.common.utilities.capability.inventory.ExtendedComponentSidedInventoryProvider; import net.minecraft.block.entity.BlockEntityType; import com.github.chainmailstudios.astromine.common.component.inventory.ItemInventoryComponent; +import com.github.chainmailstudios.astromine.common.utilities.capability.inventory.ExtendedComponentSidedInventoryProvider; import com.github.chainmailstudios.astromine.registry.AstromineComponentTypes; public abstract class ComponentInventoryBlockEntity extends ComponentBlockEntity implements ExtendedComponentSidedInventoryProvider { protected final ItemInventoryComponent itemComponent = createItemComponent(); - protected abstract ItemInventoryComponent createItemComponent(); - public ComponentInventoryBlockEntity(BlockEntityType type) { super(type); addComponent(AstromineComponentTypes.ITEM_INVENTORY_COMPONENT, itemComponent); } + protected abstract ItemInventoryComponent createItemComponent(); + public ItemInventoryComponent getItemComponent() { return itemComponent; } diff --git a/astromine-core/src/main/java/com/github/chainmailstudios/astromine/common/callback/ServerChunkTickCallback.java b/astromine-core/src/main/java/com/github/chainmailstudios/astromine/common/callback/ServerChunkTickCallback.java index 2abe5f757..9142b7523 100644 --- a/astromine-core/src/main/java/com/github/chainmailstudios/astromine/common/callback/ServerChunkTickCallback.java +++ b/astromine-core/src/main/java/com/github/chainmailstudios/astromine/common/callback/ServerChunkTickCallback.java @@ -26,6 +26,7 @@ import net.fabricmc.fabric.api.event.Event; import net.fabricmc.fabric.api.event.EventFactory; + import net.minecraft.server.world.ServerWorld; import net.minecraft.world.chunk.WorldChunk; diff --git a/astromine-core/src/main/java/com/github/chainmailstudios/astromine/common/component/SidedComponentProvider.java b/astromine-core/src/main/java/com/github/chainmailstudios/astromine/common/component/SidedComponentProvider.java index 4090c38b5..fc87bcfe1 100644 --- a/astromine-core/src/main/java/com/github/chainmailstudios/astromine/common/component/SidedComponentProvider.java +++ b/astromine-core/src/main/java/com/github/chainmailstudios/astromine/common/component/SidedComponentProvider.java @@ -36,14 +36,14 @@ import java.util.Optional; public interface SidedComponentProvider extends nerdhub.cardinal.components.api.component.ComponentProvider { + static SidedComponentProvider fromBlockEntity(BlockEntity blockEntity) { + return blockEntity instanceof SidedComponentProvider ? (SidedComponentProvider) blockEntity : null; + } + Collection getSidedComponents(@Nullable Direction direction); default T getSidedComponent(@Nullable Direction direction, @NotNull ComponentType type) { Optional optional = (Optional) getSidedComponents(direction).stream().filter(component -> type.getComponentClass().isInstance(component)).findFirst(); return optional.orElse(null); } - - static SidedComponentProvider fromBlockEntity(BlockEntity blockEntity) { - return blockEntity instanceof SidedComponentProvider ? (SidedComponentProvider) blockEntity : null; - } } diff --git a/astromine-core/src/main/java/com/github/chainmailstudios/astromine/common/component/block/entity/BlockEntityTransferComponent.java b/astromine-core/src/main/java/com/github/chainmailstudios/astromine/common/component/block/entity/BlockEntityTransferComponent.java index 41a73225f..204c666ab 100644 --- a/astromine-core/src/main/java/com/github/chainmailstudios/astromine/common/component/block/entity/BlockEntityTransferComponent.java +++ b/astromine-core/src/main/java/com/github/chainmailstudios/astromine/common/component/block/entity/BlockEntityTransferComponent.java @@ -24,6 +24,10 @@ package com.github.chainmailstudios.astromine.common.component.block.entity; +import net.minecraft.nbt.CompoundTag; +import net.minecraft.util.Identifier; +import net.minecraft.util.math.Direction; + import com.github.chainmailstudios.astromine.common.block.transfer.TransferType; import com.github.chainmailstudios.astromine.common.utilities.DirectionUtilities; import it.unimi.dsi.fastutil.objects.Reference2ReferenceMap; @@ -31,9 +35,6 @@ import nerdhub.cardinal.components.api.ComponentRegistry; import nerdhub.cardinal.components.api.ComponentType; import nerdhub.cardinal.components.api.component.Component; -import net.minecraft.nbt.CompoundTag; -import net.minecraft.util.Identifier; -import net.minecraft.util.math.Direction; import org.jetbrains.annotations.NotNull; import java.util.Map; diff --git a/astromine-core/src/main/java/com/github/chainmailstudios/astromine/common/component/inventory/EnergyInventoryComponent.java b/astromine-core/src/main/java/com/github/chainmailstudios/astromine/common/component/inventory/EnergyInventoryComponent.java index cfea8e224..23ddbc756 100644 --- a/astromine-core/src/main/java/com/github/chainmailstudios/astromine/common/component/inventory/EnergyInventoryComponent.java +++ b/astromine-core/src/main/java/com/github/chainmailstudios/astromine/common/component/inventory/EnergyInventoryComponent.java @@ -24,17 +24,19 @@ package com.github.chainmailstudios.astromine.common.component.inventory; -import com.github.chainmailstudios.astromine.common.volume.energy.EnergyVolume; -import com.github.chainmailstudios.astromine.registry.AstromineComponentTypes; -import com.github.chainmailstudios.astromine.registry.AstromineItems; -import nerdhub.cardinal.components.api.ComponentType; import net.fabricmc.fabric.api.util.NbtType; + import net.minecraft.item.Item; import net.minecraft.nbt.CompoundTag; import net.minecraft.text.TranslatableText; import net.minecraft.util.ActionResult; import net.minecraft.util.TypedActionResult; import net.minecraft.util.math.Direction; + +import com.github.chainmailstudios.astromine.common.volume.energy.EnergyVolume; +import com.github.chainmailstudios.astromine.registry.AstromineComponentTypes; +import com.github.chainmailstudios.astromine.registry.AstromineItems; +import nerdhub.cardinal.components.api.ComponentType; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -47,6 +49,11 @@ public interface EnergyInventoryComponent extends NameableComponent { EnergyVolume getVolume(); + default void setVolume(EnergyVolume volume) { + getVolume().setSize(volume.getSize()); + getVolume().setAmount(volume.getAmount()); + } + default Item getSymbol() { return AstromineItems.ENERGY.asItem(); } @@ -92,11 +99,6 @@ default TypedActionResult insert(Direction direction, double amoun return new TypedActionResult<>(ActionResult.FAIL, null); } - default void setVolume(EnergyVolume volume) { - getVolume().setSize(volume.getSize()); - getVolume().setAmount(volume.getAmount()); - } - default void dispatchConsumers() { this.getListeners().forEach(Runnable::run); } @@ -215,19 +217,19 @@ default boolean isEmpty() { return AstromineComponentTypes.ENERGY_INVENTORY_COMPONENT; } - default void setAmount(double amount) { - getVolume().setAmount(amount); - } - default double getAmount() { return getVolume().getAmount(); } - default void setSize(double amount) { - getVolume().setSize(amount); + default void setAmount(double amount) { + getVolume().setAmount(amount); } default double getSize() { return getVolume().getSize(); } + + default void setSize(double amount) { + getVolume().setSize(amount); + } } diff --git a/astromine-core/src/main/java/com/github/chainmailstudios/astromine/common/component/inventory/FluidInventoryComponent.java b/astromine-core/src/main/java/com/github/chainmailstudios/astromine/common/component/inventory/FluidInventoryComponent.java index f46d51a30..1f058005a 100644 --- a/astromine-core/src/main/java/com/github/chainmailstudios/astromine/common/component/inventory/FluidInventoryComponent.java +++ b/astromine-core/src/main/java/com/github/chainmailstudios/astromine/common/component/inventory/FluidInventoryComponent.java @@ -33,9 +33,9 @@ import net.minecraft.util.math.Direction; import com.github.chainmailstudios.astromine.AstromineCommon; -import com.github.chainmailstudios.astromine.common.volume.fraction.Fraction; import com.github.chainmailstudios.astromine.common.utilities.data.Range; import com.github.chainmailstudios.astromine.common.volume.fluid.FluidVolume; +import com.github.chainmailstudios.astromine.common.volume.fraction.Fraction; import com.github.chainmailstudios.astromine.registry.AstromineComponentTypes; import com.github.chainmailstudios.astromine.registry.AstromineItems; import nerdhub.cardinal.components.api.ComponentType; diff --git a/astromine-core/src/main/java/com/github/chainmailstudios/astromine/common/component/inventory/ItemInventoryComponent.java b/astromine-core/src/main/java/com/github/chainmailstudios/astromine/common/component/inventory/ItemInventoryComponent.java index ecd237f94..ecaf02135 100644 --- a/astromine-core/src/main/java/com/github/chainmailstudios/astromine/common/component/inventory/ItemInventoryComponent.java +++ b/astromine-core/src/main/java/com/github/chainmailstudios/astromine/common/component/inventory/ItemInventoryComponent.java @@ -24,7 +24,6 @@ package com.github.chainmailstudios.astromine.common.component.inventory; -import com.github.chainmailstudios.astromine.common.component.inventory.compatibility.ItemInventoryFromInventoryComponent; import net.minecraft.inventory.Inventory; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -36,6 +35,7 @@ import net.minecraft.util.math.Direction; import com.github.chainmailstudios.astromine.AstromineCommon; +import com.github.chainmailstudios.astromine.common.component.inventory.compatibility.ItemInventoryFromInventoryComponent; import com.github.chainmailstudios.astromine.common.utilities.data.Range; import com.github.chainmailstudios.astromine.registry.AstromineComponentTypes; import com.github.chainmailstudios.astromine.registry.AstromineItems; diff --git a/astromine-core/src/main/java/com/github/chainmailstudios/astromine/common/component/inventory/SimpleEnergyInventoryComponent.java b/astromine-core/src/main/java/com/github/chainmailstudios/astromine/common/component/inventory/SimpleEnergyInventoryComponent.java index 7f8cf46be..d12f87d67 100644 --- a/astromine-core/src/main/java/com/github/chainmailstudios/astromine/common/component/inventory/SimpleEnergyInventoryComponent.java +++ b/astromine-core/src/main/java/com/github/chainmailstudios/astromine/common/component/inventory/SimpleEnergyInventoryComponent.java @@ -24,9 +24,10 @@ package com.github.chainmailstudios.astromine.common.component.inventory; -import com.github.chainmailstudios.astromine.common.volume.energy.EnergyVolume; import net.minecraft.nbt.CompoundTag; +import com.github.chainmailstudios.astromine.common.volume.energy.EnergyVolume; + import java.util.ArrayList; import java.util.List; diff --git a/astromine-core/src/main/java/com/github/chainmailstudios/astromine/common/component/inventory/SimpleFluidInventoryComponent.java b/astromine-core/src/main/java/com/github/chainmailstudios/astromine/common/component/inventory/SimpleFluidInventoryComponent.java index 7602c6d63..8b5bf7753 100644 --- a/astromine-core/src/main/java/com/github/chainmailstudios/astromine/common/component/inventory/SimpleFluidInventoryComponent.java +++ b/astromine-core/src/main/java/com/github/chainmailstudios/astromine/common/component/inventory/SimpleFluidInventoryComponent.java @@ -24,12 +24,12 @@ package com.github.chainmailstudios.astromine.common.component.inventory; -import com.github.chainmailstudios.astromine.common.utilities.data.predicate.TriPredicate; -import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap; import net.minecraft.nbt.CompoundTag; +import net.minecraft.util.math.Direction; +import com.github.chainmailstudios.astromine.common.utilities.data.predicate.TriPredicate; import com.github.chainmailstudios.astromine.common.volume.fluid.FluidVolume; -import net.minecraft.util.math.Direction; +import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap; import org.jetbrains.annotations.Nullable; import java.util.ArrayList; @@ -41,12 +41,10 @@ public class SimpleFluidInventoryComponent implements FluidInventoryComponent { private final Map contents = new Int2ObjectOpenHashMap<>(); private final List listeners = new ArrayList<>(); - + private final int size; private TriPredicate<@Nullable Direction, FluidVolume, Integer> insertPredicate = (direction, volume, slot) -> true; private TriPredicate<@Nullable Direction, FluidVolume, Integer> extractPredicate = (direction, volume, integer) -> true; - private final int size; - public SimpleFluidInventoryComponent() { this(0); } diff --git a/astromine-core/src/main/java/com/github/chainmailstudios/astromine/common/component/inventory/SimpleItemInventoryComponent.java b/astromine-core/src/main/java/com/github/chainmailstudios/astromine/common/component/inventory/SimpleItemInventoryComponent.java index 14f562a5e..203d9fcc4 100644 --- a/astromine-core/src/main/java/com/github/chainmailstudios/astromine/common/component/inventory/SimpleItemInventoryComponent.java +++ b/astromine-core/src/main/java/com/github/chainmailstudios/astromine/common/component/inventory/SimpleItemInventoryComponent.java @@ -24,12 +24,12 @@ package com.github.chainmailstudios.astromine.common.component.inventory; -import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundTag; import net.minecraft.util.math.Direction; import com.github.chainmailstudios.astromine.common.utilities.data.predicate.TriPredicate; +import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap; import org.jetbrains.annotations.Nullable; import java.util.ArrayList; diff --git a/astromine-core/src/main/java/com/github/chainmailstudios/astromine/common/component/world/ChunkAtmosphereComponent.java b/astromine-core/src/main/java/com/github/chainmailstudios/astromine/common/component/world/ChunkAtmosphereComponent.java index f69cbce40..b743a3169 100644 --- a/astromine-core/src/main/java/com/github/chainmailstudios/astromine/common/component/world/ChunkAtmosphereComponent.java +++ b/astromine-core/src/main/java/com/github/chainmailstudios/astromine/common/component/world/ChunkAtmosphereComponent.java @@ -24,16 +24,8 @@ package com.github.chainmailstudios.astromine.common.component.world; -import com.github.chainmailstudios.astromine.client.cca.ClientAtmosphereManager; -import com.github.chainmailstudios.astromine.common.volume.fluid.FluidVolume; -import com.github.chainmailstudios.astromine.common.volume.fraction.Fraction; -import com.github.chainmailstudios.astromine.registry.AstromineComponentTypes; -import com.github.chainmailstudios.astromine.registry.AstromineConfig; -import com.google.common.collect.Lists; -import nerdhub.cardinal.components.api.ComponentType; -import nerdhub.cardinal.components.api.component.ComponentProvider; -import nerdhub.cardinal.components.api.component.extension.CopyableComponent; import net.fabricmc.fabric.api.network.ServerSidePacketRegistry; + import net.minecraft.nbt.CompoundTag; import net.minecraft.state.property.Properties; import net.minecraft.util.Tickable; @@ -44,6 +36,16 @@ import net.minecraft.world.World; import net.minecraft.world.chunk.Chunk; +import com.github.chainmailstudios.astromine.client.cca.ClientAtmosphereManager; +import com.github.chainmailstudios.astromine.common.volume.fluid.FluidVolume; +import com.github.chainmailstudios.astromine.common.volume.fraction.Fraction; +import com.github.chainmailstudios.astromine.registry.AstromineComponentTypes; +import com.github.chainmailstudios.astromine.registry.AstromineConfig; +import nerdhub.cardinal.components.api.ComponentType; +import nerdhub.cardinal.components.api.component.ComponentProvider; +import nerdhub.cardinal.components.api.component.extension.CopyableComponent; + +import com.google.common.collect.Lists; import java.util.Collections; import java.util.List; import java.util.Map; @@ -62,6 +64,23 @@ public ChunkAtmosphereComponent(World world, Chunk chunk) { this.chunk = chunk; } + public static boolean isInChunk(ChunkPos chunkPos, BlockPos pos) { + return pos.getX() >= chunkPos.getStartX() && pos.getX() <= chunkPos.getEndX() && pos.getZ() >= chunkPos.getStartZ() && pos.getZ() <= chunkPos.getEndZ(); + } + + public static ChunkPos getNeighborFromPos(ChunkPos chunkPos, BlockPos pos) { + if (pos.getX() < chunkPos.getStartX()) { + return new ChunkPos(chunkPos.x - 1, chunkPos.z); + } else if (pos.getX() > chunkPos.getEndX()) { + return new ChunkPos(chunkPos.x + 1, chunkPos.z); + } else if (pos.getZ() < chunkPos.getStartZ()) { + return new ChunkPos(chunkPos.x, chunkPos.z - 1); + } else if (pos.getZ() > chunkPos.getEndZ()) { + return new ChunkPos(chunkPos.x, chunkPos.z + 1); + } + return chunkPos; + } + public World getWorld() { return world; } @@ -168,23 +187,6 @@ public ChunkPos getNeighborFromPos(BlockPos pos) { return getNeighborFromPos(chunk.getPos(), pos); } - public static boolean isInChunk(ChunkPos chunkPos, BlockPos pos) { - return pos.getX() >= chunkPos.getStartX() && pos.getX() <= chunkPos.getEndX() && pos.getZ() >= chunkPos.getStartZ() && pos.getZ() <= chunkPos.getEndZ(); - } - - public static ChunkPos getNeighborFromPos(ChunkPos chunkPos, BlockPos pos) { - if (pos.getX() < chunkPos.getStartX()) { - return new ChunkPos(chunkPos.x - 1, chunkPos.z); - } else if (pos.getX() > chunkPos.getEndX()) { - return new ChunkPos(chunkPos.x + 1, chunkPos.z); - } else if (pos.getZ() < chunkPos.getStartZ()) { - return new ChunkPos(chunkPos.x, chunkPos.z - 1); - } else if (pos.getZ() > chunkPos.getEndZ()) { - return new ChunkPos(chunkPos.x, chunkPos.z + 1); - } - return chunkPos; - } - @Override public CompoundTag toTag(CompoundTag tag) { CompoundTag dataTag = new CompoundTag(); diff --git a/astromine-core/src/main/java/com/github/chainmailstudios/astromine/common/entity/base/ComponentFluidInventoryEntity.java b/astromine-core/src/main/java/com/github/chainmailstudios/astromine/common/entity/base/ComponentFluidInventoryEntity.java index b337ad67a..8434b253f 100644 --- a/astromine-core/src/main/java/com/github/chainmailstudios/astromine/common/entity/base/ComponentFluidInventoryEntity.java +++ b/astromine-core/src/main/java/com/github/chainmailstudios/astromine/common/entity/base/ComponentFluidInventoryEntity.java @@ -24,12 +24,12 @@ package com.github.chainmailstudios.astromine.common.entity.base; -import com.github.chainmailstudios.astromine.common.utilities.capability.inventory.ExtendedInventoryProvider; import net.minecraft.entity.EntityType; import net.minecraft.world.World; import com.github.chainmailstudios.astromine.common.component.inventory.FluidInventoryComponent; import com.github.chainmailstudios.astromine.common.component.inventory.ItemInventoryComponent; +import com.github.chainmailstudios.astromine.common.utilities.capability.inventory.ExtendedInventoryProvider; import com.github.chainmailstudios.astromine.registry.AstromineComponentTypes; import nerdhub.cardinal.components.api.component.ComponentProvider; diff --git a/astromine-core/src/main/java/com/github/chainmailstudios/astromine/common/item/DrillItem.java b/astromine-core/src/main/java/com/github/chainmailstudios/astromine/common/item/DrillItem.java index 2f4bc9ac8..3aafd5b8f 100644 --- a/astromine-core/src/main/java/com/github/chainmailstudios/astromine/common/item/DrillItem.java +++ b/astromine-core/src/main/java/com/github/chainmailstudios/astromine/common/item/DrillItem.java @@ -24,12 +24,8 @@ package com.github.chainmailstudios.astromine.common.item; -import com.github.chainmailstudios.astromine.common.item.base.EnergyVolumeItem; -import com.github.chainmailstudios.astromine.registry.AstromineConfig; -import com.google.common.collect.ImmutableMultimap; -import com.google.common.collect.Multimap; -import draylar.magna.api.MagnaTool; import net.fabricmc.fabric.api.tool.attribute.v1.DynamicAttributeTool; + import net.minecraft.block.BlockState; import net.minecraft.entity.EquipmentSlot; import net.minecraft.entity.LivingEntity; @@ -43,9 +39,16 @@ import net.minecraft.tag.Tag; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; + +import com.github.chainmailstudios.astromine.common.item.base.EnergyVolumeItem; +import com.github.chainmailstudios.astromine.registry.AstromineConfig; +import draylar.magna.api.MagnaTool; import team.reborn.energy.Energy; import team.reborn.energy.EnergyHandler; +import com.google.common.collect.ImmutableMultimap; +import com.google.common.collect.Multimap; + public class DrillItem extends EnergyVolumeItem implements DynamicAttributeTool, Vanishable, MagnaTool, DiggerTool { private final int radius; private final ToolMaterial material; diff --git a/astromine-core/src/main/java/com/github/chainmailstudios/astromine/common/item/base/BaseVolumeBlockItem.java b/astromine-core/src/main/java/com/github/chainmailstudios/astromine/common/item/base/BaseVolumeBlockItem.java index cd579d427..b3dd0dc50 100644 --- a/astromine-core/src/main/java/com/github/chainmailstudios/astromine/common/item/base/BaseVolumeBlockItem.java +++ b/astromine-core/src/main/java/com/github/chainmailstudios/astromine/common/item/base/BaseVolumeBlockItem.java @@ -24,10 +24,11 @@ package com.github.chainmailstudios.astromine.common.item.base; -import com.github.chainmailstudios.astromine.common.volume.base.Volume; import net.minecraft.block.Block; import net.minecraft.item.BlockItem; +import com.github.chainmailstudios.astromine.common.volume.base.Volume; + public abstract class BaseVolumeBlockItem> extends BlockItem { public BaseVolumeBlockItem(Block block, Settings settings) { super(block, settings); diff --git a/astromine-core/src/main/java/com/github/chainmailstudios/astromine/common/item/base/BaseVolumeItem.java b/astromine-core/src/main/java/com/github/chainmailstudios/astromine/common/item/base/BaseVolumeItem.java index 76237f395..c2ef33485 100644 --- a/astromine-core/src/main/java/com/github/chainmailstudios/astromine/common/item/base/BaseVolumeItem.java +++ b/astromine-core/src/main/java/com/github/chainmailstudios/astromine/common/item/base/BaseVolumeItem.java @@ -24,9 +24,10 @@ package com.github.chainmailstudios.astromine.common.item.base; -import com.github.chainmailstudios.astromine.common.volume.base.Volume; import net.minecraft.item.Item; +import com.github.chainmailstudios.astromine.common.volume.base.Volume; + public abstract class BaseVolumeItem> extends Item { public BaseVolumeItem(Item.Settings settings) { super(settings); diff --git a/astromine-core/src/main/java/com/github/chainmailstudios/astromine/common/item/base/EnergyVolumeItem.java b/astromine-core/src/main/java/com/github/chainmailstudios/astromine/common/item/base/EnergyVolumeItem.java index 0a36b1bd1..7d25bc7a6 100644 --- a/astromine-core/src/main/java/com/github/chainmailstudios/astromine/common/item/base/EnergyVolumeItem.java +++ b/astromine-core/src/main/java/com/github/chainmailstudios/astromine/common/item/base/EnergyVolumeItem.java @@ -24,12 +24,13 @@ package com.github.chainmailstudios.astromine.common.item.base; -import com.github.chainmailstudios.astromine.common.volume.energy.EnergyVolume; -import me.shedaniel.cloth.api.durability.bar.DurabilityBarItem; import net.minecraft.item.Item; import net.minecraft.item.ItemGroup; import net.minecraft.item.ItemStack; import net.minecraft.util.collection.DefaultedList; + +import com.github.chainmailstudios.astromine.common.volume.energy.EnergyVolume; +import me.shedaniel.cloth.api.durability.bar.DurabilityBarItem; import team.reborn.energy.Energy; import team.reborn.energy.EnergyHolder; import team.reborn.energy.EnergyTier; @@ -43,10 +44,6 @@ public EnergyVolumeItem(Item.Settings settings, double size) { this.size = size; } - public double getSize() { - return size; - } - public static EnergyVolumeItem ofCreative(Item.Settings settings) { return new EnergyVolumeItem(settings, Double.MAX_VALUE); } @@ -55,6 +52,10 @@ public static EnergyVolumeItem of(Settings settings, double size) { return new EnergyVolumeItem(settings, size); } + public double getSize() { + return size; + } + @Override public double getMaxStoredPower() { return getSize(); diff --git a/astromine-core/src/main/java/com/github/chainmailstudios/astromine/common/item/base/FluidVolumeItem.java b/astromine-core/src/main/java/com/github/chainmailstudios/astromine/common/item/base/FluidVolumeItem.java index 0b1f862a3..cad54f75f 100644 --- a/astromine-core/src/main/java/com/github/chainmailstudios/astromine/common/item/base/FluidVolumeItem.java +++ b/astromine-core/src/main/java/com/github/chainmailstudios/astromine/common/item/base/FluidVolumeItem.java @@ -24,9 +24,9 @@ package com.github.chainmailstudios.astromine.common.item.base; -import com.github.chainmailstudios.astromine.common.volume.fluid.FluidVolume; import net.minecraft.item.Item; +import com.github.chainmailstudios.astromine.common.volume.fluid.FluidVolume; import com.github.chainmailstudios.astromine.common.volume.fraction.Fraction; public class FluidVolumeItem extends BaseVolumeItem { @@ -38,11 +38,11 @@ private FluidVolumeItem(Item.Settings settings, Fraction size) { this.size = size; } - public Fraction getSize() { - return size; - } - public static FluidVolumeItem of(Item.Settings settings, Fraction size) { return new FluidVolumeItem(settings, size); } + + public Fraction getSize() { + return size; + } } diff --git a/astromine-core/src/main/java/com/github/chainmailstudios/astromine/common/lba/LibBlockAttributesCompatibility.java b/astromine-core/src/main/java/com/github/chainmailstudios/astromine/common/lba/LibBlockAttributesCompatibility.java index 3ea5311f3..7e73aea3e 100644 --- a/astromine-core/src/main/java/com/github/chainmailstudios/astromine/common/lba/LibBlockAttributesCompatibility.java +++ b/astromine-core/src/main/java/com/github/chainmailstudios/astromine/common/lba/LibBlockAttributesCompatibility.java @@ -44,8 +44,8 @@ import alexiil.mc.lib.attributes.fluid.volume.FluidKeys; import com.github.chainmailstudios.astromine.common.component.SidedComponentProvider; import com.github.chainmailstudios.astromine.common.component.inventory.FluidInventoryComponent; -import com.github.chainmailstudios.astromine.common.volume.fraction.Fraction; import com.github.chainmailstudios.astromine.common.volume.fluid.FluidVolume; +import com.github.chainmailstudios.astromine.common.volume.fraction.Fraction; import com.github.chainmailstudios.astromine.registry.AstromineComponentTypes; import org.jetbrains.annotations.Nullable; diff --git a/astromine-core/src/main/java/com/github/chainmailstudios/astromine/common/network/type/EnergyNetworkType.java b/astromine-core/src/main/java/com/github/chainmailstudios/astromine/common/network/type/EnergyNetworkType.java index 8db84ab6d..4278043d8 100644 --- a/astromine-core/src/main/java/com/github/chainmailstudios/astromine/common/network/type/EnergyNetworkType.java +++ b/astromine-core/src/main/java/com/github/chainmailstudios/astromine/common/network/type/EnergyNetworkType.java @@ -24,6 +24,8 @@ package com.github.chainmailstudios.astromine.common.network.type; +import net.minecraft.block.entity.BlockEntity; + import com.github.chainmailstudios.astromine.common.block.transfer.TransferType; import com.github.chainmailstudios.astromine.common.network.NetworkInstance; import com.github.chainmailstudios.astromine.common.network.NetworkMember; @@ -33,13 +35,12 @@ import com.github.chainmailstudios.astromine.common.utilities.data.position.WorldPos; import com.github.chainmailstudios.astromine.common.volume.handler.TransferHandler; import com.github.chainmailstudios.astromine.registry.AstromineComponentTypes; -import com.google.common.collect.Lists; import it.unimi.dsi.fastutil.objects.Reference2DoubleMap; import it.unimi.dsi.fastutil.objects.Reference2DoubleOpenHashMap; -import net.minecraft.block.entity.BlockEntity; import team.reborn.energy.Energy; import team.reborn.energy.EnergyHandler; +import com.google.common.collect.Lists; import java.util.Arrays; import java.util.Collections; import java.util.Comparator; diff --git a/astromine-core/src/main/java/com/github/chainmailstudios/astromine/common/network/type/FluidNetworkType.java b/astromine-core/src/main/java/com/github/chainmailstudios/astromine/common/network/type/FluidNetworkType.java index 59e467598..3a2e24c6e 100644 --- a/astromine-core/src/main/java/com/github/chainmailstudios/astromine/common/network/type/FluidNetworkType.java +++ b/astromine-core/src/main/java/com/github/chainmailstudios/astromine/common/network/type/FluidNetworkType.java @@ -35,13 +35,13 @@ import com.github.chainmailstudios.astromine.common.component.SidedComponentProvider; import com.github.chainmailstudios.astromine.common.component.block.entity.BlockEntityTransferComponent; import com.github.chainmailstudios.astromine.common.component.inventory.FluidInventoryComponent; -import com.github.chainmailstudios.astromine.common.volume.fraction.Fraction; import com.github.chainmailstudios.astromine.common.network.NetworkInstance; import com.github.chainmailstudios.astromine.common.network.NetworkMember; import com.github.chainmailstudios.astromine.common.network.NetworkMemberNode; import com.github.chainmailstudios.astromine.common.network.type.base.NetworkType; import com.github.chainmailstudios.astromine.common.registry.NetworkMemberRegistry; import com.github.chainmailstudios.astromine.common.volume.fluid.FluidVolume; +import com.github.chainmailstudios.astromine.common.volume.fraction.Fraction; import com.github.chainmailstudios.astromine.registry.AstromineComponentTypes; import com.google.common.collect.Lists; diff --git a/astromine-core/src/main/java/com/github/chainmailstudios/astromine/common/screenhandler/base/block/BlockStateScreenHandler.java b/astromine-core/src/main/java/com/github/chainmailstudios/astromine/common/screenhandler/base/block/BlockStateScreenHandler.java index 0f1d8acf1..014382454 100644 --- a/astromine-core/src/main/java/com/github/chainmailstudios/astromine/common/screenhandler/base/block/BlockStateScreenHandler.java +++ b/astromine-core/src/main/java/com/github/chainmailstudios/astromine/common/screenhandler/base/block/BlockStateScreenHandler.java @@ -24,19 +24,20 @@ package com.github.chainmailstudios.astromine.common.screenhandler.base.block; -import com.github.vini2003.blade.common.handler.BaseScreenHandler; import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.screen.ScreenHandlerContext; import net.minecraft.screen.ScreenHandlerType; import net.minecraft.util.math.BlockPos; + +import com.github.vini2003.blade.common.handler.BaseScreenHandler; import org.jetbrains.annotations.Nullable; public abstract class BlockStateScreenHandler extends BaseScreenHandler { - BlockState state; public BlockPos position; public Block originalBlock; + BlockState state; public BlockStateScreenHandler(ScreenHandlerType type, int syncId, PlayerEntity player, BlockPos position) { super(type, syncId, player); diff --git a/astromine-core/src/main/java/com/github/chainmailstudios/astromine/common/screenhandler/base/block/ComponentBlockEntityEnergyFluidScreenHandler.java b/astromine-core/src/main/java/com/github/chainmailstudios/astromine/common/screenhandler/base/block/ComponentBlockEntityEnergyFluidScreenHandler.java index dc5db8d94..514b209c7 100644 --- a/astromine-core/src/main/java/com/github/chainmailstudios/astromine/common/screenhandler/base/block/ComponentBlockEntityEnergyFluidScreenHandler.java +++ b/astromine-core/src/main/java/com/github/chainmailstudios/astromine/common/screenhandler/base/block/ComponentBlockEntityEnergyFluidScreenHandler.java @@ -24,6 +24,10 @@ package com.github.chainmailstudios.astromine.common.screenhandler.base.block; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.screen.ScreenHandlerType; +import net.minecraft.util.math.BlockPos; + import com.github.chainmailstudios.astromine.common.block.entity.base.ComponentEnergyFluidBlockEntity; import com.github.chainmailstudios.astromine.common.widget.blade.EnergyVerticalBarWidget; import com.github.chainmailstudios.astromine.common.widget.blade.FluidVerticalBarWidget; @@ -31,10 +35,6 @@ import com.github.vini2003.blade.common.miscellaneous.Position; import com.github.vini2003.blade.common.miscellaneous.Size; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.screen.ScreenHandlerType; -import net.minecraft.util.math.BlockPos; - public class ComponentBlockEntityEnergyFluidScreenHandler extends ComponentBlockEntityScreenHandler { public EnergyVerticalBarWidget energyBar; public FluidVerticalBarWidget fluidBar; diff --git a/astromine-core/src/main/java/com/github/chainmailstudios/astromine/common/screenhandler/base/block/ComponentBlockEntityEnergyItemScreenHandler.java b/astromine-core/src/main/java/com/github/chainmailstudios/astromine/common/screenhandler/base/block/ComponentBlockEntityEnergyItemScreenHandler.java index 2856f7cfc..668d9e420 100644 --- a/astromine-core/src/main/java/com/github/chainmailstudios/astromine/common/screenhandler/base/block/ComponentBlockEntityEnergyItemScreenHandler.java +++ b/astromine-core/src/main/java/com/github/chainmailstudios/astromine/common/screenhandler/base/block/ComponentBlockEntityEnergyItemScreenHandler.java @@ -24,15 +24,15 @@ package com.github.chainmailstudios.astromine.common.screenhandler.base.block; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.screen.ScreenHandlerType; +import net.minecraft.util.math.BlockPos; + import com.github.chainmailstudios.astromine.common.block.entity.base.ComponentEnergyInventoryBlockEntity; import com.github.chainmailstudios.astromine.common.widget.blade.EnergyVerticalBarWidget; import com.github.vini2003.blade.common.miscellaneous.Position; import com.github.vini2003.blade.common.miscellaneous.Size; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.screen.ScreenHandlerType; -import net.minecraft.util.math.BlockPos; - public class ComponentBlockEntityEnergyItemScreenHandler extends ComponentBlockEntityScreenHandler { public ComponentEnergyInventoryBlockEntity blockEntity; diff --git a/astromine-core/src/main/java/com/github/chainmailstudios/astromine/common/screenhandler/base/block/ComponentBlockEntityEnergyScreenHandler.java b/astromine-core/src/main/java/com/github/chainmailstudios/astromine/common/screenhandler/base/block/ComponentBlockEntityEnergyScreenHandler.java index 834580021..2b27471a1 100644 --- a/astromine-core/src/main/java/com/github/chainmailstudios/astromine/common/screenhandler/base/block/ComponentBlockEntityEnergyScreenHandler.java +++ b/astromine-core/src/main/java/com/github/chainmailstudios/astromine/common/screenhandler/base/block/ComponentBlockEntityEnergyScreenHandler.java @@ -24,15 +24,15 @@ package com.github.chainmailstudios.astromine.common.screenhandler.base.block; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.screen.ScreenHandlerType; +import net.minecraft.util.math.BlockPos; + import com.github.chainmailstudios.astromine.common.block.entity.base.ComponentEnergyBlockEntity; import com.github.chainmailstudios.astromine.common.widget.blade.EnergyVerticalBarWidget; import com.github.vini2003.blade.common.miscellaneous.Position; import com.github.vini2003.blade.common.miscellaneous.Size; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.screen.ScreenHandlerType; -import net.minecraft.util.math.BlockPos; - public class ComponentBlockEntityEnergyScreenHandler extends ComponentBlockEntityScreenHandler { public ComponentEnergyBlockEntity blockEntity; diff --git a/astromine-core/src/main/java/com/github/chainmailstudios/astromine/common/screenhandler/base/block/ComponentBlockEntityScreenHandler.java b/astromine-core/src/main/java/com/github/chainmailstudios/astromine/common/screenhandler/base/block/ComponentBlockEntityScreenHandler.java index 8302a7a36..f0b01bfa4 100644 --- a/astromine-core/src/main/java/com/github/chainmailstudios/astromine/common/screenhandler/base/block/ComponentBlockEntityScreenHandler.java +++ b/astromine-core/src/main/java/com/github/chainmailstudios/astromine/common/screenhandler/base/block/ComponentBlockEntityScreenHandler.java @@ -40,10 +40,10 @@ import com.github.chainmailstudios.astromine.common.component.inventory.NameableComponent; import com.github.chainmailstudios.astromine.common.utilities.WidgetUtilities; import com.github.chainmailstudios.astromine.registry.AstromineComponentTypes; -import com.github.vini2003.blade.common.miscellaneous.Position; -import com.github.vini2003.blade.common.miscellaneous.Size; import com.github.vini2003.blade.common.collection.TabWidgetCollection; import com.github.vini2003.blade.common.handler.BaseScreenHandler; +import com.github.vini2003.blade.common.miscellaneous.Position; +import com.github.vini2003.blade.common.miscellaneous.Size; import com.github.vini2003.blade.common.utilities.Slots; import com.github.vini2003.blade.common.widget.base.SlotWidget; import com.github.vini2003.blade.common.widget.base.TabWidget; @@ -62,14 +62,6 @@ public abstract class ComponentBlockEntityScreenHandler extends BaseScreenHandle public TabWidgetCollection mainTab; protected TabWidget tabs; - public Position getTabsPosition(int width, int height) { - return Position.of(width / 2 - tabs.getWidth() / 2, height / 2 - tabs.getHeight() / 2); - } - - public Size getTabsSize(int width, int height) { - return Size.of(176F, 188F + getTabWidgetExtendedHeight()); - } - public ComponentBlockEntityScreenHandler(ScreenHandlerType type, int syncId, PlayerEntity player, BlockPos position) { super(type, syncId, player); @@ -83,6 +75,14 @@ public ComponentBlockEntityScreenHandler(ScreenHandlerType type, int syncId, } } + public Position getTabsPosition(int width, int height) { + return Position.of(width / 2 - tabs.getWidth() / 2, height / 2 - tabs.getHeight() / 2); + } + + public Size getTabsSize(int width, int height) { + return Size.of(176F, 188F + getTabWidgetExtendedHeight()); + } + public int getTabWidgetExtendedHeight() { return 0; } diff --git a/astromine-core/src/main/java/com/github/chainmailstudios/astromine/common/utilities/EnergyUtilities.java b/astromine-core/src/main/java/com/github/chainmailstudios/astromine/common/utilities/EnergyUtilities.java index ef875c4ce..983d05101 100644 --- a/astromine-core/src/main/java/com/github/chainmailstudios/astromine/common/utilities/EnergyUtilities.java +++ b/astromine-core/src/main/java/com/github/chainmailstudios/astromine/common/utilities/EnergyUtilities.java @@ -24,18 +24,19 @@ package com.github.chainmailstudios.astromine.common.utilities; -import com.google.gson.JsonElement; -import com.google.gson.JsonPrimitive; import net.minecraft.network.PacketByteBuf; import net.minecraft.text.MutableText; import net.minecraft.text.TranslatableText; import net.minecraft.util.Formatting; import net.minecraft.util.math.Direction; + import org.jetbrains.annotations.Nullable; import team.reborn.energy.Energy; import team.reborn.energy.EnergyHandler; import team.reborn.energy.EnergySide; +import com.google.gson.JsonElement; +import com.google.gson.JsonPrimitive; import java.text.DecimalFormat; public class EnergyUtilities { diff --git a/astromine-core/src/main/java/com/github/chainmailstudios/astromine/common/utilities/ExplosionUtilities.java b/astromine-core/src/main/java/com/github/chainmailstudios/astromine/common/utilities/ExplosionUtilities.java index 37754a8ef..e500d2c19 100644 --- a/astromine-core/src/main/java/com/github/chainmailstudios/astromine/common/utilities/ExplosionUtilities.java +++ b/astromine-core/src/main/java/com/github/chainmailstudios/astromine/common/utilities/ExplosionUtilities.java @@ -24,7 +24,6 @@ package com.github.chainmailstudios.astromine.common.utilities; -import com.github.chainmailstudios.astromine.AstromineCommon; import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; import net.minecraft.network.packet.s2c.play.ChunkDataS2CPacket; @@ -36,6 +35,8 @@ import net.minecraft.world.chunk.ChunkSection; import net.minecraft.world.chunk.WorldChunk; +import com.github.chainmailstudios.astromine.AstromineCommon; + public class ExplosionUtilities { private static final BlockState AIR = Blocks.AIR.getDefaultState(); diff --git a/astromine-core/src/main/java/com/github/chainmailstudios/astromine/common/utilities/data/Holder.java b/astromine-core/src/main/java/com/github/chainmailstudios/astromine/common/utilities/data/Holder.java index a36c34352..080aa45f2 100644 --- a/astromine-core/src/main/java/com/github/chainmailstudios/astromine/common/utilities/data/Holder.java +++ b/astromine-core/src/main/java/com/github/chainmailstudios/astromine/common/utilities/data/Holder.java @@ -33,6 +33,10 @@ private Holder(T t) { this.t = t; } + public static Holder of(Y y) { + return new Holder<>(y); + } + public Holder with(Consumer consumer) { consumer.accept(t); @@ -46,8 +50,4 @@ public T get() { public void set(T t) { this.t = t; } - - public static Holder of(Y y) { - return new Holder<>(y); - } } diff --git a/astromine-core/src/main/java/com/github/chainmailstudios/astromine/common/volume/energy/EnergyVolume.java b/astromine-core/src/main/java/com/github/chainmailstudios/astromine/common/volume/energy/EnergyVolume.java index f2b5225c0..4d07c6442 100644 --- a/astromine-core/src/main/java/com/github/chainmailstudios/astromine/common/volume/energy/EnergyVolume.java +++ b/astromine-core/src/main/java/com/github/chainmailstudios/astromine/common/volume/energy/EnergyVolume.java @@ -24,11 +24,12 @@ package com.github.chainmailstudios.astromine.common.volume.energy; +import net.minecraft.nbt.CompoundTag; +import net.minecraft.util.Identifier; + import com.github.chainmailstudios.astromine.AstromineCommon; import com.github.chainmailstudios.astromine.common.component.inventory.SimpleEnergyInventoryComponent; import com.github.chainmailstudios.astromine.common.volume.base.Volume; -import net.minecraft.nbt.CompoundTag; -import net.minecraft.util.Identifier; public class EnergyVolume extends Volume { public static final Identifier ID = AstromineCommon.identifier("energy"); @@ -41,6 +42,30 @@ public EnergyVolume(double amount, double size, Runnable runnable) { super(ID, amount, size, runnable); } + public static EnergyVolume empty() { + return new EnergyVolume(0.0D, 0.0D); + } + + public static EnergyVolume attached(SimpleEnergyInventoryComponent component) { + return new EnergyVolume(0.0D, 0.0D, component::dispatchConsumers); + } + + public static EnergyVolume attached(double size, SimpleEnergyInventoryComponent component) { + return new EnergyVolume(0.0D, size, component::dispatchConsumers); + } + + public static EnergyVolume of(double amount) { + return new EnergyVolume(amount, Long.MAX_VALUE); + } + + public static EnergyVolume of(double amount, double size) { + return new EnergyVolume(amount, size); + } + + public static EnergyVolume fromTag(CompoundTag tag) { + return of(tag.getDouble("amount"), tag.getDouble("size")); + } + @Override public > V add(V v, Double doubleA) { if (!(v instanceof EnergyVolume)) @@ -84,26 +109,6 @@ public > V minus(Double aDouble) { return (V) this; } - public static EnergyVolume empty() { - return new EnergyVolume(0.0D, 0.0D); - } - - public static EnergyVolume attached(SimpleEnergyInventoryComponent component) { - return new EnergyVolume(0.0D, 0.0D, component::dispatchConsumers); - } - - public static EnergyVolume attached(double size, SimpleEnergyInventoryComponent component) { - return new EnergyVolume(0.0D, size, component::dispatchConsumers); - } - - public static EnergyVolume of(double amount) { - return new EnergyVolume(amount, Long.MAX_VALUE); - } - - public static EnergyVolume of(double amount, double size) { - return new EnergyVolume(amount, size); - } - @Override public CompoundTag toTag() { CompoundTag tag = new CompoundTag(); @@ -112,10 +117,6 @@ public CompoundTag toTag() { return tag; } - public static EnergyVolume fromTag(CompoundTag tag) { - return of(tag.getDouble("amount"), tag.getDouble("size")); - } - @Override public > V copy() { return (V) of(getAmount(), getSize()); diff --git a/astromine-core/src/main/java/com/github/chainmailstudios/astromine/common/volume/energy/InfiniteEnergyVolume.java b/astromine-core/src/main/java/com/github/chainmailstudios/astromine/common/volume/energy/InfiniteEnergyVolume.java index 7d5fd6cfe..50a5acb5b 100644 --- a/astromine-core/src/main/java/com/github/chainmailstudios/astromine/common/volume/energy/InfiniteEnergyVolume.java +++ b/astromine-core/src/main/java/com/github/chainmailstudios/astromine/common/volume/energy/InfiniteEnergyVolume.java @@ -24,9 +24,10 @@ package com.github.chainmailstudios.astromine.common.volume.energy; -import com.github.chainmailstudios.astromine.common.volume.base.Volume; import net.minecraft.util.Identifier; +import com.github.chainmailstudios.astromine.common.volume.base.Volume; + public class InfiniteEnergyVolume extends EnergyVolume { public InfiniteEnergyVolume() { super(Double.MAX_VALUE, Double.MAX_VALUE); diff --git a/astromine-core/src/main/java/com/github/chainmailstudios/astromine/common/volume/energy/WrappedEnergyVolume.java b/astromine-core/src/main/java/com/github/chainmailstudios/astromine/common/volume/energy/WrappedEnergyVolume.java index e15cce0e0..aa60eedf4 100644 --- a/astromine-core/src/main/java/com/github/chainmailstudios/astromine/common/volume/energy/WrappedEnergyVolume.java +++ b/astromine-core/src/main/java/com/github/chainmailstudios/astromine/common/volume/energy/WrappedEnergyVolume.java @@ -25,6 +25,7 @@ package com.github.chainmailstudios.astromine.common.volume.energy; import net.minecraft.util.math.Direction; + import team.reborn.energy.EnergyHandler; public class WrappedEnergyVolume extends EnergyVolume { diff --git a/astromine-core/src/main/java/com/github/chainmailstudios/astromine/common/volume/fluid/FluidVolume.java b/astromine-core/src/main/java/com/github/chainmailstudios/astromine/common/volume/fluid/FluidVolume.java index 84f694eea..a8469d492 100644 --- a/astromine-core/src/main/java/com/github/chainmailstudios/astromine/common/volume/fluid/FluidVolume.java +++ b/astromine-core/src/main/java/com/github/chainmailstudios/astromine/common/volume/fluid/FluidVolume.java @@ -24,7 +24,6 @@ package com.github.chainmailstudios.astromine.common.volume.fluid; -import com.google.common.base.Objects; import net.minecraft.fluid.Fluid; import net.minecraft.fluid.Fluids; import net.minecraft.nbt.CompoundTag; @@ -33,8 +32,10 @@ import com.github.chainmailstudios.astromine.AstromineCommon; import com.github.chainmailstudios.astromine.common.component.inventory.SimpleFluidInventoryComponent; -import com.github.chainmailstudios.astromine.common.volume.fraction.Fraction; import com.github.chainmailstudios.astromine.common.volume.base.Volume; +import com.github.chainmailstudios.astromine.common.volume.fraction.Fraction; + +import com.google.common.base.Objects; public class FluidVolume extends Volume { public static final Identifier ID = AstromineCommon.identifier("fluid"); @@ -51,6 +52,38 @@ public FluidVolume(Fraction amount, Fraction size, Fluid fluid, Runnable runnabl this.fluid = fluid; } + public static FluidVolume empty() { + return new FluidVolume(Fraction.empty(), Fraction.bucket(), Fluids.EMPTY); + } + + public static FluidVolume oxygen() { + return new FluidVolume(Fraction.bucket(), Fraction.bucket(), Registry.FLUID.get(AstromineCommon.identifier("oxygen"))); + } + + public static FluidVolume attached(SimpleFluidInventoryComponent component) { + return new FluidVolume(Fraction.empty(), Fraction.bucket(), Fluids.EMPTY, component::dispatchConsumers); + } + + public static FluidVolume of(Fraction amount, Fluid fluid) { + return new FluidVolume(amount, Fraction.of(128L), fluid); + } + + public static FluidVolume of(Fraction amount, Fraction size, Fluid fluid) { + return new FluidVolume(amount, size, fluid); + } + + public static FluidVolume of(Fraction amount, Fluid fluid, Runnable runnable) { + return new FluidVolume(amount, Fraction.of(128L), fluid, runnable); + } + + public static FluidVolume of(Fraction amount, Fraction size, Fluid fluid, Runnable runnable) { + return new FluidVolume(amount, size, fluid, runnable); + } + + public static FluidVolume fromTag(CompoundTag tag) { + return new FluidVolume(Fraction.fromTag(tag.getCompound("amount")), Fraction.fromTag(tag.getCompound("size")), Registry.FLUID.get(new Identifier(tag.getString("fluid")))); + } + public Fluid getFluid() { return this.fluid; } @@ -126,34 +159,6 @@ public > V minus(Fraction fraction) { return (V) this; } - public static FluidVolume empty() { - return new FluidVolume(Fraction.empty(), Fraction.bucket(), Fluids.EMPTY); - } - - public static FluidVolume oxygen() { - return new FluidVolume(Fraction.bucket(), Fraction.bucket(), Registry.FLUID.get(AstromineCommon.identifier("oxygen"))); - } - - public static FluidVolume attached(SimpleFluidInventoryComponent component) { - return new FluidVolume(Fraction.empty(), Fraction.bucket(), Fluids.EMPTY, component::dispatchConsumers); - } - - public static FluidVolume of(Fraction amount, Fluid fluid) { - return new FluidVolume(amount, Fraction.of(128L), fluid); - } - - public static FluidVolume of(Fraction amount, Fraction size, Fluid fluid) { - return new FluidVolume(amount, size, fluid); - } - - public static FluidVolume of(Fraction amount, Fluid fluid, Runnable runnable) { - return new FluidVolume(amount, Fraction.of(128L), fluid, runnable); - } - - public static FluidVolume of(Fraction amount, Fraction size, Fluid fluid, Runnable runnable) { - return new FluidVolume(amount, size, fluid, runnable); - } - @Override public > V copy() { return (V) of(getAmount().copy(), getSize().copy(), getFluid()); @@ -172,10 +177,6 @@ public CompoundTag toTag() { return tag; } - public static FluidVolume fromTag(CompoundTag tag) { - return new FluidVolume(Fraction.fromTag(tag.getCompound("amount")), Fraction.fromTag(tag.getCompound("size")), Registry.FLUID.get(new Identifier(tag.getString("fluid")))); - } - @Override public boolean isEmpty() { return super.isEmpty() || getFluid() == Fluids.EMPTY; diff --git a/astromine-core/src/main/java/com/github/chainmailstudios/astromine/common/volume/fluid/InfiniteFluidVolume.java b/astromine-core/src/main/java/com/github/chainmailstudios/astromine/common/volume/fluid/InfiniteFluidVolume.java index 6cf56c697..6a0cdef6a 100644 --- a/astromine-core/src/main/java/com/github/chainmailstudios/astromine/common/volume/fluid/InfiniteFluidVolume.java +++ b/astromine-core/src/main/java/com/github/chainmailstudios/astromine/common/volume/fluid/InfiniteFluidVolume.java @@ -24,16 +24,21 @@ package com.github.chainmailstudios.astromine.common.volume.fluid; -import com.github.chainmailstudios.astromine.common.volume.fraction.Fraction; -import com.github.chainmailstudios.astromine.common.volume.base.Volume; import net.minecraft.fluid.Fluid; import net.minecraft.util.Identifier; +import com.github.chainmailstudios.astromine.common.volume.base.Volume; +import com.github.chainmailstudios.astromine.common.volume.fraction.Fraction; + public class InfiniteFluidVolume extends FluidVolume { public InfiniteFluidVolume(Fluid fluid) { super(Fraction.of(Long.MAX_VALUE), Fraction.of(Long.MAX_VALUE), fluid); } + public static InfiniteFluidVolume of(Fluid fluid) { + return new InfiniteFluidVolume(fluid); + } + @Override public Fraction getAmount() { return Fraction.of(Long.MAX_VALUE); @@ -44,10 +49,6 @@ public Fraction getSize() { return Fraction.of(Long.MAX_VALUE); } - public static InfiniteFluidVolume of(Fluid fluid) { - return new InfiniteFluidVolume(fluid); - } - @Override public > V copy() { return (V) of(getFluid()); diff --git a/astromine-core/src/main/java/com/github/chainmailstudios/astromine/common/volume/fraction/Fraction.java b/astromine-core/src/main/java/com/github/chainmailstudios/astromine/common/volume/fraction/Fraction.java index 7663cb88a..0dd1a9eaa 100644 --- a/astromine-core/src/main/java/com/github/chainmailstudios/astromine/common/volume/fraction/Fraction.java +++ b/astromine-core/src/main/java/com/github/chainmailstudios/astromine/common/volume/fraction/Fraction.java @@ -40,14 +40,6 @@ public Fraction(long numerator, long denominator) { this.denominator = Math.max(1, denominator); } - public long getNumerator() { - return this.numerator; - } - - public long getDenominator() { - return this.denominator; - } - public static Fraction empty() { return new Fraction(0, 1); } @@ -92,68 +84,36 @@ public static Fraction add(Fraction fractionA, Fraction fractionB) { return new Fraction(fractionA.numerator * (denominator / fractionA.denominator) + fractionB.numerator * (denominator / fractionB.denominator), denominator); } - public Fraction add(Fraction fractionB) { - return Fraction.add(this, fractionB); - } - public static Fraction subtract(Fraction fractionA, Fraction fractionB) { long denominator = lowestCommonDenominator(fractionA.denominator, fractionB.denominator); return new Fraction(fractionA.numerator * (denominator / fractionA.denominator) - fractionB.numerator * (denominator / fractionB.denominator), denominator); } - public Fraction subtract(Fraction fractionB) { - return Fraction.subtract(this, fractionB); - } - public static Fraction divide(Fraction fractionA, Fraction fractionB) { return multiply(fractionA, Fraction.inverse(fractionB)); } - public Fraction divide(Fraction fractionB) { - return Fraction.divide(this, fractionB); - } - public static Fraction multiply(Fraction fractionA, Fraction fractionB) { return new Fraction(fractionA.numerator * fractionB.numerator, fractionA.denominator * fractionB.denominator); } - public Fraction multiply(Fraction fractionB) { - return Fraction.multiply(this, fractionB); - } - public static Fraction inverse(Fraction fraction) { return new Fraction(fraction.denominator, fraction.numerator); } - public Fraction inverse() { - return Fraction.inverse(this); - } - public static Fraction limit(Fraction source, Fraction target) { return new Fraction(source.numerator * (target.denominator / source.denominator), target.denominator); } - public Fraction limit(Fraction target) { - return Fraction.limit(this, target); - } - public static Fraction minimum(Fraction fractionA, Fraction fractionB) { return (fractionA.smallerThan(fractionB) ? fractionA : fractionB); } - public Fraction minimum(Fraction fractionB) { - return Fraction.minimum(this, fractionB); - } - public static Fraction maximum(Fraction fractionA, Fraction fractionB) { return (fractionA.biggerThan(fractionB) ? fractionA : fractionB); } - public Fraction maximum(Fraction fractionB) { - return Fraction.maximum(this, fractionB); - } - public static Fraction simplify(Fraction fraction) { if (fraction.numerator == 0) return new Fraction(0, 1); @@ -166,6 +126,98 @@ public static Fraction simplify(Fraction fraction) { return new Fraction(fraction.numerator / divisor, fraction.denominator / divisor); } + public static Fraction fromTag(CompoundTag tag) { + long[] values = tag.getLongArray("values"); + + if (values.length != 2) + values = new long[]{ 0, 0 }; + + return new Fraction(values[0], values[1]); + } + + private static long lowestCommonDenominator(long a, long b) { + return a == b ? a : a == 1 ? b : b == 1 ? a : (a * b) / greatestCommonDivisor(a, b); + } + + /** + * Iterative version of Stein's Algorithm for greatest common divisor. + */ + private static long greatestCommonDivisor(long a, long b) { + long shift = 0; + + if (a == 0) { + return b; + } + if (b == 0) { + return a; + } + + while (((a | b) & 1) == 0) { + ++shift; + a >>= 1; + b >>= 1; + } + + while ((a & 1) == 0) { + a >>= 1; + } + + do { + while ((b & 1) == 0) { + b >>= 1; + } + if (a > b) { + long t = b; + b = a; + a = t; + } + + b -= a; + } while (b != 0); + + return a << shift; + } + + public long getNumerator() { + return this.numerator; + } + + public long getDenominator() { + return this.denominator; + } + + public Fraction add(Fraction fractionB) { + return Fraction.add(this, fractionB); + } + + public Fraction subtract(Fraction fractionB) { + return Fraction.subtract(this, fractionB); + } + + public Fraction divide(Fraction fractionB) { + return Fraction.divide(this, fractionB); + } + + public Fraction multiply(Fraction fractionB) { + return Fraction.multiply(this, fractionB); + } + + public Fraction inverse() { + return Fraction.inverse(this); + } + + public Fraction limit(Fraction target) { + return Fraction.limit(this, target); + } + + public Fraction minimum(Fraction fractionB) { + return Fraction.minimum(this, fractionB); + } + + public Fraction maximum(Fraction fractionB) { + return Fraction.maximum(this, fractionB); + } + public Fraction simplify() { return Fraction.simplify(this); } @@ -259,15 +311,6 @@ public Fraction ifNotBiggerOrEqualThan(Fraction fraction, Runnable runnable) { return this; } - public static Fraction fromTag(CompoundTag tag) { - long[] values = tag.getLongArray("values"); - - if (values.length != 2) - values = new long[]{ 0, 0 }; - - return new Fraction(values[0], values[1]); - } - public CompoundTag toTag() { CompoundTag tag = new CompoundTag(); @@ -339,47 +382,4 @@ public float floatValue() { public double doubleValue() { return (double) this.numerator / (double) this.denominator; } - - private static long lowestCommonDenominator(long a, long b) { - return a == b ? a : a == 1 ? b : b == 1 ? a : (a * b) / greatestCommonDivisor(a, b); - } - - /** - * Iterative version of Stein's Algorithm for greatest common divisor. - */ - private static long greatestCommonDivisor(long a, long b) { - long shift = 0; - - if (a == 0) { - return b; - } - if (b == 0) { - return a; - } - - while (((a | b) & 1) == 0) { - ++shift; - a >>= 1; - b >>= 1; - } - - while ((a & 1) == 0) { - a >>= 1; - } - - do { - while ((b & 1) == 0) { - b >>= 1; - } - if (a > b) { - long t = b; - b = a; - a = t; - } - - b -= a; - } while (b != 0); - - return a << shift; - } } diff --git a/astromine-core/src/main/java/com/github/chainmailstudios/astromine/common/volume/handler/FluidHandler.java b/astromine-core/src/main/java/com/github/chainmailstudios/astromine/common/volume/handler/FluidHandler.java index 489711d71..62c8d9a91 100644 --- a/astromine-core/src/main/java/com/github/chainmailstudios/astromine/common/volume/handler/FluidHandler.java +++ b/astromine-core/src/main/java/com/github/chainmailstudios/astromine/common/volume/handler/FluidHandler.java @@ -24,17 +24,18 @@ package com.github.chainmailstudios.astromine.common.volume.handler; -import com.github.chainmailstudios.astromine.common.component.inventory.FluidInventoryComponent; -import com.github.chainmailstudios.astromine.common.component.inventory.SimpleFluidInventoryComponent; -import com.github.chainmailstudios.astromine.common.volume.fraction.Fraction; -import com.github.chainmailstudios.astromine.common.volume.fluid.FluidVolume; -import com.github.chainmailstudios.astromine.registry.AstromineComponentTypes; -import nerdhub.cardinal.components.api.component.ComponentProvider; import net.minecraft.fluid.Fluid; import net.minecraft.item.BucketItem; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.math.Direction; + +import com.github.chainmailstudios.astromine.common.component.inventory.FluidInventoryComponent; +import com.github.chainmailstudios.astromine.common.component.inventory.SimpleFluidInventoryComponent; +import com.github.chainmailstudios.astromine.common.volume.fluid.FluidVolume; +import com.github.chainmailstudios.astromine.common.volume.fraction.Fraction; +import com.github.chainmailstudios.astromine.registry.AstromineComponentTypes; +import nerdhub.cardinal.components.api.component.ComponentProvider; import org.jetbrains.annotations.Nullable; import java.util.Optional; @@ -48,6 +49,46 @@ private FluidHandler(FluidInventoryComponent component) { this.component = component; } + public static FluidHandler of(Object object) { + return ofOptional(object).get(); + } + + public static Optional ofOptional(Object object) { + if (object instanceof ComponentProvider) { + ComponentProvider provider = (ComponentProvider) object; + + if (provider.hasComponent(AstromineComponentTypes.FLUID_INVENTORY_COMPONENT)) { + FluidInventoryComponent component = provider.getComponent(AstromineComponentTypes.FLUID_INVENTORY_COMPONENT); + + if (component != null) { + return Optional.of(new FluidHandler(component)); + } + } else { + if (object instanceof ItemStack) { + ItemStack stack = (ItemStack) object; + Item item = stack.getItem(); + + if (item instanceof BucketItem) { + BucketItem bucket = (BucketItem) item; + + FluidInventoryComponent bucketComponent = new SimpleFluidInventoryComponent(1); + + Optional bucketVolume = Optional.of(FluidVolume.of(Fraction.bucket(), bucket.fluid)); + + if (bucketVolume.isPresent()) { + bucketComponent.setVolume(0, bucketVolume.get()); + return Optional.of(new FluidHandler(bucketComponent)); + } + } + } + } + } else if (object instanceof FluidInventoryComponent) { + return Optional.of(new FluidHandler((FluidInventoryComponent) object)); + } + + return Optional.empty(); + } + public FluidVolume getVolume(int slot) { return component.getVolume(slot); } @@ -84,111 +125,71 @@ public FluidVolume getFirst() { return getVolume(0); } - public FluidVolume getSecond() { - return getVolume(1); - } - - public FluidVolume getThird() { - return getVolume(2); - } - - public FluidVolume getFourth() { - return getVolume(3); - } - - public FluidVolume getFifth() { - return getVolume(4); - } - - public FluidVolume getSixth() { - return getVolume(5); - } - - public FluidVolume getSeventh() { - return getVolume(6); - } - - public FluidVolume getEighth() { - return getVolume(7); - } - public void setFirst(FluidVolume volume) { setVolume(0, volume); } + public FluidVolume getSecond() { + return getVolume(1); + } + public void setSecond(FluidVolume volume) { setVolume(1, volume); } + public FluidVolume getThird() { + return getVolume(2); + } + public void setThird(FluidVolume volume) { setVolume(2, volume); } + public FluidVolume getFourth() { + return getVolume(3); + } + public void setFourth(FluidVolume volume) { setVolume(3, volume); } + public FluidVolume getFifth() { + return getVolume(4); + } + public void setFifth(FluidVolume volume) { setVolume(4, volume); } + public FluidVolume getSixth() { + return getVolume(5); + } + public void setSixth(FluidVolume volume) { setVolume(5, volume); } + public FluidVolume getSeventh() { + return getVolume(6); + } + public void setSeventh(FluidVolume volume) { setVolume(6, volume); } - public void setEight(FluidVolume volume) { - setVolume(7, volume); + public FluidVolume getEighth() { + return getVolume(7); } - public void setNinth(FluidVolume volume) { - setVolume(8, volume); + public void setEight(FluidVolume volume) { + setVolume(7, volume); } public FluidVolume getNinth() { return getVolume(8); } - public static FluidHandler of(Object object) { - return ofOptional(object).get(); - } - - public static Optional ofOptional(Object object) { - if (object instanceof ComponentProvider) { - ComponentProvider provider = (ComponentProvider) object; - - if (provider.hasComponent(AstromineComponentTypes.FLUID_INVENTORY_COMPONENT)) { - FluidInventoryComponent component = provider.getComponent(AstromineComponentTypes.FLUID_INVENTORY_COMPONENT); - - if (component != null) { - return Optional.of(new FluidHandler(component)); - } - } else { - if (object instanceof ItemStack) { - ItemStack stack = (ItemStack) object; - Item item = stack.getItem(); - - if (item instanceof BucketItem) { - BucketItem bucket = (BucketItem) item; - - FluidInventoryComponent bucketComponent = new SimpleFluidInventoryComponent(1); - - Optional bucketVolume = Optional.of(FluidVolume.of(Fraction.bucket(), bucket.fluid)); - - if (bucketVolume.isPresent()) { - bucketComponent.setVolume(0, bucketVolume.get()); - return Optional.of(new FluidHandler(bucketComponent)); - } - } - } - } - } else if (object instanceof FluidInventoryComponent) { - return Optional.of(new FluidHandler((FluidInventoryComponent) object)); - } - - return Optional.empty(); + public void setNinth(FluidVolume volume) { + setVolume(8, volume); } } diff --git a/astromine-core/src/main/java/com/github/chainmailstudios/astromine/common/volume/handler/ItemHandler.java b/astromine-core/src/main/java/com/github/chainmailstudios/astromine/common/volume/handler/ItemHandler.java index 6949109f3..bd91d8090 100644 --- a/astromine-core/src/main/java/com/github/chainmailstudios/astromine/common/volume/handler/ItemHandler.java +++ b/astromine-core/src/main/java/com/github/chainmailstudios/astromine/common/volume/handler/ItemHandler.java @@ -24,10 +24,11 @@ package com.github.chainmailstudios.astromine.common.volume.handler; +import net.minecraft.item.ItemStack; + import com.github.chainmailstudios.astromine.common.component.inventory.ItemInventoryComponent; import com.github.chainmailstudios.astromine.registry.AstromineComponentTypes; import nerdhub.cardinal.components.api.component.ComponentProvider; -import net.minecraft.item.ItemStack; import java.util.Optional; import java.util.function.Consumer; @@ -39,6 +40,28 @@ private ItemHandler(ItemInventoryComponent component) { this.component = component; } + public static ItemHandler of(Object object) { + return ofOptional(object).get(); + } + + public static Optional ofOptional(Object object) { + if (object instanceof ComponentProvider) { + ComponentProvider provider = (ComponentProvider) object; + + if (provider.hasComponent(AstromineComponentTypes.ITEM_INVENTORY_COMPONENT)) { + ItemInventoryComponent component = provider.getComponent(AstromineComponentTypes.ITEM_INVENTORY_COMPONENT); + + if (component != null) { + return Optional.of(new ItemHandler(component)); + } + } + } else if (object instanceof ItemInventoryComponent) { + return Optional.of(new ItemHandler((ItemInventoryComponent) object)); + } + + return Optional.empty(); + } + public ItemStack getStack(int slot) { return component.getStack(slot); } @@ -57,99 +80,77 @@ public ItemStack getFirst() { return getStack(0); } - public ItemStack getSecond() { - return getStack(1); - } - - public ItemStack getThird() { - return getStack(2); - } - - public ItemStack getFourth() { - return getStack(3); - } - - public ItemStack getFifth() { - return getStack(4); - } - - public ItemStack getSixth() { - return getStack(5); - } - - public ItemStack getSeventh() { - return getStack(6); - } - - public ItemStack getEight() { - return getStack(7); - } - public void setFirst(ItemStack volume) { setVolume(0, volume); } + public ItemStack getSecond() { + return getStack(1); + } + public void setSecond(ItemStack volume) { setVolume(1, volume); } + public ItemStack getThird() { + return getStack(2); + } + public void setThird(ItemStack volume) { setVolume(2, volume); } + public ItemStack getFourth() { + return getStack(3); + } + public void setFourth(ItemStack volume) { setVolume(3, volume); } + public ItemStack getFifth() { + return getStack(4); + } + public void setFifth(ItemStack volume) { setVolume(4, volume); } + public ItemStack getSixth() { + return getStack(5); + } + public void setSixth(ItemStack volume) { setVolume(5, volume); } + public ItemStack getSeventh() { + return getStack(6); + } + public void setSeventh(ItemStack volume) { setVolume(6, volume); } - public void setEight(ItemStack volume) { - setVolume(7, volume); + public ItemStack getEight() { + return getStack(7); } - public void setNinth(ItemStack volume) { - setVolume(8, volume); + public void setEight(ItemStack volume) { + setVolume(7, volume); } public ItemStack getNinth() { return getStack(8); } + public void setNinth(ItemStack volume) { + setVolume(8, volume); + } + public ItemHandler forEach(Consumer stack) { component.getContents().values().forEach(stack); return this; } - - public static ItemHandler of(Object object) { - return ofOptional(object).get(); - } - - public static Optional ofOptional(Object object) { - if (object instanceof ComponentProvider) { - ComponentProvider provider = (ComponentProvider) object; - - if (provider.hasComponent(AstromineComponentTypes.ITEM_INVENTORY_COMPONENT)) { - ItemInventoryComponent component = provider.getComponent(AstromineComponentTypes.ITEM_INVENTORY_COMPONENT); - - if (component != null) { - return Optional.of(new ItemHandler(component)); - } - } - } else if (object instanceof ItemInventoryComponent) { - return Optional.of(new ItemHandler((ItemInventoryComponent) object)); - } - - return Optional.empty(); - } } diff --git a/astromine-core/src/main/java/com/github/chainmailstudios/astromine/common/volume/handler/TransferHandler.java b/astromine-core/src/main/java/com/github/chainmailstudios/astromine/common/volume/handler/TransferHandler.java index f6b3a7ad7..a5e65991f 100644 --- a/astromine-core/src/main/java/com/github/chainmailstudios/astromine/common/volume/handler/TransferHandler.java +++ b/astromine-core/src/main/java/com/github/chainmailstudios/astromine/common/volume/handler/TransferHandler.java @@ -24,12 +24,13 @@ package com.github.chainmailstudios.astromine.common.volume.handler; +import net.minecraft.util.math.Direction; + import com.github.chainmailstudios.astromine.common.block.transfer.TransferType; import com.github.chainmailstudios.astromine.common.component.block.entity.BlockEntityTransferComponent; import com.github.chainmailstudios.astromine.registry.AstromineComponentTypes; import nerdhub.cardinal.components.api.ComponentType; import nerdhub.cardinal.components.api.component.ComponentProvider; -import net.minecraft.util.math.Direction; import java.util.Optional; import java.util.function.Consumer; @@ -41,12 +42,6 @@ public TransferHandler(BlockEntityTransferComponent transferComponent) { this.transferComponent = transferComponent; } - public TransferHandler withDirection(ComponentType type, Direction direction, Consumer consumer) { - Optional.ofNullable(transferComponent.get(type).get(direction)).ifPresent(consumer); - - return this; - } - public static Optional of(Object object) { if (object instanceof ComponentProvider) { ComponentProvider provider = (ComponentProvider) object; @@ -62,4 +57,10 @@ public static Optional of(Object object) { return Optional.empty(); } + + public TransferHandler withDirection(ComponentType type, Direction direction, Consumer consumer) { + Optional.ofNullable(transferComponent.get(type).get(direction)).ifPresent(consumer); + + return this; + } } diff --git a/astromine-core/src/main/java/com/github/chainmailstudios/astromine/common/widget/blade/EnergyVerticalBarWidget.java b/astromine-core/src/main/java/com/github/chainmailstudios/astromine/common/widget/blade/EnergyVerticalBarWidget.java index 49a541dc2..dc4eb980e 100644 --- a/astromine-core/src/main/java/com/github/chainmailstudios/astromine/common/widget/blade/EnergyVerticalBarWidget.java +++ b/astromine-core/src/main/java/com/github/chainmailstudios/astromine/common/widget/blade/EnergyVerticalBarWidget.java @@ -24,7 +24,6 @@ package com.github.chainmailstudios.astromine.common.widget.blade; -import com.github.chainmailstudios.astromine.common.utilities.NumberUtilities; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; @@ -38,6 +37,7 @@ import com.github.chainmailstudios.astromine.AstromineCommon; import com.github.chainmailstudios.astromine.client.BaseRenderer; +import com.github.chainmailstudios.astromine.common.utilities.NumberUtilities; import com.github.chainmailstudios.astromine.common.volume.energy.EnergyVolume; import com.github.vini2003.blade.client.utilities.Instances; import com.github.vini2003.blade.client.utilities.Layers; diff --git a/astromine-core/src/main/java/com/github/chainmailstudios/astromine/common/widget/blade/FluidVerticalBarWidget.java b/astromine-core/src/main/java/com/github/chainmailstudios/astromine/common/widget/blade/FluidVerticalBarWidget.java index cdc3128cd..28f3bfddc 100644 --- a/astromine-core/src/main/java/com/github/chainmailstudios/astromine/common/widget/blade/FluidVerticalBarWidget.java +++ b/astromine-core/src/main/java/com/github/chainmailstudios/astromine/common/widget/blade/FluidVerticalBarWidget.java @@ -24,11 +24,10 @@ package com.github.chainmailstudios.astromine.common.widget.blade; -import com.github.chainmailstudios.astromine.common.utilities.NumberUtilities; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; - import net.fabricmc.loader.api.FabricLoader; + import net.minecraft.client.MinecraftClient; import net.minecraft.client.render.OverlayTexture; import net.minecraft.client.render.RenderLayer; @@ -45,9 +44,10 @@ import com.github.chainmailstudios.astromine.AstromineCommon; import com.github.chainmailstudios.astromine.client.BaseRenderer; import com.github.chainmailstudios.astromine.client.render.sprite.SpriteRenderer; -import com.github.chainmailstudios.astromine.common.volume.fraction.Fraction; import com.github.chainmailstudios.astromine.common.utilities.FluidUtilities; +import com.github.chainmailstudios.astromine.common.utilities.NumberUtilities; import com.github.chainmailstudios.astromine.common.volume.fluid.FluidVolume; +import com.github.chainmailstudios.astromine.common.volume.fraction.Fraction; import com.github.vini2003.blade.client.utilities.Layers; import com.github.vini2003.blade.common.widget.base.AbstractWidget; diff --git a/astromine-core/src/main/java/com/github/chainmailstudios/astromine/mixin/AbstractBlockMixin.java b/astromine-core/src/main/java/com/github/chainmailstudios/astromine/mixin/AbstractBlockMixin.java index 600c030de..ec6f3a043 100644 --- a/astromine-core/src/main/java/com/github/chainmailstudios/astromine/mixin/AbstractBlockMixin.java +++ b/astromine-core/src/main/java/com/github/chainmailstudios/astromine/mixin/AbstractBlockMixin.java @@ -24,13 +24,11 @@ package com.github.chainmailstudios.astromine.mixin; -import com.github.chainmailstudios.astromine.common.block.transfer.TransferType; -import com.github.chainmailstudios.astromine.common.volume.handler.FluidHandler; -import com.github.chainmailstudios.astromine.common.volume.fraction.Fraction; -import com.github.chainmailstudios.astromine.common.item.base.FluidVolumeItem; -import com.github.chainmailstudios.astromine.common.utilities.data.Holder; -import com.github.chainmailstudios.astromine.common.volume.handler.TransferHandler; -import com.github.chainmailstudios.astromine.registry.AstromineComponentTypes; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; + import net.minecraft.block.AbstractBlock; import net.minecraft.block.Block; import net.minecraft.block.BlockState; @@ -45,10 +43,14 @@ import net.minecraft.util.hit.BlockHitResult; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Inject; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; + +import com.github.chainmailstudios.astromine.common.block.transfer.TransferType; +import com.github.chainmailstudios.astromine.common.item.base.FluidVolumeItem; +import com.github.chainmailstudios.astromine.common.utilities.data.Holder; +import com.github.chainmailstudios.astromine.common.volume.fraction.Fraction; +import com.github.chainmailstudios.astromine.common.volume.handler.FluidHandler; +import com.github.chainmailstudios.astromine.common.volume.handler.TransferHandler; +import com.github.chainmailstudios.astromine.registry.AstromineComponentTypes; import java.util.Optional; diff --git a/astromine-core/src/main/java/com/github/chainmailstudios/astromine/mixin/BucketItemMixin.java b/astromine-core/src/main/java/com/github/chainmailstudios/astromine/mixin/BucketItemMixin.java index 7ed19723d..0dae9842d 100644 --- a/astromine-core/src/main/java/com/github/chainmailstudios/astromine/mixin/BucketItemMixin.java +++ b/astromine-core/src/main/java/com/github/chainmailstudios/astromine/mixin/BucketItemMixin.java @@ -24,8 +24,13 @@ package com.github.chainmailstudios.astromine.mixin; -import com.github.chainmailstudios.astromine.common.component.SidedComponentProvider; -import com.github.chainmailstudios.astromine.registry.AstromineComponentTypes; +import org.spongepowered.asm.mixin.Final; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Shadow; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; + import net.minecraft.block.Block; import net.minecraft.block.BlockEntityProvider; import net.minecraft.block.BlockState; @@ -43,12 +48,9 @@ import net.minecraft.util.math.Vec3d; import net.minecraft.world.RaycastContext; import net.minecraft.world.World; -import org.spongepowered.asm.mixin.Final; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.Shadow; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Inject; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; + +import com.github.chainmailstudios.astromine.common.component.SidedComponentProvider; +import com.github.chainmailstudios.astromine.registry.AstromineComponentTypes; @Mixin(BucketItem.class) public class BucketItemMixin { @@ -56,6 +58,25 @@ public class BucketItemMixin { @Final public Fluid fluid; + private static BlockHitResult raycast(World world, PlayerEntity player, RaycastContext.FluidHandling fluidHandling) { + float f = player.pitch; + float g = player.yaw; + + Vec3d vec3d = player.getCameraPosVec(1.0F); + + float h = MathHelper.cos(-g * 0.017453292F - 3.1415927F); + float i = MathHelper.sin(-g * 0.017453292F - 3.1415927F); + float j = -MathHelper.cos(-f * 0.017453292F); + float k = MathHelper.sin(-f * 0.017453292F); + + float l = i * j; + float n = h * j; + + Vec3d vec3d2 = vec3d.add((double) l * 5.0D, (double) k * 5.0D, (double) n * 5.0D); + + return world.raycast(new RaycastContext(vec3d, vec3d2, RaycastContext.ShapeType.OUTLINE, fluidHandling, player)); + } + @Inject(at = @At("HEAD"), method = "use(Lnet/minecraft/world/World;Lnet/minecraft/entity/player/PlayerEntity;Lnet/minecraft/util/Hand;)Lnet/minecraft/util/TypedActionResult;", cancellable = true) void onUse(World world, PlayerEntity user, Hand hand, CallbackInfoReturnable> cir) { BlockHitResult result = raycast(world, user, fluid == Fluids.EMPTY ? RaycastContext.FluidHandling.SOURCE_ONLY : RaycastContext.FluidHandling.NONE); @@ -77,23 +98,4 @@ void onUse(World world, PlayerEntity user, Hand hand, CallbackInfoReturnable equippedArmor; + @Inject(at = @At("RETURN"), method = "createLivingAttributes()Lnet/minecraft/entity/attribute/DefaultAttributeContainer$Builder;") + private static void createLivingAttributesInject(CallbackInfoReturnable cir) { + cir.getReturnValue().add(AstromineAttributes.GRAVITY_MULTIPLIER); + } + @Shadow public abstract double getAttributeValue(EntityAttribute attribute); @Shadow public abstract Iterable getArmorItems(); - @Shadow - public float flyingSpeed; - @ModifyConstant(method = "travel(Lnet/minecraft/util/math/Vec3d;)V", constant = @Constant(doubleValue = 0.08D, ordinal = 0)) private double modifyGravity(double original) { return getGravity(); @@ -201,9 +205,4 @@ void onTick(CallbackInfo callbackInformation) { } } } - - @Inject(at = @At("RETURN"), method = "createLivingAttributes()Lnet/minecraft/entity/attribute/DefaultAttributeContainer$Builder;") - private static void createLivingAttributesInject(CallbackInfoReturnable cir) { - cir.getReturnValue().add(AstromineAttributes.GRAVITY_MULTIPLIER); - } } diff --git a/astromine-core/src/main/java/com/github/chainmailstudios/astromine/mixin/PiglinBrainMixin.java b/astromine-core/src/main/java/com/github/chainmailstudios/astromine/mixin/PiglinBrainMixin.java index c5ac7c69a..077f55576 100644 --- a/astromine-core/src/main/java/com/github/chainmailstudios/astromine/mixin/PiglinBrainMixin.java +++ b/astromine-core/src/main/java/com/github/chainmailstudios/astromine/mixin/PiglinBrainMixin.java @@ -27,49 +27,23 @@ import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; -import org.spongepowered.asm.mixin.injection.Redirect; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; import org.spongepowered.asm.mixin.injection.callback.LocalCapture; -import net.minecraft.entity.LivingEntity; import net.minecraft.entity.ai.brain.MemoryModuleType; import net.minecraft.entity.mob.PiglinBrain; import net.minecraft.entity.mob.PiglinEntity; import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.item.Items; import net.minecraft.server.network.ServerPlayerEntity; import com.github.chainmailstudios.astromine.registry.AstromineCriteria; import com.github.chainmailstudios.astromine.registry.AstromineTags; -import java.util.Iterator; import java.util.Optional; @Mixin(PiglinBrain.class) public abstract class PiglinBrainMixin { - @Inject(method = "acceptsForBarter(Lnet/minecraft/item/Item;)Z", at = @At("RETURN"), cancellable = true) - private static void acceptsForBarterInject(Item item, CallbackInfoReturnable cir) { - if (item.isIn(AstromineTags.PIGLIN_BARTERING_ITEMS)) { - cir.setReturnValue(true); - } - } - - @Inject(method = "wearsGoldArmor(Lnet/minecraft/entity/LivingEntity;)Z", at = @At(value = "INVOKE_ASSIGN", target = "Lnet/minecraft/item/ItemStack;getItem()Lnet/minecraft/item/Item;"), cancellable = true, locals = LocalCapture.CAPTURE_FAILHARD) - private static void wearsGoldArmorInject(LivingEntity entity, CallbackInfoReturnable cir, Iterable iterable, Iterator iterator, ItemStack stack, Item item) { - if (item.isIn(AstromineTags.PIGLIN_SAFE_ARMOR)) { - cir.setReturnValue(true); - } - } - - @Redirect(method = "loot(Lnet/minecraft/entity/mob/PiglinEntity;Lnet/minecraft/entity/ItemEntity;)V", at = @At(value = "INVOKE", target = "Lnet/minecraft/item/ItemStack;getItem()Lnet/minecraft/item/Item;")) - private static Item lootRedirect(ItemStack stack) { - Item item = stack.getItem(); - return item.isIn(AstromineTags.PIGLIN_LOVED_NUGGETS) ? Items.GOLD_NUGGET : item; - } - @Inject(method = "consumeOffHandItem(Lnet/minecraft/entity/mob/PiglinEntity;Z)V", at = @At(value = "INVOKE_ASSIGN", target = "Lnet/minecraft/entity/mob/PiglinBrain;acceptsForBarter(Lnet/minecraft/item/Item;)Z"), locals = LocalCapture.CAPTURE_FAILHARD) private static void triggerCriterion(PiglinEntity entity, boolean bl, CallbackInfo ci, ItemStack stack, boolean bl2) { if (bl && bl2 && stack.getItem().isIn(AstromineTags.TRICKS_PIGLINS)) { diff --git a/astromine-core/src/main/java/com/github/chainmailstudios/astromine/mixin/PiglinEntityMixin.java b/astromine-core/src/main/java/com/github/chainmailstudios/astromine/mixin/PiglinEntityMixin.java deleted file mode 100644 index 721033d2b..000000000 --- a/astromine-core/src/main/java/com/github/chainmailstudios/astromine/mixin/PiglinEntityMixin.java +++ /dev/null @@ -1,49 +0,0 @@ -/* - * MIT License - * - * Copyright (c) 2020 Chainmail Studios - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -package com.github.chainmailstudios.astromine.mixin; - -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Inject; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; - -import net.minecraft.entity.EquipmentSlot; -import net.minecraft.entity.mob.MobEntity; -import net.minecraft.entity.mob.PiglinEntity; -import net.minecraft.item.ItemStack; - -import com.github.chainmailstudios.astromine.registry.AstromineTags; - -@Mixin(PiglinEntity.class) -public class PiglinEntityMixin { - @Inject(method = "equipToOffHand(Lnet/minecraft/item/ItemStack;)V", at = @At("HEAD"), cancellable = true) - public void equipToOffHandInject(ItemStack stack, CallbackInfo ci) { - if (stack.getItem().isIn(AstromineTags.PIGLIN_BARTERING_ITEMS)) { - ((MobEntity) (Object) this).equipStack(EquipmentSlot.OFFHAND, stack); - ((MobEntity) (Object) this).updateDropChances(EquipmentSlot.OFFHAND); - ci.cancel(); - } - } -} diff --git a/astromine-core/src/main/java/com/github/chainmailstudios/astromine/mixin/ServerWorldMixin.java b/astromine-core/src/main/java/com/github/chainmailstudios/astromine/mixin/ServerWorldMixin.java index e2598397d..716de5eb6 100644 --- a/astromine-core/src/main/java/com/github/chainmailstudios/astromine/mixin/ServerWorldMixin.java +++ b/astromine-core/src/main/java/com/github/chainmailstudios/astromine/mixin/ServerWorldMixin.java @@ -24,14 +24,16 @@ package com.github.chainmailstudios.astromine.mixin; -import com.github.chainmailstudios.astromine.common.callback.ServerChunkTickCallback; -import net.minecraft.server.world.ServerWorld; -import net.minecraft.world.chunk.WorldChunk; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; +import net.minecraft.server.world.ServerWorld; +import net.minecraft.world.chunk.WorldChunk; + +import com.github.chainmailstudios.astromine.common.callback.ServerChunkTickCallback; + @Mixin(ServerWorld.class) public class ServerWorldMixin { @Inject(method = "tickChunk", at = @At("HEAD")) diff --git a/astromine-core/src/main/java/com/github/chainmailstudios/astromine/registry/AstromineBlocks.java b/astromine-core/src/main/java/com/github/chainmailstudios/astromine/registry/AstromineBlocks.java index 448c768f2..db07bd71c 100644 --- a/astromine-core/src/main/java/com/github/chainmailstudios/astromine/registry/AstromineBlocks.java +++ b/astromine-core/src/main/java/com/github/chainmailstudios/astromine/registry/AstromineBlocks.java @@ -24,9 +24,9 @@ package com.github.chainmailstudios.astromine.registry; -import com.github.chainmailstudios.astromine.AstromineCommon; import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; import net.fabricmc.fabric.api.tool.attribute.v1.FabricToolTags; + import net.minecraft.block.Block; import net.minecraft.block.Material; import net.minecraft.block.MaterialColor; @@ -36,6 +36,8 @@ import net.minecraft.util.Identifier; import net.minecraft.util.registry.Registry; +import com.github.chainmailstudios.astromine.AstromineCommon; + public class AstromineBlocks { public static void initialize() { diff --git a/astromine-core/src/main/java/com/github/chainmailstudios/astromine/registry/AstromineCommonCallbacks.java b/astromine-core/src/main/java/com/github/chainmailstudios/astromine/registry/AstromineCommonCallbacks.java index 14b5c4289..a870cf7d1 100644 --- a/astromine-core/src/main/java/com/github/chainmailstudios/astromine/registry/AstromineCommonCallbacks.java +++ b/astromine-core/src/main/java/com/github/chainmailstudios/astromine/registry/AstromineCommonCallbacks.java @@ -24,6 +24,16 @@ package com.github.chainmailstudios.astromine.registry; +import net.fabricmc.fabric.api.event.lifecycle.v1.ServerTickEvents; +import net.fabricmc.fabric.api.event.registry.RegistryEntryAddedCallback; + +import net.minecraft.entity.LivingEntity; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.fluid.Fluids; +import net.minecraft.item.Item; +import net.minecraft.util.registry.Registry; +import net.minecraft.world.chunk.WorldChunk; + import com.github.chainmailstudios.astromine.common.callback.ServerChunkTickCallback; import com.github.chainmailstudios.astromine.common.component.entity.EntityOxygenComponent; import com.github.chainmailstudios.astromine.common.component.inventory.FluidInventoryComponent; @@ -31,7 +41,11 @@ import com.github.chainmailstudios.astromine.common.component.world.ChunkAtmosphereComponent; import com.github.chainmailstudios.astromine.common.component.world.WorldBridgeComponent; import com.github.chainmailstudios.astromine.common.component.world.WorldNetworkComponent; -import com.github.chainmailstudios.astromine.common.entity.base.*; +import com.github.chainmailstudios.astromine.common.entity.base.ComponentEnergyEntity; +import com.github.chainmailstudios.astromine.common.entity.base.ComponentEnergyItemEntity; +import com.github.chainmailstudios.astromine.common.entity.base.ComponentFluidEntity; +import com.github.chainmailstudios.astromine.common.entity.base.ComponentFluidInventoryEntity; +import com.github.chainmailstudios.astromine.common.entity.base.ComponentItemEntity; import com.github.chainmailstudios.astromine.common.item.base.FluidVolumeItem; import com.github.chainmailstudios.astromine.common.screenhandler.base.block.ComponentBlockEntityScreenHandler; import com.github.chainmailstudios.astromine.common.volume.fluid.FluidVolume; @@ -41,14 +55,6 @@ import nerdhub.cardinal.components.api.event.EntityComponentCallback; import nerdhub.cardinal.components.api.event.ItemComponentCallbackV2; import nerdhub.cardinal.components.api.event.WorldComponentCallback; -import net.fabricmc.fabric.api.event.lifecycle.v1.ServerTickEvents; -import net.fabricmc.fabric.api.event.registry.RegistryEntryAddedCallback; -import net.minecraft.entity.LivingEntity; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.fluid.Fluids; -import net.minecraft.item.Item; -import net.minecraft.util.registry.Registry; -import net.minecraft.world.chunk.WorldChunk; import java.util.function.Consumer; diff --git a/astromine-core/src/main/java/com/github/chainmailstudios/astromine/registry/AstromineItems.java b/astromine-core/src/main/java/com/github/chainmailstudios/astromine/registry/AstromineItems.java index 2836ce409..9718a7906 100644 --- a/astromine-core/src/main/java/com/github/chainmailstudios/astromine/registry/AstromineItems.java +++ b/astromine-core/src/main/java/com/github/chainmailstudios/astromine/registry/AstromineItems.java @@ -24,12 +24,13 @@ package com.github.chainmailstudios.astromine.registry; -import com.github.chainmailstudios.astromine.AstromineCommon; -import com.github.chainmailstudios.astromine.common.item.ManualItem; import net.minecraft.item.Item; import net.minecraft.util.Identifier; import net.minecraft.util.registry.Registry; +import com.github.chainmailstudios.astromine.AstromineCommon; +import com.github.chainmailstudios.astromine.common.item.ManualItem; + public class AstromineItems { public static final Item ENERGY = register("energy", new Item(new Item.Settings())); public static final Item FLUID = register("fluid", new Item(new Item.Settings())); @@ -44,6 +45,7 @@ public static void initialize() {} * Name of item instance to be registered * @param item * Item instance to be registered + * * @return Item instance registered */ public static T register(String name, T item) { @@ -55,6 +57,7 @@ public static T register(String name, T item) { * Identifier of item instance to be registered * @param item * Item instance to be registered + * * @return Item instance registered */ public static T register(Identifier name, T item) { diff --git a/astromine-core/src/main/java/com/github/chainmailstudios/astromine/registry/AstromineTags.java b/astromine-core/src/main/java/com/github/chainmailstudios/astromine/registry/AstromineTags.java index c423c509b..edceec26f 100644 --- a/astromine-core/src/main/java/com/github/chainmailstudios/astromine/registry/AstromineTags.java +++ b/astromine-core/src/main/java/com/github/chainmailstudios/astromine/registry/AstromineTags.java @@ -35,9 +35,6 @@ public class AstromineTags { public static final Tag TRICKS_PIGLINS = TagRegistry.item(AstromineCommon.identifier("tricks_piglins")); - public static final Tag PIGLIN_LOVED_NUGGETS = TagRegistry.item(AstromineCommon.identifier("piglin_loved_nuggets")); - public static final Tag PIGLIN_BARTERING_ITEMS = TagRegistry.item(AstromineCommon.identifier("piglin_bartering_items")); - public static final Tag PIGLIN_SAFE_ARMOR = TagRegistry.item(AstromineCommon.identifier("piglin_safe_armor")); public static final Tag NORMAL_BREATHABLE = TagRegistry.fluid(AstromineCommon.identifier("normal_breathable")); public static final Tag WATER_BREATHABLE = TagRegistry.fluid(AstromineCommon.identifier("water_breathable")); diff --git a/astromine-core/src/main/java/com/github/chainmailstudios/astromine/registry/client/AstromineClientCallbacks.java b/astromine-core/src/main/java/com/github/chainmailstudios/astromine/registry/client/AstromineClientCallbacks.java index 061f83b02..4d0312fec 100644 --- a/astromine-core/src/main/java/com/github/chainmailstudios/astromine/registry/client/AstromineClientCallbacks.java +++ b/astromine-core/src/main/java/com/github/chainmailstudios/astromine/registry/client/AstromineClientCallbacks.java @@ -24,16 +24,17 @@ package com.github.chainmailstudios.astromine.registry.client; +import net.fabricmc.fabric.api.client.item.v1.ItemTooltipCallback; + +import net.minecraft.text.LiteralText; +import net.minecraft.text.TranslatableText; +import net.minecraft.util.Formatting; + import com.github.chainmailstudios.astromine.common.item.base.EnergyVolumeItem; import com.github.chainmailstudios.astromine.common.item.base.FluidVolumeItem; import com.github.chainmailstudios.astromine.common.utilities.EnergyUtilities; import com.github.chainmailstudios.astromine.common.utilities.NumberUtilities; import com.github.chainmailstudios.astromine.common.volume.handler.FluidHandler; -import net.fabricmc.fabric.api.client.item.v1.ItemTooltipCallback; -import net.minecraft.text.LiteralText; -import net.minecraft.text.TranslatableText; - -import net.minecraft.util.Formatting; import team.reborn.energy.EnergyHandler; public class AstromineClientCallbacks { diff --git a/astromine-core/src/main/resources/assets/astromine/lang/en_us.json b/astromine-core/src/main/resources/assets/astromine/lang/en_us.json index 1037beea5..de2cb6fad 100644 --- a/astromine-core/src/main/resources/assets/astromine/lang/en_us.json +++ b/astromine-core/src/main/resources/assets/astromine/lang/en_us.json @@ -626,7 +626,7 @@ "item.astromine.lunum_helmet": "Lunum Helmet", "item.astromine.lunum_chestplate": "Lunum Chestplate", "item.astromine.lunum_leggings": "Lunum Leggings", - "item.astromine.lunum_boots": "Lunum Boots", + "item.astromine.lunum_boots": "Lunum Boots", "item.astromine.meteoric_steel_helmet": "Meteoric Steel Helmet", "item.astromine.meteoric_steel_chestplate": "Meteoric Steel Chestplate", "item.astromine.meteoric_steel_leggings": "Meteoric Steel Leggings", diff --git a/astromine-core/src/main/resources/astromine.mixins.json b/astromine-core/src/main/resources/astromine.mixins.json index 3c938a056..9fdd6f292 100644 --- a/astromine-core/src/main/resources/astromine.mixins.json +++ b/astromine-core/src/main/resources/astromine.mixins.json @@ -4,9 +4,11 @@ "package": "com.github.chainmailstudios.astromine.mixin", "compatibilityLevel": "JAVA_8", "mixins": [ - "AbstractBlockMixin", "AbstractMinecartEntityMixin", "BiomeLayerSamplerMixin", "BucketItemMixin", "DiggerEnchantmentTargetMixin", "EntityMixin", - "FishingBobberEntityMixin", "GravityEntityMixin", "HoneyBlockMixin", "IdentifierMixin", "ItemEntityMixin", "LivingEntityMixin", "PiglinBrainMixin", - "PiglinEntityMixin", "ServerChunkManagerMixin", "ServerWorldMixin", "SquidEntityMixin", "StepAndDestroyBlockGoalMixin", "WorldChunkMixin" + "AbstractBlockMixin", "AbstractMinecartEntityMixin", "BiomeLayerSamplerMixin", "BucketItemMixin", + "DiggerEnchantmentTargetMixin", "EntityMixin", + "FishingBobberEntityMixin", "GravityEntityMixin", "HoneyBlockMixin", "IdentifierMixin", "ItemEntityMixin", + "LivingEntityMixin", "PiglinBrainMixin", + "ServerChunkManagerMixin", "ServerWorldMixin", "SquidEntityMixin", "StepAndDestroyBlockGoalMixin", "WorldChunkMixin" ], "client": [ "BossBarHudMixin", "ClientRecipeBookMixin", "CurrentDownParticleMixin", diff --git a/astromine-discoveries/src/datagen/java/com/github/chainmailstudios/astromine/discoveries/datagen/registry/AstromineDiscoveriesModelStateGenerators.java b/astromine-discoveries/src/datagen/java/com/github/chainmailstudios/astromine/discoveries/datagen/registry/AstromineDiscoveriesModelStateGenerators.java index bae4d4a70..e564da701 100644 --- a/astromine-discoveries/src/datagen/java/com/github/chainmailstudios/astromine/discoveries/datagen/registry/AstromineDiscoveriesModelStateGenerators.java +++ b/astromine-discoveries/src/datagen/java/com/github/chainmailstudios/astromine/discoveries/datagen/registry/AstromineDiscoveriesModelStateGenerators.java @@ -56,10 +56,10 @@ public class AstromineDiscoveriesModelStateGenerators extends AstromineModelStat )); public final ModelStateGenerator SPACE_SUIT = register(new GenericItemModelGenerator( - AstromineDiscoveriesItems.SPACE_SUIT_HELMET, - AstromineDiscoveriesItems.SPACE_SUIT_CHESTPLATE, - AstromineDiscoveriesItems.SPACE_SUIT_LEGGINGS, - AstromineDiscoveriesItems.SPACE_SUIT_BOOTS + AstromineDiscoveriesItems.SPACE_SUIT_HELMET, + AstromineDiscoveriesItems.SPACE_SUIT_CHESTPLATE, + AstromineDiscoveriesItems.SPACE_SUIT_LEGGINGS, + AstromineDiscoveriesItems.SPACE_SUIT_BOOTS )); public final ModelStateGenerator ROCKET_PARTS = register(new GenericItemModelGenerator( diff --git a/astromine-discoveries/src/datagen/java/com/github/chainmailstudios/astromine/discoveries/datagen/registry/AstromineDiscoveriesRecipeGenerators.java b/astromine-discoveries/src/datagen/java/com/github/chainmailstudios/astromine/discoveries/datagen/registry/AstromineDiscoveriesRecipeGenerators.java index fcd77e0a6..6ac20eaf6 100644 --- a/astromine-discoveries/src/datagen/java/com/github/chainmailstudios/astromine/discoveries/datagen/registry/AstromineDiscoveriesRecipeGenerators.java +++ b/astromine-discoveries/src/datagen/java/com/github/chainmailstudios/astromine/discoveries/datagen/registry/AstromineDiscoveriesRecipeGenerators.java @@ -10,8 +10,8 @@ import com.github.chainmailstudios.astromine.datagen.generator.recipe.set.BlastingSetRecipeGenerator; import com.github.chainmailstudios.astromine.datagen.generator.recipe.set.SmeltingSetRecipeGenerator; import com.github.chainmailstudios.astromine.datagen.registry.AstromineRecipeGenerators; -import com.github.chainmailstudios.astromine.discoveries.registry.AstromineDiscoveriesBlocks; import com.github.chainmailstudios.astromine.discoveries.datagen.generators.recipe.TrituratingRecipeGenerator; +import com.github.chainmailstudios.astromine.discoveries.registry.AstromineDiscoveriesBlocks; import static com.github.chainmailstudios.astromine.datagen.material.MaterialItemType.ASTEROID_CLUSTER; import static com.github.chainmailstudios.astromine.datagen.material.MaterialItemType.ASTEROID_ORE; diff --git a/astromine-discoveries/src/main/java/com/github/chainmailstudios/astromine/discoveries/client/model/PrimitiveRocketEntityModel.java b/astromine-discoveries/src/main/java/com/github/chainmailstudios/astromine/discoveries/client/model/PrimitiveRocketEntityModel.java index 48f3cda4d..7f80b4371 100644 --- a/astromine-discoveries/src/main/java/com/github/chainmailstudios/astromine/discoveries/client/model/PrimitiveRocketEntityModel.java +++ b/astromine-discoveries/src/main/java/com/github/chainmailstudios/astromine/discoveries/client/model/PrimitiveRocketEntityModel.java @@ -24,12 +24,13 @@ package com.github.chainmailstudios.astromine.discoveries.client.model; -import com.github.chainmailstudios.astromine.discoveries.common.entity.PrimitiveRocketEntity; import net.minecraft.client.model.ModelPart; import net.minecraft.client.render.VertexConsumer; import net.minecraft.client.render.entity.model.EntityModel; import net.minecraft.client.util.math.MatrixStack; +import com.github.chainmailstudios.astromine.discoveries.common.entity.PrimitiveRocketEntity; + public class PrimitiveRocketEntityModel extends EntityModel { private final ModelPart model; diff --git a/astromine-discoveries/src/main/java/com/github/chainmailstudios/astromine/discoveries/client/render/entity/PrimitiveRocketEntityRenderer.java b/astromine-discoveries/src/main/java/com/github/chainmailstudios/astromine/discoveries/client/render/entity/PrimitiveRocketEntityRenderer.java index f0011a57a..89ab3b0f7 100644 --- a/astromine-discoveries/src/main/java/com/github/chainmailstudios/astromine/discoveries/client/render/entity/PrimitiveRocketEntityRenderer.java +++ b/astromine-discoveries/src/main/java/com/github/chainmailstudios/astromine/discoveries/client/render/entity/PrimitiveRocketEntityRenderer.java @@ -24,9 +24,6 @@ package com.github.chainmailstudios.astromine.discoveries.client.render.entity; -import com.github.chainmailstudios.astromine.discoveries.client.model.PrimitiveRocketEntityModel; - -import com.github.chainmailstudios.astromine.discoveries.common.entity.PrimitiveRocketEntity; import net.minecraft.client.render.OverlayTexture; import net.minecraft.client.render.VertexConsumer; import net.minecraft.client.render.VertexConsumerProvider; @@ -37,6 +34,8 @@ import net.minecraft.util.Identifier; import com.github.chainmailstudios.astromine.AstromineCommon; +import com.github.chainmailstudios.astromine.discoveries.client.model.PrimitiveRocketEntityModel; +import com.github.chainmailstudios.astromine.discoveries.common.entity.PrimitiveRocketEntity; public class PrimitiveRocketEntityRenderer extends EntityRenderer { public static final Identifier ID = AstromineCommon.identifier("textures/entity/rocket/primitive_rocket.png"); diff --git a/astromine-discoveries/src/main/java/com/github/chainmailstudios/astromine/discoveries/client/screen/RocketHandledScreen.java b/astromine-discoveries/src/main/java/com/github/chainmailstudios/astromine/discoveries/client/screen/RocketHandledScreen.java index 380406fdb..baab2831b 100644 --- a/astromine-discoveries/src/main/java/com/github/chainmailstudios/astromine/discoveries/client/screen/RocketHandledScreen.java +++ b/astromine-discoveries/src/main/java/com/github/chainmailstudios/astromine/discoveries/client/screen/RocketHandledScreen.java @@ -24,11 +24,11 @@ package com.github.chainmailstudios.astromine.discoveries.client.screen; -import com.github.chainmailstudios.astromine.client.screen.base.entity.ComponentEntityFluidInventoryHandledScreen; -import com.github.chainmailstudios.astromine.discoveries.common.screenhandler.RocketScreenHandler; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.text.Text; +import com.github.chainmailstudios.astromine.client.screen.base.entity.ComponentEntityFluidInventoryHandledScreen; +import com.github.chainmailstudios.astromine.discoveries.common.screenhandler.RocketScreenHandler; import com.github.vini2003.blade.common.handler.BaseScreenHandler; public class RocketHandledScreen extends ComponentEntityFluidInventoryHandledScreen { diff --git a/astromine-discoveries/src/main/java/com/github/chainmailstudios/astromine/discoveries/common/block/entity/AltarPedestalBlockEntity.java b/astromine-discoveries/src/main/java/com/github/chainmailstudios/astromine/discoveries/common/block/entity/AltarPedestalBlockEntity.java index 7469fa63f..ef914719f 100644 --- a/astromine-discoveries/src/main/java/com/github/chainmailstudios/astromine/discoveries/common/block/entity/AltarPedestalBlockEntity.java +++ b/astromine-discoveries/src/main/java/com/github/chainmailstudios/astromine/discoveries/common/block/entity/AltarPedestalBlockEntity.java @@ -24,11 +24,8 @@ package com.github.chainmailstudios.astromine.discoveries.common.block.entity; -import com.github.chainmailstudios.astromine.common.component.inventory.ItemInventoryComponent; -import com.github.chainmailstudios.astromine.common.component.inventory.SimpleItemInventoryComponent; -import com.github.chainmailstudios.astromine.common.component.inventory.compatibility.ItemInventoryFromInventoryComponent; -import com.github.chainmailstudios.astromine.discoveries.registry.AstromineDiscoveriesBlockEntityTypes; import net.fabricmc.fabric.api.block.entity.BlockEntityClientSerializable; + import net.minecraft.block.BlockState; import net.minecraft.block.entity.BlockEntity; import net.minecraft.nbt.CompoundTag; @@ -38,6 +35,11 @@ import net.minecraft.util.Tickable; import net.minecraft.util.math.BlockPos; +import com.github.chainmailstudios.astromine.common.component.inventory.ItemInventoryComponent; +import com.github.chainmailstudios.astromine.common.component.inventory.SimpleItemInventoryComponent; +import com.github.chainmailstudios.astromine.common.component.inventory.compatibility.ItemInventoryFromInventoryComponent; +import com.github.chainmailstudios.astromine.discoveries.registry.AstromineDiscoveriesBlockEntityTypes; + public class AltarPedestalBlockEntity extends BlockEntity implements ItemInventoryFromInventoryComponent, Tickable, BlockEntityClientSerializable { public BlockPos parent; private int spinAge; @@ -78,7 +80,8 @@ public void tick() { if (parent != null) { AltarBlockEntity blockEntity = (AltarBlockEntity) world.getBlockEntity(parent); - if (blockEntity == null) onRemove(); + if (blockEntity == null) + onRemove(); else { spinAge += blockEntity.craftingTicks / 5; lastSpinAddition += blockEntity.craftingTicks / 5; diff --git a/astromine-discoveries/src/main/java/com/github/chainmailstudios/astromine/discoveries/common/entity/PrimitiveRocketEntity.java b/astromine-discoveries/src/main/java/com/github/chainmailstudios/astromine/discoveries/common/entity/PrimitiveRocketEntity.java index 4fe6e8268..a10e9a193 100644 --- a/astromine-discoveries/src/main/java/com/github/chainmailstudios/astromine/discoveries/common/entity/PrimitiveRocketEntity.java +++ b/astromine-discoveries/src/main/java/com/github/chainmailstudios/astromine/discoveries/common/entity/PrimitiveRocketEntity.java @@ -24,20 +24,9 @@ package com.github.chainmailstudios.astromine.discoveries.common.entity; -import com.github.chainmailstudios.astromine.AstromineCommon; -import com.github.chainmailstudios.astromine.common.component.inventory.FluidInventoryComponent; -import com.github.chainmailstudios.astromine.common.component.inventory.ItemInventoryComponent; -import com.github.chainmailstudios.astromine.common.component.inventory.SimpleFluidInventoryComponent; -import com.github.chainmailstudios.astromine.common.component.inventory.SimpleItemInventoryComponent; -import com.github.chainmailstudios.astromine.common.volume.fluid.FluidVolume; -import com.github.chainmailstudios.astromine.common.volume.fraction.Fraction; -import com.github.chainmailstudios.astromine.common.volume.handler.FluidHandler; -import com.github.chainmailstudios.astromine.discoveries.common.entity.base.RocketEntity; -import com.github.chainmailstudios.astromine.discoveries.common.screenhandler.RocketScreenHandler; -import com.github.chainmailstudios.astromine.foundations.registry.AstromineFoundationsFluids; -import io.netty.buffer.Unpooled; import net.fabricmc.fabric.api.network.ServerSidePacketRegistry; import net.fabricmc.fabric.api.screenhandler.v1.ExtendedScreenHandlerFactory; + import net.minecraft.entity.EntityType; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerInventory; @@ -51,6 +40,19 @@ import net.minecraft.util.Identifier; import net.minecraft.util.math.Vec3d; import net.minecraft.world.World; + +import com.github.chainmailstudios.astromine.AstromineCommon; +import com.github.chainmailstudios.astromine.common.component.inventory.FluidInventoryComponent; +import com.github.chainmailstudios.astromine.common.component.inventory.ItemInventoryComponent; +import com.github.chainmailstudios.astromine.common.component.inventory.SimpleFluidInventoryComponent; +import com.github.chainmailstudios.astromine.common.component.inventory.SimpleItemInventoryComponent; +import com.github.chainmailstudios.astromine.common.volume.fluid.FluidVolume; +import com.github.chainmailstudios.astromine.common.volume.fraction.Fraction; +import com.github.chainmailstudios.astromine.common.volume.handler.FluidHandler; +import com.github.chainmailstudios.astromine.discoveries.common.entity.base.RocketEntity; +import com.github.chainmailstudios.astromine.discoveries.common.screenhandler.RocketScreenHandler; +import com.github.chainmailstudios.astromine.foundations.registry.AstromineFoundationsFluids; +import io.netty.buffer.Unpooled; import org.joml.Vector3d; import org.joml.Vector3f; diff --git a/astromine-discoveries/src/main/java/com/github/chainmailstudios/astromine/discoveries/common/entity/base/RocketEntity.java b/astromine-discoveries/src/main/java/com/github/chainmailstudios/astromine/discoveries/common/entity/base/RocketEntity.java index 0a7ab5d15..c28226c0b 100644 --- a/astromine-discoveries/src/main/java/com/github/chainmailstudios/astromine/discoveries/common/entity/base/RocketEntity.java +++ b/astromine-discoveries/src/main/java/com/github/chainmailstudios/astromine/discoveries/common/entity/base/RocketEntity.java @@ -24,12 +24,6 @@ package com.github.chainmailstudios.astromine.discoveries.common.entity.base; -import com.github.chainmailstudios.astromine.common.entity.base.ComponentFluidInventoryEntity; -import com.github.chainmailstudios.astromine.common.volume.fraction.Fraction; -import com.github.chainmailstudios.astromine.common.volume.fluid.FluidVolume; -import com.github.chainmailstudios.astromine.common.volume.handler.FluidHandler; -import com.github.chainmailstudios.astromine.common.volume.handler.ItemHandler; -import com.github.chainmailstudios.astromine.discoveries.registry.AstromineDiscoveriesParticles; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityType; import net.minecraft.entity.LivingEntity; @@ -51,6 +45,13 @@ import net.minecraft.util.math.Vec3d; import net.minecraft.world.World; import net.minecraft.world.explosion.Explosion; + +import com.github.chainmailstudios.astromine.common.entity.base.ComponentFluidInventoryEntity; +import com.github.chainmailstudios.astromine.common.volume.fluid.FluidVolume; +import com.github.chainmailstudios.astromine.common.volume.fraction.Fraction; +import com.github.chainmailstudios.astromine.common.volume.handler.FluidHandler; +import com.github.chainmailstudios.astromine.common.volume.handler.ItemHandler; +import com.github.chainmailstudios.astromine.discoveries.registry.AstromineDiscoveriesParticles; import org.joml.Vector3d; import org.joml.Vector3f; @@ -61,31 +62,26 @@ public abstract class RocketEntity extends ComponentFluidInventoryEntity { public static final TrackedData IS_RUNNING = DataTracker.registerData(RocketEntity.class, TrackedDataHandlerRegistry.BOOLEAN); + private final Predicate fuelPredicate = createFuelPredicate(); + private final Function consumptionFunction = createConsumptionFunction(); + private final Collection explosionRemains = createExplosionRemains(); + private final Function accelerationFunction = createAccelerationFunction(); + private final Supplier passengerPosition = createPassengerPosition(); - protected abstract Predicate createFuelPredicate(); + public RocketEntity(EntityType type, World world) { + super(type, world); + } - private final Predicate fuelPredicate = createFuelPredicate(); + protected abstract Predicate createFuelPredicate(); protected abstract Function createConsumptionFunction(); - private final Function consumptionFunction = createConsumptionFunction(); - protected abstract Collection createExplosionRemains(); - private final Collection explosionRemains = createExplosionRemains(); - protected abstract Function createAccelerationFunction(); - private final Function accelerationFunction = createAccelerationFunction(); - protected abstract Supplier createPassengerPosition(); - private final Supplier passengerPosition = createPassengerPosition(); - - public RocketEntity(EntityType type, World world) { - super(type, world); - } - @Override protected void initDataTracker() { this.getDataTracker().startTracking(IS_RUNNING, false); diff --git a/astromine-discoveries/src/main/java/com/github/chainmailstudios/astromine/discoveries/common/screenhandler/RocketScreenHandler.java b/astromine-discoveries/src/main/java/com/github/chainmailstudios/astromine/discoveries/common/screenhandler/RocketScreenHandler.java index 12440db78..fba301f9b 100644 --- a/astromine-discoveries/src/main/java/com/github/chainmailstudios/astromine/discoveries/common/screenhandler/RocketScreenHandler.java +++ b/astromine-discoveries/src/main/java/com/github/chainmailstudios/astromine/discoveries/common/screenhandler/RocketScreenHandler.java @@ -24,6 +24,12 @@ package com.github.chainmailstudios.astromine.discoveries.common.screenhandler; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.item.ItemStack; +import net.minecraft.text.Text; +import net.minecraft.text.TranslatableText; +import net.minecraft.util.Formatting; + import com.github.chainmailstudios.astromine.common.screenhandler.base.entity.ComponentEntityFluidInventoryScreenHandler; import com.github.chainmailstudios.astromine.common.volume.fraction.Fraction; import com.github.chainmailstudios.astromine.discoveries.common.entity.base.RocketEntity; @@ -34,11 +40,6 @@ import com.github.vini2003.blade.common.widget.base.ButtonWidget; import com.github.vini2003.blade.common.widget.base.SlotWidget; import com.github.vini2003.blade.common.widget.base.TextWidget; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.item.ItemStack; -import net.minecraft.text.Text; -import net.minecraft.text.TranslatableText; -import net.minecraft.util.Formatting; public class RocketScreenHandler extends ComponentEntityFluidInventoryScreenHandler { private TextWidget fuelTextWidget; diff --git a/astromine-discoveries/src/main/java/com/github/chainmailstudios/astromine/discoveries/common/world/decorator/MoonOreDecorator.java b/astromine-discoveries/src/main/java/com/github/chainmailstudios/astromine/discoveries/common/world/decorator/MoonOreDecorator.java index 713ede452..81b1ca2fe 100644 --- a/astromine-discoveries/src/main/java/com/github/chainmailstudios/astromine/discoveries/common/world/decorator/MoonOreDecorator.java +++ b/astromine-discoveries/src/main/java/com/github/chainmailstudios/astromine/discoveries/common/world/decorator/MoonOreDecorator.java @@ -24,19 +24,18 @@ package com.github.chainmailstudios.astromine.discoveries.common.world.decorator; -import java.util.ArrayList; -import java.util.List; -import java.util.Random; -import java.util.stream.Stream; - -import com.mojang.serialization.Codec; - import net.minecraft.util.collection.WeightedList; import net.minecraft.util.math.BlockPos; import net.minecraft.world.Heightmap; import net.minecraft.world.gen.CountConfig; import net.minecraft.world.gen.decorator.Decorator; import net.minecraft.world.gen.decorator.DecoratorContext; +import com.mojang.serialization.Codec; + +import java.util.ArrayList; +import java.util.List; +import java.util.Random; +import java.util.stream.Stream; public class MoonOreDecorator extends Decorator { public MoonOreDecorator(Codec configCodec) { diff --git a/astromine-discoveries/src/main/java/com/github/chainmailstudios/astromine/discoveries/common/world/feature/MoonLakeFeature.java b/astromine-discoveries/src/main/java/com/github/chainmailstudios/astromine/discoveries/common/world/feature/MoonLakeFeature.java index 50b9a3bf5..ffd90589c 100644 --- a/astromine-discoveries/src/main/java/com/github/chainmailstudios/astromine/discoveries/common/world/feature/MoonLakeFeature.java +++ b/astromine-discoveries/src/main/java/com/github/chainmailstudios/astromine/discoveries/common/world/feature/MoonLakeFeature.java @@ -24,17 +24,17 @@ package com.github.chainmailstudios.astromine.discoveries.common.world.feature; -import java.util.Random; - -import com.github.chainmailstudios.astromine.discoveries.registry.AstromineDiscoveriesBlocks; -import com.mojang.serialization.Codec; - import net.minecraft.block.Blocks; import net.minecraft.util.math.BlockPos; import net.minecraft.world.StructureWorldAccess; import net.minecraft.world.gen.chunk.ChunkGenerator; import net.minecraft.world.gen.feature.DefaultFeatureConfig; import net.minecraft.world.gen.feature.Feature; +import com.mojang.serialization.Codec; + +import com.github.chainmailstudios.astromine.discoveries.registry.AstromineDiscoveriesBlocks; + +import java.util.Random; public class MoonLakeFeature extends Feature { public MoonLakeFeature(Codec configCodec) { diff --git a/astromine-discoveries/src/main/java/com/github/chainmailstudios/astromine/discoveries/common/world/feature/MoonOreFeature.java b/astromine-discoveries/src/main/java/com/github/chainmailstudios/astromine/discoveries/common/world/feature/MoonOreFeature.java index 98daccfd6..7f2741a73 100644 --- a/astromine-discoveries/src/main/java/com/github/chainmailstudios/astromine/discoveries/common/world/feature/MoonOreFeature.java +++ b/astromine-discoveries/src/main/java/com/github/chainmailstudios/astromine/discoveries/common/world/feature/MoonOreFeature.java @@ -24,11 +24,14 @@ package com.github.chainmailstudios.astromine.discoveries.common.world.feature; -import java.util.Random; -import java.util.stream.Collectors; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.StructureWorldAccess; +import net.minecraft.world.gen.chunk.ChunkGenerator; +import net.minecraft.world.gen.feature.DefaultFeatureConfig; +import net.minecraft.world.gen.feature.Feature; +import com.mojang.serialization.Codec; import com.github.chainmailstudios.astromine.discoveries.registry.AstromineDiscoveriesBlocks; -import com.mojang.serialization.Codec; import com.terraformersmc.shapes.api.Position; import com.terraformersmc.shapes.api.Quaternion; import com.terraformersmc.shapes.api.Shape; @@ -36,11 +39,8 @@ import com.terraformersmc.shapes.impl.layer.transform.RotateLayer; import com.terraformersmc.shapes.impl.layer.transform.TranslateLayer; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.StructureWorldAccess; -import net.minecraft.world.gen.chunk.ChunkGenerator; -import net.minecraft.world.gen.feature.DefaultFeatureConfig; -import net.minecraft.world.gen.feature.Feature; +import java.util.Random; +import java.util.stream.Collectors; public class MoonOreFeature extends Feature { public MoonOreFeature(Codec configCodec) { diff --git a/astromine-discoveries/src/main/java/com/github/chainmailstudios/astromine/discoveries/common/world/generation/glacios/GlaciosChunkGenerator.java b/astromine-discoveries/src/main/java/com/github/chainmailstudios/astromine/discoveries/common/world/generation/glacios/GlaciosChunkGenerator.java index 8e7ea620f..ffcfc755d 100644 --- a/astromine-discoveries/src/main/java/com/github/chainmailstudios/astromine/discoveries/common/world/generation/glacios/GlaciosChunkGenerator.java +++ b/astromine-discoveries/src/main/java/com/github/chainmailstudios/astromine/discoveries/common/world/generation/glacios/GlaciosChunkGenerator.java @@ -24,14 +24,6 @@ package com.github.chainmailstudios.astromine.discoveries.common.world.generation.glacios; -import java.util.Random; - -import com.github.chainmailstudios.astromine.common.noise.FastNoise; -import com.github.chainmailstudios.astromine.common.noise.OctaveNoiseSampler; -import com.github.chainmailstudios.astromine.common.noise.OpenSimplexNoise; -import com.mojang.serialization.Codec; -import com.mojang.serialization.codecs.RecordCodecBuilder; - import net.minecraft.block.Blocks; import net.minecraft.util.math.BlockPos; import net.minecraft.util.registry.Registry; @@ -46,6 +38,14 @@ import net.minecraft.world.gen.StructureAccessor; import net.minecraft.world.gen.chunk.ChunkGenerator; import net.minecraft.world.gen.chunk.StructuresConfig; +import com.mojang.serialization.Codec; +import com.mojang.serialization.codecs.RecordCodecBuilder; + +import com.github.chainmailstudios.astromine.common.noise.FastNoise; +import com.github.chainmailstudios.astromine.common.noise.OctaveNoiseSampler; +import com.github.chainmailstudios.astromine.common.noise.OpenSimplexNoise; + +import java.util.Random; public class GlaciosChunkGenerator extends ChunkGenerator { public static Codec CODEC = RecordCodecBuilder.create(instance -> instance.group(Codec.LONG.fieldOf("seed").forGetter(gen -> gen.seed), RegistryLookupCodec.of(Registry.BIOME_KEY).forGetter(source -> source.biomeRegistry)).apply(instance, diff --git a/astromine-discoveries/src/main/java/com/github/chainmailstudios/astromine/discoveries/common/world/generation/moon/MoonChunkGenerator.java b/astromine-discoveries/src/main/java/com/github/chainmailstudios/astromine/discoveries/common/world/generation/moon/MoonChunkGenerator.java index 95a84034e..a37e3619d 100644 --- a/astromine-discoveries/src/main/java/com/github/chainmailstudios/astromine/discoveries/common/world/generation/moon/MoonChunkGenerator.java +++ b/astromine-discoveries/src/main/java/com/github/chainmailstudios/astromine/discoveries/common/world/generation/moon/MoonChunkGenerator.java @@ -75,6 +75,10 @@ public MoonChunkGenerator(long seed, Registry biomeRegistry) { this.cache = ThreadLocal.withInitial(() -> new BiomeGeneratorCache(biomeSource)); } + private static double computeNoiseFalloff(int y) { + return Math.max(((10.0) / (y + 0.1)) - 1, 0); + } + @Override protected Codec getCodec() { return CODEC; @@ -156,10 +160,6 @@ public void populateNoise(WorldAccess world, StructureAccessor accessor, Chunk c } } - private static double computeNoiseFalloff(int y) { - return Math.max(((10.0) / (y + 0.1)) - 1, 0); - } - @Override public int getHeight(int x, int z, Heightmap.Type heightmapType) { return 0; diff --git a/astromine-discoveries/src/main/java/com/github/chainmailstudios/astromine/discoveries/common/world/generation/space/EarthSpaceChunkGenerator.java b/astromine-discoveries/src/main/java/com/github/chainmailstudios/astromine/discoveries/common/world/generation/space/EarthSpaceChunkGenerator.java index 69957a3bb..7248eda60 100644 --- a/astromine-discoveries/src/main/java/com/github/chainmailstudios/astromine/discoveries/common/world/generation/space/EarthSpaceChunkGenerator.java +++ b/astromine-discoveries/src/main/java/com/github/chainmailstudios/astromine/discoveries/common/world/generation/space/EarthSpaceChunkGenerator.java @@ -24,7 +24,6 @@ package com.github.chainmailstudios.astromine.discoveries.common.world.generation.space; -import com.github.chainmailstudios.astromine.registry.AstromineConfig; import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; import net.minecraft.util.math.BlockPos; @@ -47,6 +46,7 @@ import com.github.chainmailstudios.astromine.common.noise.OctaveNoiseSampler; import com.github.chainmailstudios.astromine.common.noise.OpenSimplexNoise; import com.github.chainmailstudios.astromine.discoveries.registry.AstromineDiscoveriesBlocks; +import com.github.chainmailstudios.astromine.registry.AstromineConfig; import java.util.Arrays; import java.util.Random; diff --git a/astromine-discoveries/src/main/java/com/github/chainmailstudios/astromine/discoveries/mixin/client/BuiltinModelItemRendererMixin.java b/astromine-discoveries/src/main/java/com/github/chainmailstudios/astromine/discoveries/mixin/client/BuiltinModelItemRendererMixin.java index dd4847a22..f0819415c 100644 --- a/astromine-discoveries/src/main/java/com/github/chainmailstudios/astromine/discoveries/mixin/client/BuiltinModelItemRendererMixin.java +++ b/astromine-discoveries/src/main/java/com/github/chainmailstudios/astromine/discoveries/mixin/client/BuiltinModelItemRendererMixin.java @@ -24,7 +24,6 @@ package com.github.chainmailstudios.astromine.discoveries.mixin.client; -import com.github.chainmailstudios.astromine.discoveries.client.model.PrimitiveRocketEntityModel; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Unique; import org.spongepowered.asm.mixin.injection.At; @@ -37,6 +36,7 @@ import net.minecraft.client.util.math.MatrixStack; import net.minecraft.item.ItemStack; +import com.github.chainmailstudios.astromine.discoveries.client.model.PrimitiveRocketEntityModel; import com.github.chainmailstudios.astromine.discoveries.registry.AstromineDiscoveriesItems; import com.github.chainmailstudios.astromine.discoveries.registry.client.AstromineDiscoveriesClientModels; diff --git a/astromine-discoveries/src/main/java/com/github/chainmailstudios/astromine/discoveries/registry/AstromineDiscoveriesCommonCallbacks.java b/astromine-discoveries/src/main/java/com/github/chainmailstudios/astromine/discoveries/registry/AstromineDiscoveriesCommonCallbacks.java index ef77d27bb..318c93956 100644 --- a/astromine-discoveries/src/main/java/com/github/chainmailstudios/astromine/discoveries/registry/AstromineDiscoveriesCommonCallbacks.java +++ b/astromine-discoveries/src/main/java/com/github/chainmailstudios/astromine/discoveries/registry/AstromineDiscoveriesCommonCallbacks.java @@ -24,12 +24,12 @@ package com.github.chainmailstudios.astromine.discoveries.registry; -import com.github.chainmailstudios.astromine.common.volume.fraction.Fraction; import net.minecraft.server.world.ServerWorld; import com.github.chainmailstudios.astromine.common.callback.ServerChunkManagerCallback; import com.github.chainmailstudios.astromine.common.component.inventory.FluidInventoryComponent; import com.github.chainmailstudios.astromine.common.component.inventory.SimpleFluidInventoryComponent; +import com.github.chainmailstudios.astromine.common.volume.fraction.Fraction; import com.github.chainmailstudios.astromine.discoveries.common.world.generation.glacios.GlaciosChunkGenerator; import com.github.chainmailstudios.astromine.discoveries.common.world.generation.mars.MarsChunkGenerator; import com.github.chainmailstudios.astromine.discoveries.common.world.generation.moon.MoonChunkGenerator; diff --git a/astromine-discoveries/src/main/java/com/github/chainmailstudios/astromine/discoveries/registry/AstromineDiscoveriesCommonPackets.java b/astromine-discoveries/src/main/java/com/github/chainmailstudios/astromine/discoveries/registry/AstromineDiscoveriesCommonPackets.java index 9e961ff9e..91055da28 100644 --- a/astromine-discoveries/src/main/java/com/github/chainmailstudios/astromine/discoveries/registry/AstromineDiscoveriesCommonPackets.java +++ b/astromine-discoveries/src/main/java/com/github/chainmailstudios/astromine/discoveries/registry/AstromineDiscoveriesCommonPackets.java @@ -24,13 +24,15 @@ package com.github.chainmailstudios.astromine.discoveries.registry; +import net.fabricmc.fabric.api.network.ServerSidePacketRegistry; + +import net.minecraft.network.PacketByteBuf; +import net.minecraft.util.Identifier; + import com.github.chainmailstudios.astromine.AstromineCommon; import com.github.chainmailstudios.astromine.discoveries.common.entity.PrimitiveRocketEntity; import com.github.chainmailstudios.astromine.registry.AstromineCommonPackets; import io.netty.buffer.Unpooled; -import net.fabricmc.fabric.api.network.ServerSidePacketRegistry; -import net.minecraft.network.PacketByteBuf; -import net.minecraft.util.Identifier; public class AstromineDiscoveriesCommonPackets extends AstromineCommonPackets { public static final Identifier ROCKET_LAUNCH = AstromineCommon.identifier("rocket_launch"); diff --git a/astromine-discoveries/src/main/java/com/github/chainmailstudios/astromine/discoveries/registry/AstromineDiscoveriesDecorators.java b/astromine-discoveries/src/main/java/com/github/chainmailstudios/astromine/discoveries/registry/AstromineDiscoveriesDecorators.java index f2d5bf874..817bffd04 100644 --- a/astromine-discoveries/src/main/java/com/github/chainmailstudios/astromine/discoveries/registry/AstromineDiscoveriesDecorators.java +++ b/astromine-discoveries/src/main/java/com/github/chainmailstudios/astromine/discoveries/registry/AstromineDiscoveriesDecorators.java @@ -24,14 +24,14 @@ package com.github.chainmailstudios.astromine.discoveries.registry; -import com.github.chainmailstudios.astromine.AstromineCommon; -import com.github.chainmailstudios.astromine.discoveries.common.world.decorator.MoonOreDecorator; - import net.minecraft.util.registry.Registry; import net.minecraft.world.gen.CountConfig; import net.minecraft.world.gen.decorator.Decorator; import net.minecraft.world.gen.decorator.DecoratorConfig; +import com.github.chainmailstudios.astromine.AstromineCommon; +import com.github.chainmailstudios.astromine.discoveries.common.world.decorator.MoonOreDecorator; + public class AstromineDiscoveriesDecorators { public static Decorator MOON_ORE = register("moon_ore_decorator", new MoonOreDecorator(CountConfig.CODEC)); diff --git a/astromine-discoveries/src/main/java/com/github/chainmailstudios/astromine/discoveries/registry/AstromineDiscoveriesEntityTypes.java b/astromine-discoveries/src/main/java/com/github/chainmailstudios/astromine/discoveries/registry/AstromineDiscoveriesEntityTypes.java index 19674b58d..9b5d675d4 100644 --- a/astromine-discoveries/src/main/java/com/github/chainmailstudios/astromine/discoveries/registry/AstromineDiscoveriesEntityTypes.java +++ b/astromine-discoveries/src/main/java/com/github/chainmailstudios/astromine/discoveries/registry/AstromineDiscoveriesEntityTypes.java @@ -24,7 +24,6 @@ package com.github.chainmailstudios.astromine.discoveries.registry; -import com.github.chainmailstudios.astromine.discoveries.common.entity.PrimitiveRocketEntity; import net.fabricmc.fabric.api.event.player.AttackEntityCallback; import net.fabricmc.fabric.api.object.builder.v1.entity.FabricDefaultAttributeRegistry; import net.fabricmc.fabric.api.object.builder.v1.entity.FabricEntityTypeBuilder; @@ -37,6 +36,7 @@ import net.minecraft.util.ActionResult; import net.minecraft.world.Heightmap; +import com.github.chainmailstudios.astromine.discoveries.common.entity.PrimitiveRocketEntity; import com.github.chainmailstudios.astromine.discoveries.common.entity.SpaceSlimeEntity; import com.github.chainmailstudios.astromine.discoveries.common.entity.SuperSpaceSlimeEntity; import com.github.chainmailstudios.astromine.registry.AstromineEntityTypes; diff --git a/astromine-discoveries/src/main/java/com/github/chainmailstudios/astromine/discoveries/registry/AstromineDiscoveriesScreenHandlers.java b/astromine-discoveries/src/main/java/com/github/chainmailstudios/astromine/discoveries/registry/AstromineDiscoveriesScreenHandlers.java index 76136424d..75bf46136 100644 --- a/astromine-discoveries/src/main/java/com/github/chainmailstudios/astromine/discoveries/registry/AstromineDiscoveriesScreenHandlers.java +++ b/astromine-discoveries/src/main/java/com/github/chainmailstudios/astromine/discoveries/registry/AstromineDiscoveriesScreenHandlers.java @@ -24,12 +24,12 @@ package com.github.chainmailstudios.astromine.discoveries.registry; -import com.github.chainmailstudios.astromine.discoveries.common.screenhandler.RocketScreenHandler; import net.fabricmc.fabric.api.screenhandler.v1.ScreenHandlerRegistry; import net.minecraft.screen.ScreenHandlerType; import com.github.chainmailstudios.astromine.AstromineCommon; +import com.github.chainmailstudios.astromine.discoveries.common.screenhandler.RocketScreenHandler; import com.github.chainmailstudios.astromine.registry.AstromineScreenHandlers; public class AstromineDiscoveriesScreenHandlers extends AstromineScreenHandlers { diff --git a/astromine-discoveries/src/main/java/com/github/chainmailstudios/astromine/discoveries/registry/client/AstromineDiscoveriesClientCallbacks.java b/astromine-discoveries/src/main/java/com/github/chainmailstudios/astromine/discoveries/registry/client/AstromineDiscoveriesClientCallbacks.java index 9680b05dc..3f7986b75 100644 --- a/astromine-discoveries/src/main/java/com/github/chainmailstudios/astromine/discoveries/registry/client/AstromineDiscoveriesClientCallbacks.java +++ b/astromine-discoveries/src/main/java/com/github/chainmailstudios/astromine/discoveries/registry/client/AstromineDiscoveriesClientCallbacks.java @@ -24,7 +24,6 @@ package com.github.chainmailstudios.astromine.discoveries.registry.client; -import com.github.chainmailstudios.astromine.discoveries.common.entity.PrimitiveRocketEntity; import net.fabricmc.fabric.api.client.item.v1.ItemTooltipCallback; import net.fabricmc.fabric.api.network.ClientSidePacketRegistry; @@ -39,6 +38,7 @@ import com.github.chainmailstudios.astromine.discoveries.client.render.sky.MoonSkyProperties; import com.github.chainmailstudios.astromine.discoveries.client.render.sky.SpaceSkyProperties; import com.github.chainmailstudios.astromine.discoveries.client.render.sky.VulcanSkyProperties; +import com.github.chainmailstudios.astromine.discoveries.common.entity.PrimitiveRocketEntity; import com.github.chainmailstudios.astromine.discoveries.common.item.SpaceSuitItem; import com.github.chainmailstudios.astromine.discoveries.registry.AstromineDiscoveriesDimensions; import com.github.chainmailstudios.astromine.discoveries.registry.AstromineDiscoveriesEntityTypes; diff --git a/astromine-discoveries/src/main/java/com/github/chainmailstudios/astromine/discoveries/registry/client/AstromineDiscoveriesClientModels.java b/astromine-discoveries/src/main/java/com/github/chainmailstudios/astromine/discoveries/registry/client/AstromineDiscoveriesClientModels.java index 411aef69a..009c1da9a 100644 --- a/astromine-discoveries/src/main/java/com/github/chainmailstudios/astromine/discoveries/registry/client/AstromineDiscoveriesClientModels.java +++ b/astromine-discoveries/src/main/java/com/github/chainmailstudios/astromine/discoveries/registry/client/AstromineDiscoveriesClientModels.java @@ -24,16 +24,16 @@ package com.github.chainmailstudios.astromine.discoveries.registry.client; -import com.github.chainmailstudios.astromine.AstromineCommon; -import com.github.chainmailstudios.astromine.discoveries.client.model.PrimitiveRocketEntityModel; -import com.github.chainmailstudios.astromine.discoveries.client.render.entity.PrimitiveRocketEntityRenderer; -import com.github.chainmailstudios.astromine.registry.client.AstromineClientModels; -import com.mojang.datafixers.util.Pair; import net.fabricmc.fabric.api.client.model.ModelLoadingRegistry; + import net.minecraft.client.render.VertexConsumer; import net.minecraft.client.render.VertexConsumerProvider; import net.minecraft.client.render.item.ItemRenderer; -import net.minecraft.client.render.model.*; +import net.minecraft.client.render.model.BakedModel; +import net.minecraft.client.render.model.BuiltinBakedModel; +import net.minecraft.client.render.model.ModelBakeSettings; +import net.minecraft.client.render.model.ModelLoader; +import net.minecraft.client.render.model.UnbakedModel; import net.minecraft.client.render.model.json.ModelOverrideList; import net.minecraft.client.render.model.json.ModelTransformation; import net.minecraft.client.texture.Sprite; @@ -43,6 +43,12 @@ import net.minecraft.client.util.math.Vector3f; import net.minecraft.item.ItemStack; import net.minecraft.util.Identifier; +import com.mojang.datafixers.util.Pair; + +import com.github.chainmailstudios.astromine.AstromineCommon; +import com.github.chainmailstudios.astromine.discoveries.client.model.PrimitiveRocketEntityModel; +import com.github.chainmailstudios.astromine.discoveries.client.render.entity.PrimitiveRocketEntityRenderer; +import com.github.chainmailstudios.astromine.registry.client.AstromineClientModels; import java.util.Collection; import java.util.Collections; @@ -90,7 +96,7 @@ public static void renderRocket(PrimitiveRocketEntityModel primitiveRocketEntity matrices.multiply(Vector3f.POSITIVE_Y.getDegreesQuaternion(45)); matrices.multiply(Vector3f.POSITIVE_X.getDegreesQuaternion(45)); } - VertexConsumer vertexConsumer2 = ItemRenderer.getDirectGlintVertexConsumer(vertexConsumerProvider, primitiveRocketEntityModel.getLayer(PrimitiveRocketEntityRenderer.ID), false, stack.hasGlint()); + VertexConsumer vertexConsumer2 = ItemRenderer.getDirectItemGlintConsumer(vertexConsumerProvider, primitiveRocketEntityModel.getLayer(PrimitiveRocketEntityRenderer.ID), false, stack.hasGlint()); primitiveRocketEntityModel.render(matrices, vertexConsumer2, i, j, 1.0F, 1.0F, 1.0F, 1.0F); matrices.pop(); } diff --git a/astromine-discoveries/src/main/java/com/github/chainmailstudios/astromine/discoveries/registry/client/AstromineDiscoveriesEntityRenderers.java b/astromine-discoveries/src/main/java/com/github/chainmailstudios/astromine/discoveries/registry/client/AstromineDiscoveriesEntityRenderers.java index a8486721e..52964316e 100644 --- a/astromine-discoveries/src/main/java/com/github/chainmailstudios/astromine/discoveries/registry/client/AstromineDiscoveriesEntityRenderers.java +++ b/astromine-discoveries/src/main/java/com/github/chainmailstudios/astromine/discoveries/registry/client/AstromineDiscoveriesEntityRenderers.java @@ -24,9 +24,9 @@ package com.github.chainmailstudios.astromine.discoveries.registry.client; -import com.github.chainmailstudios.astromine.discoveries.client.render.entity.PrimitiveRocketEntityRenderer; import net.fabricmc.fabric.api.client.rendereregistry.v1.EntityRendererRegistry; +import com.github.chainmailstudios.astromine.discoveries.client.render.entity.PrimitiveRocketEntityRenderer; import com.github.chainmailstudios.astromine.discoveries.client.render.entity.SpaceSlimeEntityRenderer; import com.github.chainmailstudios.astromine.discoveries.client.render.entity.SuperSpaceSlimeEntityRenderer; import com.github.chainmailstudios.astromine.discoveries.registry.AstromineDiscoveriesEntityTypes; diff --git a/astromine-foundations/src/datagen/java/com/github/chainmailstudios/astromine/foundations/datagen/generators/tag/BeaconBaseTagGenerator.java b/astromine-foundations/src/datagen/java/com/github/chainmailstudios/astromine/foundations/datagen/generators/tag/BeaconBaseTagGenerator.java index 67e926fd8..dfe213405 100644 --- a/astromine-foundations/src/datagen/java/com/github/chainmailstudios/astromine/foundations/datagen/generators/tag/BeaconBaseTagGenerator.java +++ b/astromine-foundations/src/datagen/java/com/github/chainmailstudios/astromine/foundations/datagen/generators/tag/BeaconBaseTagGenerator.java @@ -6,7 +6,6 @@ import com.github.chainmailstudios.astromine.datagen.generator.tag.set.GenericSetTagGenerator; import com.github.chainmailstudios.astromine.datagen.material.MaterialItemType; import com.github.chainmailstudios.astromine.datagen.material.MaterialSet; -import com.github.chainmailstudios.astromine.foundations.datagen.registry.AstromineFoundationsMaterialSets; import me.shedaniel.cloth.api.datagen.v1.TagData; public class BeaconBaseTagGenerator extends GenericSetTagGenerator { diff --git a/astromine-foundations/src/datagen/java/com/github/chainmailstudios/astromine/foundations/datagen/generators/tag/BeaconPaymentTagGenerator.java b/astromine-foundations/src/datagen/java/com/github/chainmailstudios/astromine/foundations/datagen/generators/tag/BeaconPaymentTagGenerator.java index 6c115da8a..65d235e27 100644 --- a/astromine-foundations/src/datagen/java/com/github/chainmailstudios/astromine/foundations/datagen/generators/tag/BeaconPaymentTagGenerator.java +++ b/astromine-foundations/src/datagen/java/com/github/chainmailstudios/astromine/foundations/datagen/generators/tag/BeaconPaymentTagGenerator.java @@ -1,14 +1,11 @@ package com.github.chainmailstudios.astromine.foundations.datagen.generators.tag; -import net.minecraft.block.Block; -import net.minecraft.item.Item; import net.minecraft.item.ItemConvertible; import net.minecraft.util.Identifier; import com.github.chainmailstudios.astromine.datagen.generator.tag.set.GenericSetTagGenerator; import com.github.chainmailstudios.astromine.datagen.material.MaterialItemType; import com.github.chainmailstudios.astromine.datagen.material.MaterialSet; -import com.github.chainmailstudios.astromine.foundations.datagen.registry.AstromineFoundationsMaterialSets; import me.shedaniel.cloth.api.datagen.v1.TagData; public class BeaconPaymentTagGenerator extends GenericSetTagGenerator { diff --git a/astromine-foundations/src/datagen/java/com/github/chainmailstudios/astromine/foundations/datagen/generators/tag/CarbonDustTagGenerator.java b/astromine-foundations/src/datagen/java/com/github/chainmailstudios/astromine/foundations/datagen/generators/tag/CarbonDustTagGenerator.java index 2f0e55d00..b896609c4 100644 --- a/astromine-foundations/src/datagen/java/com/github/chainmailstudios/astromine/foundations/datagen/generators/tag/CarbonDustTagGenerator.java +++ b/astromine-foundations/src/datagen/java/com/github/chainmailstudios/astromine/foundations/datagen/generators/tag/CarbonDustTagGenerator.java @@ -2,7 +2,6 @@ import net.minecraft.util.Identifier; -import com.github.chainmailstudios.astromine.AstromineCommon; import com.github.chainmailstudios.astromine.datagen.generator.tag.set.SetTagGenerator; import com.github.chainmailstudios.astromine.datagen.material.MaterialItemType; import com.github.chainmailstudios.astromine.datagen.material.MaterialSet; diff --git a/astromine-foundations/src/datagen/java/com/github/chainmailstudios/astromine/foundations/datagen/generators/tag/PiglinArmorTagGenerator.java b/astromine-foundations/src/datagen/java/com/github/chainmailstudios/astromine/foundations/datagen/generators/tag/PiglinArmorTagGenerator.java index 839fbfb17..2514856c1 100644 --- a/astromine-foundations/src/datagen/java/com/github/chainmailstudios/astromine/foundations/datagen/generators/tag/PiglinArmorTagGenerator.java +++ b/astromine-foundations/src/datagen/java/com/github/chainmailstudios/astromine/foundations/datagen/generators/tag/PiglinArmorTagGenerator.java @@ -1,13 +1,14 @@ package com.github.chainmailstudios.astromine.foundations.datagen.generators.tag; -import com.github.chainmailstudios.astromine.AstromineCommon; +import net.minecraft.util.Identifier; + import com.github.chainmailstudios.astromine.datagen.generator.tag.set.GenericSetTagGenerator; import com.github.chainmailstudios.astromine.datagen.material.MaterialItemType; import com.github.chainmailstudios.astromine.datagen.material.MaterialSet; public class PiglinArmorTagGenerator extends GenericSetTagGenerator { public PiglinArmorTagGenerator(MaterialItemType type) { - super("piglin_armor", AstromineCommon.identifier("piglin_safe_armor"), type); + super("piglin_armor", new Identifier("piglib", "piglin_safe_armor"), type); } @Override diff --git a/astromine-foundations/src/datagen/java/com/github/chainmailstudios/astromine/foundations/datagen/generators/tag/PiglinBarterTagGenerator.java b/astromine-foundations/src/datagen/java/com/github/chainmailstudios/astromine/foundations/datagen/generators/tag/PiglinBarterTagGenerator.java index a87b8f3a5..c5f97a09b 100644 --- a/astromine-foundations/src/datagen/java/com/github/chainmailstudios/astromine/foundations/datagen/generators/tag/PiglinBarterTagGenerator.java +++ b/astromine-foundations/src/datagen/java/com/github/chainmailstudios/astromine/foundations/datagen/generators/tag/PiglinBarterTagGenerator.java @@ -1,13 +1,14 @@ package com.github.chainmailstudios.astromine.foundations.datagen.generators.tag; -import com.github.chainmailstudios.astromine.AstromineCommon; +import net.minecraft.util.Identifier; + import com.github.chainmailstudios.astromine.datagen.generator.tag.set.GenericSetTagGenerator; import com.github.chainmailstudios.astromine.datagen.material.MaterialItemType; import com.github.chainmailstudios.astromine.datagen.material.MaterialSet; public class PiglinBarterTagGenerator extends GenericSetTagGenerator { public PiglinBarterTagGenerator(MaterialItemType type) { - super("piglin_barter", AstromineCommon.identifier("piglin_bartering_items"), type); + super("piglin_barter", new Identifier("piglib", "piglin_bartering_items"), type); } @Override diff --git a/astromine-foundations/src/datagen/java/com/github/chainmailstudios/astromine/foundations/datagen/generators/tag/PiglinNuggetTagGenerator.java b/astromine-foundations/src/datagen/java/com/github/chainmailstudios/astromine/foundations/datagen/generators/tag/PiglinNuggetTagGenerator.java index 0ffc8d2bc..e8e302695 100644 --- a/astromine-foundations/src/datagen/java/com/github/chainmailstudios/astromine/foundations/datagen/generators/tag/PiglinNuggetTagGenerator.java +++ b/astromine-foundations/src/datagen/java/com/github/chainmailstudios/astromine/foundations/datagen/generators/tag/PiglinNuggetTagGenerator.java @@ -1,13 +1,14 @@ package com.github.chainmailstudios.astromine.foundations.datagen.generators.tag; -import com.github.chainmailstudios.astromine.AstromineCommon; +import net.minecraft.util.Identifier; + import com.github.chainmailstudios.astromine.datagen.generator.tag.set.GenericSetTagGenerator; import com.github.chainmailstudios.astromine.datagen.material.MaterialItemType; import com.github.chainmailstudios.astromine.datagen.material.MaterialSet; public class PiglinNuggetTagGenerator extends GenericSetTagGenerator { public PiglinNuggetTagGenerator(MaterialItemType type) { - super("piglin_nugget", AstromineCommon.identifier("piglin_loved_nuggets"), type); + super("piglin_nugget", new Identifier("piglib", "piglin_loved_nuggets"), type); } @Override diff --git a/astromine-foundations/src/datagen/java/com/github/chainmailstudios/astromine/foundations/datagen/registry/AstromineFoundationsModelStateGenerators.java b/astromine-foundations/src/datagen/java/com/github/chainmailstudios/astromine/foundations/datagen/registry/AstromineFoundationsModelStateGenerators.java index 6ac7f0cb8..aeb2de158 100644 --- a/astromine-foundations/src/datagen/java/com/github/chainmailstudios/astromine/foundations/datagen/registry/AstromineFoundationsModelStateGenerators.java +++ b/astromine-foundations/src/datagen/java/com/github/chainmailstudios/astromine/foundations/datagen/registry/AstromineFoundationsModelStateGenerators.java @@ -3,7 +3,6 @@ import com.github.chainmailstudios.astromine.AstromineCommon; import com.github.chainmailstudios.astromine.datagen.generator.modelstate.ModelStateGenerator; import com.github.chainmailstudios.astromine.datagen.generator.modelstate.onetime.GenericBlockModelStateGenerator; -import com.github.chainmailstudios.astromine.datagen.generator.modelstate.onetime.HandheldItemModelGenerator; import com.github.chainmailstudios.astromine.datagen.generator.modelstate.onetime.SimpleBlockItemModelGenerator; import com.github.chainmailstudios.astromine.datagen.generator.modelstate.set.ColumnBlockSetModelStateGenerator; import com.github.chainmailstudios.astromine.datagen.generator.modelstate.set.GenericBlockSetModelStateGenerator; @@ -12,7 +11,6 @@ import com.github.chainmailstudios.astromine.datagen.material.MaterialItemType; import com.github.chainmailstudios.astromine.datagen.registry.AstromineModelStateGenerators; import com.github.chainmailstudios.astromine.foundations.registry.AstromineFoundationsBlocks; -import com.github.chainmailstudios.astromine.foundations.registry.AstromineFoundationsItems; public class AstromineFoundationsModelStateGenerators extends AstromineModelStateGenerators { public final ModelStateGenerator INGOT = register(new GenericItemSetModelGenerator(MaterialItemType.INGOT)); diff --git a/astromine-foundations/src/datagen/java/com/github/chainmailstudios/astromine/foundations/datagen/registry/AstromineFoundationsRecipeGenerators.java b/astromine-foundations/src/datagen/java/com/github/chainmailstudios/astromine/foundations/datagen/registry/AstromineFoundationsRecipeGenerators.java index eb240e02e..8eea33651 100644 --- a/astromine-foundations/src/datagen/java/com/github/chainmailstudios/astromine/foundations/datagen/registry/AstromineFoundationsRecipeGenerators.java +++ b/astromine-foundations/src/datagen/java/com/github/chainmailstudios/astromine/foundations/datagen/registry/AstromineFoundationsRecipeGenerators.java @@ -14,14 +14,12 @@ import com.github.chainmailstudios.astromine.datagen.generator.recipe.set.ShapelessCraftingSetRecipeGenerator; import com.github.chainmailstudios.astromine.datagen.generator.recipe.set.SmeltingSetRecipeGenerator; import com.github.chainmailstudios.astromine.datagen.generator.recipe.set.SmithingSetRecipeGenerator; -import com.github.chainmailstudios.astromine.datagen.material.MaterialItemType; import com.github.chainmailstudios.astromine.datagen.registry.AstromineRecipeGenerators; import com.github.chainmailstudios.astromine.foundations.datagen.generators.recipe.AppleCraftingRecipeGenerator; import com.github.chainmailstudios.astromine.foundations.datagen.generators.recipe.ArmorCraftingRecipeGenerators; import com.github.chainmailstudios.astromine.foundations.datagen.generators.recipe.ToolCraftingRecipeGenerators; import com.github.chainmailstudios.astromine.foundations.datagen.generators.recipe.WrenchCraftingRecipeGenerator; import com.github.chainmailstudios.astromine.foundations.registry.AstromineFoundationsBlocks; -import com.github.chainmailstudios.astromine.foundations.registry.AstromineFoundationsItems; import static com.github.chainmailstudios.astromine.datagen.material.MaterialItemType.*; diff --git a/astromine-foundations/src/generated/resources/data/astromine/tags/items/piglin_bartering_items.json b/astromine-foundations/src/generated/resources/data/piglib/tags/items/piglin_bartering_items.json similarity index 100% rename from astromine-foundations/src/generated/resources/data/astromine/tags/items/piglin_bartering_items.json rename to astromine-foundations/src/generated/resources/data/piglib/tags/items/piglin_bartering_items.json diff --git a/astromine-foundations/src/generated/resources/data/astromine/tags/items/piglin_loved_nuggets.json b/astromine-foundations/src/generated/resources/data/piglib/tags/items/piglin_loved_nuggets.json similarity index 100% rename from astromine-foundations/src/generated/resources/data/astromine/tags/items/piglin_loved_nuggets.json rename to astromine-foundations/src/generated/resources/data/piglib/tags/items/piglin_loved_nuggets.json diff --git a/astromine-foundations/src/generated/resources/data/astromine/tags/items/piglin_safe_armor.json b/astromine-foundations/src/generated/resources/data/piglib/tags/items/piglin_safe_armor.json similarity index 100% rename from astromine-foundations/src/generated/resources/data/astromine/tags/items/piglin_safe_armor.json rename to astromine-foundations/src/generated/resources/data/piglib/tags/items/piglin_safe_armor.json diff --git a/astromine-foundations/src/main/java/com/github/chainmailstudios/astromine/foundations/AstromineFoundationsCommon.java b/astromine-foundations/src/main/java/com/github/chainmailstudios/astromine/foundations/AstromineFoundationsCommon.java index de4986cca..e1c7e6eae 100644 --- a/astromine-foundations/src/main/java/com/github/chainmailstudios/astromine/foundations/AstromineFoundationsCommon.java +++ b/astromine-foundations/src/main/java/com/github/chainmailstudios/astromine/foundations/AstromineFoundationsCommon.java @@ -25,7 +25,13 @@ package com.github.chainmailstudios.astromine.foundations; import com.github.chainmailstudios.astromine.AstromineCommon; -import com.github.chainmailstudios.astromine.foundations.registry.*; +import com.github.chainmailstudios.astromine.foundations.registry.AstromineFoundationsBlocks; +import com.github.chainmailstudios.astromine.foundations.registry.AstromineFoundationsCriteria; +import com.github.chainmailstudios.astromine.foundations.registry.AstromineFoundationsFeatures; +import com.github.chainmailstudios.astromine.foundations.registry.AstromineFoundationsFluidEffects; +import com.github.chainmailstudios.astromine.foundations.registry.AstromineFoundationsFluids; +import com.github.chainmailstudios.astromine.foundations.registry.AstromineFoundationsItems; +import com.github.chainmailstudios.astromine.foundations.registry.AstromineFoundationsOres; public class AstromineFoundationsCommon extends AstromineCommon { public static String appendId(String id) { diff --git a/astromine-foundations/src/main/java/com/github/chainmailstudios/astromine/foundations/common/world/feature/CrudeOilFeature.java b/astromine-foundations/src/main/java/com/github/chainmailstudios/astromine/foundations/common/world/feature/CrudeOilFeature.java index 29e531ec5..8a88ab882 100644 --- a/astromine-foundations/src/main/java/com/github/chainmailstudios/astromine/foundations/common/world/feature/CrudeOilFeature.java +++ b/astromine-foundations/src/main/java/com/github/chainmailstudios/astromine/foundations/common/world/feature/CrudeOilFeature.java @@ -24,13 +24,6 @@ package com.github.chainmailstudios.astromine.foundations.common.world.feature; -import com.github.chainmailstudios.astromine.AstromineCommon; -import com.github.chainmailstudios.astromine.foundations.registry.AstromineFoundationsFluids; -import com.mojang.serialization.Codec; -import com.terraformersmc.shapes.api.Position; -import com.terraformersmc.shapes.impl.Shapes; -import com.terraformersmc.shapes.impl.layer.transform.NoiseTranslateLayer; -import com.terraformersmc.shapes.impl.layer.transform.TranslateLayer; import net.minecraft.block.Block; import net.minecraft.block.FluidBlock; import net.minecraft.util.Lazy; @@ -42,6 +35,14 @@ import net.minecraft.world.gen.chunk.ChunkGenerator; import net.minecraft.world.gen.feature.DefaultFeatureConfig; import net.minecraft.world.gen.feature.Feature; +import com.mojang.serialization.Codec; + +import com.github.chainmailstudios.astromine.AstromineCommon; +import com.github.chainmailstudios.astromine.foundations.registry.AstromineFoundationsFluids; +import com.terraformersmc.shapes.api.Position; +import com.terraformersmc.shapes.impl.Shapes; +import com.terraformersmc.shapes.impl.layer.transform.NoiseTranslateLayer; +import com.terraformersmc.shapes.impl.layer.transform.TranslateLayer; import java.util.Random; diff --git a/astromine-foundations/src/main/java/com/github/chainmailstudios/astromine/foundations/registry/AstromineFoundationsFeatures.java b/astromine-foundations/src/main/java/com/github/chainmailstudios/astromine/foundations/registry/AstromineFoundationsFeatures.java index ee275ec01..f47420eed 100644 --- a/astromine-foundations/src/main/java/com/github/chainmailstudios/astromine/foundations/registry/AstromineFoundationsFeatures.java +++ b/astromine-foundations/src/main/java/com/github/chainmailstudios/astromine/foundations/registry/AstromineFoundationsFeatures.java @@ -24,7 +24,6 @@ package com.github.chainmailstudios.astromine.foundations.registry; -import com.github.chainmailstudios.astromine.foundations.common.world.feature.CrudeOilFeature; import net.minecraft.structure.StructurePieceType; import net.minecraft.util.Identifier; import net.minecraft.util.registry.Registry; @@ -32,9 +31,14 @@ import net.minecraft.world.biome.Biome; import net.minecraft.world.gen.GenerationStep; import net.minecraft.world.gen.chunk.StructureConfig; -import net.minecraft.world.gen.feature.*; +import net.minecraft.world.gen.feature.ConfiguredFeature; +import net.minecraft.world.gen.feature.ConfiguredStructureFeature; +import net.minecraft.world.gen.feature.DefaultFeatureConfig; +import net.minecraft.world.gen.feature.Feature; +import net.minecraft.world.gen.feature.StructureFeature; import com.github.chainmailstudios.astromine.AstromineCommon; +import com.github.chainmailstudios.astromine.foundations.common.world.feature.CrudeOilFeature; import com.github.chainmailstudios.astromine.foundations.common.world.feature.MeteorFeature; import com.github.chainmailstudios.astromine.foundations.common.world.feature.MeteorGenerator; import com.github.chainmailstudios.astromine.registry.AstromineFeatures; diff --git a/astromine-technologies/src/datagen/java/com/github/chainmailstudios/astromine/technologies/datagen/AstromineTechnologiesLootTableGenerators.java b/astromine-technologies/src/datagen/java/com/github/chainmailstudios/astromine/technologies/datagen/AstromineTechnologiesLootTableGenerators.java index 1cac5cee0..6f630d1c5 100644 --- a/astromine-technologies/src/datagen/java/com/github/chainmailstudios/astromine/technologies/datagen/AstromineTechnologiesLootTableGenerators.java +++ b/astromine-technologies/src/datagen/java/com/github/chainmailstudios/astromine/technologies/datagen/AstromineTechnologiesLootTableGenerators.java @@ -3,91 +3,84 @@ import com.github.chainmailstudios.astromine.datagen.generator.loottable.LootTableGenerator; import com.github.chainmailstudios.astromine.datagen.generator.loottable.onetime.DropSelfLootTableGenerator; import com.github.chainmailstudios.astromine.datagen.registry.AstromineLootTableGenerators; -import com.github.chainmailstudios.astromine.technologies.common.block.*; import com.github.chainmailstudios.astromine.technologies.registry.AstromineTechnologiesBlocks; -import com.github.chainmailstudios.astromine.technologies.registry.AstromineTechnologiesItems; -import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; -import net.fabricmc.fabric.api.tool.attribute.v1.FabricToolTags; -import net.minecraft.block.Block; -import net.minecraft.block.Material; -import net.minecraft.sound.BlockSoundGroup; public class AstromineTechnologiesLootTableGenerators extends AstromineLootTableGenerators { public final LootTableGenerator DROP_SELF = register(new DropSelfLootTableGenerator( - AstromineTechnologiesBlocks.HOLOGRAPHIC_BRIDGE_PROJECTOR, - AstromineTechnologiesBlocks.HOLOGRAPHIC_BRIDGE_INVISIBLE_BLOCK, - - AstromineTechnologiesBlocks.VENT, - - AstromineTechnologiesBlocks.PRIMITIVE_TANK, - AstromineTechnologiesBlocks.BASIC_TANK, - AstromineTechnologiesBlocks.ADVANCED_TANK, - AstromineTechnologiesBlocks.ELITE_TANK, - AstromineTechnologiesBlocks.CREATIVE_TANK, - - AstromineTechnologiesBlocks.PRIMITIVE_SOLID_GENERATOR, - AstromineTechnologiesBlocks.BASIC_SOLID_GENERATOR, - AstromineTechnologiesBlocks.ADVANCED_SOLID_GENERATOR, - AstromineTechnologiesBlocks.ELITE_SOLID_GENERATOR, - - AstromineTechnologiesBlocks.PRIMITIVE_LIQUID_GENERATOR, - AstromineTechnologiesBlocks.BASIC_LIQUID_GENERATOR, - AstromineTechnologiesBlocks.ADVANCED_LIQUID_GENERATOR, - AstromineTechnologiesBlocks.ELITE_LIQUID_GENERATOR, - - AstromineTechnologiesBlocks.PRIMITIVE_ELECTRIC_SMELTER, - AstromineTechnologiesBlocks.BASIC_ELECTRIC_SMELTER, - AstromineTechnologiesBlocks.ADVANCED_ELECTRIC_SMELTER, - AstromineTechnologiesBlocks.ELITE_ELECTRIC_SMELTER, - - AstromineTechnologiesBlocks.PRIMITIVE_ALLOY_SMELTER, - AstromineTechnologiesBlocks.BASIC_ALLOY_SMELTER, - AstromineTechnologiesBlocks.ADVANCED_ALLOY_SMELTER, - AstromineTechnologiesBlocks.ELITE_ALLOY_SMELTER, - - AstromineTechnologiesBlocks.PRIMITIVE_TRITURATOR, - AstromineTechnologiesBlocks.BASIC_TRITURATOR, - AstromineTechnologiesBlocks.ADVANCED_TRITURATOR, - AstromineTechnologiesBlocks.ELITE_TRITURATOR, - - AstromineTechnologiesBlocks.PRIMITIVE_PRESSER, - AstromineTechnologiesBlocks.BASIC_PRESSER, - AstromineTechnologiesBlocks.ADVANCED_PRESSER, - AstromineTechnologiesBlocks.ELITE_PRESSER, - - AstromineTechnologiesBlocks.PRIMITIVE_ELECTROLYZER, - AstromineTechnologiesBlocks.BASIC_ELECTROLYZER, - AstromineTechnologiesBlocks.ADVANCED_ELECTROLYZER, - AstromineTechnologiesBlocks.ELITE_ELECTROLYZER, - - AstromineTechnologiesBlocks.PRIMITIVE_REFINERY, - AstromineTechnologiesBlocks.BASIC_REFINERY, - AstromineTechnologiesBlocks.ADVANCED_REFINERY, - AstromineTechnologiesBlocks.ELITE_REFINERY, - - AstromineTechnologiesBlocks.PRIMITIVE_FLUID_MIXER, - AstromineTechnologiesBlocks.BASIC_FLUID_MIXER, - AstromineTechnologiesBlocks.ADVANCED_FLUID_MIXER, - AstromineTechnologiesBlocks.ELITE_FLUID_MIXER, - - AstromineTechnologiesBlocks.PRIMITIVE_BUFFER, - AstromineTechnologiesBlocks.BASIC_BUFFER, - AstromineTechnologiesBlocks.ADVANCED_BUFFER, - AstromineTechnologiesBlocks.ELITE_BUFFER, - AstromineTechnologiesBlocks.CREATIVE_BUFFER, - - AstromineTechnologiesBlocks.FLUID_EXTRACTOR, - AstromineTechnologiesBlocks.FLUID_INSERTER, - AstromineTechnologiesBlocks.BLOCK_BREAKER, - AstromineTechnologiesBlocks.BLOCK_PLACER, - - AstromineTechnologiesBlocks.NUCLEAR_WARHEAD, - - AstromineTechnologiesBlocks.PRIMITIVE_CAPACITOR, - AstromineTechnologiesBlocks.BASIC_CAPACITOR, - AstromineTechnologiesBlocks.ADVANCED_CAPACITOR, - AstromineTechnologiesBlocks.ELITE_CAPACITOR, - AstromineTechnologiesBlocks.CREATIVE_CAPACITOR, - - AstromineTechnologiesBlocks.AIRLOCK)); + AstromineTechnologiesBlocks.HOLOGRAPHIC_BRIDGE_PROJECTOR, + AstromineTechnologiesBlocks.HOLOGRAPHIC_BRIDGE_INVISIBLE_BLOCK, + + AstromineTechnologiesBlocks.VENT, + + AstromineTechnologiesBlocks.PRIMITIVE_TANK, + AstromineTechnologiesBlocks.BASIC_TANK, + AstromineTechnologiesBlocks.ADVANCED_TANK, + AstromineTechnologiesBlocks.ELITE_TANK, + AstromineTechnologiesBlocks.CREATIVE_TANK, + + AstromineTechnologiesBlocks.PRIMITIVE_SOLID_GENERATOR, + AstromineTechnologiesBlocks.BASIC_SOLID_GENERATOR, + AstromineTechnologiesBlocks.ADVANCED_SOLID_GENERATOR, + AstromineTechnologiesBlocks.ELITE_SOLID_GENERATOR, + + AstromineTechnologiesBlocks.PRIMITIVE_LIQUID_GENERATOR, + AstromineTechnologiesBlocks.BASIC_LIQUID_GENERATOR, + AstromineTechnologiesBlocks.ADVANCED_LIQUID_GENERATOR, + AstromineTechnologiesBlocks.ELITE_LIQUID_GENERATOR, + + AstromineTechnologiesBlocks.PRIMITIVE_ELECTRIC_SMELTER, + AstromineTechnologiesBlocks.BASIC_ELECTRIC_SMELTER, + AstromineTechnologiesBlocks.ADVANCED_ELECTRIC_SMELTER, + AstromineTechnologiesBlocks.ELITE_ELECTRIC_SMELTER, + + AstromineTechnologiesBlocks.PRIMITIVE_ALLOY_SMELTER, + AstromineTechnologiesBlocks.BASIC_ALLOY_SMELTER, + AstromineTechnologiesBlocks.ADVANCED_ALLOY_SMELTER, + AstromineTechnologiesBlocks.ELITE_ALLOY_SMELTER, + + AstromineTechnologiesBlocks.PRIMITIVE_TRITURATOR, + AstromineTechnologiesBlocks.BASIC_TRITURATOR, + AstromineTechnologiesBlocks.ADVANCED_TRITURATOR, + AstromineTechnologiesBlocks.ELITE_TRITURATOR, + + AstromineTechnologiesBlocks.PRIMITIVE_PRESSER, + AstromineTechnologiesBlocks.BASIC_PRESSER, + AstromineTechnologiesBlocks.ADVANCED_PRESSER, + AstromineTechnologiesBlocks.ELITE_PRESSER, + + AstromineTechnologiesBlocks.PRIMITIVE_ELECTROLYZER, + AstromineTechnologiesBlocks.BASIC_ELECTROLYZER, + AstromineTechnologiesBlocks.ADVANCED_ELECTROLYZER, + AstromineTechnologiesBlocks.ELITE_ELECTROLYZER, + + AstromineTechnologiesBlocks.PRIMITIVE_REFINERY, + AstromineTechnologiesBlocks.BASIC_REFINERY, + AstromineTechnologiesBlocks.ADVANCED_REFINERY, + AstromineTechnologiesBlocks.ELITE_REFINERY, + + AstromineTechnologiesBlocks.PRIMITIVE_FLUID_MIXER, + AstromineTechnologiesBlocks.BASIC_FLUID_MIXER, + AstromineTechnologiesBlocks.ADVANCED_FLUID_MIXER, + AstromineTechnologiesBlocks.ELITE_FLUID_MIXER, + + AstromineTechnologiesBlocks.PRIMITIVE_BUFFER, + AstromineTechnologiesBlocks.BASIC_BUFFER, + AstromineTechnologiesBlocks.ADVANCED_BUFFER, + AstromineTechnologiesBlocks.ELITE_BUFFER, + AstromineTechnologiesBlocks.CREATIVE_BUFFER, + + AstromineTechnologiesBlocks.FLUID_EXTRACTOR, + AstromineTechnologiesBlocks.FLUID_INSERTER, + AstromineTechnologiesBlocks.BLOCK_BREAKER, + AstromineTechnologiesBlocks.BLOCK_PLACER, + + AstromineTechnologiesBlocks.NUCLEAR_WARHEAD, + + AstromineTechnologiesBlocks.PRIMITIVE_CAPACITOR, + AstromineTechnologiesBlocks.BASIC_CAPACITOR, + AstromineTechnologiesBlocks.ADVANCED_CAPACITOR, + AstromineTechnologiesBlocks.ELITE_CAPACITOR, + AstromineTechnologiesBlocks.CREATIVE_CAPACITOR, + + AstromineTechnologiesBlocks.AIRLOCK)); } diff --git a/astromine-technologies/src/datagen/java/com/github/chainmailstudios/astromine/technologies/datagen/AstromineTechnologiesModelStateGenerators.java b/astromine-technologies/src/datagen/java/com/github/chainmailstudios/astromine/technologies/datagen/AstromineTechnologiesModelStateGenerators.java index 8fe21b001..0afa9c61a 100644 --- a/astromine-technologies/src/datagen/java/com/github/chainmailstudios/astromine/technologies/datagen/AstromineTechnologiesModelStateGenerators.java +++ b/astromine-technologies/src/datagen/java/com/github/chainmailstudios/astromine/technologies/datagen/AstromineTechnologiesModelStateGenerators.java @@ -114,16 +114,16 @@ public class AstromineTechnologiesModelStateGenerators extends AstromineModelSta )); public final ModelStateGenerator UPGRADE_KIT = register(new GenericItemModelGenerator( - AstromineTechnologiesItems.BASIC_MACHINE_UPGRADE_KIT, - AstromineTechnologiesItems.ADVANCED_MACHINE_UPGRADE_KIT, - AstromineTechnologiesItems.ELITE_MACHINE_UPGRADE_KIT + AstromineTechnologiesItems.BASIC_MACHINE_UPGRADE_KIT, + AstromineTechnologiesItems.ADVANCED_MACHINE_UPGRADE_KIT, + AstromineTechnologiesItems.ELITE_MACHINE_UPGRADE_KIT )); public final ModelStateGenerator CANISTERS = register(new GenericItemModelGenerator( AstromineTechnologiesItems.GAS_CANISTER, AstromineTechnologiesItems.PRESSURIZED_GAS_CANISTER )); - + public final ModelStateGenerator CIRCUITS = register(new GenericItemModelGenerator( AstromineTechnologiesItems.BASIC_CIRCUIT, AstromineTechnologiesItems.ADVANCED_CIRCUIT, diff --git a/astromine-technologies/src/datagen/java/com/github/chainmailstudios/astromine/technologies/datagen/AstromineTechnologiesRecipeGenerators.java b/astromine-technologies/src/datagen/java/com/github/chainmailstudios/astromine/technologies/datagen/AstromineTechnologiesRecipeGenerators.java index 0b5288c90..9b9b8c7d9 100644 --- a/astromine-technologies/src/datagen/java/com/github/chainmailstudios/astromine/technologies/datagen/AstromineTechnologiesRecipeGenerators.java +++ b/astromine-technologies/src/datagen/java/com/github/chainmailstudios/astromine/technologies/datagen/AstromineTechnologiesRecipeGenerators.java @@ -1,11 +1,8 @@ package com.github.chainmailstudios.astromine.technologies.datagen; -import net.fabricmc.fabric.api.tag.TagRegistry; - import net.minecraft.block.Blocks; import net.minecraft.item.Items; import net.minecraft.recipe.Ingredient; -import net.minecraft.util.Identifier; import com.github.chainmailstudios.astromine.datagen.generator.recipe.RecipeGenerator; import com.github.chainmailstudios.astromine.datagen.registry.AstromineRecipeGenerators; @@ -62,7 +59,7 @@ public class AstromineTechnologiesRecipeGenerators extends AstromineRecipeGenera public final RecipeGenerator GREEN_CONCRETE_POWDER_FROM_CONCRETE = register(new TrituratingRecipeGenerator("green_concrete_powder_from_triturating_concrete", Ingredient.ofItems(Blocks.GREEN_CONCRETE), Blocks.GREEN_CONCRETE_POWDER, 10, 50)); public final RecipeGenerator RED_CONCRETE_POWDER_FROM_CONCRETE = register(new TrituratingRecipeGenerator("red_concrete_powder_from_triturating_concrete", Ingredient.ofItems(Blocks.RED_CONCRETE), Blocks.RED_CONCRETE_POWDER, 10, 50)); public final RecipeGenerator BLACK_CONCRETE_POWDER_FROM_CONCRETE = register(new TrituratingRecipeGenerator("black_concrete_powder_from_triturating_concrete", Ingredient.ofItems(Blocks.BLACK_CONCRETE), Blocks.BLACK_CONCRETE_POWDER, 10, 50)); - + public final RecipeGenerator SUGAR_FROM_SUGAR_CANE = register(new TrituratingRecipeGenerator("sugar_from_triturating_sugar_cane", Ingredient.ofItems(Items.SUGAR_CANE), Items.SUGAR, 2, 10, 50)); public final RecipeGenerator BLAZE_POWDER_FROM_ROD = register(new TrituratingRecipeGenerator("blaze_powder_from_triturating_rod", Ingredient.ofItems(Items.BLAZE_ROD), Items.BLAZE_POWDER, 4, 15, 60)); public final RecipeGenerator BONE_MEAL_FROM_BONE = register(new TrituratingRecipeGenerator("bone_meal_from_triturating_bone", Ingredient.ofItems(Items.BONE), Items.BONE_MEAL, 5, 10, 50)); diff --git a/astromine-technologies/src/datagen/java/com/github/chainmailstudios/astromine/technologies/datagen/generators/recipe/onetime/TrituratingRecipeGenerator.java b/astromine-technologies/src/datagen/java/com/github/chainmailstudios/astromine/technologies/datagen/generators/recipe/onetime/TrituratingRecipeGenerator.java index c7e0ff692..0289b1a17 100644 --- a/astromine-technologies/src/datagen/java/com/github/chainmailstudios/astromine/technologies/datagen/generators/recipe/onetime/TrituratingRecipeGenerator.java +++ b/astromine-technologies/src/datagen/java/com/github/chainmailstudios/astromine/technologies/datagen/generators/recipe/onetime/TrituratingRecipeGenerator.java @@ -8,8 +8,6 @@ import com.github.chainmailstudios.astromine.AstromineCommon; import com.github.chainmailstudios.astromine.common.utilities.GeneratorUtilities; import com.github.chainmailstudios.astromine.datagen.generator.recipe.onetime.base.EnergyProcessingRecipeGenerator; -import com.github.chainmailstudios.astromine.datagen.material.MaterialItemType; -import com.github.chainmailstudios.astromine.datagen.material.MaterialSet; import com.github.chainmailstudios.astromine.technologies.common.recipe.TrituratingRecipe; import me.shedaniel.cloth.api.datagen.v1.RecipeData; diff --git a/astromine-technologies/src/datagen/java/com/github/chainmailstudios/astromine/technologies/datagen/generators/recipe/set/PressingSetRecipeGenerator.java b/astromine-technologies/src/datagen/java/com/github/chainmailstudios/astromine/technologies/datagen/generators/recipe/set/PressingSetRecipeGenerator.java index b5fc7cf73..6812249c0 100644 --- a/astromine-technologies/src/datagen/java/com/github/chainmailstudios/astromine/technologies/datagen/generators/recipe/set/PressingSetRecipeGenerator.java +++ b/astromine-technologies/src/datagen/java/com/github/chainmailstudios/astromine/technologies/datagen/generators/recipe/set/PressingSetRecipeGenerator.java @@ -1,12 +1,14 @@ package com.github.chainmailstudios.astromine.technologies.datagen.generators.recipe.set; +import com.github.chainmailstudios.astromine.common.utilities.GeneratorUtilities; import com.github.chainmailstudios.astromine.datagen.generator.recipe.set.base.EnergyProcessingSetRecipeGenerator; import com.github.chainmailstudios.astromine.datagen.material.MaterialItemType; import com.github.chainmailstudios.astromine.datagen.material.MaterialSet; -import com.github.chainmailstudios.astromine.technologies.common.recipe.PressingRecipe;import com.github.chainmailstudios.astromine.common.utilities.GeneratorUtilities; +import com.github.chainmailstudios.astromine.technologies.common.recipe.PressingRecipe; +import me.shedaniel.cloth.api.datagen.v1.RecipeData; + import com.google.gson.JsonElement; import com.google.gson.JsonObject; -import me.shedaniel.cloth.api.datagen.v1.RecipeData; public class PressingSetRecipeGenerator extends EnergyProcessingSetRecipeGenerator { public PressingSetRecipeGenerator(MaterialItemType input, int inputCount, MaterialItemType output, int outputCount, int time, int energyConsumed) { diff --git a/astromine-technologies/src/datagen/java/com/github/chainmailstudios/astromine/technologies/datagen/generators/recipe/set/TrituratingSetRecipeGenerator.java b/astromine-technologies/src/datagen/java/com/github/chainmailstudios/astromine/technologies/datagen/generators/recipe/set/TrituratingSetRecipeGenerator.java index eec08f87d..ca65010f9 100644 --- a/astromine-technologies/src/datagen/java/com/github/chainmailstudios/astromine/technologies/datagen/generators/recipe/set/TrituratingSetRecipeGenerator.java +++ b/astromine-technologies/src/datagen/java/com/github/chainmailstudios/astromine/technologies/datagen/generators/recipe/set/TrituratingSetRecipeGenerator.java @@ -1,13 +1,14 @@ package com.github.chainmailstudios.astromine.technologies.datagen.generators.recipe.set; +import com.github.chainmailstudios.astromine.common.utilities.GeneratorUtilities; import com.github.chainmailstudios.astromine.datagen.generator.recipe.set.base.EnergyProcessingSetRecipeGenerator; import com.github.chainmailstudios.astromine.datagen.material.MaterialItemType; import com.github.chainmailstudios.astromine.datagen.material.MaterialSet; -import com.github.chainmailstudios.astromine.common.utilities.GeneratorUtilities; import com.github.chainmailstudios.astromine.technologies.common.recipe.TrituratingRecipe; +import me.shedaniel.cloth.api.datagen.v1.RecipeData; + import com.google.gson.JsonElement; import com.google.gson.JsonObject; -import me.shedaniel.cloth.api.datagen.v1.RecipeData; public class TrituratingSetRecipeGenerator extends EnergyProcessingSetRecipeGenerator { public TrituratingSetRecipeGenerator(MaterialItemType input, int inputCount, MaterialItemType output, int outputCount, int time, int energyConsumed) { diff --git a/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/client/rei/AstromineTechnologiesRoughlyEnoughItemsPlugin.java b/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/client/rei/AstromineTechnologiesRoughlyEnoughItemsPlugin.java index 4b2a4a55f..5825ad823 100644 --- a/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/client/rei/AstromineTechnologiesRoughlyEnoughItemsPlugin.java +++ b/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/client/rei/AstromineTechnologiesRoughlyEnoughItemsPlugin.java @@ -24,8 +24,6 @@ package com.github.chainmailstudios.astromine.technologies.client.rei; -import com.github.chainmailstudios.astromine.technologies.client.rei.refining.RefiningCategory; -import com.github.chainmailstudios.astromine.technologies.client.rei.refining.RefiningDisplay; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; @@ -37,7 +35,6 @@ import com.github.chainmailstudios.astromine.AstromineCommon; import com.github.chainmailstudios.astromine.client.rei.AstromineRoughlyEnoughItemsPlugin; -import com.github.chainmailstudios.astromine.technologies.common.recipe.*; import com.github.chainmailstudios.astromine.technologies.client.rei.alloysmelting.AlloySmeltingCategory; import com.github.chainmailstudios.astromine.technologies.client.rei.alloysmelting.AlloySmeltingDisplay; import com.github.chainmailstudios.astromine.technologies.client.rei.electricsmelting.ElectricSmeltingCategory; @@ -52,8 +49,17 @@ import com.github.chainmailstudios.astromine.technologies.client.rei.generating.SolidGeneratingDisplay; import com.github.chainmailstudios.astromine.technologies.client.rei.pressing.PressingCategory; import com.github.chainmailstudios.astromine.technologies.client.rei.pressing.PressingDisplay; +import com.github.chainmailstudios.astromine.technologies.client.rei.refining.RefiningCategory; +import com.github.chainmailstudios.astromine.technologies.client.rei.refining.RefiningDisplay; import com.github.chainmailstudios.astromine.technologies.client.rei.triturating.TrituratingCategory; import com.github.chainmailstudios.astromine.technologies.client.rei.triturating.TrituratingDisplay; +import com.github.chainmailstudios.astromine.technologies.common.recipe.AlloySmeltingRecipe; +import com.github.chainmailstudios.astromine.technologies.common.recipe.ElectrolyzingRecipe; +import com.github.chainmailstudios.astromine.technologies.common.recipe.FluidMixingRecipe; +import com.github.chainmailstudios.astromine.technologies.common.recipe.LiquidGeneratingRecipe; +import com.github.chainmailstudios.astromine.technologies.common.recipe.PressingRecipe; +import com.github.chainmailstudios.astromine.technologies.common.recipe.RefiningRecipe; +import com.github.chainmailstudios.astromine.technologies.common.recipe.TrituratingRecipe; import com.github.chainmailstudios.astromine.technologies.registry.AstromineTechnologiesBlocks; import me.shedaniel.math.Rectangle; import me.shedaniel.rei.api.EntryStack; diff --git a/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/client/rei/SimpleTransferRecipeDisplay.java b/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/client/rei/SimpleTransferRecipeDisplay.java index 237a7f765..38e150772 100644 --- a/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/client/rei/SimpleTransferRecipeDisplay.java +++ b/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/client/rei/SimpleTransferRecipeDisplay.java @@ -24,10 +24,11 @@ package com.github.chainmailstudios.astromine.technologies.client.rei; +import net.minecraft.screen.ScreenHandler; + import me.shedaniel.rei.api.EntryStack; import me.shedaniel.rei.api.TransferRecipeDisplay; import me.shedaniel.rei.server.ContainerInfo; -import net.minecraft.screen.ScreenHandler; import java.util.List; diff --git a/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/client/rei/alloysmelting/AlloySmeltingDisplay.java b/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/client/rei/alloysmelting/AlloySmeltingDisplay.java index d0257e7f9..6bc7fa87d 100644 --- a/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/client/rei/alloysmelting/AlloySmeltingDisplay.java +++ b/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/client/rei/alloysmelting/AlloySmeltingDisplay.java @@ -24,16 +24,18 @@ package com.github.chainmailstudios.astromine.technologies.client.rei.alloysmelting; +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; + +import net.minecraft.util.Identifier; + import com.github.chainmailstudios.astromine.technologies.client.rei.AstromineTechnologiesRoughlyEnoughItemsPlugin; import com.github.chainmailstudios.astromine.technologies.client.rei.SimpleTransferRecipeDisplay; import com.github.chainmailstudios.astromine.technologies.common.recipe.AlloySmeltingRecipe; -import com.google.common.collect.Lists; import me.shedaniel.rei.api.EntryStack; -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; -import net.minecraft.util.Identifier; import org.jetbrains.annotations.NotNull; +import com.google.common.collect.Lists; import java.util.Arrays; import java.util.Collections; import java.util.List; diff --git a/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/client/rei/electricsmelting/ElectricSmeltingCategory.java b/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/client/rei/electricsmelting/ElectricSmeltingCategory.java index 430b80a43..679350be0 100644 --- a/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/client/rei/electricsmelting/ElectricSmeltingCategory.java +++ b/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/client/rei/electricsmelting/ElectricSmeltingCategory.java @@ -24,7 +24,6 @@ package com.github.chainmailstudios.astromine.technologies.client.rei.electricsmelting; -import it.unimi.dsi.fastutil.ints.IntList; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; @@ -34,6 +33,7 @@ import com.github.chainmailstudios.astromine.client.rei.AstromineRoughlyEnoughItemsPlugin; import com.github.chainmailstudios.astromine.technologies.client.rei.AstromineTechnologiesRoughlyEnoughItemsPlugin; import com.github.chainmailstudios.astromine.technologies.registry.AstromineTechnologiesBlocks; +import it.unimi.dsi.fastutil.ints.IntList; import me.shedaniel.math.Point; import me.shedaniel.math.Rectangle; import me.shedaniel.rei.api.EntryStack; diff --git a/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/client/rei/electricsmelting/ElectricSmeltingDisplay.java b/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/client/rei/electricsmelting/ElectricSmeltingDisplay.java index 112b1dc6e..a1a920c98 100644 --- a/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/client/rei/electricsmelting/ElectricSmeltingDisplay.java +++ b/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/client/rei/electricsmelting/ElectricSmeltingDisplay.java @@ -24,13 +24,15 @@ package com.github.chainmailstudios.astromine.technologies.client.rei.electricsmelting; -import com.github.chainmailstudios.astromine.technologies.client.rei.AstromineTechnologiesRoughlyEnoughItemsPlugin; -import me.shedaniel.rei.plugin.cooking.DefaultCookingDisplay; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; + import net.minecraft.recipe.AbstractCookingRecipe; import net.minecraft.util.Identifier; +import com.github.chainmailstudios.astromine.technologies.client.rei.AstromineTechnologiesRoughlyEnoughItemsPlugin; +import me.shedaniel.rei.plugin.cooking.DefaultCookingDisplay; + @Environment(EnvType.CLIENT) public class ElectricSmeltingDisplay extends DefaultCookingDisplay { private final double energyRequired; diff --git a/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/client/rei/electrolyzing/ElectrolyzingDisplay.java b/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/client/rei/electrolyzing/ElectrolyzingDisplay.java index eeaad32e0..7ca86b5a4 100644 --- a/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/client/rei/electrolyzing/ElectrolyzingDisplay.java +++ b/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/client/rei/electrolyzing/ElectrolyzingDisplay.java @@ -24,15 +24,15 @@ package com.github.chainmailstudios.astromine.technologies.client.rei.electrolyzing; -import com.github.chainmailstudios.astromine.client.rei.AstromineRoughlyEnoughItemsPlugin; -import com.github.chainmailstudios.astromine.technologies.client.rei.AstromineTechnologiesRoughlyEnoughItemsPlugin; -import com.github.chainmailstudios.astromine.technologies.common.recipe.ElectrolyzingRecipe; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; import net.minecraft.util.Identifier; +import com.github.chainmailstudios.astromine.client.rei.AstromineRoughlyEnoughItemsPlugin; import com.github.chainmailstudios.astromine.common.volume.fluid.FluidVolume; +import com.github.chainmailstudios.astromine.technologies.client.rei.AstromineTechnologiesRoughlyEnoughItemsPlugin; +import com.github.chainmailstudios.astromine.technologies.common.recipe.ElectrolyzingRecipe; import me.shedaniel.rei.api.EntryStack; import me.shedaniel.rei.api.RecipeDisplay; diff --git a/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/client/rei/fluidmixing/FluidMixingDisplay.java b/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/client/rei/fluidmixing/FluidMixingDisplay.java index 9e48efd72..bc7dd3c3e 100644 --- a/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/client/rei/fluidmixing/FluidMixingDisplay.java +++ b/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/client/rei/fluidmixing/FluidMixingDisplay.java @@ -24,11 +24,11 @@ package com.github.chainmailstudios.astromine.technologies.client.rei.fluidmixing; -import com.github.chainmailstudios.astromine.technologies.client.rei.AstromineTechnologiesRoughlyEnoughItemsPlugin; -import com.github.chainmailstudios.astromine.technologies.common.recipe.FluidMixingRecipe; import net.minecraft.util.Identifier; import com.github.chainmailstudios.astromine.common.volume.fluid.FluidVolume; +import com.github.chainmailstudios.astromine.technologies.client.rei.AstromineTechnologiesRoughlyEnoughItemsPlugin; +import com.github.chainmailstudios.astromine.technologies.common.recipe.FluidMixingRecipe; public class FluidMixingDisplay extends AbstractFluidMixingDisplay { public FluidMixingDisplay(FluidMixingRecipe recipe) { diff --git a/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/client/rei/generating/LiquidGeneratingDisplay.java b/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/client/rei/generating/LiquidGeneratingDisplay.java index 473d2b542..d0e057650 100644 --- a/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/client/rei/generating/LiquidGeneratingDisplay.java +++ b/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/client/rei/generating/LiquidGeneratingDisplay.java @@ -24,8 +24,6 @@ package com.github.chainmailstudios.astromine.technologies.client.rei.generating; -import com.github.chainmailstudios.astromine.technologies.client.rei.AstromineTechnologiesRoughlyEnoughItemsPlugin; -import com.github.chainmailstudios.astromine.technologies.common.recipe.LiquidGeneratingRecipe; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; @@ -33,6 +31,8 @@ import net.minecraft.util.Identifier; import com.github.chainmailstudios.astromine.common.volume.fraction.Fraction; +import com.github.chainmailstudios.astromine.technologies.client.rei.AstromineTechnologiesRoughlyEnoughItemsPlugin; +import com.github.chainmailstudios.astromine.technologies.common.recipe.LiquidGeneratingRecipe; import me.shedaniel.rei.api.EntryStack; import java.util.Collections; diff --git a/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/client/rei/generating/SolidGeneratingDisplay.java b/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/client/rei/generating/SolidGeneratingDisplay.java index a3783621f..3f771c58c 100644 --- a/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/client/rei/generating/SolidGeneratingDisplay.java +++ b/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/client/rei/generating/SolidGeneratingDisplay.java @@ -24,12 +24,12 @@ package com.github.chainmailstudios.astromine.technologies.client.rei.generating; -import com.github.chainmailstudios.astromine.technologies.client.rei.AstromineTechnologiesRoughlyEnoughItemsPlugin; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; import net.minecraft.util.Identifier; +import com.github.chainmailstudios.astromine.technologies.client.rei.AstromineTechnologiesRoughlyEnoughItemsPlugin; import me.shedaniel.rei.api.EntryStack; import java.util.Collections; diff --git a/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/client/rei/pressing/PressingCategory.java b/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/client/rei/pressing/PressingCategory.java index 868cfa30a..6f54215f1 100644 --- a/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/client/rei/pressing/PressingCategory.java +++ b/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/client/rei/pressing/PressingCategory.java @@ -24,22 +24,24 @@ package com.github.chainmailstudios.astromine.technologies.client.rei.pressing; +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; + +import net.minecraft.client.resource.language.I18n; +import net.minecraft.text.TranslatableText; +import net.minecraft.util.Identifier; + import com.github.chainmailstudios.astromine.client.rei.AstromineRoughlyEnoughItemsPlugin; import com.github.chainmailstudios.astromine.technologies.client.rei.AstromineTechnologiesRoughlyEnoughItemsPlugin; import com.github.chainmailstudios.astromine.technologies.registry.AstromineTechnologiesBlocks; -import com.google.common.collect.Lists; import me.shedaniel.math.Point; import me.shedaniel.math.Rectangle; import me.shedaniel.rei.api.EntryStack; import me.shedaniel.rei.api.RecipeCategory; import me.shedaniel.rei.api.widgets.Widgets; import me.shedaniel.rei.gui.widget.Widget; -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; -import net.minecraft.client.resource.language.I18n; -import net.minecraft.text.TranslatableText; -import net.minecraft.util.Identifier; +import com.google.common.collect.Lists; import java.text.DecimalFormat; import java.util.List; diff --git a/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/client/rei/pressing/PressingDisplay.java b/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/client/rei/pressing/PressingDisplay.java index 8102d70d2..1cec18108 100644 --- a/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/client/rei/pressing/PressingDisplay.java +++ b/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/client/rei/pressing/PressingDisplay.java @@ -24,12 +24,12 @@ package com.github.chainmailstudios.astromine.technologies.client.rei.pressing; -import com.github.chainmailstudios.astromine.technologies.client.rei.AstromineTechnologiesRoughlyEnoughItemsPlugin; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; import net.minecraft.util.Identifier; +import com.github.chainmailstudios.astromine.technologies.client.rei.AstromineTechnologiesRoughlyEnoughItemsPlugin; import com.github.chainmailstudios.astromine.technologies.common.recipe.PressingRecipe; import me.shedaniel.rei.api.EntryStack; import me.shedaniel.rei.api.RecipeDisplay; diff --git a/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/client/rei/refining/RefiningCategory.java b/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/client/rei/refining/RefiningCategory.java index 0f2f7cf31..9bb4e7b1e 100644 --- a/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/client/rei/refining/RefiningCategory.java +++ b/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/client/rei/refining/RefiningCategory.java @@ -24,19 +24,21 @@ package com.github.chainmailstudios.astromine.technologies.client.rei.refining; +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; + +import net.minecraft.client.resource.language.I18n; +import net.minecraft.util.Identifier; + import com.github.chainmailstudios.astromine.client.rei.AstromineRoughlyEnoughItemsPlugin; -import com.google.common.collect.Lists; import me.shedaniel.math.Point; import me.shedaniel.math.Rectangle; import me.shedaniel.rei.api.EntryStack; import me.shedaniel.rei.api.RecipeCategory; import me.shedaniel.rei.api.widgets.Widgets; import me.shedaniel.rei.gui.widget.Widget; -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; -import net.minecraft.client.resource.language.I18n; -import net.minecraft.util.Identifier; +import com.google.common.collect.Lists; import java.util.List; @Environment(EnvType.CLIENT) diff --git a/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/client/rei/refining/RefiningDisplay.java b/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/client/rei/refining/RefiningDisplay.java index 890c0437d..be39265bb 100644 --- a/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/client/rei/refining/RefiningDisplay.java +++ b/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/client/rei/refining/RefiningDisplay.java @@ -24,15 +24,17 @@ package com.github.chainmailstudios.astromine.technologies.client.rei.refining; +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; + +import net.minecraft.util.Identifier; + import com.github.chainmailstudios.astromine.client.rei.AstromineRoughlyEnoughItemsPlugin; import com.github.chainmailstudios.astromine.common.volume.fluid.FluidVolume; import com.github.chainmailstudios.astromine.technologies.client.rei.AstromineTechnologiesRoughlyEnoughItemsPlugin; import com.github.chainmailstudios.astromine.technologies.common.recipe.RefiningRecipe; import me.shedaniel.rei.api.EntryStack; import me.shedaniel.rei.api.RecipeDisplay; -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; -import net.minecraft.util.Identifier; import java.util.Arrays; import java.util.Collections; diff --git a/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/client/rei/triturating/TrituratingCategory.java b/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/client/rei/triturating/TrituratingCategory.java index 9b7efcfb3..5e3e7434f 100644 --- a/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/client/rei/triturating/TrituratingCategory.java +++ b/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/client/rei/triturating/TrituratingCategory.java @@ -24,22 +24,24 @@ package com.github.chainmailstudios.astromine.technologies.client.rei.triturating; +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; + +import net.minecraft.client.resource.language.I18n; +import net.minecraft.text.TranslatableText; +import net.minecraft.util.Identifier; + import com.github.chainmailstudios.astromine.client.rei.AstromineRoughlyEnoughItemsPlugin; import com.github.chainmailstudios.astromine.technologies.client.rei.AstromineTechnologiesRoughlyEnoughItemsPlugin; import com.github.chainmailstudios.astromine.technologies.registry.AstromineTechnologiesBlocks; -import com.google.common.collect.Lists; import me.shedaniel.math.Point; import me.shedaniel.math.Rectangle; import me.shedaniel.rei.api.EntryStack; import me.shedaniel.rei.api.RecipeCategory; import me.shedaniel.rei.api.widgets.Widgets; import me.shedaniel.rei.gui.widget.Widget; -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; -import net.minecraft.client.resource.language.I18n; -import net.minecraft.text.TranslatableText; -import net.minecraft.util.Identifier; +import com.google.common.collect.Lists; import java.text.DecimalFormat; import java.util.List; diff --git a/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/client/rei/triturating/TrituratingDisplay.java b/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/client/rei/triturating/TrituratingDisplay.java index af786035d..94c625299 100644 --- a/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/client/rei/triturating/TrituratingDisplay.java +++ b/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/client/rei/triturating/TrituratingDisplay.java @@ -24,13 +24,13 @@ package com.github.chainmailstudios.astromine.technologies.client.rei.triturating; -import com.github.chainmailstudios.astromine.technologies.client.rei.AstromineTechnologiesRoughlyEnoughItemsPlugin; -import com.github.chainmailstudios.astromine.technologies.common.recipe.TrituratingRecipe; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; import net.minecraft.util.Identifier; +import com.github.chainmailstudios.astromine.technologies.client.rei.AstromineTechnologiesRoughlyEnoughItemsPlugin; +import com.github.chainmailstudios.astromine.technologies.common.recipe.TrituratingRecipe; import me.shedaniel.rei.api.EntryStack; import me.shedaniel.rei.api.RecipeDisplay; diff --git a/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/client/screen/RefineryHandledScreen.java b/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/client/screen/RefineryHandledScreen.java index 2e3638fba..8df2f4781 100644 --- a/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/client/screen/RefineryHandledScreen.java +++ b/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/client/screen/RefineryHandledScreen.java @@ -24,11 +24,12 @@ package com.github.chainmailstudios.astromine.technologies.client.screen; +import net.minecraft.entity.player.PlayerInventory; +import net.minecraft.text.Text; + import com.github.chainmailstudios.astromine.client.screen.base.block.ComponentBlockEntityEnergyFluidHandledScreen; import com.github.chainmailstudios.astromine.technologies.common.screenhandler.RefineryScreenHandler; import com.github.vini2003.blade.common.handler.BaseScreenHandler; -import net.minecraft.entity.player.PlayerInventory; -import net.minecraft.text.Text; public class RefineryHandledScreen extends ComponentBlockEntityEnergyFluidHandledScreen { public RefineryHandledScreen(BaseScreenHandler handler, PlayerInventory inventory, Text title) { diff --git a/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/common/block/AirlockBlock.java b/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/common/block/AirlockBlock.java index 8c0304133..7ac3a0d3e 100644 --- a/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/common/block/AirlockBlock.java +++ b/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/common/block/AirlockBlock.java @@ -24,10 +24,16 @@ package com.github.chainmailstudios.astromine.technologies.common.block; -import com.github.chainmailstudios.astromine.common.utilities.VoxelShapeUtilities; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; -import net.minecraft.block.*; + +import net.minecraft.block.Block; +import net.minecraft.block.BlockState; +import net.minecraft.block.Blocks; +import net.minecraft.block.HorizontalFacingBlock; +import net.minecraft.block.ShapeContext; +import net.minecraft.block.TallPlantBlock; +import net.minecraft.block.Waterloggable; import net.minecraft.block.enums.DoubleBlockHalf; import net.minecraft.block.piston.PistonBehavior; import net.minecraft.entity.LivingEntity; @@ -54,6 +60,8 @@ import net.minecraft.world.WorldAccess; import net.minecraft.world.WorldView; +import com.github.chainmailstudios.astromine.common.utilities.VoxelShapeUtilities; + import javax.annotation.Nullable; public class AirlockBlock extends Block implements Waterloggable { diff --git a/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/common/block/BlockBreakerBlock.java b/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/common/block/BlockBreakerBlock.java index 144322787..6e47b1760 100644 --- a/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/common/block/BlockBreakerBlock.java +++ b/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/common/block/BlockBreakerBlock.java @@ -24,9 +24,6 @@ package com.github.chainmailstudios.astromine.technologies.common.block; -import com.github.chainmailstudios.astromine.common.block.base.WrenchableHorizontalFacingBlockWithEntity; -import com.github.chainmailstudios.astromine.technologies.common.block.entity.BlockBreakerBlockEntity; -import com.github.chainmailstudios.astromine.technologies.common.screenhandler.BlockBreakerScreenHandler; import net.minecraft.block.BlockState; import net.minecraft.block.entity.BlockEntity; import net.minecraft.entity.player.PlayerEntity; @@ -37,6 +34,10 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import com.github.chainmailstudios.astromine.common.block.base.WrenchableHorizontalFacingBlockWithEntity; +import com.github.chainmailstudios.astromine.technologies.common.block.entity.BlockBreakerBlockEntity; +import com.github.chainmailstudios.astromine.technologies.common.screenhandler.BlockBreakerScreenHandler; + public class BlockBreakerBlock extends WrenchableHorizontalFacingBlockWithEntity { public BlockBreakerBlock(Settings settings) { super(settings); diff --git a/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/common/block/BlockPlacerBlock.java b/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/common/block/BlockPlacerBlock.java index 7dcb44431..7a506dbbc 100644 --- a/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/common/block/BlockPlacerBlock.java +++ b/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/common/block/BlockPlacerBlock.java @@ -24,9 +24,6 @@ package com.github.chainmailstudios.astromine.technologies.common.block; -import com.github.chainmailstudios.astromine.common.block.base.WrenchableHorizontalFacingBlockWithEntity; -import com.github.chainmailstudios.astromine.technologies.common.block.entity.BlockPlacerBlockEntity; -import com.github.chainmailstudios.astromine.technologies.common.screenhandler.BlockPlacerScreenHandler; import net.minecraft.block.BlockState; import net.minecraft.block.entity.BlockEntity; import net.minecraft.entity.player.PlayerEntity; @@ -37,6 +34,10 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import com.github.chainmailstudios.astromine.common.block.base.WrenchableHorizontalFacingBlockWithEntity; +import com.github.chainmailstudios.astromine.technologies.common.block.entity.BlockPlacerBlockEntity; +import com.github.chainmailstudios.astromine.technologies.common.screenhandler.BlockPlacerScreenHandler; + public class BlockPlacerBlock extends WrenchableHorizontalFacingBlockWithEntity { public BlockPlacerBlock(Settings settings) { super(settings); diff --git a/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/common/block/BufferBlock.java b/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/common/block/BufferBlock.java index 3942e37e8..7717c1e71 100644 --- a/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/common/block/BufferBlock.java +++ b/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/common/block/BufferBlock.java @@ -24,9 +24,6 @@ package com.github.chainmailstudios.astromine.technologies.common.block; -import com.github.chainmailstudios.astromine.common.block.base.WrenchableHorizontalFacingTieredBlockWithEntity; -import com.github.chainmailstudios.astromine.technologies.common.block.entity.BufferBlockEntity; -import com.github.chainmailstudios.astromine.technologies.common.screenhandler.BufferScreenHandler; import net.minecraft.block.BlockState; import net.minecraft.block.entity.BlockEntity; import net.minecraft.entity.player.PlayerEntity; @@ -37,6 +34,10 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import com.github.chainmailstudios.astromine.common.block.base.WrenchableHorizontalFacingTieredBlockWithEntity; +import com.github.chainmailstudios.astromine.technologies.common.block.entity.BufferBlockEntity; +import com.github.chainmailstudios.astromine.technologies.common.screenhandler.BufferScreenHandler; + public abstract class BufferBlock extends WrenchableHorizontalFacingTieredBlockWithEntity { public BufferBlock(Settings settings) { super(settings); diff --git a/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/common/block/FluidExtractorBlock.java b/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/common/block/FluidExtractorBlock.java index 20356a5d4..dac332de3 100644 --- a/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/common/block/FluidExtractorBlock.java +++ b/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/common/block/FluidExtractorBlock.java @@ -24,9 +24,6 @@ package com.github.chainmailstudios.astromine.technologies.common.block; -import com.github.chainmailstudios.astromine.common.block.base.WrenchableHorizontalFacingBlockWithEntity; -import com.github.chainmailstudios.astromine.technologies.common.block.entity.FluidExtractorBlockEntity; -import com.github.chainmailstudios.astromine.technologies.common.screenhandler.FluidExtractorScreenHandler; import net.minecraft.block.BlockState; import net.minecraft.block.entity.BlockEntity; import net.minecraft.entity.player.PlayerEntity; @@ -37,6 +34,10 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import com.github.chainmailstudios.astromine.common.block.base.WrenchableHorizontalFacingBlockWithEntity; +import com.github.chainmailstudios.astromine.technologies.common.block.entity.FluidExtractorBlockEntity; +import com.github.chainmailstudios.astromine.technologies.common.screenhandler.FluidExtractorScreenHandler; + public class FluidExtractorBlock extends WrenchableHorizontalFacingBlockWithEntity { public FluidExtractorBlock(Settings settings) { super(settings); diff --git a/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/common/block/FluidInserterBlock.java b/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/common/block/FluidInserterBlock.java index 9d11e6bb1..6d37e1f2b 100644 --- a/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/common/block/FluidInserterBlock.java +++ b/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/common/block/FluidInserterBlock.java @@ -24,9 +24,6 @@ package com.github.chainmailstudios.astromine.technologies.common.block; -import com.github.chainmailstudios.astromine.common.block.base.WrenchableHorizontalFacingBlockWithEntity; -import com.github.chainmailstudios.astromine.technologies.common.block.entity.FluidInserterBlockEntity; -import com.github.chainmailstudios.astromine.technologies.common.screenhandler.FluidInserterScreenHandler; import net.minecraft.block.BlockState; import net.minecraft.block.entity.BlockEntity; import net.minecraft.entity.player.PlayerEntity; @@ -37,6 +34,10 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import com.github.chainmailstudios.astromine.common.block.base.WrenchableHorizontalFacingBlockWithEntity; +import com.github.chainmailstudios.astromine.technologies.common.block.entity.FluidInserterBlockEntity; +import com.github.chainmailstudios.astromine.technologies.common.screenhandler.FluidInserterScreenHandler; + public class FluidInserterBlock extends WrenchableHorizontalFacingBlockWithEntity { public FluidInserterBlock(Settings settings) { super(settings); diff --git a/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/common/block/HolographicBridgeProjectorBlock.java b/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/common/block/HolographicBridgeProjectorBlock.java index fee3dbbc3..fbde8c728 100644 --- a/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/common/block/HolographicBridgeProjectorBlock.java +++ b/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/common/block/HolographicBridgeProjectorBlock.java @@ -24,9 +24,6 @@ package com.github.chainmailstudios.astromine.technologies.common.block; -import com.github.chainmailstudios.astromine.common.block.base.WrenchableHorizontalFacingBlockWithEntity; -import com.github.chainmailstudios.astromine.technologies.common.block.entity.HolographicBridgeProjectorBlockEntity; -import com.github.vini2003.blade.common.miscellaneous.Color; import net.minecraft.block.AbstractBlock; import net.minecraft.block.BlockState; import net.minecraft.block.entity.BlockEntity; @@ -43,6 +40,10 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import com.github.chainmailstudios.astromine.common.block.base.WrenchableHorizontalFacingBlockWithEntity; +import com.github.chainmailstudios.astromine.technologies.common.block.entity.HolographicBridgeProjectorBlockEntity; +import com.github.vini2003.blade.common.miscellaneous.Color; + public class HolographicBridgeProjectorBlock extends WrenchableHorizontalFacingBlockWithEntity { public HolographicBridgeProjectorBlock(AbstractBlock.Settings settings) { super(settings); diff --git a/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/common/block/LiquidGeneratorBlock.java b/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/common/block/LiquidGeneratorBlock.java index 76ffe945e..fd41d50d3 100644 --- a/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/common/block/LiquidGeneratorBlock.java +++ b/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/common/block/LiquidGeneratorBlock.java @@ -24,9 +24,6 @@ package com.github.chainmailstudios.astromine.technologies.common.block; -import com.github.chainmailstudios.astromine.common.block.base.WrenchableHorizontalFacingTieredBlockWithEntity; -import com.github.chainmailstudios.astromine.technologies.common.block.entity.LiquidGeneratorBlockEntity; -import com.github.chainmailstudios.astromine.technologies.common.screenhandler.LiquidGeneratorScreenHandler; import net.minecraft.block.BlockState; import net.minecraft.block.entity.BlockEntity; import net.minecraft.entity.player.PlayerEntity; @@ -37,6 +34,10 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import com.github.chainmailstudios.astromine.common.block.base.WrenchableHorizontalFacingTieredBlockWithEntity; +import com.github.chainmailstudios.astromine.technologies.common.block.entity.LiquidGeneratorBlockEntity; +import com.github.chainmailstudios.astromine.technologies.common.screenhandler.LiquidGeneratorScreenHandler; + public abstract class LiquidGeneratorBlock extends WrenchableHorizontalFacingTieredBlockWithEntity { public LiquidGeneratorBlock(Settings settings) { super(settings); diff --git a/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/common/block/NuclearWarheadBlock.java b/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/common/block/NuclearWarheadBlock.java index a4edff60d..e67722e69 100644 --- a/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/common/block/NuclearWarheadBlock.java +++ b/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/common/block/NuclearWarheadBlock.java @@ -24,13 +24,14 @@ package com.github.chainmailstudios.astromine.technologies.common.block; -import com.github.chainmailstudios.astromine.common.utilities.ExplosionUtilities; -import com.github.chainmailstudios.astromine.registry.AstromineConfig; import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import com.github.chainmailstudios.astromine.common.utilities.ExplosionUtilities; +import com.github.chainmailstudios.astromine.registry.AstromineConfig; + public class NuclearWarheadBlock extends Block { public NuclearWarheadBlock(Settings settings) { super(settings); diff --git a/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/common/block/RefineryBlock.java b/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/common/block/RefineryBlock.java index 056dae018..99e74a37e 100644 --- a/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/common/block/RefineryBlock.java +++ b/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/common/block/RefineryBlock.java @@ -24,9 +24,6 @@ package com.github.chainmailstudios.astromine.technologies.common.block; -import com.github.chainmailstudios.astromine.common.block.base.WrenchableHorizontalFacingTieredBlockWithEntity; -import com.github.chainmailstudios.astromine.technologies.common.block.entity.RefineryBlockEntity; -import com.github.chainmailstudios.astromine.technologies.common.screenhandler.RefineryScreenHandler; import net.minecraft.block.BlockState; import net.minecraft.block.entity.BlockEntity; import net.minecraft.entity.player.PlayerEntity; @@ -37,6 +34,10 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import com.github.chainmailstudios.astromine.common.block.base.WrenchableHorizontalFacingTieredBlockWithEntity; +import com.github.chainmailstudios.astromine.technologies.common.block.entity.RefineryBlockEntity; +import com.github.chainmailstudios.astromine.technologies.common.screenhandler.RefineryScreenHandler; + public abstract class RefineryBlock extends WrenchableHorizontalFacingTieredBlockWithEntity { public RefineryBlock(Settings settings) { super(settings); diff --git a/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/common/block/TankBlock.java b/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/common/block/TankBlock.java index af1fc43da..09637cf8c 100644 --- a/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/common/block/TankBlock.java +++ b/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/common/block/TankBlock.java @@ -24,7 +24,6 @@ package com.github.chainmailstudios.astromine.technologies.common.block; -import com.github.chainmailstudios.astromine.technologies.common.block.entity.TankBlockEntity; import net.minecraft.block.BlockState; import net.minecraft.block.entity.BlockEntity; import net.minecraft.entity.player.PlayerEntity; @@ -36,6 +35,7 @@ import net.minecraft.world.World; import com.github.chainmailstudios.astromine.common.block.base.WrenchableHorizontalFacingTieredBlockWithEntity; +import com.github.chainmailstudios.astromine.technologies.common.block.entity.TankBlockEntity; import com.github.chainmailstudios.astromine.technologies.common.screenhandler.TankScreenHandler; public abstract class TankBlock extends WrenchableHorizontalFacingTieredBlockWithEntity { diff --git a/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/common/block/entity/AlloySmelterBlockEntity.java b/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/common/block/entity/AlloySmelterBlockEntity.java index 38780b47b..6bab73476 100644 --- a/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/common/block/entity/AlloySmelterBlockEntity.java +++ b/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/common/block/entity/AlloySmelterBlockEntity.java @@ -24,6 +24,12 @@ package com.github.chainmailstudios.astromine.technologies.common.block.entity; +import net.minecraft.block.Block; +import net.minecraft.block.BlockState; +import net.minecraft.block.entity.BlockEntityType; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.CompoundTag; + import com.github.chainmailstudios.astromine.common.block.entity.base.ComponentEnergyInventoryBlockEntity; import com.github.chainmailstudios.astromine.common.component.inventory.EnergyInventoryComponent; import com.github.chainmailstudios.astromine.common.component.inventory.ItemInventoryComponent; @@ -43,11 +49,6 @@ import it.unimi.dsi.fastutil.ints.IntArraySet; import it.unimi.dsi.fastutil.ints.IntSet; import it.unimi.dsi.fastutil.ints.IntSets; -import net.minecraft.block.Block; -import net.minecraft.block.BlockState; -import net.minecraft.block.entity.BlockEntityType; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.CompoundTag; import org.jetbrains.annotations.NotNull; import java.util.Optional; diff --git a/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/common/block/entity/BlockBreakerBlockEntity.java b/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/common/block/entity/BlockBreakerBlockEntity.java index 5b83e6235..d48606956 100644 --- a/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/common/block/entity/BlockBreakerBlockEntity.java +++ b/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/common/block/entity/BlockBreakerBlockEntity.java @@ -24,6 +24,18 @@ package com.github.chainmailstudios.astromine.technologies.common.block.entity; +import net.minecraft.block.Block; +import net.minecraft.block.BlockState; +import net.minecraft.block.HorizontalFacingBlock; +import net.minecraft.block.entity.BlockEntity; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.CompoundTag; +import net.minecraft.server.world.ServerWorld; +import net.minecraft.util.ItemScatterer; +import net.minecraft.util.Pair; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.Direction; + import com.github.chainmailstudios.astromine.common.block.entity.base.ComponentEnergyInventoryBlockEntity; import com.github.chainmailstudios.astromine.common.component.inventory.EnergyInventoryComponent; import com.github.chainmailstudios.astromine.common.component.inventory.ItemInventoryComponent; @@ -39,17 +51,6 @@ import com.github.chainmailstudios.astromine.technologies.common.block.entity.machine.SpeedProvider; import com.github.chainmailstudios.astromine.technologies.registry.AstromineTechnologiesBlockEntityTypes; import com.github.chainmailstudios.astromine.technologies.registry.AstromineTechnologiesBlocks; -import net.minecraft.block.Block; -import net.minecraft.block.BlockState; -import net.minecraft.block.HorizontalFacingBlock; -import net.minecraft.block.entity.BlockEntity; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.CompoundTag; -import net.minecraft.server.world.ServerWorld; -import net.minecraft.util.ItemScatterer; -import net.minecraft.util.Pair; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.Direction; import org.jetbrains.annotations.NotNull; import java.util.List; diff --git a/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/common/block/entity/BlockPlacerBlockEntity.java b/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/common/block/entity/BlockPlacerBlockEntity.java index 46fb00a3e..ac56213d0 100644 --- a/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/common/block/entity/BlockPlacerBlockEntity.java +++ b/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/common/block/entity/BlockPlacerBlockEntity.java @@ -24,6 +24,14 @@ package com.github.chainmailstudios.astromine.technologies.common.block.entity; +import net.minecraft.block.BlockState; +import net.minecraft.block.HorizontalFacingBlock; +import net.minecraft.item.BlockItem; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.CompoundTag; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.Direction; + import com.github.chainmailstudios.astromine.common.block.entity.base.ComponentEnergyInventoryBlockEntity; import com.github.chainmailstudios.astromine.common.component.inventory.EnergyInventoryComponent; import com.github.chainmailstudios.astromine.common.component.inventory.ItemInventoryComponent; @@ -38,13 +46,6 @@ import com.github.chainmailstudios.astromine.technologies.common.block.entity.machine.SpeedProvider; import com.github.chainmailstudios.astromine.technologies.registry.AstromineTechnologiesBlockEntityTypes; import com.github.chainmailstudios.astromine.technologies.registry.AstromineTechnologiesBlocks; -import net.minecraft.block.BlockState; -import net.minecraft.block.HorizontalFacingBlock; -import net.minecraft.item.BlockItem; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.CompoundTag; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.Direction; import org.jetbrains.annotations.NotNull; public class BlockPlacerBlockEntity extends ComponentEnergyInventoryBlockEntity implements EnergySizeProvider, SpeedProvider, EnergyConsumedProvider { diff --git a/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/common/block/entity/BufferBlockEntity.java b/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/common/block/entity/BufferBlockEntity.java index d5a9a8170..3aa5f4272 100644 --- a/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/common/block/entity/BufferBlockEntity.java +++ b/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/common/block/entity/BufferBlockEntity.java @@ -24,12 +24,12 @@ package com.github.chainmailstudios.astromine.technologies.common.block.entity; -import com.github.chainmailstudios.astromine.common.volume.handler.ItemHandler; import net.minecraft.block.entity.BlockEntityType; import com.github.chainmailstudios.astromine.common.block.entity.base.ComponentInventoryBlockEntity; import com.github.chainmailstudios.astromine.common.component.inventory.ItemInventoryComponent; import com.github.chainmailstudios.astromine.common.component.inventory.SimpleItemInventoryComponent; +import com.github.chainmailstudios.astromine.common.volume.handler.ItemHandler; import com.github.chainmailstudios.astromine.technologies.registry.AstromineTechnologiesBlockEntityTypes; public abstract class BufferBlockEntity extends ComponentInventoryBlockEntity { diff --git a/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/common/block/entity/CapacitorBlockEntity.java b/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/common/block/entity/CapacitorBlockEntity.java index 0d29b224a..0766df45d 100644 --- a/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/common/block/entity/CapacitorBlockEntity.java +++ b/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/common/block/entity/CapacitorBlockEntity.java @@ -24,6 +24,10 @@ package com.github.chainmailstudios.astromine.technologies.common.block.entity; +import net.minecraft.block.Block; +import net.minecraft.block.entity.BlockEntityType; +import net.minecraft.item.ItemStack; + import com.github.chainmailstudios.astromine.common.block.entity.base.ComponentEnergyInventoryBlockEntity; import com.github.chainmailstudios.astromine.common.component.inventory.EnergyInventoryComponent; import com.github.chainmailstudios.astromine.common.component.inventory.ItemInventoryComponent; @@ -37,9 +41,6 @@ import com.github.chainmailstudios.astromine.technologies.common.block.entity.machine.TierProvider; import com.github.chainmailstudios.astromine.technologies.registry.AstromineTechnologiesBlockEntityTypes; import com.github.chainmailstudios.astromine.technologies.registry.AstromineTechnologiesBlocks; -import net.minecraft.block.Block; -import net.minecraft.block.entity.BlockEntityType; -import net.minecraft.item.ItemStack; import team.reborn.energy.Energy; import team.reborn.energy.EnergyHandler; diff --git a/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/common/block/entity/ElectricSmelterBlockEntity.java b/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/common/block/entity/ElectricSmelterBlockEntity.java index 2dae7dfca..bd1027375 100644 --- a/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/common/block/entity/ElectricSmelterBlockEntity.java +++ b/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/common/block/entity/ElectricSmelterBlockEntity.java @@ -24,6 +24,14 @@ package com.github.chainmailstudios.astromine.technologies.common.block.entity; +import net.minecraft.block.Block; +import net.minecraft.block.BlockState; +import net.minecraft.block.entity.BlockEntityType; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.CompoundTag; +import net.minecraft.recipe.RecipeType; +import net.minecraft.recipe.SmeltingRecipe; + import com.github.chainmailstudios.astromine.common.block.entity.base.ComponentEnergyInventoryBlockEntity; import com.github.chainmailstudios.astromine.common.component.inventory.EnergyInventoryComponent; import com.github.chainmailstudios.astromine.common.component.inventory.ItemInventoryComponent; @@ -41,13 +49,6 @@ import com.github.chainmailstudios.astromine.technologies.registry.AstromineTechnologiesBlocks; import it.unimi.dsi.fastutil.ints.IntSet; import it.unimi.dsi.fastutil.ints.IntSets; -import net.minecraft.block.Block; -import net.minecraft.block.BlockState; -import net.minecraft.block.entity.BlockEntityType; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.CompoundTag; -import net.minecraft.recipe.RecipeType; -import net.minecraft.recipe.SmeltingRecipe; import org.jetbrains.annotations.NotNull; import java.util.Optional; diff --git a/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/common/block/entity/ElectrolyzerBlockEntity.java b/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/common/block/entity/ElectrolyzerBlockEntity.java index d26a72d2d..45a4d6e0f 100644 --- a/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/common/block/entity/ElectrolyzerBlockEntity.java +++ b/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/common/block/entity/ElectrolyzerBlockEntity.java @@ -24,6 +24,12 @@ package com.github.chainmailstudios.astromine.technologies.common.block.entity; +import net.minecraft.block.Block; +import net.minecraft.block.BlockState; +import net.minecraft.block.entity.BlockEntityType; +import net.minecraft.fluid.Fluid; +import net.minecraft.nbt.CompoundTag; + import com.github.chainmailstudios.astromine.common.block.entity.base.ComponentEnergyFluidBlockEntity; import com.github.chainmailstudios.astromine.common.component.inventory.EnergyInventoryComponent; import com.github.chainmailstudios.astromine.common.component.inventory.FluidInventoryComponent; @@ -42,11 +48,6 @@ import com.github.chainmailstudios.astromine.technologies.common.recipe.ElectrolyzingRecipe; import com.github.chainmailstudios.astromine.technologies.registry.AstromineTechnologiesBlockEntityTypes; import com.github.chainmailstudios.astromine.technologies.registry.AstromineTechnologiesBlocks; -import net.minecraft.block.Block; -import net.minecraft.block.BlockState; -import net.minecraft.block.entity.BlockEntityType; -import net.minecraft.fluid.Fluid; -import net.minecraft.nbt.CompoundTag; import org.jetbrains.annotations.NotNull; import java.util.Optional; diff --git a/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/common/block/entity/FluidExtractorBlockEntity.java b/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/common/block/entity/FluidExtractorBlockEntity.java index aa137d4cf..55bed32a3 100644 --- a/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/common/block/entity/FluidExtractorBlockEntity.java +++ b/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/common/block/entity/FluidExtractorBlockEntity.java @@ -24,6 +24,14 @@ package com.github.chainmailstudios.astromine.technologies.common.block.entity; +import net.minecraft.block.Blocks; +import net.minecraft.block.HorizontalFacingBlock; +import net.minecraft.fluid.FluidState; +import net.minecraft.sound.SoundCategory; +import net.minecraft.sound.SoundEvents; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.Direction; + import com.github.chainmailstudios.astromine.common.block.entity.base.ComponentEnergyFluidBlockEntity; import com.github.chainmailstudios.astromine.common.component.inventory.EnergyInventoryComponent; import com.github.chainmailstudios.astromine.common.component.inventory.FluidInventoryComponent; @@ -39,13 +47,6 @@ import com.github.chainmailstudios.astromine.technologies.common.block.entity.machine.SpeedProvider; import com.github.chainmailstudios.astromine.technologies.registry.AstromineTechnologiesBlockEntityTypes; import com.github.chainmailstudios.astromine.technologies.registry.AstromineTechnologiesBlocks; -import net.minecraft.block.Blocks; -import net.minecraft.block.HorizontalFacingBlock; -import net.minecraft.fluid.FluidState; -import net.minecraft.sound.SoundCategory; -import net.minecraft.sound.SoundEvents; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.Direction; public class FluidExtractorBlockEntity extends ComponentEnergyFluidBlockEntity implements EnergySizeProvider, SpeedProvider, EnergyConsumedProvider { private Fraction cooldown = Fraction.empty(); diff --git a/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/common/block/entity/FluidInserterBlockEntity.java b/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/common/block/entity/FluidInserterBlockEntity.java index 7367c19f8..5b9b6fe01 100644 --- a/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/common/block/entity/FluidInserterBlockEntity.java +++ b/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/common/block/entity/FluidInserterBlockEntity.java @@ -24,6 +24,13 @@ package com.github.chainmailstudios.astromine.technologies.common.block.entity; +import net.minecraft.block.BlockState; +import net.minecraft.block.HorizontalFacingBlock; +import net.minecraft.sound.SoundCategory; +import net.minecraft.sound.SoundEvents; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.Direction; + import com.github.chainmailstudios.astromine.common.block.entity.base.ComponentEnergyFluidBlockEntity; import com.github.chainmailstudios.astromine.common.component.inventory.EnergyInventoryComponent; import com.github.chainmailstudios.astromine.common.component.inventory.FluidInventoryComponent; @@ -39,12 +46,6 @@ import com.github.chainmailstudios.astromine.technologies.common.block.entity.machine.SpeedProvider; import com.github.chainmailstudios.astromine.technologies.registry.AstromineTechnologiesBlockEntityTypes; import com.github.chainmailstudios.astromine.technologies.registry.AstromineTechnologiesBlocks; -import net.minecraft.block.BlockState; -import net.minecraft.block.HorizontalFacingBlock; -import net.minecraft.sound.SoundCategory; -import net.minecraft.sound.SoundEvents; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.Direction; public class FluidInserterBlockEntity extends ComponentEnergyFluidBlockEntity implements EnergySizeProvider, SpeedProvider, EnergyConsumedProvider { private Fraction cooldown = Fraction.empty(); diff --git a/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/common/block/entity/FluidMixerBlockEntity.java b/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/common/block/entity/FluidMixerBlockEntity.java index 9aecc5f57..ba6b411e7 100644 --- a/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/common/block/entity/FluidMixerBlockEntity.java +++ b/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/common/block/entity/FluidMixerBlockEntity.java @@ -24,6 +24,12 @@ package com.github.chainmailstudios.astromine.technologies.common.block.entity; +import net.minecraft.block.Block; +import net.minecraft.block.BlockState; +import net.minecraft.block.entity.BlockEntityType; +import net.minecraft.fluid.Fluid; +import net.minecraft.nbt.CompoundTag; + import com.github.chainmailstudios.astromine.common.block.entity.base.ComponentEnergyFluidBlockEntity; import com.github.chainmailstudios.astromine.common.component.inventory.EnergyInventoryComponent; import com.github.chainmailstudios.astromine.common.component.inventory.FluidInventoryComponent; @@ -42,11 +48,6 @@ import com.github.chainmailstudios.astromine.technologies.common.recipe.FluidMixingRecipe; import com.github.chainmailstudios.astromine.technologies.registry.AstromineTechnologiesBlockEntityTypes; import com.github.chainmailstudios.astromine.technologies.registry.AstromineTechnologiesBlocks; -import net.minecraft.block.Block; -import net.minecraft.block.BlockState; -import net.minecraft.block.entity.BlockEntityType; -import net.minecraft.fluid.Fluid; -import net.minecraft.nbt.CompoundTag; import org.jetbrains.annotations.NotNull; import java.util.Optional; diff --git a/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/common/block/entity/LiquidGeneratorBlockEntity.java b/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/common/block/entity/LiquidGeneratorBlockEntity.java index 97b4d437b..378ed6edd 100644 --- a/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/common/block/entity/LiquidGeneratorBlockEntity.java +++ b/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/common/block/entity/LiquidGeneratorBlockEntity.java @@ -24,6 +24,12 @@ package com.github.chainmailstudios.astromine.technologies.common.block.entity; +import net.minecraft.block.Block; +import net.minecraft.block.BlockState; +import net.minecraft.block.entity.BlockEntityType; +import net.minecraft.fluid.Fluid; +import net.minecraft.nbt.CompoundTag; + import com.github.chainmailstudios.astromine.common.block.entity.base.ComponentEnergyFluidBlockEntity; import com.github.chainmailstudios.astromine.common.component.inventory.EnergyInventoryComponent; import com.github.chainmailstudios.astromine.common.component.inventory.FluidInventoryComponent; @@ -41,11 +47,6 @@ import com.github.chainmailstudios.astromine.technologies.common.recipe.LiquidGeneratingRecipe; import com.github.chainmailstudios.astromine.technologies.registry.AstromineTechnologiesBlockEntityTypes; import com.github.chainmailstudios.astromine.technologies.registry.AstromineTechnologiesBlocks; -import net.minecraft.block.Block; -import net.minecraft.block.BlockState; -import net.minecraft.block.entity.BlockEntityType; -import net.minecraft.fluid.Fluid; -import net.minecraft.nbt.CompoundTag; import org.jetbrains.annotations.NotNull; import java.util.Optional; @@ -100,7 +101,8 @@ public void tick() { FluidHandler.ofOptional(this).ifPresent(fluids -> { EnergyVolume energyVolume = getEnergyComponent().getVolume(); if (!optionalRecipe.isPresent() && shouldTry) { - optionalRecipe = (Optional) world.getRecipeManager().getAllOfType(LiquidGeneratingRecipe.Type.INSTANCE).values().stream().filter(recipe -> recipe instanceof LiquidGeneratingRecipe).filter(recipe -> ((LiquidGeneratingRecipe) recipe).matches(fluidComponent)).findFirst(); + optionalRecipe = (Optional) world.getRecipeManager().getAllOfType(LiquidGeneratingRecipe.Type.INSTANCE).values().stream().filter(recipe -> recipe instanceof LiquidGeneratingRecipe).filter(recipe -> ((LiquidGeneratingRecipe) recipe).matches(fluidComponent)) + .findFirst(); shouldTry = false; if (!optionalRecipe.isPresent()) { diff --git a/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/common/block/entity/PresserBlockEntity.java b/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/common/block/entity/PresserBlockEntity.java index ae6bf9ce0..5c401dc9d 100644 --- a/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/common/block/entity/PresserBlockEntity.java +++ b/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/common/block/entity/PresserBlockEntity.java @@ -24,6 +24,13 @@ package com.github.chainmailstudios.astromine.technologies.common.block.entity; +import net.minecraft.block.Block; +import net.minecraft.block.BlockState; +import net.minecraft.block.entity.BlockEntityType; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.CompoundTag; +import net.minecraft.recipe.RecipeType; + import com.github.chainmailstudios.astromine.common.block.entity.base.ComponentEnergyInventoryBlockEntity; import com.github.chainmailstudios.astromine.common.component.inventory.EnergyInventoryComponent; import com.github.chainmailstudios.astromine.common.component.inventory.ItemInventoryComponent; @@ -43,12 +50,6 @@ import com.github.chainmailstudios.astromine.technologies.registry.AstromineTechnologiesBlocks; import it.unimi.dsi.fastutil.ints.IntSet; import it.unimi.dsi.fastutil.ints.IntSets; -import net.minecraft.block.Block; -import net.minecraft.block.BlockState; -import net.minecraft.block.entity.BlockEntityType; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.CompoundTag; -import net.minecraft.recipe.RecipeType; import org.jetbrains.annotations.NotNull; import java.util.Optional; diff --git a/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/common/block/entity/RefineryBlockEntity.java b/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/common/block/entity/RefineryBlockEntity.java index 5a00c8e9f..513743b1b 100644 --- a/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/common/block/entity/RefineryBlockEntity.java +++ b/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/common/block/entity/RefineryBlockEntity.java @@ -24,6 +24,12 @@ package com.github.chainmailstudios.astromine.technologies.common.block.entity; +import net.minecraft.block.Block; +import net.minecraft.block.BlockState; +import net.minecraft.block.entity.BlockEntityType; +import net.minecraft.fluid.Fluid; +import net.minecraft.nbt.CompoundTag; + import com.github.chainmailstudios.astromine.common.block.entity.base.ComponentEnergyFluidBlockEntity; import com.github.chainmailstudios.astromine.common.component.inventory.EnergyInventoryComponent; import com.github.chainmailstudios.astromine.common.component.inventory.FluidInventoryComponent; @@ -42,11 +48,6 @@ import com.github.chainmailstudios.astromine.technologies.common.recipe.RefiningRecipe; import com.github.chainmailstudios.astromine.technologies.registry.AstromineTechnologiesBlockEntityTypes; import com.github.chainmailstudios.astromine.technologies.registry.AstromineTechnologiesBlocks; -import net.minecraft.block.Block; -import net.minecraft.block.BlockState; -import net.minecraft.block.entity.BlockEntityType; -import net.minecraft.fluid.Fluid; -import net.minecraft.nbt.CompoundTag; import org.jetbrains.annotations.NotNull; import java.util.Optional; diff --git a/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/common/block/entity/SolidGeneratorBlockEntity.java b/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/common/block/entity/SolidGeneratorBlockEntity.java index 762d5ef93..1f34afd79 100644 --- a/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/common/block/entity/SolidGeneratorBlockEntity.java +++ b/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/common/block/entity/SolidGeneratorBlockEntity.java @@ -24,6 +24,15 @@ package com.github.chainmailstudios.astromine.technologies.common.block.entity; +import net.fabricmc.fabric.api.registry.FuelRegistry; + +import net.minecraft.block.Block; +import net.minecraft.block.BlockState; +import net.minecraft.block.entity.BlockEntityType; +import net.minecraft.item.BucketItem; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.CompoundTag; + import com.github.chainmailstudios.astromine.common.block.entity.base.ComponentEnergyInventoryBlockEntity; import com.github.chainmailstudios.astromine.common.component.inventory.EnergyInventoryComponent; import com.github.chainmailstudios.astromine.common.component.inventory.ItemInventoryComponent; @@ -38,13 +47,6 @@ import com.github.chainmailstudios.astromine.technologies.common.block.entity.machine.TierProvider; import com.github.chainmailstudios.astromine.technologies.registry.AstromineTechnologiesBlockEntityTypes; import com.github.chainmailstudios.astromine.technologies.registry.AstromineTechnologiesBlocks; -import net.fabricmc.fabric.api.registry.FuelRegistry; -import net.minecraft.block.Block; -import net.minecraft.block.BlockState; -import net.minecraft.block.entity.BlockEntityType; -import net.minecraft.item.BucketItem; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.CompoundTag; import org.jetbrains.annotations.NotNull; public abstract class SolidGeneratorBlockEntity extends ComponentEnergyInventoryBlockEntity implements EnergySizeProvider, TierProvider, SpeedProvider { diff --git a/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/common/block/entity/TankBlockEntity.java b/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/common/block/entity/TankBlockEntity.java index 676d51ab9..f7332f690 100644 --- a/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/common/block/entity/TankBlockEntity.java +++ b/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/common/block/entity/TankBlockEntity.java @@ -24,6 +24,13 @@ package com.github.chainmailstudios.astromine.technologies.common.block.entity; +import net.minecraft.block.entity.BlockEntityType; +import net.minecraft.fluid.Fluid; +import net.minecraft.item.BucketItem; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.item.Items; + import com.github.chainmailstudios.astromine.common.block.entity.base.ComponentFluidInventoryBlockEntity; import com.github.chainmailstudios.astromine.common.component.inventory.FluidInventoryComponent; import com.github.chainmailstudios.astromine.common.component.inventory.ItemInventoryComponent; @@ -39,12 +46,6 @@ import com.github.chainmailstudios.astromine.technologies.common.block.entity.machine.SpeedProvider; import com.github.chainmailstudios.astromine.technologies.common.block.entity.machine.TierProvider; import com.github.chainmailstudios.astromine.technologies.registry.AstromineTechnologiesBlockEntityTypes; -import net.minecraft.block.entity.BlockEntityType; -import net.minecraft.fluid.Fluid; -import net.minecraft.item.BucketItem; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.item.Items; import java.util.Optional; diff --git a/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/common/block/entity/TrituratorBlockEntity.java b/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/common/block/entity/TrituratorBlockEntity.java index b1ad809d6..56d083296 100644 --- a/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/common/block/entity/TrituratorBlockEntity.java +++ b/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/common/block/entity/TrituratorBlockEntity.java @@ -24,6 +24,13 @@ package com.github.chainmailstudios.astromine.technologies.common.block.entity; +import net.minecraft.block.Block; +import net.minecraft.block.BlockState; +import net.minecraft.block.entity.BlockEntityType; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.CompoundTag; +import net.minecraft.recipe.RecipeType; + import com.github.chainmailstudios.astromine.common.block.entity.base.ComponentEnergyInventoryBlockEntity; import com.github.chainmailstudios.astromine.common.component.inventory.EnergyInventoryComponent; import com.github.chainmailstudios.astromine.common.component.inventory.ItemInventoryComponent; @@ -43,12 +50,6 @@ import com.github.chainmailstudios.astromine.technologies.registry.AstromineTechnologiesBlocks; import it.unimi.dsi.fastutil.ints.IntSet; import it.unimi.dsi.fastutil.ints.IntSets; -import net.minecraft.block.Block; -import net.minecraft.block.BlockState; -import net.minecraft.block.entity.BlockEntityType; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.CompoundTag; -import net.minecraft.recipe.RecipeType; import org.jetbrains.annotations.NotNull; import java.util.Optional; diff --git a/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/common/block/entity/VentBlockEntity.java b/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/common/block/entity/VentBlockEntity.java index 031e76756..78d50dd3e 100644 --- a/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/common/block/entity/VentBlockEntity.java +++ b/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/common/block/entity/VentBlockEntity.java @@ -24,6 +24,11 @@ package com.github.chainmailstudios.astromine.technologies.common.block.entity; +import net.minecraft.block.FacingBlock; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.ChunkPos; +import net.minecraft.util.math.Direction; + import com.github.chainmailstudios.astromine.common.block.entity.base.ComponentEnergyFluidBlockEntity; import com.github.chainmailstudios.astromine.common.component.inventory.EnergyInventoryComponent; import com.github.chainmailstudios.astromine.common.component.inventory.FluidInventoryComponent; @@ -43,10 +48,6 @@ import com.github.chainmailstudios.astromine.technologies.registry.AstromineTechnologiesBlockEntityTypes; import com.github.chainmailstudios.astromine.technologies.registry.AstromineTechnologiesBlocks; import nerdhub.cardinal.components.api.component.ComponentProvider; -import net.minecraft.block.FacingBlock; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.ChunkPos; -import net.minecraft.util.math.Direction; public class VentBlockEntity extends ComponentEnergyFluidBlockEntity implements FluidSizeProvider, EnergySizeProvider, SpeedProvider, EnergyConsumedProvider { public VentBlockEntity() { diff --git a/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/common/item/GravityGauntletItem.java b/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/common/item/GravityGauntletItem.java index 77dcbf135..f743dd4e2 100644 --- a/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/common/item/GravityGauntletItem.java +++ b/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/common/item/GravityGauntletItem.java @@ -24,7 +24,6 @@ package com.github.chainmailstudios.astromine.technologies.common.item; -import com.github.chainmailstudios.astromine.technologies.registry.AstromineTechnologiesItems; import net.fabricmc.fabric.api.tool.attribute.v1.DynamicAttributeTool; import net.minecraft.entity.EquipmentSlot; @@ -41,6 +40,7 @@ import com.github.chainmailstudios.astromine.common.item.base.EnergyVolumeItem; import com.github.chainmailstudios.astromine.registry.AstromineConfig; +import com.github.chainmailstudios.astromine.technologies.registry.AstromineTechnologiesItems; import team.reborn.energy.Energy; import team.reborn.energy.EnergyHandler; @@ -50,6 +50,10 @@ public class GravityGauntletItem extends EnergyVolumeItem implements DynamicAttributeTool { private static final Multimap EAMS = HashMultimap.create(); + static { + EAMS.put(EntityAttributes.GENERIC_ATTACK_DAMAGE, new EntityAttributeModifier(ATTACK_DAMAGE_MODIFIER_ID, "attack", 4f, EntityAttributeModifier.Operation.ADDITION)); + } + public GravityGauntletItem(Settings settings, double size) { super(settings, size); } @@ -130,8 +134,4 @@ public Multimap getAttributeModifiers( } return super.getAttributeModifiers(slot); } - - static { - EAMS.put(EntityAttributes.GENERIC_ATTACK_DAMAGE, new EntityAttributeModifier(ATTACK_DAMAGE_MODIFIER_ID, "attack", 4f, EntityAttributeModifier.Operation.ADDITION)); - } } diff --git a/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/common/recipe/ElectrolyzingRecipe.java b/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/common/recipe/ElectrolyzingRecipe.java index f1392846e..9f46e84f0 100644 --- a/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/common/recipe/ElectrolyzingRecipe.java +++ b/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/common/recipe/ElectrolyzingRecipe.java @@ -24,9 +24,6 @@ package com.github.chainmailstudios.astromine.technologies.common.recipe; -import com.github.chainmailstudios.astromine.common.recipe.AstromineRecipeType; -import com.github.chainmailstudios.astromine.common.volume.handler.FluidHandler; -import com.github.chainmailstudios.astromine.technologies.registry.AstromineTechnologiesBlocks; import net.minecraft.fluid.Fluid; import net.minecraft.fluid.Fluids; import net.minecraft.inventory.Inventory; @@ -39,17 +36,20 @@ import net.minecraft.util.Lazy; import net.minecraft.util.registry.Registry; import net.minecraft.util.registry.RegistryKey; +import net.minecraft.world.World; import com.github.chainmailstudios.astromine.AstromineCommon; import com.github.chainmailstudios.astromine.common.component.inventory.FluidInventoryComponent; -import com.github.chainmailstudios.astromine.common.volume.fraction.Fraction; +import com.github.chainmailstudios.astromine.common.recipe.AstromineRecipeType; import com.github.chainmailstudios.astromine.common.recipe.base.EnergyConsumingRecipe; import com.github.chainmailstudios.astromine.common.utilities.EnergyUtilities; import com.github.chainmailstudios.astromine.common.utilities.FractionUtilities; import com.github.chainmailstudios.astromine.common.utilities.PacketUtilities; import com.github.chainmailstudios.astromine.common.utilities.ParsingUtilities; import com.github.chainmailstudios.astromine.common.volume.fluid.FluidVolume; -import net.minecraft.world.World; +import com.github.chainmailstudios.astromine.common.volume.fraction.Fraction; +import com.github.chainmailstudios.astromine.common.volume.handler.FluidHandler; +import com.github.chainmailstudios.astromine.technologies.registry.AstromineTechnologiesBlocks; import com.google.gson.Gson; import com.google.gson.JsonElement; @@ -86,6 +86,14 @@ public ElectrolyzingRecipe(Identifier identifier, RegistryKey inputFluidK this.time = time; } + public static boolean allows(World world, Fluid inserting, Fluid existing) { + return world.getRecipeManager().getAllOfType(ElectrolyzingRecipe.Type.INSTANCE).values().stream().anyMatch(it -> { + ElectrolyzingRecipe recipe = ((ElectrolyzingRecipe) it); + + return (existing == inserting || existing == Fluids.EMPTY) && (recipe.inputFluid.get() == inserting); + }); + } + public boolean matches(FluidInventoryComponent fluidComponent) { FluidHandler fluidHandler = FluidHandler.of(fluidComponent); @@ -112,14 +120,6 @@ public boolean matches(FluidInventoryComponent fluidComponent) { return secondOutputVolume.hasAvailable(secondOutputAmount); } - public static boolean allows(World world, Fluid inserting, Fluid existing) { - return world.getRecipeManager().getAllOfType(ElectrolyzingRecipe.Type.INSTANCE).values().stream().anyMatch(it -> { - ElectrolyzingRecipe recipe = ((ElectrolyzingRecipe) it); - - return (existing == inserting || existing == Fluids.EMPTY) && (recipe.inputFluid.get() == inserting); - }); - } - @Override public Identifier getId() { return identifier; diff --git a/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/common/recipe/FluidMixingRecipe.java b/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/common/recipe/FluidMixingRecipe.java index 7dd51889c..86c10987d 100644 --- a/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/common/recipe/FluidMixingRecipe.java +++ b/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/common/recipe/FluidMixingRecipe.java @@ -24,9 +24,6 @@ package com.github.chainmailstudios.astromine.technologies.common.recipe; -import com.github.chainmailstudios.astromine.common.recipe.AstromineRecipeType; -import com.github.chainmailstudios.astromine.common.volume.handler.FluidHandler; -import com.github.chainmailstudios.astromine.technologies.registry.AstromineTechnologiesBlocks; import net.minecraft.fluid.Fluid; import net.minecraft.fluid.Fluids; import net.minecraft.inventory.Inventory; @@ -41,17 +38,20 @@ import net.minecraft.util.collection.DefaultedList; import net.minecraft.util.registry.Registry; import net.minecraft.util.registry.RegistryKey; +import net.minecraft.world.World; import com.github.chainmailstudios.astromine.AstromineCommon; import com.github.chainmailstudios.astromine.common.component.inventory.FluidInventoryComponent; -import com.github.chainmailstudios.astromine.common.volume.fraction.Fraction; +import com.github.chainmailstudios.astromine.common.recipe.AstromineRecipeType; import com.github.chainmailstudios.astromine.common.recipe.base.EnergyConsumingRecipe; import com.github.chainmailstudios.astromine.common.utilities.EnergyUtilities; import com.github.chainmailstudios.astromine.common.utilities.FractionUtilities; import com.github.chainmailstudios.astromine.common.utilities.PacketUtilities; import com.github.chainmailstudios.astromine.common.utilities.ParsingUtilities; import com.github.chainmailstudios.astromine.common.volume.fluid.FluidVolume; -import net.minecraft.world.World; +import com.github.chainmailstudios.astromine.common.volume.fraction.Fraction; +import com.github.chainmailstudios.astromine.common.volume.handler.FluidHandler; +import com.github.chainmailstudios.astromine.technologies.registry.AstromineTechnologiesBlocks; import com.google.gson.Gson; import com.google.gson.JsonElement; @@ -87,6 +87,14 @@ public FluidMixingRecipe(Identifier identifier, RegistryKey firstInputFlu this.time = time; } + public static boolean allows(World world, Fluid inserting, Fluid existing) { + return world.getRecipeManager().getAllOfType(Type.INSTANCE).values().stream().anyMatch(it -> { + FluidMixingRecipe recipe = ((FluidMixingRecipe) it); + + return (existing == inserting || existing == Fluids.EMPTY) && (recipe.firstInputFluid.get() == inserting || recipe.secondInputFluid.get() == inserting); + }); + } + public boolean matches(FluidInventoryComponent fluidComponent) { FluidHandler fluidHandler = FluidHandler.of(fluidComponent); @@ -117,14 +125,6 @@ public boolean matches(FluidInventoryComponent fluidComponent) { return outputVolume.hasAvailable(outputAmount); } - public static boolean allows(World world, Fluid inserting, Fluid existing) { - return world.getRecipeManager().getAllOfType(Type.INSTANCE).values().stream().anyMatch(it -> { - FluidMixingRecipe recipe = ((FluidMixingRecipe) it); - - return (existing == inserting || existing == Fluids.EMPTY) && (recipe.firstInputFluid.get() == inserting || recipe.secondInputFluid.get() == inserting); - }); - } - @Override public Identifier getId() { return identifier; diff --git a/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/common/recipe/LiquidGeneratingRecipe.java b/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/common/recipe/LiquidGeneratingRecipe.java index 78a65f6c6..28bffae04 100644 --- a/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/common/recipe/LiquidGeneratingRecipe.java +++ b/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/common/recipe/LiquidGeneratingRecipe.java @@ -24,9 +24,6 @@ package com.github.chainmailstudios.astromine.technologies.common.recipe; -import com.github.chainmailstudios.astromine.common.recipe.AstromineRecipeType; -import com.github.chainmailstudios.astromine.common.volume.handler.FluidHandler; -import com.github.chainmailstudios.astromine.technologies.registry.AstromineTechnologiesBlocks; import net.minecraft.fluid.Fluid; import net.minecraft.fluid.Fluids; import net.minecraft.inventory.Inventory; @@ -41,17 +38,20 @@ import net.minecraft.util.collection.DefaultedList; import net.minecraft.util.registry.Registry; import net.minecraft.util.registry.RegistryKey; +import net.minecraft.world.World; import com.github.chainmailstudios.astromine.AstromineCommon; import com.github.chainmailstudios.astromine.common.component.inventory.FluidInventoryComponent; -import com.github.chainmailstudios.astromine.common.volume.fraction.Fraction; +import com.github.chainmailstudios.astromine.common.recipe.AstromineRecipeType; import com.github.chainmailstudios.astromine.common.recipe.base.EnergyGeneratingRecipe; import com.github.chainmailstudios.astromine.common.utilities.EnergyUtilities; import com.github.chainmailstudios.astromine.common.utilities.FractionUtilities; import com.github.chainmailstudios.astromine.common.utilities.PacketUtilities; import com.github.chainmailstudios.astromine.common.utilities.ParsingUtilities; import com.github.chainmailstudios.astromine.common.volume.fluid.FluidVolume; -import net.minecraft.world.World; +import com.github.chainmailstudios.astromine.common.volume.fraction.Fraction; +import com.github.chainmailstudios.astromine.common.volume.handler.FluidHandler; +import com.github.chainmailstudios.astromine.technologies.registry.AstromineTechnologiesBlocks; import com.google.gson.Gson; import com.google.gson.JsonElement; @@ -75,6 +75,14 @@ public LiquidGeneratingRecipe(Identifier identifier, RegistryKey fluidKey this.time = time; } + public static boolean allows(World world, Fluid inserting, Fluid existing) { + return world.getRecipeManager().getAllOfType(LiquidGeneratingRecipe.Type.INSTANCE).values().stream().anyMatch(it -> { + LiquidGeneratingRecipe recipe = ((LiquidGeneratingRecipe) it); + + return (existing == inserting || existing == Fluids.EMPTY) && (recipe.fluid.get() == inserting); + }); + } + public boolean matches(FluidInventoryComponent fluidComponent) { FluidHandler handler = FluidHandler.of(fluidComponent); @@ -87,14 +95,6 @@ public boolean matches(FluidInventoryComponent fluidComponent) { return fluidVolume.hasStored(amount); } - public static boolean allows(World world, Fluid inserting, Fluid existing) { - return world.getRecipeManager().getAllOfType(LiquidGeneratingRecipe.Type.INSTANCE).values().stream().anyMatch(it -> { - LiquidGeneratingRecipe recipe = ((LiquidGeneratingRecipe) it); - - return (existing == inserting || existing == Fluids.EMPTY) && (recipe.fluid.get() == inserting); - }); - } - @Override public boolean matches(Inventory inventory, World world) { return false; diff --git a/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/common/recipe/PressingRecipe.java b/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/common/recipe/PressingRecipe.java index 7423c14f3..2fb06210a 100644 --- a/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/common/recipe/PressingRecipe.java +++ b/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/common/recipe/PressingRecipe.java @@ -24,10 +24,6 @@ package com.github.chainmailstudios.astromine.technologies.common.recipe; -import com.github.chainmailstudios.astromine.common.recipe.AstromineRecipeType; -import com.github.chainmailstudios.astromine.technologies.registry.AstromineTechnologiesBlocks; -import net.minecraft.fluid.Fluid; -import net.minecraft.fluid.Fluids; import net.minecraft.inventory.Inventory; import net.minecraft.item.ItemStack; import net.minecraft.network.PacketByteBuf; @@ -40,12 +36,14 @@ import com.github.chainmailstudios.astromine.AstromineCommon; import com.github.chainmailstudios.astromine.common.component.inventory.compatibility.ItemInventoryComponentFromItemInventory; +import com.github.chainmailstudios.astromine.common.recipe.AstromineRecipeType; import com.github.chainmailstudios.astromine.common.recipe.base.EnergyConsumingRecipe; import com.github.chainmailstudios.astromine.common.utilities.EnergyUtilities; import com.github.chainmailstudios.astromine.common.utilities.IngredientUtilities; import com.github.chainmailstudios.astromine.common.utilities.PacketUtilities; import com.github.chainmailstudios.astromine.common.utilities.ParsingUtilities; import com.github.chainmailstudios.astromine.common.utilities.StackUtilities; +import com.github.chainmailstudios.astromine.technologies.registry.AstromineTechnologiesBlocks; import com.google.gson.Gson; import com.google.gson.JsonElement; @@ -68,11 +66,6 @@ public PressingRecipe(Identifier identifier, Ingredient input, ItemStack output, this.time = time; } - @Override - public boolean matches(Inventory inventory, World world) { - return ItemInventoryComponentFromItemInventory.of(inventory).getContents().values().stream().anyMatch(input); - } - public static boolean allows(World world, Inventory inventory) { return world.getRecipeManager().getAllOfType(PressingRecipe.Type.INSTANCE).values().stream().anyMatch(it -> { PressingRecipe recipe = ((PressingRecipe) it); @@ -81,6 +74,11 @@ public static boolean allows(World world, Inventory inventory) { }); } + @Override + public boolean matches(Inventory inventory, World world) { + return ItemInventoryComponentFromItemInventory.of(inventory).getContents().values().stream().anyMatch(input); + } + @Override public ItemStack craft(Inventory inventory) { return output.copy(); diff --git a/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/common/recipe/RefiningRecipe.java b/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/common/recipe/RefiningRecipe.java index 72e79d6e9..371a1812d 100644 --- a/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/common/recipe/RefiningRecipe.java +++ b/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/common/recipe/RefiningRecipe.java @@ -24,6 +24,20 @@ package com.github.chainmailstudios.astromine.technologies.common.recipe; +import net.minecraft.fluid.Fluid; +import net.minecraft.fluid.Fluids; +import net.minecraft.inventory.Inventory; +import net.minecraft.item.ItemStack; +import net.minecraft.network.PacketByteBuf; +import net.minecraft.recipe.Recipe; +import net.minecraft.recipe.RecipeSerializer; +import net.minecraft.recipe.RecipeType; +import net.minecraft.util.Identifier; +import net.minecraft.util.Lazy; +import net.minecraft.util.registry.Registry; +import net.minecraft.util.registry.RegistryKey; +import net.minecraft.world.World; + import com.github.chainmailstudios.astromine.AstromineCommon; import com.github.chainmailstudios.astromine.common.component.inventory.FluidInventoryComponent; import com.github.chainmailstudios.astromine.common.recipe.AstromineRecipeType; @@ -36,23 +50,11 @@ import com.github.chainmailstudios.astromine.common.volume.fraction.Fraction; import com.github.chainmailstudios.astromine.common.volume.handler.FluidHandler; import com.github.chainmailstudios.astromine.technologies.registry.AstromineTechnologiesBlocks; + import com.google.gson.Gson; import com.google.gson.JsonElement; import com.google.gson.JsonObject; import com.google.gson.annotations.SerializedName; -import net.minecraft.fluid.Fluid; -import net.minecraft.fluid.Fluids; -import net.minecraft.inventory.Inventory; -import net.minecraft.item.ItemStack; -import net.minecraft.network.PacketByteBuf; -import net.minecraft.recipe.Recipe; -import net.minecraft.recipe.RecipeSerializer; -import net.minecraft.recipe.RecipeType; -import net.minecraft.util.Identifier; -import net.minecraft.util.Lazy; -import net.minecraft.util.registry.Registry; -import net.minecraft.util.registry.RegistryKey; -import net.minecraft.world.World; public class RefiningRecipe implements Recipe, EnergyConsumingRecipe { final Identifier identifier; @@ -115,6 +117,14 @@ public RefiningRecipe(Identifier identifier, RegistryKey inputFluidKey, F this.time = time; } + public static boolean allows(World world, Fluid inserting, Fluid existing) { + return world.getRecipeManager().getAllOfType(RefiningRecipe.Type.INSTANCE).values().stream().anyMatch(it -> { + RefiningRecipe recipe = ((RefiningRecipe) it); + + return (existing == inserting || existing == Fluids.EMPTY) && (recipe.inputFluid.get() == inserting); + }); + } + public boolean matches(FluidInventoryComponent fluidComponent) { FluidHandler fluidHandler = FluidHandler.of(fluidComponent); @@ -188,14 +198,6 @@ public boolean matches(FluidInventoryComponent fluidComponent) { return seventhOutputVolume.hasAvailable(seventhOutputAmount); } - public static boolean allows(World world, Fluid inserting, Fluid existing) { - return world.getRecipeManager().getAllOfType(RefiningRecipe.Type.INSTANCE).values().stream().anyMatch(it -> { - RefiningRecipe recipe = ((RefiningRecipe) it); - - return (existing == inserting || existing == Fluids.EMPTY) && (recipe.inputFluid.get() == inserting); - }); - } - @Override public Identifier getId() { return identifier; diff --git a/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/common/recipe/TrituratingRecipe.java b/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/common/recipe/TrituratingRecipe.java index d19688ba8..5386e4b00 100644 --- a/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/common/recipe/TrituratingRecipe.java +++ b/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/common/recipe/TrituratingRecipe.java @@ -24,8 +24,6 @@ package com.github.chainmailstudios.astromine.technologies.common.recipe; -import com.github.chainmailstudios.astromine.common.recipe.AstromineRecipeType; -import com.github.chainmailstudios.astromine.technologies.registry.AstromineTechnologiesBlocks; import net.minecraft.inventory.Inventory; import net.minecraft.item.ItemStack; import net.minecraft.network.PacketByteBuf; @@ -39,12 +37,14 @@ import com.github.chainmailstudios.astromine.AstromineCommon; import com.github.chainmailstudios.astromine.common.component.inventory.ItemInventoryComponent; import com.github.chainmailstudios.astromine.common.component.inventory.compatibility.ItemInventoryComponentFromItemInventory; +import com.github.chainmailstudios.astromine.common.recipe.AstromineRecipeType; import com.github.chainmailstudios.astromine.common.recipe.base.EnergyConsumingRecipe; import com.github.chainmailstudios.astromine.common.utilities.EnergyUtilities; import com.github.chainmailstudios.astromine.common.utilities.IngredientUtilities; import com.github.chainmailstudios.astromine.common.utilities.PacketUtilities; import com.github.chainmailstudios.astromine.common.utilities.ParsingUtilities; import com.github.chainmailstudios.astromine.common.utilities.StackUtilities; +import com.github.chainmailstudios.astromine.technologies.registry.AstromineTechnologiesBlocks; import com.google.common.collect.Lists; import com.google.gson.Gson; @@ -70,11 +70,6 @@ public TrituratingRecipe(Identifier identifier, Ingredient input, ItemStack outp this.time = time; } - @Override - public boolean matches(Inventory inventory, World world) { - return ItemInventoryComponentFromItemInventory.of(inventory).getContents().values().stream().anyMatch(input); - } - public static boolean allows(World world, Inventory inventory) { return world.getRecipeManager().getAllOfType(TrituratingRecipe.Type.INSTANCE).values().stream().anyMatch(it -> { TrituratingRecipe recipe = ((TrituratingRecipe) it); @@ -83,6 +78,11 @@ public static boolean allows(World world, Inventory inventory) { }); } + @Override + public boolean matches(Inventory inventory, World world) { + return ItemInventoryComponentFromItemInventory.of(inventory).getContents().values().stream().anyMatch(input); + } + @Override public ItemStack craft(Inventory inventory) { ItemInventoryComponent component = ItemInventoryComponentFromItemInventory.of(inventory); diff --git a/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/common/rei/AstromineTechnologiesServerContainerPlugin.java b/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/common/rei/AstromineTechnologiesServerContainerPlugin.java index 84f3f2ab2..5ab1d132b 100644 --- a/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/common/rei/AstromineTechnologiesServerContainerPlugin.java +++ b/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/common/rei/AstromineTechnologiesServerContainerPlugin.java @@ -24,15 +24,24 @@ package com.github.chainmailstudios.astromine.technologies.common.rei; +import net.minecraft.inventory.Inventory; +import net.minecraft.screen.ScreenHandler; +import net.minecraft.util.Identifier; + import com.github.chainmailstudios.astromine.AstromineCommon; import com.github.chainmailstudios.astromine.common.screenhandler.base.block.ComponentBlockEntityScreenHandler; -import com.github.chainmailstudios.astromine.technologies.common.screenhandler.*; +import com.github.chainmailstudios.astromine.technologies.common.screenhandler.AlloySmelterScreenHandler; +import com.github.chainmailstudios.astromine.technologies.common.screenhandler.ElectricSmelterScreenHandler; +import com.github.chainmailstudios.astromine.technologies.common.screenhandler.PresserScreenHandler; +import com.github.chainmailstudios.astromine.technologies.common.screenhandler.SolidGeneratorScreenHandler; +import com.github.chainmailstudios.astromine.technologies.common.screenhandler.TrituratorScreenHandler; import it.unimi.dsi.fastutil.ints.IntArrayList; import it.unimi.dsi.fastutil.ints.IntList; -import me.shedaniel.rei.server.*; -import net.minecraft.inventory.Inventory; -import net.minecraft.screen.ScreenHandler; -import net.minecraft.util.Identifier; +import me.shedaniel.rei.server.ContainerContext; +import me.shedaniel.rei.server.ContainerInfo; +import me.shedaniel.rei.server.ContainerInfoHandler; +import me.shedaniel.rei.server.InventoryStackAccessor; +import me.shedaniel.rei.server.StackAccessor; import java.util.List; import java.util.stream.Collectors; diff --git a/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/common/screenhandler/ElectrolyzerScreenHandler.java b/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/common/screenhandler/ElectrolyzerScreenHandler.java index 4e729ddee..e5579dc57 100644 --- a/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/common/screenhandler/ElectrolyzerScreenHandler.java +++ b/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/common/screenhandler/ElectrolyzerScreenHandler.java @@ -24,17 +24,18 @@ package com.github.chainmailstudios.astromine.technologies.common.screenhandler; -import com.github.chainmailstudios.astromine.technologies.common.block.entity.ElectrolyzerBlockEntity; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.util.math.BlockPos; + import com.github.chainmailstudios.astromine.common.component.SidedComponentProvider; import com.github.chainmailstudios.astromine.common.screenhandler.base.block.ComponentBlockEntityEnergyFluidScreenHandler; import com.github.chainmailstudios.astromine.common.widget.blade.FluidVerticalBarWidget; import com.github.chainmailstudios.astromine.common.widget.blade.HorizontalArrowWidget; import com.github.chainmailstudios.astromine.registry.AstromineComponentTypes; +import com.github.chainmailstudios.astromine.technologies.common.block.entity.ElectrolyzerBlockEntity; import com.github.chainmailstudios.astromine.technologies.registry.AstromineTechnologiesScreenHandlers; import com.github.vini2003.blade.common.miscellaneous.Position; import com.github.vini2003.blade.common.miscellaneous.Size; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.util.math.BlockPos; public class ElectrolyzerScreenHandler extends ComponentBlockEntityEnergyFluidScreenHandler { private ElectrolyzerBlockEntity electrolyzer; diff --git a/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/common/screenhandler/FluidMixerScreenHandler.java b/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/common/screenhandler/FluidMixerScreenHandler.java index 334461b60..2a1d4a0e5 100644 --- a/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/common/screenhandler/FluidMixerScreenHandler.java +++ b/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/common/screenhandler/FluidMixerScreenHandler.java @@ -24,16 +24,16 @@ package com.github.chainmailstudios.astromine.technologies.common.screenhandler; -import com.github.chainmailstudios.astromine.technologies.registry.AstromineTechnologiesScreenHandlers; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.util.math.BlockPos; -import com.github.chainmailstudios.astromine.technologies.common.block.entity.FluidMixerBlockEntity; import com.github.chainmailstudios.astromine.common.component.SidedComponentProvider; import com.github.chainmailstudios.astromine.common.screenhandler.base.block.ComponentBlockEntityEnergyFluidScreenHandler; import com.github.chainmailstudios.astromine.common.widget.blade.FluidVerticalBarWidget; import com.github.chainmailstudios.astromine.common.widget.blade.HorizontalArrowWidget; import com.github.chainmailstudios.astromine.registry.AstromineComponentTypes; +import com.github.chainmailstudios.astromine.technologies.common.block.entity.FluidMixerBlockEntity; +import com.github.chainmailstudios.astromine.technologies.registry.AstromineTechnologiesScreenHandlers; import com.github.vini2003.blade.common.miscellaneous.Position; import com.github.vini2003.blade.common.miscellaneous.Size; diff --git a/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/common/screenhandler/RefineryScreenHandler.java b/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/common/screenhandler/RefineryScreenHandler.java index 104c0111a..cca95de86 100644 --- a/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/common/screenhandler/RefineryScreenHandler.java +++ b/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/common/screenhandler/RefineryScreenHandler.java @@ -24,6 +24,9 @@ package com.github.chainmailstudios.astromine.technologies.common.screenhandler; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.util.math.BlockPos; + import com.github.chainmailstudios.astromine.common.component.SidedComponentProvider; import com.github.chainmailstudios.astromine.common.screenhandler.base.block.ComponentBlockEntityEnergyFluidScreenHandler; import com.github.chainmailstudios.astromine.common.widget.blade.FluidVerticalBarWidget; @@ -33,8 +36,6 @@ import com.github.chainmailstudios.astromine.technologies.registry.AstromineTechnologiesScreenHandlers; import com.github.vini2003.blade.common.miscellaneous.Position; import com.github.vini2003.blade.common.miscellaneous.Size; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.util.math.BlockPos; public class RefineryScreenHandler extends ComponentBlockEntityEnergyFluidScreenHandler { private RefineryBlockEntity refinery; diff --git a/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/registry/AstromineTechnologiesItems.java b/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/registry/AstromineTechnologiesItems.java index 9cda1425c..32e667e1f 100644 --- a/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/registry/AstromineTechnologiesItems.java +++ b/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/registry/AstromineTechnologiesItems.java @@ -24,15 +24,16 @@ package com.github.chainmailstudios.astromine.technologies.registry; -import com.github.chainmailstudios.astromine.common.volume.fraction.Fraction; +import net.minecraft.item.Item; + import com.github.chainmailstudios.astromine.common.item.DrillItem; -import com.github.chainmailstudios.astromine.technologies.common.item.GravityGauntletItem; import com.github.chainmailstudios.astromine.common.item.base.EnergyVolumeItem; import com.github.chainmailstudios.astromine.common.item.base.FluidVolumeItem; +import com.github.chainmailstudios.astromine.common.volume.fraction.Fraction; import com.github.chainmailstudios.astromine.registry.AstromineConfig; import com.github.chainmailstudios.astromine.registry.AstromineItems; +import com.github.chainmailstudios.astromine.technologies.common.item.GravityGauntletItem; import com.github.chainmailstudios.astromine.technologies.common.item.HolographicConnectorItem; -import net.minecraft.item.Item; public class AstromineTechnologiesItems extends AstromineItems { public static final Item PRIMITIVE_MACHINE_CHASSIS = register("primitive_machine_chassis", new Item(getBasicSettings())); diff --git a/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/registry/AstromineTechnologiesRecipeSerializers.java b/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/registry/AstromineTechnologiesRecipeSerializers.java index 9acabd36a..cbe05846a 100644 --- a/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/registry/AstromineTechnologiesRecipeSerializers.java +++ b/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/registry/AstromineTechnologiesRecipeSerializers.java @@ -24,11 +24,18 @@ package com.github.chainmailstudios.astromine.technologies.registry; -import com.github.chainmailstudios.astromine.technologies.common.recipe.*; -import com.github.chainmailstudios.astromine.registry.AstromineRecipeSerializers; import net.minecraft.recipe.RecipeSerializer; import net.minecraft.util.registry.Registry; +import com.github.chainmailstudios.astromine.registry.AstromineRecipeSerializers; +import com.github.chainmailstudios.astromine.technologies.common.recipe.AlloySmeltingRecipe; +import com.github.chainmailstudios.astromine.technologies.common.recipe.ElectrolyzingRecipe; +import com.github.chainmailstudios.astromine.technologies.common.recipe.FluidMixingRecipe; +import com.github.chainmailstudios.astromine.technologies.common.recipe.LiquidGeneratingRecipe; +import com.github.chainmailstudios.astromine.technologies.common.recipe.PressingRecipe; +import com.github.chainmailstudios.astromine.technologies.common.recipe.RefiningRecipe; +import com.github.chainmailstudios.astromine.technologies.common.recipe.TrituratingRecipe; + public class AstromineTechnologiesRecipeSerializers extends AstromineRecipeSerializers { public static final RecipeSerializer TRITURATING = Registry.register(Registry.RECIPE_SERIALIZER, TrituratingRecipe.Serializer.ID, TrituratingRecipe.Serializer.INSTANCE); diff --git a/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/registry/client/AstromineTechnologiesClientCallbacks.java b/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/registry/client/AstromineTechnologiesClientCallbacks.java index 033d680da..cc720628e 100644 --- a/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/registry/client/AstromineTechnologiesClientCallbacks.java +++ b/astromine-technologies/src/main/java/com/github/chainmailstudios/astromine/technologies/registry/client/AstromineTechnologiesClientCallbacks.java @@ -24,9 +24,8 @@ package com.github.chainmailstudios.astromine.technologies.registry.client; -import com.github.chainmailstudios.astromine.registry.client.AstromineClientCallbacks; -import com.github.chainmailstudios.astromine.technologies.common.item.HolographicConnectorItem; import net.fabricmc.fabric.api.client.item.v1.ItemTooltipCallback; + import net.minecraft.text.Text; import net.minecraft.text.TranslatableText; import net.minecraft.util.Formatting; @@ -35,6 +34,9 @@ import net.minecraft.util.registry.RegistryKey; import net.minecraft.world.World; +import com.github.chainmailstudios.astromine.registry.client.AstromineClientCallbacks; +import com.github.chainmailstudios.astromine.technologies.common.item.HolographicConnectorItem; + public class AstromineTechnologiesClientCallbacks extends AstromineClientCallbacks { public static void initialize() { ItemTooltipCallback.EVENT.register(((stack, context, tooltip) -> { diff --git a/astromine-technologies/src/main/resources/data/astromine/recipes/advanced_buffer.json b/astromine-technologies/src/main/resources/data/astromine/recipes/advanced_buffer.json index 14ea58ebb..813780b0b 100644 --- a/astromine-technologies/src/main/resources/data/astromine/recipes/advanced_buffer.json +++ b/astromine-technologies/src/main/resources/data/astromine/recipes/advanced_buffer.json @@ -2,15 +2,15 @@ "type": "minecraft:crafting_shaped", "pattern": ["012", "345", "678"], "key": { - "0": { "tag": "c:steel_plates" }, - "1": { "item": "minecraft:chest" }, - "2": { "tag": "c:steel_plates" }, - "3": { "tag": "c:steel_gears" }, - "4": { "item": "astromine:advanced_machine_chassis" }, - "5": { "tag": "c:steel_gears" }, - "6": { "tag": "c:steel_plates" }, - "7": { "item": "minecraft:chest" }, - "8": { "tag": "c:steel_plates" } + "0": {"tag": "c:steel_plates"}, + "1": {"item": "minecraft:chest"}, + "2": {"tag": "c:steel_plates"}, + "3": {"tag": "c:steel_gears"}, + "4": {"item": "astromine:advanced_machine_chassis"}, + "5": {"tag": "c:steel_gears"}, + "6": {"tag": "c:steel_plates"}, + "7": {"item": "minecraft:chest"}, + "8": {"tag": "c:steel_plates"} }, - "result": { "item": "astromine:advanced_buffer", "count": 1 } + "result": {"item": "astromine:advanced_buffer", "count": 1} } diff --git a/astromine-technologies/src/main/resources/data/astromine/recipes/advanced_tank.json b/astromine-technologies/src/main/resources/data/astromine/recipes/advanced_tank.json index 02719a9ec..068ccb323 100644 --- a/astromine-technologies/src/main/resources/data/astromine/recipes/advanced_tank.json +++ b/astromine-technologies/src/main/resources/data/astromine/recipes/advanced_tank.json @@ -2,15 +2,15 @@ "type": "minecraft:crafting_shaped", "pattern": ["012", "345", "678"], "key": { - "0": { "tag": "c:steel_plates" }, - "1": { "item": "astromine:pressurized_gas_canister" }, - "2": { "tag": "c:steel_plates" }, - "3": { "tag": "c:steel_gears" }, - "4": { "item": "astromine:advanced_machine_chassis" }, - "5": { "tag": "c:steel_gears" }, - "6": { "tag": "c:steel_plates" }, - "7": { "item": "astromine:pressurized_gas_canister" }, - "8": { "tag": "c:steel_plates" } + "0": {"tag": "c:steel_plates"}, + "1": {"item": "astromine:pressurized_gas_canister"}, + "2": {"tag": "c:steel_plates"}, + "3": {"tag": "c:steel_gears"}, + "4": {"item": "astromine:advanced_machine_chassis"}, + "5": {"tag": "c:steel_gears"}, + "6": {"tag": "c:steel_plates"}, + "7": {"item": "astromine:pressurized_gas_canister"}, + "8": {"tag": "c:steel_plates"} }, - "result": { "item": "astromine:advanced_tank", "count": 1 } + "result": {"item": "astromine:advanced_tank", "count": 1} } diff --git a/astromine-technologies/src/main/resources/data/astromine/recipes/basic_buffer.json b/astromine-technologies/src/main/resources/data/astromine/recipes/basic_buffer.json index 43cb7e387..d9ac20e68 100644 --- a/astromine-technologies/src/main/resources/data/astromine/recipes/basic_buffer.json +++ b/astromine-technologies/src/main/resources/data/astromine/recipes/basic_buffer.json @@ -2,15 +2,15 @@ "type": "minecraft:crafting_shaped", "pattern": ["012", "345", "678"], "key": { - "0": { "tag": "c:iron_plates" }, - "1": { "item": "minecraft:chest" }, - "2": { "tag": "c:iron_plates" }, - "3": { "tag": "c:iron_gears" }, - "4": { "item": "astromine:basic_machine_chassis" }, - "5": { "tag": "c:iron_gears" }, - "6": { "tag": "c:iron_plates" }, - "7": { "item": "minecraft:chest" }, - "8": { "tag": "c:iron_plates" } + "0": {"tag": "c:iron_plates"}, + "1": {"item": "minecraft:chest"}, + "2": {"tag": "c:iron_plates"}, + "3": {"tag": "c:iron_gears"}, + "4": {"item": "astromine:basic_machine_chassis"}, + "5": {"tag": "c:iron_gears"}, + "6": {"tag": "c:iron_plates"}, + "7": {"item": "minecraft:chest"}, + "8": {"tag": "c:iron_plates"} }, - "result": { "item": "astromine:basic_buffer", "count": 1 } + "result": {"item": "astromine:basic_buffer", "count": 1} } diff --git a/astromine-technologies/src/main/resources/data/astromine/recipes/basic_tank.json b/astromine-technologies/src/main/resources/data/astromine/recipes/basic_tank.json index 0ca1a5291..f90b78be4 100644 --- a/astromine-technologies/src/main/resources/data/astromine/recipes/basic_tank.json +++ b/astromine-technologies/src/main/resources/data/astromine/recipes/basic_tank.json @@ -2,15 +2,15 @@ "type": "minecraft:crafting_shaped", "pattern": ["012", "345", "678"], "key": { - "0": { "tag": "c:iron_plates" }, - "1": { "item": "astromine:gas_canister" }, - "2": { "tag": "c:iron_plates" }, - "3": { "tag": "c:iron_gears" }, - "4": { "item": "astromine:basic_machine_chassis" }, - "5": { "tag": "c:iron_gears" }, - "6": { "tag": "c:iron_plates" }, - "7": { "item": "astromine:gas_canister" }, - "8": { "tag": "c:iron_plates" } + "0": {"tag": "c:iron_plates"}, + "1": {"item": "astromine:gas_canister"}, + "2": {"tag": "c:iron_plates"}, + "3": {"tag": "c:iron_gears"}, + "4": {"item": "astromine:basic_machine_chassis"}, + "5": {"tag": "c:iron_gears"}, + "6": {"tag": "c:iron_plates"}, + "7": {"item": "astromine:gas_canister"}, + "8": {"tag": "c:iron_plates"} }, - "result": { "item": "astromine:basic_tank", "count": 1 } + "result": {"item": "astromine:basic_tank", "count": 1} } diff --git a/astromine-technologies/src/main/resources/data/astromine/recipes/elite_buffer.json b/astromine-technologies/src/main/resources/data/astromine/recipes/elite_buffer.json index 26486d762..d0cbd264b 100644 --- a/astromine-technologies/src/main/resources/data/astromine/recipes/elite_buffer.json +++ b/astromine-technologies/src/main/resources/data/astromine/recipes/elite_buffer.json @@ -2,15 +2,15 @@ "type": "minecraft:crafting_shaped", "pattern": ["012", "345", "678"], "key": { - "0": { "tag": "c:meteoric_steel_plates" }, - "1": { "item": "minecraft:chest" }, - "2": { "tag": "c:meteoric_steel_plates" }, - "3": { "tag": "c:meteoric_steel_gears" }, - "4": { "item": "astromine:elite_machine_chassis" }, - "5": { "tag": "c:meteoric_steel_gears" }, - "6": { "tag": "c:meteoric_steel_plates" }, - "7": { "item": "minecraft:chest" }, - "8": { "tag": "c:meteoric_steel_plates" } + "0": {"tag": "c:meteoric_steel_plates"}, + "1": {"item": "minecraft:chest"}, + "2": {"tag": "c:meteoric_steel_plates"}, + "3": {"tag": "c:meteoric_steel_gears"}, + "4": {"item": "astromine:elite_machine_chassis"}, + "5": {"tag": "c:meteoric_steel_gears"}, + "6": {"tag": "c:meteoric_steel_plates"}, + "7": {"item": "minecraft:chest"}, + "8": {"tag": "c:meteoric_steel_plates"} }, - "result": { "item": "astromine:elite_buffer", "count": 1 } + "result": {"item": "astromine:elite_buffer", "count": 1} } diff --git a/astromine-technologies/src/main/resources/data/astromine/recipes/elite_tank.json b/astromine-technologies/src/main/resources/data/astromine/recipes/elite_tank.json index 6d87571d1..f04f80e8c 100644 --- a/astromine-technologies/src/main/resources/data/astromine/recipes/elite_tank.json +++ b/astromine-technologies/src/main/resources/data/astromine/recipes/elite_tank.json @@ -2,10 +2,10 @@ "type": "minecraft:crafting_shaped", "pattern": ["010", "343", "010"], "key": { - "0": { "tag": "c:meteoric_steel_plates" }, - "1": { "item": "astromine:pressurized_gas_canister" }, - "3": { "tag": "c:meteoric_steel_gears" }, - "4": { "item": "astromine:elite_machine_chassis" } + "0": {"tag": "c:meteoric_steel_plates"}, + "1": {"item": "astromine:pressurized_gas_canister"}, + "3": {"tag": "c:meteoric_steel_gears"}, + "4": {"item": "astromine:elite_machine_chassis"} }, - "result": { "item": "astromine:elite_tank", "count": 1 } + "result": {"item": "astromine:elite_tank", "count": 1} } diff --git a/astromine-technologies/src/main/resources/data/astromine/recipes/primitive_buffer.json b/astromine-technologies/src/main/resources/data/astromine/recipes/primitive_buffer.json index 9543464d1..6cc947b77 100644 --- a/astromine-technologies/src/main/resources/data/astromine/recipes/primitive_buffer.json +++ b/astromine-technologies/src/main/resources/data/astromine/recipes/primitive_buffer.json @@ -2,15 +2,15 @@ "type": "minecraft:crafting_shaped", "pattern": ["012", "345", "678"], "key": { - "0": { "tag": "c:bronze_plates" }, - "1": { "item": "minecraft:chest" }, - "2": { "tag": "c:bronze_plates" }, - "3": { "tag": "c:bronze_gears" }, - "4": { "item": "astromine:primitive_machine_chassis" }, - "5": { "tag": "c:bronze_gears" }, - "6": { "tag": "c:bronze_plates" }, - "7": { "item": "minecraft:chest" }, - "8": { "tag": "c:bronze_plates" } + "0": {"tag": "c:bronze_plates"}, + "1": {"item": "minecraft:chest"}, + "2": {"tag": "c:bronze_plates"}, + "3": {"tag": "c:bronze_gears"}, + "4": {"item": "astromine:primitive_machine_chassis"}, + "5": {"tag": "c:bronze_gears"}, + "6": {"tag": "c:bronze_plates"}, + "7": {"item": "minecraft:chest"}, + "8": {"tag": "c:bronze_plates"} }, - "result": { "item": "astromine:primitive_buffer", "count": 1 } + "result": {"item": "astromine:primitive_buffer", "count": 1} } diff --git a/astromine-technologies/src/main/resources/data/astromine/recipes/primitive_tank.json b/astromine-technologies/src/main/resources/data/astromine/recipes/primitive_tank.json index 27aa5b89b..21aff067d 100644 --- a/astromine-technologies/src/main/resources/data/astromine/recipes/primitive_tank.json +++ b/astromine-technologies/src/main/resources/data/astromine/recipes/primitive_tank.json @@ -2,15 +2,15 @@ "type": "minecraft:crafting_shaped", "pattern": ["012", "345", "678"], "key": { - "0": { "tag": "c:bronze_plates" }, - "1": { "item": "astromine:gas_canister" }, - "2": { "tag": "c:bronze_plates" }, - "3": { "tag": "c:bronze_gears" }, - "4": { "item": "astromine:primitive_machine_chassis" }, - "5": { "tag": "c:bronze_gears" }, - "6": { "tag": "c:bronze_plates" }, - "7": { "item": "astromine:gas_canister" }, - "8": { "tag": "c:bronze_plates" } + "0": {"tag": "c:bronze_plates"}, + "1": {"item": "astromine:gas_canister"}, + "2": {"tag": "c:bronze_plates"}, + "3": {"tag": "c:bronze_gears"}, + "4": {"item": "astromine:primitive_machine_chassis"}, + "5": {"tag": "c:bronze_gears"}, + "6": {"tag": "c:bronze_plates"}, + "7": {"item": "astromine:gas_canister"}, + "8": {"tag": "c:bronze_plates"} }, - "result": { "item": "astromine:primitive_tank", "count": 1 } + "result": {"item": "astromine:primitive_tank", "count": 1} } diff --git a/astromine-transportations/src/main/java/com/github/chainmailstudios/astromine/transportations/common/block/CatwalkBlock.java b/astromine-transportations/src/main/java/com/github/chainmailstudios/astromine/transportations/common/block/CatwalkBlock.java index 40e2f5fda..bc769d709 100644 --- a/astromine-transportations/src/main/java/com/github/chainmailstudios/astromine/transportations/common/block/CatwalkBlock.java +++ b/astromine-transportations/src/main/java/com/github/chainmailstudios/astromine/transportations/common/block/CatwalkBlock.java @@ -24,8 +24,12 @@ package com.github.chainmailstudios.astromine.transportations.common.block; -import com.github.chainmailstudios.astromine.transportations.common.block.property.ConveyorProperties; -import net.minecraft.block.*; +import net.minecraft.block.Block; +import net.minecraft.block.BlockState; +import net.minecraft.block.Blocks; +import net.minecraft.block.EntityShapeContext; +import net.minecraft.block.ShapeContext; +import net.minecraft.block.Waterloggable; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.fluid.FluidState; import net.minecraft.fluid.Fluids; @@ -44,6 +48,7 @@ import net.minecraft.world.World; import net.minecraft.world.WorldAccess; +import com.github.chainmailstudios.astromine.transportations.common.block.property.ConveyorProperties; import com.zundrel.wrenchable.WrenchableUtilities; import com.zundrel.wrenchable.block.BlockWrenchable; import grondag.fermion.modkeys.api.ModKeys; diff --git a/astromine-transportations/src/main/java/com/github/chainmailstudios/astromine/transportations/common/block/CatwalkStairsBlock.java b/astromine-transportations/src/main/java/com/github/chainmailstudios/astromine/transportations/common/block/CatwalkStairsBlock.java index fc465dd5a..3dbe23790 100644 --- a/astromine-transportations/src/main/java/com/github/chainmailstudios/astromine/transportations/common/block/CatwalkStairsBlock.java +++ b/astromine-transportations/src/main/java/com/github/chainmailstudios/astromine/transportations/common/block/CatwalkStairsBlock.java @@ -24,9 +24,12 @@ package com.github.chainmailstudios.astromine.transportations.common.block; -import com.github.chainmailstudios.astromine.common.utilities.RotationUtilities; -import com.github.chainmailstudios.astromine.transportations.common.block.property.ConveyorProperties; -import net.minecraft.block.*; +import net.minecraft.block.Block; +import net.minecraft.block.BlockState; +import net.minecraft.block.Blocks; +import net.minecraft.block.HorizontalFacingBlock; +import net.minecraft.block.ShapeContext; +import net.minecraft.block.Waterloggable; import net.minecraft.fluid.FluidState; import net.minecraft.fluid.Fluids; import net.minecraft.item.ItemPlacementContext; @@ -40,6 +43,9 @@ import net.minecraft.world.BlockView; import net.minecraft.world.WorldAccess; +import com.github.chainmailstudios.astromine.common.utilities.RotationUtilities; +import com.github.chainmailstudios.astromine.transportations.common.block.property.ConveyorProperties; + public class CatwalkStairsBlock extends HorizontalFacingBlock implements Waterloggable { public CatwalkStairsBlock(Settings settings) { super(settings); diff --git a/astromine-transportations/src/main/java/com/github/chainmailstudios/astromine/transportations/common/block/ConveyorBlock.java b/astromine-transportations/src/main/java/com/github/chainmailstudios/astromine/transportations/common/block/ConveyorBlock.java index 938dabda8..6cc516431 100644 --- a/astromine-transportations/src/main/java/com/github/chainmailstudios/astromine/transportations/common/block/ConveyorBlock.java +++ b/astromine-transportations/src/main/java/com/github/chainmailstudios/astromine/transportations/common/block/ConveyorBlock.java @@ -24,10 +24,13 @@ package com.github.chainmailstudios.astromine.transportations.common.block; -import com.github.chainmailstudios.astromine.common.utilities.capability.block.FacingBlockWrenchable; -import com.github.chainmailstudios.astromine.common.utilities.MovementUtilities; -import com.github.chainmailstudios.astromine.transportations.common.block.property.ConveyorProperties; -import net.minecraft.block.*; +import net.minecraft.block.Block; +import net.minecraft.block.BlockEntityProvider; +import net.minecraft.block.BlockState; +import net.minecraft.block.Blocks; +import net.minecraft.block.HorizontalFacingBlock; +import net.minecraft.block.ShapeContext; +import net.minecraft.block.Waterloggable; import net.minecraft.block.entity.BlockEntity; import net.minecraft.entity.Entity; import net.minecraft.entity.ItemEntity; @@ -50,7 +53,10 @@ import net.minecraft.world.World; import net.minecraft.world.WorldAccess; +import com.github.chainmailstudios.astromine.common.utilities.MovementUtilities; +import com.github.chainmailstudios.astromine.common.utilities.capability.block.FacingBlockWrenchable; import com.github.chainmailstudios.astromine.transportations.common.block.entity.ConveyorBlockEntity; +import com.github.chainmailstudios.astromine.transportations.common.block.property.ConveyorProperties; import com.github.chainmailstudios.astromine.transportations.common.conveyor.Conveyable; import com.github.chainmailstudios.astromine.transportations.common.conveyor.Conveyor; import com.github.chainmailstudios.astromine.transportations.common.conveyor.ConveyorConveyable; diff --git a/astromine-transportations/src/main/java/com/github/chainmailstudios/astromine/transportations/common/block/InserterBlock.java b/astromine-transportations/src/main/java/com/github/chainmailstudios/astromine/transportations/common/block/InserterBlock.java index 493435aed..8a04f6275 100644 --- a/astromine-transportations/src/main/java/com/github/chainmailstudios/astromine/transportations/common/block/InserterBlock.java +++ b/astromine-transportations/src/main/java/com/github/chainmailstudios/astromine/transportations/common/block/InserterBlock.java @@ -24,8 +24,13 @@ package com.github.chainmailstudios.astromine.transportations.common.block; -import com.github.chainmailstudios.astromine.common.utilities.capability.block.FacingBlockWrenchable; -import net.minecraft.block.*; +import net.minecraft.block.Block; +import net.minecraft.block.BlockEntityProvider; +import net.minecraft.block.BlockState; +import net.minecraft.block.Blocks; +import net.minecraft.block.HorizontalFacingBlock; +import net.minecraft.block.ShapeContext; +import net.minecraft.block.Waterloggable; import net.minecraft.block.entity.BlockEntity; import net.minecraft.fluid.FluidState; import net.minecraft.fluid.Fluids; @@ -40,6 +45,7 @@ import net.minecraft.world.BlockView; import net.minecraft.world.World; +import com.github.chainmailstudios.astromine.common.utilities.capability.block.FacingBlockWrenchable; import com.github.chainmailstudios.astromine.transportations.common.block.entity.InserterBlockEntity; import com.github.chainmailstudios.astromine.transportations.common.conveyor.ConveyableBlock; diff --git a/astromine-transportations/src/main/java/com/github/chainmailstudios/astromine/transportations/common/block/VerticalConveyorBlock.java b/astromine-transportations/src/main/java/com/github/chainmailstudios/astromine/transportations/common/block/VerticalConveyorBlock.java index 6cbe42add..cc1942399 100644 --- a/astromine-transportations/src/main/java/com/github/chainmailstudios/astromine/transportations/common/block/VerticalConveyorBlock.java +++ b/astromine-transportations/src/main/java/com/github/chainmailstudios/astromine/transportations/common/block/VerticalConveyorBlock.java @@ -24,9 +24,13 @@ package com.github.chainmailstudios.astromine.transportations.common.block; -import com.github.chainmailstudios.astromine.transportations.common.block.property.ConveyorProperties; -import com.github.chainmailstudios.astromine.transportations.common.block.entity.VerticalConveyorBlockEntity; -import net.minecraft.block.*; +import net.minecraft.block.Block; +import net.minecraft.block.BlockEntityProvider; +import net.minecraft.block.BlockState; +import net.minecraft.block.Blocks; +import net.minecraft.block.HorizontalFacingBlock; +import net.minecraft.block.ShapeContext; +import net.minecraft.block.Waterloggable; import net.minecraft.block.entity.BlockEntity; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.fluid.FluidState; @@ -48,12 +52,14 @@ import net.minecraft.world.World; import net.minecraft.world.WorldAccess; +import com.github.chainmailstudios.astromine.common.utilities.RotationUtilities; +import com.github.chainmailstudios.astromine.common.utilities.capability.block.FacingBlockWrenchable; import com.github.chainmailstudios.astromine.transportations.common.block.entity.ConveyorBlockEntity; +import com.github.chainmailstudios.astromine.transportations.common.block.entity.VerticalConveyorBlockEntity; +import com.github.chainmailstudios.astromine.transportations.common.block.property.ConveyorProperties; import com.github.chainmailstudios.astromine.transportations.common.conveyor.Conveyable; import com.github.chainmailstudios.astromine.transportations.common.conveyor.Conveyor; import com.github.chainmailstudios.astromine.transportations.common.conveyor.ConveyorTypes; -import com.github.chainmailstudios.astromine.common.utilities.capability.block.FacingBlockWrenchable; -import com.github.chainmailstudios.astromine.common.utilities.RotationUtilities; public class VerticalConveyorBlock extends HorizontalFacingBlock implements BlockEntityProvider, Conveyor, FacingBlockWrenchable, Waterloggable { private int speed; diff --git a/build.gradle b/build.gradle index a619f9ec5..c80492ac1 100644 --- a/build.gradle +++ b/build.gradle @@ -98,7 +98,7 @@ allprojects { includeGroup "net.earthcomputer" } } - maven { + maven { name = "BlameJared" url = "https://maven.blamejared.com" content { @@ -106,8 +106,8 @@ allprojects { } } maven { - name = "Modmaven" - url = "https://modmaven.k-4u.nl" + name = "dblsaiko" + url = "https://maven.dblsaiko.net/" } } diff --git a/dependencies.gradle b/dependencies.gradle index 2a00263ec..190acec41 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -62,6 +62,9 @@ project.ext.setDefaultApis = { // Maybe Data useAsApi("com.github.Draylar:maybe-data:${maybe_data_version}") + + // Piglib + useAsApi("com.github.Shnupbups:Piglib:${piglib_version}") } project.ext.setRuntimeTestMods = { @@ -73,7 +76,4 @@ project.ext.setRuntimeTestMods = { // DataBreaker useAsRuntime("com.github.SuperCoder7979:databreaker:${databreaker_version}") - - // AE2 - useAsRuntime("appeng:appliedenergistics2-fabric:${ae2_version}") } \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index 9bf9fe566..d0f180d04 100644 --- a/gradle.properties +++ b/gradle.properties @@ -30,11 +30,11 @@ cloth_api_version=1.4.8 kotlin_version=1.4.0 joml_version=1.9.25 maybe_data_version=0446d26 +piglib_version=1.0 # Conveniences rei_version=5.6.1 modmenu_version=1.14.6+build.31 databreaker_version=0.2.6 tech_reborn_version=3.5.4+build.129 reborn_core_version=4.4.2+build.75 -wrenchable_version=1.0.0+1.16.1 -ae2_version=8.1.0-alpha.10 \ No newline at end of file +wrenchable_version=1.0.0+1.16.1 \ No newline at end of file From bed1dbc0f8bc8b034bd29a440441b4ac20ce864b Mon Sep 17 00:00:00 2001 From: Shnupbups Date: Sun, 11 Oct 2020 01:10:23 +1100 Subject: [PATCH 08/16] Update BucketItemMixin.java --- .../chainmailstudios/astromine/mixin/BucketItemMixin.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/astromine-core/src/main/java/com/github/chainmailstudios/astromine/mixin/BucketItemMixin.java b/astromine-core/src/main/java/com/github/chainmailstudios/astromine/mixin/BucketItemMixin.java index 0dae9842d..716423d36 100644 --- a/astromine-core/src/main/java/com/github/chainmailstudios/astromine/mixin/BucketItemMixin.java +++ b/astromine-core/src/main/java/com/github/chainmailstudios/astromine/mixin/BucketItemMixin.java @@ -58,7 +58,7 @@ public class BucketItemMixin { @Final public Fluid fluid; - private static BlockHitResult raycast(World world, PlayerEntity player, RaycastContext.FluidHandling fluidHandling) { + private static BlockHitResult astromine_raycast(World world, PlayerEntity player, RaycastContext.FluidHandling fluidHandling) { float f = player.pitch; float g = player.yaw; @@ -79,7 +79,7 @@ private static BlockHitResult raycast(World world, PlayerEntity player, RaycastC @Inject(at = @At("HEAD"), method = "use(Lnet/minecraft/world/World;Lnet/minecraft/entity/player/PlayerEntity;Lnet/minecraft/util/Hand;)Lnet/minecraft/util/TypedActionResult;", cancellable = true) void onUse(World world, PlayerEntity user, Hand hand, CallbackInfoReturnable> cir) { - BlockHitResult result = raycast(world, user, fluid == Fluids.EMPTY ? RaycastContext.FluidHandling.SOURCE_ONLY : RaycastContext.FluidHandling.NONE); + BlockHitResult result = astromine_raycast(world, user, fluid == Fluids.EMPTY ? RaycastContext.FluidHandling.SOURCE_ONLY : RaycastContext.FluidHandling.NONE); if (result.getType() == HitResult.Type.BLOCK) { BlockState state = world.getBlockState(result.getBlockPos()); From 1530dfb4e1fb5c441ca355db00dccff93ec07b12 Mon Sep 17 00:00:00 2001 From: Shnupbups Date: Sun, 11 Oct 2020 01:14:31 +1100 Subject: [PATCH 09/16] Update LivingEntityMixin.java --- .../chainmailstudios/astromine/mixin/LivingEntityMixin.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/astromine-core/src/main/java/com/github/chainmailstudios/astromine/mixin/LivingEntityMixin.java b/astromine-core/src/main/java/com/github/chainmailstudios/astromine/mixin/LivingEntityMixin.java index 40c5fde52..3415018ac 100644 --- a/astromine-core/src/main/java/com/github/chainmailstudios/astromine/mixin/LivingEntityMixin.java +++ b/astromine-core/src/main/java/com/github/chainmailstudios/astromine/mixin/LivingEntityMixin.java @@ -84,7 +84,7 @@ private static void createLivingAttributesInject(CallbackInfoReturnable Date: Sun, 11 Oct 2020 01:15:15 +1100 Subject: [PATCH 10/16] Update LivingEntityMixin.java --- .../chainmailstudios/astromine/mixin/LivingEntityMixin.java | 5 ----- 1 file changed, 5 deletions(-) diff --git a/astromine-core/src/main/java/com/github/chainmailstudios/astromine/mixin/LivingEntityMixin.java b/astromine-core/src/main/java/com/github/chainmailstudios/astromine/mixin/LivingEntityMixin.java index 3415018ac..5367942df 100644 --- a/astromine-core/src/main/java/com/github/chainmailstudios/astromine/mixin/LivingEntityMixin.java +++ b/astromine-core/src/main/java/com/github/chainmailstudios/astromine/mixin/LivingEntityMixin.java @@ -24,7 +24,6 @@ package com.github.chainmailstudios.astromine.mixin; -import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.injection.At; @@ -41,7 +40,6 @@ import net.minecraft.entity.attribute.DefaultAttributeContainer; import net.minecraft.entity.attribute.EntityAttribute; import net.minecraft.item.ItemStack; -import net.minecraft.util.collection.DefaultedList; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Box; import net.minecraft.util.math.Direction; @@ -67,9 +65,6 @@ public abstract class LivingEntityMixin implements GravityEntity { @Shadow public float flyingSpeed; - @Shadow - @Final - private DefaultedList equippedArmor; @Inject(at = @At("RETURN"), method = "createLivingAttributes()Lnet/minecraft/entity/attribute/DefaultAttributeContainer$Builder;") private static void createLivingAttributesInject(CallbackInfoReturnable cir) { From 8af5287afd563847a847d2d26521502da24dce75 Mon Sep 17 00:00:00 2001 From: vini2003 Date: Sat, 10 Oct 2020 11:17:12 -0300 Subject: [PATCH 11/16] Fix rocket issues. --- .../inventory/EnergyInventoryComponent.java | 14 +++++++++++++- .../inventory/FluidInventoryComponent.java | 13 ++++++++++++- .../inventory/ItemInventoryComponent.java | 13 ++++++++++++- .../common/entity/PrimitiveRocketEntity.java | 14 ++++++++++++++ 4 files changed, 51 insertions(+), 3 deletions(-) diff --git a/astromine-core/src/main/java/com/github/chainmailstudios/astromine/common/component/inventory/EnergyInventoryComponent.java b/astromine-core/src/main/java/com/github/chainmailstudios/astromine/common/component/inventory/EnergyInventoryComponent.java index cfea8e224..19443918d 100644 --- a/astromine-core/src/main/java/com/github/chainmailstudios/astromine/common/component/inventory/EnergyInventoryComponent.java +++ b/astromine-core/src/main/java/com/github/chainmailstudios/astromine/common/component/inventory/EnergyInventoryComponent.java @@ -27,6 +27,7 @@ import com.github.chainmailstudios.astromine.common.volume.energy.EnergyVolume; import com.github.chainmailstudios.astromine.registry.AstromineComponentTypes; import com.github.chainmailstudios.astromine.registry.AstromineItems; +import dev.onyxstudios.cca.api.v3.component.AutoSyncedComponent; import nerdhub.cardinal.components.api.ComponentType; import net.fabricmc.fabric.api.util.NbtType; import net.minecraft.item.Item; @@ -41,10 +42,11 @@ import java.util.Collection; import java.util.HashSet; import java.util.List; +import java.util.Optional; import java.util.function.Consumer; import java.util.function.Predicate; -public interface EnergyInventoryComponent extends NameableComponent { +public interface EnergyInventoryComponent extends NameableComponent, AutoSyncedComponent { EnergyVolume getVolume(); default Item getSymbol() { @@ -196,6 +198,16 @@ default EnergyInventoryComponent withListener(Consumer return this; } + @Override + default void readFromNbt(CompoundTag compoundTag) { + read(compoundTag.getCompound(getComponentType().getId().toString())); + } + + @Override + default void writeToNbt(CompoundTag compoundTag) { + compoundTag.put(getComponentType().getId().toString(), write()); + } + default void removeListener(Runnable listener) { this.getListeners().remove(listener); } diff --git a/astromine-core/src/main/java/com/github/chainmailstudios/astromine/common/component/inventory/FluidInventoryComponent.java b/astromine-core/src/main/java/com/github/chainmailstudios/astromine/common/component/inventory/FluidInventoryComponent.java index f46d51a30..0adcd906a 100644 --- a/astromine-core/src/main/java/com/github/chainmailstudios/astromine/common/component/inventory/FluidInventoryComponent.java +++ b/astromine-core/src/main/java/com/github/chainmailstudios/astromine/common/component/inventory/FluidInventoryComponent.java @@ -24,6 +24,7 @@ package com.github.chainmailstudios.astromine.common.component.inventory; +import dev.onyxstudios.cca.api.v3.component.AutoSyncedComponent; import net.minecraft.item.Item; import net.minecraft.nbt.CompoundTag; import net.minecraft.nbt.Tag; @@ -52,7 +53,7 @@ import java.util.function.Predicate; import java.util.stream.Collectors; -public interface FluidInventoryComponent extends NameableComponent { +public interface FluidInventoryComponent extends NameableComponent, AutoSyncedComponent { Map getContents(); default Item getSymbol() { @@ -320,6 +321,16 @@ default FluidInventoryComponent withListener(Consumer l return this; } + @Override + default void readFromNbt(CompoundTag compoundTag) { + read(this, compoundTag.getCompound(getComponentType().getId().toString()), Optional.empty(), Optional.empty()); + } + + @Override + default void writeToNbt(CompoundTag compoundTag) { + compoundTag.put(getComponentType().getId().toString(), write(this, Optional.empty(), Optional.empty())); + } + default void removeListener(Runnable listener) { this.getListeners().remove(listener); } diff --git a/astromine-core/src/main/java/com/github/chainmailstudios/astromine/common/component/inventory/ItemInventoryComponent.java b/astromine-core/src/main/java/com/github/chainmailstudios/astromine/common/component/inventory/ItemInventoryComponent.java index ecd237f94..460802a99 100644 --- a/astromine-core/src/main/java/com/github/chainmailstudios/astromine/common/component/inventory/ItemInventoryComponent.java +++ b/astromine-core/src/main/java/com/github/chainmailstudios/astromine/common/component/inventory/ItemInventoryComponent.java @@ -25,6 +25,7 @@ package com.github.chainmailstudios.astromine.common.component.inventory; import com.github.chainmailstudios.astromine.common.component.inventory.compatibility.ItemInventoryFromInventoryComponent; +import dev.onyxstudios.cca.api.v3.component.AutoSyncedComponent; import net.minecraft.inventory.Inventory; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -54,7 +55,7 @@ import java.util.function.Predicate; import java.util.stream.Collectors; -public interface ItemInventoryComponent extends NameableComponent { +public interface ItemInventoryComponent extends NameableComponent, AutoSyncedComponent { default Item getSymbol() { return AstromineItems.ITEM; } @@ -495,6 +496,16 @@ default ItemInventoryComponent withListener(Consumer lis return this; } + @Override + default void readFromNbt(CompoundTag compoundTag) { + read(this, compoundTag.getCompound(getComponentType().getId().toString()), Optional.empty(), Optional.empty()); + } + + @Override + default void writeToNbt(CompoundTag compoundTag) { + compoundTag.put(getComponentType().getId().toString(), write(this, Optional.empty(), Optional.empty())); + } + /** * Removes a listener from this inventory. * diff --git a/astromine-discoveries/src/main/java/com/github/chainmailstudios/astromine/discoveries/common/entity/PrimitiveRocketEntity.java b/astromine-discoveries/src/main/java/com/github/chainmailstudios/astromine/discoveries/common/entity/PrimitiveRocketEntity.java index 379da94e0..52f5c1bd4 100644 --- a/astromine-discoveries/src/main/java/com/github/chainmailstudios/astromine/discoveries/common/entity/PrimitiveRocketEntity.java +++ b/astromine-discoveries/src/main/java/com/github/chainmailstudios/astromine/discoveries/common/entity/PrimitiveRocketEntity.java @@ -34,7 +34,9 @@ import com.github.chainmailstudios.astromine.common.volume.handler.FluidHandler; import com.github.chainmailstudios.astromine.discoveries.common.entity.base.RocketEntity; import com.github.chainmailstudios.astromine.discoveries.common.screenhandler.RocketScreenHandler; +import com.github.chainmailstudios.astromine.discoveries.registry.AstromineDiscoveriesDimensions; import com.github.chainmailstudios.astromine.foundations.registry.AstromineFoundationsFluids; +import com.github.chainmailstudios.astromine.registry.AstromineDimensions; import io.netty.buffer.Unpooled; import net.fabricmc.fabric.api.network.ServerSidePacketRegistry; import net.fabricmc.fabric.api.screenhandler.v1.ExtendedScreenHandlerFactory; @@ -50,6 +52,7 @@ import net.minecraft.util.Hand; import net.minecraft.util.Identifier; import net.minecraft.util.math.Vec3d; +import net.minecraft.util.registry.Registry; import net.minecraft.world.World; import org.joml.Vector3d; import org.joml.Vector3f; @@ -153,4 +156,15 @@ public void writeScreenOpeningData(ServerPlayerEntity serverPlayerEntity, Packet public ScreenHandler createMenu(int syncId, PlayerInventory inventory, PlayerEntity player) { return new RocketScreenHandler(syncId, player, getEntityId()); } + + @Override + public void tick() { + if (world.getRegistryKey().equals(AstromineDiscoveriesDimensions.EARTH_SPACE_WORLD)) { + setVelocity(0, 0, 0); + + getDataTracker().set(IS_RUNNING, false); + } + + super.tick(); + } } From c6620e6c7ae991b9e5c7b388a9afd356643efc15 Mon Sep 17 00:00:00 2001 From: Shnupbups Date: Sun, 11 Oct 2020 01:21:43 +1100 Subject: [PATCH 12/16] fixed typo fixed #318 sorry vini --- .../src/main/resources/assets/astromine/lang/en_us.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/astromine-core/src/main/resources/assets/astromine/lang/en_us.json b/astromine-core/src/main/resources/assets/astromine/lang/en_us.json index de2cb6fad..3779bcdbb 100644 --- a/astromine-core/src/main/resources/assets/astromine/lang/en_us.json +++ b/astromine-core/src/main/resources/assets/astromine/lang/en_us.json @@ -958,7 +958,7 @@ "text.astromine.world.meteor_ores.page_one.text": "Veins of ores found in $(thing)$(l:world/meteors)meteors$(), which may be harvested for resources.$(p)When mined, will drop their respective $(thing)$(l:world/ore_clusters)ore clusters$().", "text.astromine.world.meteors.title": "Meteors", "text.astromine.world.meteors.page_one.title": "Meteors", - "text.astromine.world.meteors.page_one.text": "Foreign bodies that, cruising through the stairs, collided with a planetary body; said to contain $(thing)$(l:world/meteor_ores)extraterrestrial ores$().", + "text.astromine.world.meteors.page_one.text": "Foreign bodies that, cruising through the stars, collided with a planetary body; said to contain $(thing)$(l:world/meteor_ores)extraterrestrial ores$().", "text.astromine.world.ore_clusters.title": "Ore Clusters", "text.astromine.world.ore_clusters.page_one.title": "Ore Clusters", "text.astromine.world.ore_clusters.page_one.text": "Clusters of ores obtained from $(thing)$(l:world/asteroid_ores)asteroid ores$() or $(thing)$(l:world/meteor_ores)meteor ores$(), which may be processed for resources.", From d1b970188ae793ecc2e182c5d47cc11d7600079d Mon Sep 17 00:00:00 2001 From: Neubulae <24774842+Neubulae@users.noreply.github.com> Date: Mon, 12 Oct 2020 13:30:30 +0800 Subject: [PATCH 13/16] fix irrit --- .../src/main/resources/assets/astromine/lang/zh_cn.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/astromine-core/src/main/resources/assets/astromine/lang/zh_cn.json b/astromine-core/src/main/resources/assets/astromine/lang/zh_cn.json index b87f48270..26048dd99 100644 --- a/astromine-core/src/main/resources/assets/astromine/lang/zh_cn.json +++ b/astromine-core/src/main/resources/assets/astromine/lang/zh_cn.json @@ -414,7 +414,7 @@ "item.astromine.copper_sword": "铜剑", "item.astromine.copper_mattock": "铜鹤嘴锄", "item.astromine.copper_mining_tool": "铜采掘镐", - "item.astromine.copper_hammer": "銅槌", + "item.astromine.copper_hammer": "铜槌", "item.astromine.copper_excavator": "铜挖掘铲", "item.astromine.silver_pickaxe": "银镐", "item.astromine.silver_axe": "银斧", @@ -435,13 +435,13 @@ "item.astromine.lead_hammer": "铅槌", "item.astromine.lead_excavator": "铅挖掘铲", "item.astromine.bronze_pickaxe": "青铜镐", - "item.astromine.bronze_axe": "青銅斧", + "item.astromine.bronze_axe": "青铜斧", "item.astromine.bronze_shovel": "青铜锹", "item.astromine.bronze_hoe": "青铜锄", "item.astromine.bronze_sword": "青铜剑", "item.astromine.bronze_mattock": "黄铜鹤嘴锄", "item.astromine.bronze_mining_tool": "黄铜采掘镐", - "item.astromine.bronze_hammer": "青銅鎚", + "item.astromine.bronze_hammer": "青铜鎚", "item.astromine.bronze_excavator": "黄铜挖掘铲", "item.astromine.steel_pickaxe": "钢镐", "item.astromine.steel_axe": "钢斧", @@ -1027,4 +1027,4 @@ "advancements.astromine.get_advanced_circuit.description": "制作一块高级芯片", "advancements.astromine.get_elite_circuit.title": "新 超级电路创作家U 豪华版", "advancements.astromine.get_elite_circuit.description": "制作一块精良芯片" -} \ No newline at end of file +} From cebf3e04ef330f7effb19e79301e413c8d0d7b70 Mon Sep 17 00:00:00 2001 From: Neubulae <24774842+Neubulae@users.noreply.github.com> Date: Mon, 12 Oct 2020 18:13:23 +0800 Subject: [PATCH 14/16] holyshit (#322) yes id o arehas studpuoid mashdjkahdsuqwvfkqbdhghdwd i fukce dup so bad --- .../assets/astromine/lang/zh_cn.json | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/astromine-core/src/main/resources/assets/astromine/lang/zh_cn.json b/astromine-core/src/main/resources/assets/astromine/lang/zh_cn.json index 26048dd99..cc0e3216b 100644 --- a/astromine-core/src/main/resources/assets/astromine/lang/zh_cn.json +++ b/astromine-core/src/main/resources/assets/astromine/lang/zh_cn.json @@ -310,7 +310,7 @@ "item.astromine.copper_tiny_dust": "小堆铜粉", "item.astromine.silver_tiny_dust": "小堆银粉", "item.astromine.lead_tiny_dust": "小堆铅粉", - "item.astromine.bronze_tiny_dust": "小堆黄铜粉", + "item.astromine.bronze_tiny_dust": "小堆青铜粉", "item.astromine.steel_tiny_dust": "小堆钢粉", "item.astromine.electrum_tiny_dust": "小堆琥珀金粉", "item.astromine.rose_gold_tiny_dust": "小堆玫瑰金粉", @@ -439,10 +439,10 @@ "item.astromine.bronze_shovel": "青铜锹", "item.astromine.bronze_hoe": "青铜锄", "item.astromine.bronze_sword": "青铜剑", - "item.astromine.bronze_mattock": "黄铜鹤嘴锄", - "item.astromine.bronze_mining_tool": "黄铜采掘镐", + "item.astromine.bronze_mattock": "青铜鹤嘴锄", + "item.astromine.bronze_mining_tool": "青铜采掘镐", "item.astromine.bronze_hammer": "青铜鎚", - "item.astromine.bronze_excavator": "黄铜挖掘铲", + "item.astromine.bronze_excavator": "青铜挖掘铲", "item.astromine.steel_pickaxe": "钢镐", "item.astromine.steel_axe": "钢斧", "item.astromine.steel_shovel": "钢锹", @@ -642,7 +642,7 @@ "item.astromine.yeast": "酵母", "item.astromine.rocket": "火箭", "item.astromine.copper_wrench": "铜扳手", - "item.astromine.bronze_wrench": "黄铜扳手", + "item.astromine.bronze_wrench": "青铜扳手", "item.astromine.steel_wrench": "钢扳手", "item.astromine.rose_gold_apple": "玫瑰金苹果", "item.astromine.fools_gold_apple": "傻瓜的金苹果", @@ -823,7 +823,7 @@ "text.astromine.resources.copper.page_two.title": "获取铜", "text.astromine.resources.copper.page_two.text": "$(item)铜矿石$()可在$(thing)主世界$()的$(thing)地下$()找到。$(p)只需要$(item)石镐$()（挖掘等级1）及以上即可开采。可被$(thing)烧炼$()为$(item)铜锭$()。", "text.astromine.resources.copper.page_three.title": "用途", - "text.astromine.resources.copper.page_three.text": "铜适合制作工具和电气用途。使用$(item)$(l:machinery/alloy_smelter)合金炉$()与$(item)$(l:resources/tin)锡$()一同炼制可获得$(item)$(l:resources/bronze)黄铜$()。", + "text.astromine.resources.copper.page_three.text": "铜适合制作工具和电气用途。使用$(item)$(l:machinery/alloy_smelter)合金炉$()与$(item)$(l:resources/tin)锡$()一同炼制可获得$(item)$(l:resources/bronze)青铜$()。", "text.astromine.resources.copper.page_four.title": "性能", "text.astromine.resources.copper.page_four.text": "$(l)工具$()$(br)挖掘等级：1$(br)基础耐久：200$(br)挖掘速度：4$(br)攻击伤害：1.5$(br)附魔等级：10$(p)$(l)盔甲$()$(br)耐久倍率：12$(br)合计盔甲值：12$(br)盔甲韧性：0$(br)附魔等级：15", "text.astromine.resources.tin.title": "锡", @@ -832,16 +832,16 @@ "text.astromine.resources.tin.page_two.title": "获取锡", "text.astromine.resources.tin.page_two.text": "$(item)锡矿石$()可在$(thing)主世界$()的$(thing)地下$()找到。$(p)只需要$(item)石镐$()（挖掘等级1）及以上即可开采。可被$(thing)烧炼$()为$(item)锡锭$()。", "text.astromine.resources.tin.page_three.title": "用途", - "text.astromine.resources.tin.page_three.text": "锡适合制作防腐蚀板材。使用$(item)$(l:machinery/alloy_smelter)合金炉$()与$(item)$(l:resources/copper)铜$()一同炼制可获得$(item)$(l:resources/bronze)黄铜$()。", + "text.astromine.resources.tin.page_three.text": "锡适合制作防腐蚀板材。使用$(item)$(l:machinery/alloy_smelter)合金炉$()与$(item)$(l:resources/copper)铜$()一同炼制可获得$(item)$(l:resources/bronze)青铜$()。", "text.astromine.resources.tin.page_four.title": "性能", "text.astromine.resources.tin.page_four.text": "$(l)工具$()$(br)挖掘等级：1$(br)基础耐久：200$(br)挖掘速度：5$(br)攻击伤害：1.0$(br)附魔等级：10$(p)$(l)盔甲$()$(br)耐久倍率：12$(br)合计盔甲值：12$(br)盔甲韧性：0$(br)附魔等级：15", "text.astromine.resources.bronze.title": "青铜", "text.astromine.resources.bronze.page_one.title": "青铜", - "text.astromine.resources.bronze.page_one.text": "$(item)$(l:resources/copper)铜$()与$(item)$(l:resources/tin)锡$()的合金，黄铜相比两者都要更为强韧耐用。", + "text.astromine.resources.bronze.page_one.text": "$(item)$(l:resources/copper)铜$()与$(item)$(l:resources/tin)锡$()的合金，青铜相比两者都要更为强韧耐用。", "text.astromine.resources.bronze.page_two.title": "获取青铜", - "text.astromine.resources.bronze.page_two.text": "可通过在$(item)$(l:machinery/alloy_smelter)合金炉$()中一同炼制3个$(item)铜锭$()和1个$(item)锡锭$()来得到4个$(item)黄铜锭$()。", + "text.astromine.resources.bronze.page_two.text": "可通过在$(item)$(l:machinery/alloy_smelter)合金炉$()中一同炼制3个$(item)铜锭$()和1个$(item)锡锭$()来得到4个$(item)青铜锭$()。", "text.astromine.resources.bronze.page_three.title": "用途", - "text.astromine.resources.bronze.page_three.text": "黄铜适合制作工具，且可用于制作更高级的机械。", + "text.astromine.resources.bronze.page_three.text": "青铜适合制作工具，且可用于制作更高级的机械。", "text.astromine.resources.bronze.page_four.title": "性能", "text.astromine.resources.bronze.page_four.text": "$(l)工具$()$(br)挖掘等级：2$(br)基础耐久：539$(br)挖掘速度：7$(br)攻击伤害：2.5$(br)附魔等级：20$(p)$(l)盔甲$()$(br)耐久倍率：20$(br)合计盔甲值：15$(br)盔甲韧性：0.7$(br)附魔等级：18", "text.astromine.resources.steel.title": "钢", From 6512188bfae7aa32a9e6dbda898e65080a4f411b Mon Sep 17 00:00:00 2001 From: Shnupbups Date: Tue, 13 Oct 2020 02:17:04 +1100 Subject: [PATCH 15/16] Added new advancements and stuff Fixed Rocket Launch criterion not being triggered Added Rocket Destroy criterion and an advancement using it Added an advancement for eating a Lead Apple Added non US English --- .../assets/astromine/lang/en_au.json | 1030 +++++++++++++++++ .../assets/astromine/lang/en_ca.json | 1030 +++++++++++++++++ .../assets/astromine/lang/en_gb.json | 1030 +++++++++++++++++ .../assets/astromine/lang/en_nz.json | 1030 +++++++++++++++++ .../assets/astromine/lang/en_us.json | 6 +- .../advancement/DestroyRocketCriterion.java | 85 ++ .../common/entity/base/RocketEntity.java | 27 +- .../screenhandler/RocketScreenHandler.java | 5 +- .../AstromineDiscoveriesCriteria.java | 2 + .../destroy_rocket_unintentionally.json | 26 + .../astromine/eat_lead_apple.json | 30 + 11 files changed, 4292 insertions(+), 9 deletions(-) create mode 100644 astromine-core/src/main/resources/assets/astromine/lang/en_au.json create mode 100644 astromine-core/src/main/resources/assets/astromine/lang/en_ca.json create mode 100644 astromine-core/src/main/resources/assets/astromine/lang/en_gb.json create mode 100644 astromine-core/src/main/resources/assets/astromine/lang/en_nz.json create mode 100644 astromine-discoveries/src/main/java/com/github/chainmailstudios/astromine/discoveries/common/advancement/DestroyRocketCriterion.java create mode 100644 astromine-discoveries/src/main/resources/data/astromine/advancements/astromine/destroy_rocket_unintentionally.json create mode 100644 astromine-foundations/src/main/resources/data/astromine/advancements/astromine/eat_lead_apple.json diff --git a/astromine-core/src/main/resources/assets/astromine/lang/en_au.json b/astromine-core/src/main/resources/assets/astromine/lang/en_au.json new file mode 100644 index 000000000..292a2ecfe --- /dev/null +++ b/astromine-core/src/main/resources/assets/astromine/lang/en_au.json @@ -0,0 +1,1030 @@ +{ + "block.minecraft.empty": "Empty", + "entity.astromine.super_space_slime": "Jelanium: Super Space Slime", + "entity.astromine.space_slime": "Space Slime", + "entity.astromine.primitive_rocket": "Primitive Rocket", + "text.astromine.rocket.disassemble_empty_fuel": "Rocket experienced rapid unscheduled disassembly: no fuel loaded!", + "text.astromine.rocket.disassemble_collision": "Rocket experienced rapid unscheduled disassembly: trajectory obstructed!", + "text.astromine.rocket.disassemble_invalid_fuel": "Rocket experienced rapid unscheduled disassembly: incorrect fuel loaded!", + "text.astromine.message.holographic_connection_successful": "Succeeded in connecting projector at %s with projector at %s.", + "text.astromine.message.holographic_connection_failed": "Failed to connect projector at %s with projector at %s.", + "text.astromine.message.holographic_connection_clear": "Cleared selected projectors!", + "text.astromine.message.holographic_connector_select": "Selected projector at %s!", + "text.astromine.tooltip.fractional_bar": "%s of %s (%s)", + "text.astromine.tooltip.fractional_value": "%s/%s", + "text.astromine.tooltip.fractional_value_simple": "%s", + "text.astromine.tooltip.energy_value": "%s E", + "text.astromine.tooltip.compound_energy_value": "%s/%s E", + "text.astromine.tooltip.speed": "%sx speed", + "text.astromine.tooltip.cable.speed": "%s E/t", + "text.astromine.fluid": "Fluid", + "text.astromine.energy": "Energy", + "text.astromine.item": "Item", + "text.astromine.base": "Base", + "text.astromine.up": "Up", + "text.astromine.down": "Down", + "text.astromine.left": "Left", + "text.astromine.right": "Right", + "text.astromine.front": "Front", + "text.astromine.back": "Back", + "text.astromine.siding.input": "§bInput", + "text.astromine.siding.output": "§6Output", + "text.astromine.siding.input_output": "§bInput §7/ §6Output", + "text.astromine.siding.none": "§7None", + "text.astromine.siding.disabled": "§7§mDisabled", + "text.astromine.siding.west": "Right", + "text.astromine.siding.east": "Left", + "text.astromine.siding.up": "Top", + "text.astromine.siding.down": "Bottom", + "text.astromine.siding.north": "Front", + "text.astromine.siding.south": "Back", + "text.astromine.rocket.launch": "Launch", + "text.astromine.rocket.destroy": "Destroy!", + "text.astromine.rocket.fuel_status": "Fuel sufficient for %s of flight time.", + "item.astromine.primitive_machine_chassis": "Primitive Machine Chassis", + "item.astromine.basic_machine_chassis": "Basic Machine Chassis", + "item.astromine.advanced_machine_chassis": "Advanced Machine Chassis", + "item.astromine.elite_machine_chassis": "Elite Machine Chassis", + "item.astromine.graphite_sheet": "Graphite Sheet", + "item.astromine.gas_canister": "Gas Canister", + "item.astromine.pressurized_gas_canister": "Pressurised Gas Canister", + "item.astromine.basic_battery": "Basic Battery", + "item.astromine.advanced_battery": "Advanced Battery", + "item.astromine.elite_battery": "Elite Battery", + "item.astromine.creative_battery": "Creative Battery", + "item.astromine.fire_extinguisher": "Fire Extinguisher", + "item.astromine.holographic_connector": "Holographic Connector", + "item.astromine.holographic_bridge_projector": "Holographic Bridge Projector", + "item.astromine.primitive_rocket_fuel_tank": "Primitive Rocket Fuel Tank", + "item.astromine.primitive_rocket_hull": "Primitive Rocket Hull", + "item.astromine.primitive_rocket_plating": "Primitive Rocket Plating", + "item.astromine.primitive_rocket_booster": "Primitive Rocket Booster", + "itemGroup.astromine.core": "Astromine: Core", + "itemGroup.astromine.discoveries": "Astromine: Discoveries", + "itemGroup.astromine.foundations": "Astromine: Foundations", + "itemGroup.astromine.transportations": "Astromine: Transportations", + "itemGroup.astromine.technologies": "Astromine: Technologies", + "block.astromine.electrolyzer": "Electrolyser", + "block.astromine.fluid_mixer": "Fluid Mixer", + "block.astromine.creative_capacitor": "Creative Capacitor", + "block.astromine.creative_buffer": "Creative Buffer", + "block.astromine.primitive_buffer": "Primitive Buffer", + "block.astromine.basic_buffer": "Basic Buffer", + "block.astromine.advanced_buffer": "Advanced Buffer", + "block.astromine.elite_buffer": "Elite Buffer", + "block.astromine.vent": "Vent", + "block.astromine.primitive_solid_generator": "Primitive Solid Generator", + "block.astromine.basic_solid_generator": "Basic Solid Generator", + "block.astromine.advanced_solid_generator": "Advanced Solid Generator", + "block.astromine.elite_solid_generator": "Elite Solid Generator", + "block.astromine.primitive_liquid_generator": "Primitive Liquid Generator", + "block.astromine.basic_liquid_generator": "Basic Liquid Generator", + "block.astromine.advanced_liquid_generator": "Advanced Liquid Generator", + "block.astromine.elite_liquid_generator": "Elite Liquid Generator", + "block.astromine.primitive_presser": "Primitive Presser", + "block.astromine.basic_presser": "Basic Presser", + "block.astromine.advanced_presser": "Advanced Presser", + "block.astromine.elite_presser": "Elite Presser", + "block.astromine.primitive_triturator": "Primitive Triturator", + "block.astromine.basic_triturator": "Basic Triturator", + "block.astromine.advanced_triturator": "Advanced Triturator", + "block.astromine.elite_triturator": "Elite Triturator", + "block.astromine.primitive_electric_smelter": "Primitive Electric Smelter", + "block.astromine.basic_electric_smelter": "Basic Electric Smelter", + "block.astromine.advanced_electric_smelter": "Advanced Electric Smelter", + "block.astromine.elite_electric_smelter": "Elite Electric Smelter", + "block.astromine.primitive_alloy_smelter": "Primitive Alloy Smelter", + "block.astromine.basic_alloy_smelter": "Basic Alloy Smelter", + "block.astromine.advanced_alloy_smelter": "Advanced Alloy Smelter", + "block.astromine.elite_alloy_smelter": "Elite Alloy Smelter", + "block.astromine.primitive_electrolyzer": "Primitive Electrolyser", + "block.astromine.basic_electrolyzer": "Basic Electrolyser", + "block.astromine.advanced_electrolyzer": "Advanced Electrolyser", + "block.astromine.elite_electrolyzer": "Elite Electrolyser", + "block.astromine.primitive_refinery": "Primitive Refinery", + "block.astromine.basic_refinery": "Basic Refinery", + "block.astromine.advanced_refinery": "Advanced Refinery", + "block.astromine.elite_refinery": "Elite Refinery", + "block.astromine.primitive_fluid_mixer": "Primitive Fluid Mixer", + "block.astromine.basic_fluid_mixer": "Basic Fluid Mixer", + "block.astromine.advanced_fluid_mixer": "Advanced Fluid Mixer", + "block.astromine.elite_fluid_mixer": "Elite Fluid Mixer", + "block.astromine.fluid_cable": "Fluid Cable", + "block.astromine.primitive_energy_cable": "Primitive Energy Cable", + "block.astromine.basic_energy_cable": "Basic Energy Cable", + "block.astromine.advanced_energy_cable": "Advanced Energy Cable", + "block.astromine.elite_energy_cable": "Elite Energy Cable", + "block.astromine.primitive_capacitor": "Primitive Capacitor", + "block.astromine.basic_capacitor": "Basic Capacitor", + "block.astromine.advanced_capacitor": "Advanced Capacitor", + "block.astromine.elite_capacitor": "Elite Capacitor", + "block.astromine.airlock": "Airlock Door", + "block.astromine.altar_pedestal": "Altar Pedestal", + "block.astromine.altar": "Altar", + "item.astromine.tin_wire": "Tin Wire", + "item.astromine.copper_wire": "Copper Wire", + "item.astromine.silver_wire": "Silver Wire", + "item.astromine.lead_wire": "Lead Wire", + "item.astromine.gold_wire": "Gold Wire", + "item.astromine.steel_wire": "Steel Wire", + "item.astromine.electrum_wire": "Electrum Wire", + "block.astromine.primitive_tank": "Primitive Tank", + "block.astromine.basic_tank": "Basic Tank", + "block.astromine.advanced_tank": "Advanced Tank", + "block.astromine.elite_tank": "Elite Tank", + "block.astromine.creative_tank": "Creative Tank", + "block.astromine.fluid_extractor": "Fluid Extractor", + "block.astromine.fluid_inserter": "Fluid Inserter", + "block.astromine.block_breaker": "Block Breaker", + "block.astromine.block_placer": "Block Placer", + "block.astromine.nuclear_warhead": "Nuclear Warhead", + "block.astromine.holographic_bridge_projector": "Holographic Bridge Projector", + "block.astromine.asteroid_stone": "Asteroid Stone", + "block.astromine.moon_stone": "Moon Stone", + "block.astromine.blazing_asteroid_stone": "Blazing Asteroid Stone", + "block.astromine.meteor_stone": "Meteor Stone", + "block.astromine.tin_ore": "Tin Ore", + "block.astromine.copper_ore": "Copper Ore", + "block.astromine.silver_ore": "Silver Ore", + "block.astromine.lead_ore": "Lead Ore", + "block.astromine.asteroid_metite_ore": "Asteroid Metite Ore", + "block.astromine.meteor_metite_ore": "Meteor Metite Ore", + "block.astromine.asterite_block": "Block of Asterite", + "block.astromine.galaxium_block": "Block of Galaxium", + "block.astromine.metite_block": "Block of Metite", + "block.astromine.stellum_block": "Block of Stellum", + "block.astromine.univite_block": "Block of Univite", + "block.astromine.lunum_block": "Block of Lunum", + "block.astromine.tin_block": "Block of Tin", + "block.astromine.copper_block": "Block of Copper", + "block.astromine.silver_block": "Block of Silver", + "block.astromine.lead_block": "Block of Lead", + "block.astromine.bronze_block": "Block of Bronze", + "block.astromine.steel_block": "Block of Steel", + "block.astromine.electrum_block": "Block of Electrum", + "block.astromine.rose_gold_block": "Block of Rose Gold", + "block.astromine.sterling_silver_block": "Block of Sterling Silver", + "block.astromine.fools_gold_block": "Block of Fool's Gold", + "block.astromine.meteoric_steel_block": "Block of Meteoric Steel", + "block.astromine.asteroid_coal_ore": "Asteroid Coal Ore", + "block.astromine.asteroid_iron_ore": "Asteroid Iron Ore", + "block.astromine.asteroid_gold_ore": "Asteroid Gold Ore", + "block.astromine.asteroid_redstone_ore": "Asteroid Redstone Ore", + "block.astromine.asteroid_lapis_ore": "Asteroid Lapis Ore", + "block.astromine.asteroid_diamond_ore": "Asteroid Diamond Ore", + "block.astromine.asteroid_asterite_ore": "Asteroid Asterite Ore", + "block.astromine.asteroid_stellum_ore": "Asteroid Stellum Ore", + "block.astromine.asteroid_galaxium_ore": "Asteroid Galaxium Ore", + "block.astromine.asteroid_emerald_ore": "Asteroid Emerald Ore", + "block.astromine.asteroid_tin_ore": "Asteroid Tin Ore", + "block.astromine.asteroid_copper_ore": "Asteroid Copper Ore", + "block.astromine.asteroid_silver_ore": "Asteroid Silver Ore", + "block.astromine.asteroid_lead_ore": "Asteroid Lead Ore", + "block.astromine.moon_lunum_ore": "Lunum Ore", + "block.astromine.meteor_stone_slab": "Meteor Stone Slab", + "block.astromine.meteor_stone_stairs": "Meteor Stone Stairs", + "block.astromine.meteor_stone_wall": "Meteor Stone Wall", + "block.astromine.asteroid_stone_slab": "Asteroid Stone Slab", + "block.astromine.asteroid_stone_stairs": "Asteroid Stone Stairs", + "block.astromine.asteroid_stone_wall": "Asteroid Stone Wall", + "block.astromine.moon_stone_slab": "Moon Stone Slab", + "block.astromine.moon_stone_stairs": "Moon Stone Stairs", + "block.astromine.moon_stone_wall": "Moon Stone Wall", + "block.astromine.martian_stone_slab": "Martian Stone Slab", + "block.astromine.martian_stone_stairs": "Martian Stone Stairs", + "block.astromine.martian_stone_wall": "Martian Stone Wall", + "block.astromine.vulcan_stone_slab": "Vulcan Stone Slab", + "block.astromine.vulcan_stone_stairs": "Vulcan Stone Stairs", + "block.astromine.vulcan_stone_wall": "Vulcan Stone Wall", + "block.astromine.martian_soil": "Martian Soil", + "block.astromine.martian_stone": "Martian Stone", + "block.astromine.vulcan_stone": "Vulcan Stone", + "block.astromine.oxygen": "Oxygen", + "block.astromine.hydrogen": "Hydrogen", + "block.astromine.crude_oil": "Crude Oil", + "block.astromine.residual_fuel_oil": "Residual Fuel Oil", + "block.astromine.heavy_gas_oil": "Heavy Gas Oil", + "block.astromine.diesel": "Diesel", + "block.astromine.kerosene": "Kerosene", + "block.astromine.naphtha": "Naphtha", + "block.astromine.gasoline": "Petrol", + "block.astromine.butane": "Butane", + "block.astromine.kerosene_oxygen_fuel": "Kerosene-Oxygen Fuel", + "block.astromine.alternator": "Alternator", + "block.astromine.splitter": "Splitter", + "block.astromine.incinerator": "Incinerator", + "block.astromine.inserter": "Inserter", + "block.astromine.fast_inserter": "Fast Inserter", + "block.astromine.basic_conveyor": "Basic Conveyor", + "block.astromine.basic_vertical_conveyor": "Basic Vertical Conveyor", + "block.astromine.basic_downward_vertical_conveyor": "Basic Downward Vertical Conveyor", + "block.astromine.advanced_conveyor": "Advanced Conveyor", + "block.astromine.advanced_vertical_conveyor": "Advanced Vertical Conveyor", + "block.astromine.advanced_downward_vertical_conveyor": "Advanced Downward Vertical Conveyor", + "block.astromine.elite_conveyor": "Elite Conveyor", + "block.astromine.elite_vertical_conveyor": "Elite Vertical Conveyor", + "block.astromine.elite_downward_vertical_conveyor": "Elite Downward Vertical Conveyor", + "block.astromine.catwalk": "Catwalk", + "block.astromine.catwalk_stairs": "Catwalk Stairs", + "gas.astromine.oxygen": "Oxygen", + "gas.astromine.rocket_fuel": "Rocket Fuel", + "gas.minecraft.empty": "Vacuum", + "item.astromine.oxygen_bucket": "Oxygen Bucket", + "item.astromine.hydrogen_bucket": "Hydrogen Bucket", + "item.astromine.crude_oil_bucket": "Crude Oil Bucket", + "item.astromine.residual_fuel_oil_bucket": "Residual Fuel Oil Bucket", + "item.astromine.heavy_gas_oil_bucket": "Heavy Gas Oil Bucket", + "item.astromine.diesel_bucket": "Diesel Bucket", + "item.astromine.kerosene_bucket": "Kerosene Bucket", + "item.astromine.naphtha_bucket": "Naphtha Bucket", + "item.astromine.gasoline_bucket": "Petrol Bucket", + "item.astromine.butane_bucket": "Butane Bucket", + "item.astromine.kerosene_oxygen_fuel_bucket": "Kerosene-Oxygen Fuel Bucket", + "block.astromine.rocket_fuel": "Rocket Fuel Bucket", + "item.astromine.energy": "Energy", + "item.astromine.fluid": "Fluid", + "item.astromine.item": "Item", + "item.astromine.rocket_fuel_bucket": "Rocket Fuel Bucket", + "item.astromine.asterite_fragment": "Asterite Fragment", + "item.astromine.meteor_metite_cluster": "Meteor Metite Cluster", + "item.astromine.asteroid_metite_cluster": "Asteroid Metite Cluster", + "item.astromine.asteroid_coal_cluster": "Asteroid Coal Cluster", + "item.astromine.asteroid_iron_cluster": "Asteroid Iron Cluster", + "item.astromine.asteroid_gold_cluster": "Asteroid Gold Cluster", + "item.astromine.asteroid_redstone_cluster": "Asteroid Redstone Cluster", + "item.astromine.asteroid_lapis_cluster": "Asteroid Lapis Cluster", + "item.astromine.asteroid_diamond_cluster": "Asteroid Diamond Cluster", + "item.astromine.asteroid_emerald_cluster": "Asteroid Emerald Cluster", + "item.astromine.asteroid_asterite_cluster": "Asteroid Asterite Cluster", + "item.astromine.asteroid_stellum_cluster": "Asteroid Stellum Cluster", + "item.astromine.asteroid_galaxium_cluster": "Asteroid Galaxium Cluster", + "item.astromine.asteroid_tin_cluster": "Asteroid Tin Cluster", + "item.astromine.asteroid_copper_cluster": "Asteroid Copper Cluster", + "item.astromine.asteroid_silver_cluster": "Asteroid Silver Cluster", + "item.astromine.asteroid_lead_cluster": "Asteroid Lead Cluster", + "item.astromine.iron_dust": "Iron Dust", + "item.astromine.metite_dust": "Metite Dust", + "item.astromine.gold_dust": "Gold Dust", + "item.astromine.lapis_dust": "Lapis Dust", + "item.astromine.diamond_dust": "Diamond Dust", + "item.astromine.emerald_dust": "Emerald Dust", + "item.astromine.netherite_dust": "Netherite Dust", + "item.astromine.coal_dust": "Coal Dust", + "item.astromine.charcoal_dust": "Charcoal Dust", + "item.astromine.quartz_dust": "Quartz Dust", + "item.astromine.raw_netherite_dust": "Raw Netherite Dust", + "item.astromine.asterite_dust": "Asterite Dust", + "item.astromine.stellum_dust": "Stellum Dust", + "item.astromine.galaxium_dust": "Galaxium Dust", + "item.astromine.univite_dust": "Univite Dust", + "item.astromine.lunum_dust": "Lunum Dust", + "item.astromine.tin_dust": "Tin Dust", + "item.astromine.copper_dust": "Copper Dust", + "item.astromine.silver_dust": "Silver Dust", + "item.astromine.lead_dust": "Lead Dust", + "item.astromine.bronze_dust": "Bronze Dust", + "item.astromine.steel_dust": "Steel Dust", + "item.astromine.electrum_dust": "Electrum Dust", + "item.astromine.rose_gold_dust": "Rose Gold Dust", + "item.astromine.sterling_silver_dust": "Sterling Silver Dust", + "item.astromine.fools_gold_dust": "Fool's Gold Dust", + "item.astromine.meteoric_steel_dust": "Meteoric Steel Dust", + "item.astromine.redstone_tiny_dust": "Redstone Tiny Dust", + "item.astromine.iron_tiny_dust": "Iron Tiny Dust", + "item.astromine.metite_tiny_dust": "Metite Tiny Dust", + "item.astromine.gold_tiny_dust": "Gold Tiny Dust", + "item.astromine.lapis_tiny_dust": "Lapis Tiny Dust", + "item.astromine.diamond_tiny_dust": "Diamond Tiny Dust", + "item.astromine.emerald_tiny_dust": "Emerald Tiny Dust", + "item.astromine.netherite_tiny_dust": "Netherite Tiny Dust", + "item.astromine.coal_tiny_dust": "Coal Tiny Dust", + "item.astromine.charcoal_tiny_dust": "Charcoal Tiny Dust", + "item.astromine.quartz_tiny_dust": "Quartz Tiny Dust", + "item.astromine.raw_netherite_tiny_dust": "Raw Netherite Tiny Dust", + "item.astromine.asterite_tiny_dust": "Asterite Tiny Dust", + "item.astromine.stellum_tiny_dust": "Stellum Tiny Dust", + "item.astromine.galaxium_tiny_dust": "Galaxium Tiny Dust", + "item.astromine.univite_tiny_dust": "Univite Tiny Dust", + "item.astromine.lunum_tiny_dust": "Lunum Tiny Dust", + "item.astromine.tin_tiny_dust": "Tin Tiny Dust", + "item.astromine.copper_tiny_dust": "Copper Tiny Dust", + "item.astromine.silver_tiny_dust": "Silver Tiny Dust", + "item.astromine.lead_tiny_dust": "Lead Tiny Dust", + "item.astromine.bronze_tiny_dust": "Bronze Tiny Dust", + "item.astromine.steel_tiny_dust": "Steel Tiny Dust", + "item.astromine.electrum_tiny_dust": "Electrum Tiny Dust", + "item.astromine.rose_gold_tiny_dust": "Rose Gold Tiny Dust", + "item.astromine.sterling_silver_tiny_dust": "Sterling Silver Tiny Dust", + "item.astromine.fools_gold_tiny_dust": "Fool's Gold Tiny Dust", + "item.astromine.glowstone_tiny_dust": "Glowstone Tiny Dust", + "item.astromine.meteoric_steel_tiny_dust": "Meteoric Steel Tiny Dust", + "item.astromine.iron_plates": "Iron Plates", + "item.astromine.metite_plates": "Metite Plates", + "item.astromine.gold_plates": "Gold Plates", + "item.astromine.netherite_plates": "Netherite Plates", + "item.astromine.stellum_plates": "Stellum Plates", + "item.astromine.univite_plates": "Univite Plates", + "item.astromine.tin_plates": "Tin Plates", + "item.astromine.copper_plates": "Copper Plates", + "item.astromine.silver_plates": "Silver Plates", + "item.astromine.lead_plates": "Lead Plates", + "item.astromine.bronze_plates": "Bronze Plates", + "item.astromine.steel_plates": "Steel Plates", + "item.astromine.electrum_plates": "Electrum Plates", + "item.astromine.rose_gold_plates": "Rose Gold Plates", + "item.astromine.sterling_silver_plates": "Sterling Silver Plates", + "item.astromine.fools_gold_plates": "Fool's Gold Plates", + "item.astromine.lunum_plates": "Lunum Plates", + "item.astromine.meteoric_steel_plates": "Meteoric Steel Plates", + "item.astromine.iron_gear": "Iron Gear", + "item.astromine.metite_gear": "Metite Gear", + "item.astromine.gold_gear": "Gold Gear", + "item.astromine.netherite_gear": "Netherite Gear", + "item.astromine.stellum_gear": "Stellum Gear", + "item.astromine.univite_gear": "Univite Gear", + "item.astromine.tin_gear": "Tin Gear", + "item.astromine.copper_gear": "Copper Gear", + "item.astromine.silver_gear": "Silver Gear", + "item.astromine.lead_gear": "Lead Gear", + "item.astromine.bronze_gear": "Bronze Gear", + "item.astromine.steel_gear": "Steel Gear", + "item.astromine.electrum_gear": "Electrum Gear", + "item.astromine.rose_gold_gear": "Rose Gold Gear", + "item.astromine.sterling_silver_gear": "Sterling Silver Gear", + "item.astromine.fools_gold_gear": "Fool's Gold Gear", + "item.astromine.lunum_gear": "Lunum Gear", + "item.astromine.meteoric_steel_gear": "Meteoric Steel Gear", + "item.astromine.basic_circuit": "Basic Circuit", + "item.astromine.advanced_circuit": "Advanced Circuit", + "item.astromine.elite_circuit": "Elite Circuit", + "item.astromine.metite_ingot": "Metite Ingot", + "item.astromine.stellum_ingot": "Stellum Ingot", + "item.astromine.lunum_ingot": "Lunum Ingot", + "item.astromine.tin_ingot": "Tin Ingot", + "item.astromine.copper_ingot": "Copper Ingot", + "item.astromine.silver_ingot": "Silver Ingot", + "item.astromine.lead_ingot": "Lead Ingot", + "item.astromine.bronze_ingot": "Bronze Ingot", + "item.astromine.steel_ingot": "Steel Ingot", + "item.astromine.electrum_ingot": "Electrum Ingot", + "item.astromine.rose_gold_ingot": "Rose Gold Ingot", + "item.astromine.sterling_silver_ingot": "Sterling Silver Ingot", + "item.astromine.fools_gold_ingot": "Fool's Gold Ingot", + "item.astromine.meteoric_steel_ingot": "Meteoric Steel Ingot", + "item.astromine.univite_ingot": "Univite Ingot", + "item.astromine.galaxium_fragment": "Galaxium Fragment", + "item.astromine.diamond_fragment": "Diamond Fragment", + "item.astromine.emerald_fragment": "Emerald Fragment", + "item.astromine.quartz_fragment": "Quartz Fragment", + "item.astromine.raw_netherite_fragment": "Raw Netherite Fragment", + "item.astromine.asterite": "Asterite", + "item.astromine.galaxium": "Galaxium", + "item.astromine.metite_nugget": "Metite Nugget", + "item.astromine.stellum_nugget": "Stellum Nugget", + "item.astromine.univite_nugget": "Univite Nugget", + "item.astromine.lunum_nugget": "Lunum Nugget", + "item.astromine.netherite_nugget": "Netherite Nugget", + "item.astromine.tin_nugget": "Tin Nugget", + "item.astromine.copper_nugget": "Copper Nugget", + "item.astromine.silver_nugget": "Silver Nugget", + "item.astromine.lead_nugget": "Lead Nugget", + "item.astromine.bronze_nugget": "Bronze Nugget", + "item.astromine.steel_nugget": "Steel Nugget", + "item.astromine.electrum_nugget": "Electrum Nugget", + "item.astromine.rose_gold_nugget": "Rose Gold Nugget", + "item.astromine.sterling_silver_nugget": "Sterling Silver Nugget", + "item.astromine.fools_gold_nugget": "Fool's Gold Nugget", + "item.astromine.meteoric_steel_nugget": "Meteoric Steel Nugget", + "item.astromine.basic_drill": "Basic Drill", + "item.astromine.advanced_drill": "Advanced Drill", + "item.astromine.elite_drill": "Elite Drill", + "item.astromine.tin_pickaxe": "Tin Pickaxe", + "item.astromine.tin_axe": "Tin Axe", + "item.astromine.tin_shovel": "Tin Shovel", + "item.astromine.tin_hoe": "Tin Hoe", + "item.astromine.tin_sword": "Tin Sword", + "item.astromine.tin_mattock": "Tin Mattock", + "item.astromine.tin_mining_tool": "Tin Mining Tool", + "item.astromine.tin_hammer": "Tin Hammer", + "item.astromine.tin_excavator": "Tin Excavator", + "item.astromine.copper_pickaxe": "Copper Pickaxe", + "item.astromine.copper_axe": "Copper Axe", + "item.astromine.copper_shovel": "Copper Shovel", + "item.astromine.copper_hoe": "Copper Hoe", + "item.astromine.copper_sword": "Copper Sword", + "item.astromine.copper_mattock": "Copper Mattock", + "item.astromine.copper_mining_tool": "Copper Mining Tool", + "item.astromine.copper_hammer": "Copper Hammer", + "item.astromine.copper_excavator": "Copper Excavator", + "item.astromine.silver_pickaxe": "Silver Pickaxe", + "item.astromine.silver_axe": "Silver Axe", + "item.astromine.silver_shovel": "Silver Shovel", + "item.astromine.silver_hoe": "Silver Hoe", + "item.astromine.silver_sword": "Silver Sword", + "item.astromine.silver_mattock": "Silver Mattock", + "item.astromine.silver_mining_tool": "Silver Mining Tool", + "item.astromine.silver_hammer": "Silver Hammer", + "item.astromine.silver_excavator": "Silver Excavator", + "item.astromine.lead_pickaxe": "Lead Pickaxe", + "item.astromine.lead_axe": "Lead Axe", + "item.astromine.lead_shovel": "Lead Shovel", + "item.astromine.lead_hoe": "Lead Hoe", + "item.astromine.lead_sword": "Lead Sword", + "item.astromine.lead_mattock": "Lead Mattock", + "item.astromine.lead_mining_tool": "Lead Mining Tool", + "item.astromine.lead_hammer": "Lead Hammer", + "item.astromine.lead_excavator": "Lead Excavator", + "item.astromine.bronze_pickaxe": "Bronze Pickaxe", + "item.astromine.bronze_axe": "Bronze Axe", + "item.astromine.bronze_shovel": "Bronze Shovel", + "item.astromine.bronze_hoe": "Bronze Hoe", + "item.astromine.bronze_sword": "Bronze Sword", + "item.astromine.bronze_mattock": "Bronze Mattock", + "item.astromine.bronze_mining_tool": "Bronze Mining Tool", + "item.astromine.bronze_hammer": "Bronze Hammer", + "item.astromine.bronze_excavator": "Bronze Excavator", + "item.astromine.steel_pickaxe": "Steel Pickaxe", + "item.astromine.steel_axe": "Steel Axe", + "item.astromine.steel_shovel": "Steel Shovel", + "item.astromine.steel_hoe": "Steel Hoe", + "item.astromine.steel_sword": "Steel Sword", + "item.astromine.steel_mattock": "Steel Mattock", + "item.astromine.steel_mining_tool": "Steel Mining Tool", + "item.astromine.steel_hammer": "Steel Hammer", + "item.astromine.steel_excavator": "Steel Excavator", + "item.astromine.electrum_pickaxe": "Electrum Pickaxe", + "item.astromine.electrum_axe": "Electrum Axe", + "item.astromine.electrum_shovel": "Electrum Shovel", + "item.astromine.electrum_hoe": "Electrum Hoe", + "item.astromine.electrum_sword": "Electrum Sword", + "item.astromine.electrum_mattock": "Electrum Mattock", + "item.astromine.electrum_mining_tool": "Electrum Mining Tool", + "item.astromine.electrum_hammer": "Electrum Hammer", + "item.astromine.electrum_excavator": "Electrum Excavator", + "item.astromine.rose_gold_pickaxe": "Rose Gold Pickaxe", + "item.astromine.rose_gold_axe": "Rose Gold Axe", + "item.astromine.rose_gold_shovel": "Rose Gold Shovel", + "item.astromine.rose_gold_hoe": "Rose Gold Hoe", + "item.astromine.rose_gold_sword": "Rose Gold Sword", + "item.astromine.rose_gold_mattock": "Rose Gold Mattock", + "item.astromine.rose_gold_mining_tool": "Rose Gold Mining Tool", + "item.astromine.rose_gold_hammer": "Rose Gold Hammer", + "item.astromine.rose_gold_excavator": "Rose Gold Excavator", + "item.astromine.sterling_silver_pickaxe": "Sterling Silver Pickaxe", + "item.astromine.sterling_silver_axe": "Sterling Silver Silverver Axe", + "item.astromine.sterling_silver_shovel": "Sterling Silver Shovel", + "item.astromine.sterling_silver_hoe": "Sterling Silver Hoe", + "item.astromine.sterling_silver_sword": "Sterling Silver Sword", + "item.astromine.sterling_silver_mattock": "Sterling Silver Mattock", + "item.astromine.sterling_silver_mining_tool": "Sterling Silver Mining Tool", + "item.astromine.sterling_silver_hammer": "Sterling Silver Hammer", + "item.astromine.sterling_silver_excavator": "Sterling Silver Excavator", + "item.astromine.fools_gold_pickaxe": "Fool's Gold Pickaxe", + "item.astromine.fools_gold_axe": "Fool's Gold Axe", + "item.astromine.fools_gold_shovel": "Fool's Gold Shovel", + "item.astromine.fools_gold_hoe": "Fool's Gold Hoe", + "item.astromine.fools_gold_sword": "Fool's Gold Sword", + "item.astromine.fools_gold_mattock": "Fool's Gold Mattock", + "item.astromine.fools_gold_mining_tool": "Fool's Gold Mining Tool", + "item.astromine.fools_gold_hammer": "Fool's Gold Hammer", + "item.astromine.fools_gold_excavator": "Fool's Gold Excavator", + "item.astromine.metite_pickaxe": "Metite Pickaxe", + "item.astromine.metite_axe": "Metite Axe", + "item.astromine.metite_shovel": "Metite Shovel", + "item.astromine.metite_hoe": "Metite Hoe", + "item.astromine.metite_sword": "Metite Sword", + "item.astromine.metite_mattock": "Metite Mattock", + "item.astromine.metite_mining_tool": "Metite Mining Tool", + "item.astromine.metite_hammer": "Metite Hammer", + "item.astromine.metite_excavator": "Metite Excavator", + "item.astromine.asterite_pickaxe": "Asterite Pickaxe", + "item.astromine.asterite_axe": "Asterite Axe", + "item.astromine.asterite_shovel": "Asterite Shovel", + "item.astromine.asterite_hoe": "Asterite Hoe", + "item.astromine.asterite_sword": "Asterite Sword", + "item.astromine.asterite_mattock": "Asterite Mattock", + "item.astromine.asterite_mining_tool": "Asterite Mining Tool", + "item.astromine.asterite_hammer": "Asterite Hammer", + "item.astromine.asterite_excavator": "Asterite Excavator", + "item.astromine.stellum_pickaxe": "Stellum Pickaxe", + "item.astromine.stellum_axe": "Stellum Axe", + "item.astromine.stellum_shovel": "Stellum Shovel", + "item.astromine.stellum_hoe": "Stellum Hoe", + "item.astromine.stellum_sword": "Stellum Sword", + "item.astromine.stellum_mattock": "Stellum Mattock", + "item.astromine.stellum_mining_tool": "Stellum Mining Tool", + "item.astromine.stellum_hammer": "Stellum Hammer", + "item.astromine.stellum_excavator": "Stellum Excavator", + "item.astromine.galaxium_pickaxe": "Galaxium Pickaxe", + "item.astromine.galaxium_axe": "Galaxium Axe", + "item.astromine.galaxium_shovel": "Galaxium Shovel", + "item.astromine.galaxium_hoe": "Galaxium Hoe", + "item.astromine.galaxium_sword": "Galaxium Sword", + "item.astromine.galaxium_mattock": "Galaxium Mattock", + "item.astromine.galaxium_mining_tool": "Galaxium Mining Tool", + "item.astromine.galaxium_hammer": "Galaxium Hammer", + "item.astromine.galaxium_excavator": "Galaxium Excavator", + "item.astromine.univite_pickaxe": "Univite Pickaxe", + "item.astromine.univite_axe": "Univite Axe", + "item.astromine.univite_shovel": "Univite Shovel", + "item.astromine.univite_hoe": "Univite Hoe", + "item.astromine.univite_sword": "Univite Sword", + "item.astromine.univite_mattock": "Univite Mattock", + "item.astromine.univite_mining_tool": "Univite Mining Tool", + "item.astromine.univite_hammer": "Univite Hammer", + "item.astromine.univite_excavator": "Univite Excavator", + "item.astromine.lunum_pickaxe": "Lunum Pickaxe", + "item.astromine.lunum_axe": "Lunum Axe", + "item.astromine.lunum_shovel": "Lunum Shovel", + "item.astromine.lunum_hoe": "Lunum Hoe", + "item.astromine.lunum_sword": "Lunum Sword", + "item.astromine.lunum_mattock": "Lunum Mattock", + "item.astromine.lunum_mining_tool": "Lunum Mining Tool", + "item.astromine.lunum_hammer": "Lunum Hammer", + "item.astromine.lunum_excavator": "Lunum Excavator", + "item.astromine.meteoric_steel_pickaxe": "Meteoric Steel Pickaxe", + "item.astromine.meteoric_steel_axe": "Meteoric Steel Axe", + "item.astromine.meteoric_steel_shovel": "Meteoric Steel Shovel", + "item.astromine.meteoric_steel_hoe": "Meteoric Steel Hoe", + "item.astromine.meteoric_steel_sword": "Meteoric Steel Sword", + "item.astromine.meteoric_steel_mattock": "Meteoric Steel Mattock", + "item.astromine.meteoric_steel_mining_tool": "Meteoric Steel Mining Tool", + "item.astromine.meteoric_steel_hammer": "Meteoric Steel Hammer", + "item.astromine.meteoric_steel_excavator": "Meteoric Steel Excavator", + "item.astromine.wooden_mattock": "Wooden Mattock", + "item.astromine.wooden_mining_tool": "Wooden Mining Tool", + "item.astromine.stone_mattock": "Stone Mattock", + "item.astromine.stone_mining_tool": "Stone Mining Tool", + "item.astromine.iron_mattock": "Iron Mattock", + "item.astromine.iron_mining_tool": "Iron Mining Tool", + "item.astromine.golden_mattock": "Golden Mattock", + "item.astromine.golden_mining_tool": "Golden Mining Tool", + "item.astromine.diamond_mattock": "Diamond Mattock", + "item.astromine.diamond_mining_tool": "Diamond Mining Tool", + "item.astromine.netherite_mattock": "Netherite Mattock", + "item.astromine.netherite_mining_tool": "Netherite Mining Tool", + "item.astromine.tin_helmet": "Tin Helmet", + "item.astromine.tin_chestplate": "Tin Chestplate", + "item.astromine.tin_leggings": "Tin Leggings", + "item.astromine.tin_boots": "Tin Boots", + "item.astromine.copper_helmet": "Copper Helmet", + "item.astromine.copper_chestplate": "Copper Chestplate", + "item.astromine.copper_leggings": "Copper Leggings", + "item.astromine.copper_boots": "Copper Boots", + "item.astromine.silver_helmet": "Silver Helmet", + "item.astromine.silver_chestplate": "Silver Chestplate", + "item.astromine.silver_leggings": "Silver Leggings", + "item.astromine.silver_boots": "Silver Boots", + "item.astromine.lead_helmet": "Lead Helmet", + "item.astromine.lead_chestplate": "Lead Chestplate", + "item.astromine.lead_leggings": "Lead Leggings", + "item.astromine.lead_boots": "Lead Boots", + "item.astromine.bronze_helmet": "Bronze Helmet", + "item.astromine.bronze_chestplate": "Bronze Chestplate", + "item.astromine.bronze_leggings": "Bronze Leggings", + "item.astromine.bronze_boots": "Bronze Boots", + "item.astromine.steel_helmet": "Steel Helmet", + "item.astromine.steel_chestplate": "Steel Chestplate", + "item.astromine.steel_leggings": "Steel Leggings", + "item.astromine.steel_boots": "Steel Boots", + "item.astromine.electrum_helmet": "Electrum Helmet", + "item.astromine.electrum_chestplate": "Electrum Chestplate", + "item.astromine.electrum_leggings": "Electrum Leggings", + "item.astromine.electrum_boots": "Electrum Boots", + "item.astromine.rose_gold_helmet": "Rose Gold Helmet", + "item.astromine.rose_gold_chestplate": "Rose Gold Chestplate", + "item.astromine.rose_gold_leggings": "Rose Gold Leggings", + "item.astromine.rose_gold_boots": "Rose Gold Boots", + "item.astromine.sterling_silver_helmet": "Sterling Silver Helmet", + "item.astromine.sterling_silver_chestplate": "Sterling Silver Chestplate", + "item.astromine.sterling_silver_leggings": "Sterling Silver Leggings", + "item.astromine.sterling_silver_boots": "Sterling Silver Boots", + "item.astromine.fools_gold_helmet": "Fool's Gold Helmet", + "item.astromine.fools_gold_chestplate": "Fool's Gold Chestplate", + "item.astromine.fools_gold_leggings": "Fool's Gold Leggings", + "item.astromine.fools_gold_boots": "Fool's Gold Boots", + "item.astromine.metite_helmet": "Metite Helmet", + "item.astromine.metite_chestplate": "Metite Chestplate", + "item.astromine.metite_leggings": "Metite Leggings", + "item.astromine.metite_boots": "Metite Boots", + "item.astromine.asterite_helmet": "Asterite Helmet", + "item.astromine.asterite_chestplate": "Asterite Chestplate", + "item.astromine.asterite_leggings": "Asterite Leggings", + "item.astromine.asterite_boots": "Asterite Boots", + "item.astromine.stellum_helmet": "Stellum Helmet", + "item.astromine.stellum_chestplate": "Stellum Chestplate", + "item.astromine.stellum_leggings": "Stellum Leggings", + "item.astromine.stellum_boots": "Stellum Boots", + "item.astromine.galaxium_helmet": "Galaxium Helmet", + "item.astromine.galaxium_chestplate": "Galaxium Chestplate", + "item.astromine.galaxium_leggings": "Galaxium Leggings", + "item.astromine.galaxium_boots": "Galaxium Boots", + "item.astromine.univite_helmet": "Univite Helmet", + "item.astromine.univite_chestplate": "Univite Chestplate", + "item.astromine.univite_leggings": "Univite Leggings", + "item.astromine.univite_boots": "Univite Boots", + "item.astromine.lunum_helmet": "Lunum Helmet", + "item.astromine.lunum_chestplate": "Lunum Chestplate", + "item.astromine.lunum_leggings": "Lunum Leggings", + "item.astromine.lunum_boots": "Lunum Boots", + "item.astromine.meteoric_steel_helmet": "Meteoric Steel Helmet", + "item.astromine.meteoric_steel_chestplate": "Meteoric Steel Chestplate", + "item.astromine.meteoric_steel_leggings": "Meteoric Steel Leggings", + "item.astromine.meteoric_steel_boots": "Meteoric Steel Boots", + "item.astromine.space_suit_helmet": "Space Suit Helmet", + "item.astromine.space_suit_chestplate": "Space Suit Chest", + "item.astromine.space_suit_leggings": "Space Suit Pants", + "item.astromine.space_suit_boots": "Space Suit Boots", + "item.astromine.space_slime_spawn_egg": "Space Slime Spawn Egg", + "item.astromine.super_space_slime_shooter": "Super Space Slime Shooter", + "item.astromine.space_slime_ball": "Space Slimeball", + "item.astromine.manual": "Astromine Manual", + "item.astromine.yeast": "Yeast", + "item.astromine.rocket": "Rocket", + "item.astromine.copper_wrench": "Copper Spanner", + "item.astromine.bronze_wrench": "Bronze Spanner", + "item.astromine.steel_wrench": "Steel Spanner", + "item.astromine.rose_gold_apple": "Rose Gold Apple", + "item.astromine.fools_gold_apple": "Fool's Gold Apple", + "item.astromine.lead_apple": "Lead Apple", + "item.astromine.basic_machine_upgrade_kit": "Basic Machine Upgrade Kit", + "item.astromine.advanced_machine_upgrade_kit": "Advanced Machine Upgrade Kit", + "item.astromine.elite_machine_upgrade_kit": "Elite Machine Upgrade Kit", + "item.astromine.gravity_gauntlet": "Gravity Gauntlet", + "item.minecraft.potion.effect.rocket_fuel": "Rocket Fuel Bottle", + "item.minecraft.splash_potion.effect.rocket_fuel": "Splash Rocket Fuel Bottle", + "item.minecraft.lingering_potion.effect.rocket_fuel": "Lingering Rocket Fuel Bottle", + "item.minecraft.tipped_arrow.effect.rocket_fuel": "Arrow of Rocket Fuel", + "item.minecraft.potion.effect.sugar_water": "Sugar Water Bottle", + "item.minecraft.splash_potion.effect.sugar_water": "Splash Sugar Water Bottle", + "item.minecraft.lingering_potion.effect.sugar_water": "Lingering Sugar Water Bottle", + "item.minecraft.tipped_arrow.effect.sugar_water": "Arrow of Sugar Water", + "potion.potency.10": "X", + "subtitles.astromine.humming": "Humming", + "subtitles.astromine.holographic_connector_click": "Holographic Connector clicks", + "subtitles.astromine.fire_extinguisher_open": "Fire Extinguisher opens", + "subtitles.astromine.gunshot": "Gunshot", + "subtitles.astromine.empty_magazine": "Magazine is empty", + "text.astromine.manual.landing": "Your guide to the stars!", + "category.astromine.liquid_generating": "Liquid Generating", + "category.astromine.solid_generating": "Solid Generating", + "category.astromine.electric_smelting": "Electric Smelting", + "category.astromine.alloy_smelting": "Alloy Smelting", + "category.astromine.pressing": "Pressing", + "category.astromine.triturating": "Triturating", + "category.astromine.fluid_mixing": "Fluid Mixing", + "category.astromine.electrolyzing": "Electrolysing", + "category.astromine.refining": "Refining", + "category.astromine.infusing": "Infusing", + "category.astromine.cooking.time": "%s seconds", + "category.astromine.cooking.energy": "%s energy", + "category.astromine.generating.energy": "%s generated per tick", + "category.astromine.consuming.energy": "%s consumed", + "category.astromine.fluid.generating.consumed": "%s (%s) consumed per tick", + "category.astromine.fluid.generating.generated": "%s (%s) generated per tick", + "text.astromine.manual.obtain.info": "The Astromine Manual can be obtained by right clicking a Metite Axe on a Bookshelf.", + "text.astromine.selected.dimension.pos": "Selected %s (%d, %d, %d)", + "text.astromine.patchouli.astronautics.title": "Astronautics", + "text.astromine.patchouli.astronautics.description": "From where one dreams, to where their dreams come true.", + "text.astromine.patchouli.components.title": "Components", + "text.astromine.patchouli.components.description": "Components for crafting items to aid one in their journey.", + "text.astromine.patchouli.creatures.title": "Creatures", + "text.astromine.patchouli.creatures.description": "Those beyond our wildest realm of imagination.", + "text.astromine.patchouli.gadgets.title": "Gadgets", + "text.astromine.patchouli.gadgets.description": "One's physical assistance in their journey.", + "text.astromine.patchouli.machinery.title": "Machinery", + "text.astromine.patchouli.machinery.description": "What moves one's world.", + "text.astromine.patchouli.resources.title": "Resources", + "text.astromine.patchouli.resources.description": "The exquisite materials that one channels for power.", + "text.astromine.patchouli.warfare.title": "Warfare", + "text.astromine.patchouli.warfare.description": "What one uses to wipe away their foe.", + "text.astromine.patchouli.world.title": "World", + "text.astromine.patchouli.world.description": "What surrounds one.", + "text.astromine.astronautics.space_suit.title": "Space Suit", + "text.astromine.astronautics.space_suit.page_one.title": "Space Suit", + "text.astromine.astronautics.space_suit.page_one.text": "Vital for survival in hostile environments, a Space Suit is the most important thing one may carry. $(p)With internal tanks which may be pressurised in certain machines, it may be filled with (un-)breathable gases fit for whoever is wearing it.", + "text.astromine.astronautics.rocket.title": "Rocket", + "text.astromine.astronautics.rocket.page_one.title": "Rocket", + "text.astromine.astronautics.rocket.page_one.text": "Your ticket to the final frontier.", + "text.astromine.astronautics.rocket.page_two.title": "Crafting and Notes", + "text.astromine.astronautics.rocket.page_two.text": "Right click with a $(item)Flint and Steel$() to launch. Right click with a $(item)Stick$() to destroy. These are both temporary measures.", + "text.astromine.components.circuits.title": "Circuits", + "text.astromine.components.circuits.page_one.title": "Basic Circuit", + "text.astromine.components.circuits.page_one.text": "A basic electric circuit board, built for general systems with no special requirements, whose architecture is based on graphene.", + "text.astromine.components.circuits.page_two.title": "Basic Circuit Recipe", + "text.astromine.components.circuits.page_three.title": "Advanced Circuit", + "text.astromine.components.circuits.page_three.text": "A more advanced electric circuit board, built for systems with low latency in mind, whose architecture is based on graphene.", + "text.astromine.components.circuits.page_four.title": "Advanced Circuit Recipe", + "text.astromine.components.circuits.page_five.title": "Elite Circuit", + "text.astromine.components.circuits.page_five.text": "An elite electric circuit board, built for systems with high throughput and low latency in mind, whose architecture makes use of coveted, laboratory-made materials.", + "text.astromine.components.circuits.page_six.title": "Elite Circuit Recipe", + "text.astromine.components.gears.title": "Gears", + "text.astromine.components.gears.page_one.title": "Gears", + "text.astromine.components.gears.page_one.text": "A small wheel with teeth, gears interlocked with one another can turn to achieve any number of things.$(p)As such, they will have great use in constructing useful $(thing)machines$().", + "text.astromine.components.gears.page_two.title": "Recipe", + "text.astromine.components.gears.page_two.text": "While the recipe shown is clearly for an $(item)Iron Gear$(), simply substituting the $(item)Iron Ingots$() with any other $(thing)Ingots$() will create a gear of that type.", + "text.astromine.components.plates.title": "Plates", + "text.astromine.components.plates.page_one.title": "Plates", + "text.astromine.components.plates.page_one.text": "Thin sheets of metal, plates are useful for constructing $(thing)housing$() for $(thing)machinery$().", + "text.astromine.components.plates.page_two.title": "Recipe", + "text.astromine.components.plates.page_two.text": "While the recipe shown is clearly for $(item)Iron Plates$(), simply substituting the $(item)Iron Ingots$() with any other $(thing)Ingots$() will create plates of that type.", + "text.astromine.creatures.space_slime.title": "Space Slime", + "text.astromine.creatures.space_slime.page_one.title": "Space Slime", + "text.astromine.creatures.space_slime.page_one.text": "A fierce adversary which inhabits large sections of traversable space.", + "text.astromine.creatures.space_slime.page_two.title": "Drops", + "text.astromine.creatures.space_slime.page_two.text": "Upon defeat, a $(thing)Space Slime$() will drop $(thing)Space Slime Balls$().", + "text.astromine.gadgets.fire_extinguisher.title": "Fire Extinguisher", + "text.astromine.gadgets.fire_extinguisher.page_one.title": "Fire Extinguisher", + "text.astromine.gadgets.fire_extinguisher.page_one.text": "An important tool in one's space journeys, it is responsible for providing maneuverable thrust.$(p)Surprisingly, it can also extinguish fire.", + "text.astromine.gadgets.fire_extinguisher.page_two.title": "Recipe", + "text.astromine.gadgets.gravity_gauntlet.title": "Gravity Gauntlets", + "text.astromine.gadgets.gravity_gauntlet.page_one.title": "Gravity Gauntlets", + "text.astromine.gadgets.gravity_gauntlet.page_one.text": "Gauntlets which can repel opponents. One must be worn on each hand, and they must be charged before they can activate$(p)Charging is done by holding right click with one in each hand, and takes energy.", + "text.astromine.gadgets.gravity_gauntlet.page_two.title": "Recipe", + "text.astromine.machinery.holographic_bridge_projector.title": "Holographic Bridge Projector", + "text.astromine.machinery.holographic_bridge_projector.page_one.title": "Holographic Bridge Projector", + "text.astromine.machinery.holographic_bridge_projector.page_one.text": "A machine which generates a holographic bridge between it and another one of its kind; linkable with a $(item)$(l:gadgets/holographic_connector)Holographic Connector$().", + "text.astromine.machinery.holographic_bridge_projector.page_two.title": "Recipe", + "text.astromine.gadgets.holographic_connector.title": "Holographic Connector", + "text.astromine.gadgets.holographic_connector.page_one.title": "Holographic Connector", + "text.astromine.gadgets.holographic_connector.page_one.text": "A remote controller which allows you to link together $(item)$(l:machinery/holographic_bridge_projector)Holographic Bridge Projectors$(). They must be facing each other in the same line, but can have different heights.", + "text.astromine.gadgets.holographic_connector.page_two.title": "Recipe", + "text.astromine.machinery.creative_buffer.title": "Creative Buffer", + "text.astromine.machinery.creative_buffer.page_one.title": "Creative Buffer", + "text.astromine.machinery.creative_buffer.page_one.text": "A machine which produces a specified $(thing)item$() infinitely.", + "text.astromine.machinery.creative_capacitor.title": "Creative Capacitor", + "text.astromine.machinery.creative_capacitor.page_one.title": "Creative Capacitor", + "text.astromine.machinery.creative_capacitor.page_one.text": "A machine which produces $(thing)energy$() infinitely.", + "text.astromine.machinery.creative_tank.title": "Creative Tank", + "text.astromine.machinery.creative_tank.page_one.title": "Creative Tank", + "text.astromine.machinery.creative_tank.page_one.text": "A machine which produces a specified $(thing)fluid$() infinitely.", + "text.astromine.machinery.electric_smelter.title": "Electric Smelter", + "text.astromine.machinery.electric_smelter.page_one.title": "Electric Smelter", + "text.astromine.machinery.electric_smelter.page_one.text": "A machine which consumes $(thing)energy$() to smelt $(thing)items$() into useful materials.", + "text.astromine.machinery.electric_smelter.page_two.title": "Recipe", + "text.astromine.machinery.electrolyzer.title": "Electrolyser", + "text.astromine.machinery.electrolyzer.page_one.title": "Electrolyser", + "text.astromine.machinery.electrolyzer.page_one.text": "A machine which consumes $(thing)energy$() to electrolyse $(thing)fluids$() into useful materials.", + "text.astromine.machinery.electrolyzer.page_two.title": "Recipe", + "text.astromine.machinery.energy_cable.title": "Energy Cable", + "text.astromine.machinery.energy_cable.page_one.title": "Energy Cable", + "text.astromine.machinery.energy_cable.page_one.text": "A cable which transports $(thing)energy$(); no buffering or path-finding involved.", + "text.astromine.machinery.energy_cable.page_two.title": "Recipe", + "text.astromine.machinery.fluid_cable.title": "Fluid Cable", + "text.astromine.machinery.fluid_cable.page_one.title": "Fluid Cable", + "text.astromine.machinery.fluid_cable.page_one.text": "A cable which transports $(thing)fluids$(); no buffering or path-finding involved.", + "text.astromine.machinery.fluid_cable.page_two.title": "Recipe", + "text.astromine.machinery.fluid_extractor.title": "Fluid Extractor", + "text.astromine.machinery.fluid_extractor.page_one.title": "Fluid Extractor", + "text.astromine.machinery.fluid_extractor.page_one.text": "A machine which consumes $(thing)energy$() to pick up $(thing)fluids$() from the world.", + "text.astromine.machinery.fluid_extractor.page_two.title": "Recipe", + "text.astromine.machinery.fluid_inserter.title": "Fluid Inserter", + "text.astromine.machinery.fluid_inserter.page_one.title": "Fluid Inserter", + "text.astromine.machinery.fluid_inserter.page_one.text": "A machine which consumes $(thing)energy$() to place $(thing)fluids$() in the world.", + "text.astromine.machinery.fluid_inserter.page_two.title": "Recipe", + "text.astromine.machinery.fluid_mixer.title": "Fuel Mixer", + "text.astromine.machinery.fluid_mixer.page_one.title": "Fuel Mixer", + "text.astromine.machinery.fluid_mixer.page_one.text": "A machine which consumes $(thing)energy$() to mix $(thing)fluids$() into useful materials.", + "text.astromine.machinery.fluid_mixer.page_two.title": "Recipe", + "text.astromine.machinery.block_breaker.title": "Block Breaker", + "text.astromine.machinery.block_breaker.page_one.title": "Block Breaker", + "text.astromine.machinery.block_breaker.page_one.text": "A machine which consumes $(thing)energy$() to break and pick up $(thing)blocks$() from the world.", + "text.astromine.machinery.block_breaker.page_two.title": "Recipe", + "text.astromine.machinery.block_placer.title": "Block Placer", + "text.astromine.machinery.block_placer.page_one.title": "Block Placer", + "text.astromine.machinery.block_placer.page_one.text": "A machine which consumes $(thing)energy$() to place $(thing)blocks$() in the world.", + "text.astromine.machinery.block_placer.page_two.title": "Recipe", + "text.astromine.machinery.inserter.title": "Inserter", + "text.astromine.machinery.inserter.page_one.title": "Inserter", + "text.astromine.machinery.inserter.page_one.text": "A machine which picks up items from its front and places them at its back, for item transportation.", + "text.astromine.machinery.inserter.page_two.title": "Recipe", + "text.astromine.machinery.inserter.page_three.title": "Recipe", + "text.astromine.machinery.conveyor.title": "Conveyor", + "text.astromine.machinery.conveyor.page_one.title": "Conveyor", + "text.astromine.machinery.conveyor.page_one.text": "A machine which transports items.", + "text.astromine.machinery.conveyor.page_two.title": "Recipe", + "text.astromine.machinery.conveyor.page_three.title": "Recipe", + "text.astromine.machinery.conveyor.page_four.title": "Recipe", + "text.astromine.machinery.triturator.title": "Triturator", + "text.astromine.machinery.triturator.page_one.title": "Triturator", + "text.astromine.machinery.triturator.page_one.text": "A machine which consumes $(thing)energy$() to pulverise $(thing)items$() into useful materials.", + "text.astromine.machinery.triturator.page_two.title": "Recipe", + "text.astromine.machinery.presser.title": "Presser", + "text.astromine.machinery.presser.page_one.title": "Presser", + "text.astromine.machinery.presser.page_one.text": "A machine which consumes $(thing)energy$() to press $(thing)items$() into useful materials.", + "text.astromine.machinery.presser.page_two.title": "Recipe", + "text.astromine.machinery.vent.title": "Vent", + "text.astromine.machinery.vent.page_one.title": "Vent", + "text.astromine.machinery.vent.page_one.text": "A machine which consumes energy to ventilate fluids into the atmosphere.", + "text.astromine.machinery.vent.page_two.title": "Recipe", + "text.astromine.resources.copper.title": "Copper", + "text.astromine.resources.copper.page_one.title": "Copper", + "text.astromine.resources.copper.page_one.text": "A very common metal with high thermal and electrical conductivity and a distinct orange hue.", + "text.astromine.resources.copper.page_two.title": "Obtaining Copper", + "text.astromine.resources.copper.page_two.text": "$(item)Copper Ore$() can be commonly found $(thing)underground$() in $(thing)The Overworld$().$(p)Mining requires only a $(item)Stone Pickaxe$() (Mining Level 1) or better, and can then be $(thing)smelted$() into a $(item)Copper Ingot$().", + "text.astromine.resources.copper.page_three.title": "Usages", + "text.astromine.resources.copper.page_three.text": "Copper is very useful for basic electronics and tools. When combined with $(item)$(l:resources/tin)Tin$() in an $(item)$(l:machinery/alloy_smelter)Alloy Smelter$(), it can make $(item)$(l:resources/bronze)Bronze$().", + "text.astromine.resources.copper.page_four.title": "Statistics", + "text.astromine.resources.copper.page_four.text": "$(l)Tools$()$(br)Mining Level: 1$(br)Base Durability: 200$(br)Mining Speed: 4$(br)Attack Damage: 1.5$(br)Enchantability: 10$(p)$(l)Armor$()$(br)Durability Multiplier: 12$(br)Total Defense: 12$(br)Toughness: 0$(br)Enchantability: 15", + "text.astromine.resources.tin.title": "Tin", + "text.astromine.resources.tin.page_one.title": "Tin", + "text.astromine.resources.tin.page_one.text": "A common metal with a silvery sheen and a soft composition.", + "text.astromine.resources.tin.page_two.title": "Obtaining Tin", + "text.astromine.resources.tin.page_two.text": "$(item)Tin Ore$() can be commonly found $(thing)underground$() in $(thing)The Overworld$().$(p)Mining requires only a $(item)Stone Pickaxe$() (Mining Level 1) or better, and can then be $(thing)smelted$() into a $(item)Tin Ingot$().", + "text.astromine.resources.tin.page_three.title": "Usages", + "text.astromine.resources.tin.page_three.text": "Tin is useful for plating to prevent corrosion. When combined with $(item)$(l:resources/copper)Copper$() in an $(item)$(l:machinery/alloy_smelter)Alloy Smelter$(), it can make $(item)$(l:resources/bronze)Bronze$().", + "text.astromine.resources.tin.page_four.title": "Statistics", + "text.astromine.resources.tin.page_four.text": "$(l)Tools$()$(br)Mining Level: 1$(br)Base Durability: 200$(br)Mining Speed: 5$(br)Attack Damage: 1.0$(br)Enchantability: 10$(p)$(l)Armor$()$(br)Durability Multiplier: 12$(br)Total Defense: 12$(br)Toughness: 0$(br)Enchantability: 15", + "text.astromine.resources.bronze.title": "Bronze", + "text.astromine.resources.bronze.page_one.title": "Bronze", + "text.astromine.resources.bronze.page_one.text": "An alloy of $(item)$(l:resources/copper)Copper$() and $(item)$(l:resources/tin)Tin$(), Bronze manages to be stronger and more durable than either of them.", + "text.astromine.resources.bronze.page_two.title": "Obtaining Bronze", + "text.astromine.resources.bronze.page_two.text": "Bronze can be obtained by combining 3 Copper Ingots and 1 Tin Ingot in an $(item)$(l:machinery/alloy_smelter)Alloy Smelter$(). This produces 4 $(item)Bronze Ingots$().", + "text.astromine.resources.bronze.page_three.title": "Usages", + "text.astromine.resources.bronze.page_three.text": "Bronze is useful for creating tools, and is also used in construction of more advanced machines.", + "text.astromine.resources.bronze.page_four.title": "Statistics", + "text.astromine.resources.bronze.page_four.text": "$(l)Tools$()$(br)Mining Level: 2$(br)Base Durability: 539$(br)Mining Speed: 7$(br)Attack Damage: 2.5$(br)Enchantability: 20$(p)$(l)Armor$()$(br)Durability Multiplier: 20$(br)Total Defense: 15$(br)Toughness: 0.7$(br)Enchantability: 18", + "text.astromine.resources.steel.title": "Steel", + "text.astromine.resources.steel.page_one.title": "Steel", + "text.astromine.resources.steel.page_one.text": "An alloy of $(item)Iron$() and $(thing)Carbon$(), Steel is incredibly strong for a metal of terrestrial origin.", + "text.astromine.resources.steel.page_two.title": "Obtaining Steel", + "text.astromine.resources.steel.page_two.text": "Steel can be obtained by combining an Iron Ingot and 2 $(item)Coal Dust$() or $(item)Charcoal Dust$() in an $(item)$(l:machinery/alloy_smelter)Alloy Smelter$(). This produces a single $(item)Steel Ingot$().", + "text.astromine.resources.steel.page_three.title": "Usages", + "text.astromine.resources.steel.page_three.text": "Steel is useful for creating tools, and is also used in construction of more advanced machines.", + "text.astromine.resources.steel.page_four.title": "Statistics", + "text.astromine.resources.steel.page_four.text": "$(l)Tools$()$(br)Mining Level: 3$(br)Base Durability: 1043$(br)Mining Speed: 7.5$(br)Attack Damage: 3$(br)Enchantability: 24$(p)$(l)Armor$()$(br)Durability Multiplier: 24$(br)Total Defense: 17$(br)Toughness: 0.5$(br)Enchantability: 18", + "text.astromine.resources.silver.title": "Silver", + "text.astromine.resources.silver.page_one.title": "Silver", + "text.astromine.resources.silver.page_one.text": "A metal with high electrical conductivity and a distinct white, lustrous texture.", + "text.astromine.resources.silver.page_two.title": "Obtaining Silver", + "text.astromine.resources.silver.page_two.text": "$(item)Silver Ore$() can be found $(thing)underground$() in $(thing)The Overworld$().$(p)Mining requires only a $(item)Iron Pickaxe$() (Mining Level 2) or better, and can then be $(thing)smelted$() into a $(item)Silver Ingot$().", + "text.astromine.resources.silver.page_three.title": "Usages", + "text.astromine.resources.silver.page_three.text": "Silver is very useful for basic electronics and tools. When combined with $(item)$(l:resources/copper)Copper$() in an $(item)$(l:machinery/alloy_smelter)Alloy Smelter$(), it can make $(item)$(l:resources/electrum)Electrum$(). When combined with $(item)$(l:resources/copper)Copper$() in an $(item)$(l:machinery/alloy_smelter)Alloy Smelter$(), it can make $(item)$(l:resources/sterling_silver)Sterling Silver$().", + "text.astromine.resources.silver.page_four.title": "Statistics", + "text.astromine.resources.silver.page_four.text": "$(l)Tools$()$(br)Mining Level: 2$(br)Base Durability: 462$(br)Mining Speed: 6.5$(br)Attack Damage: 2.0$(br)Enchantability: 20$(p)$(l)Armor$()$(br)Durability Multiplier: 17$(br)Total Defense: ?$(br)Toughness: 0$(br)Enchantability: 22", + "text.astromine.resources.electrum.title": "Electrum", + "text.astromine.resources.electrum.page_one.title": "Electrum", + "text.astromine.resources.electrum.page_one.text": "A metal with significant electrical conductivity and golden texture.", + "text.astromine.resources.electrum.page_two.title": "Obtaining Electrum", + "text.astromine.resources.electrum.page_two.text": "Electrum can be obtained by combining 1 Gold Ingot and 1 Silver Ingot in an $(item)$(l:machinery/alloy_smelter)Alloy Smelter$(). This produces 2 $(item)Electrum Ingots$().", + "text.astromine.resources.electrum.page_three.title": "Usages", + "text.astromine.resources.electrum.page_three.text": "Electrum is often used for coins.", + "text.astromine.resources.electrum.page_four.title": "Statistics", + "text.astromine.resources.electrum.page_four.text": "$(l)Tools$()$(br)Mining Level: 2$(br)Base Durability: 185$(br)Mining Speed: 11$(br)Attack Damage: 1.0$(br)Enchantability: 21$(p)$(l)Armor$()$(br)Durability Multiplier: 13$(br)Total Defense: ?$(br)Toughness: 0$(br)Enchantability: 25", + "text.astromine.resources.fools_gold.title": "Fool's Gold", + "text.astromine.resources.fools_gold.page_one.title": "Fool's Gold", + "text.astromine.resources.fools_gold.page_one.text": "A metal with used to obtain sulfur dioxide, which, due to its golden colour, often confuses the unprepared traveller.", + "text.astromine.resources.fools_gold.page_two.title": "Obtaining Fool's Gold", + "text.astromine.resources.fools_gold.page_two.text": "Fool's Gold can be obtained by combining 1 Iron Ingot and 1 Gunpowder in an $(item)$(l:machinery/alloy_smelter)Alloy Smelter$(). This produces 2 $(item)Fool's Gold Ingots$().", + "text.astromine.resources.fools_gold.page_three.title": "Usages", + "text.astromine.resources.fools_gold.page_three.text": "Fool's Gold is often used for coins.", + "text.astromine.resources.fools_gold.page_four.title": "Statistics", + "text.astromine.resources.fools_gold.page_four.text": "$(l)Tools$()$(br)Mining Level: 2$(br)Base Durability: 250$(br)Mining Speed: 6.5$(br)Attack Damage: 2.0$(br)Enchantability: 16$(p)$(l)Armor$()$(br)Durability Multiplier: 15$(br)Total Defense: ?$(br)Toughness: 0$(br)Enchantability: 10", + "text.astromine.resources.rose_gold.title": "Rose Gold", + "text.astromine.resources.rose_gold.page_one.title": "Rose Gold", + "text.astromine.resources.rose_gold.page_one.text": "A metal with significant electrical conductivity and rose, pink texture.", + "text.astromine.resources.rose_gold.page_two.title": "Obtaining Rose Gold", + "text.astromine.resources.rose_gold.page_two.text": "Rose Gold can be obtained by combining 1 Gold Ingot and 1 Silver Ingot in an $(item)$(l:machinery/alloy_smelter)Alloy Smelter$(). This produces 2 $(item)Rose Gold Ingots$().", + "text.astromine.resources.rose_gold.page_three.title": "Usages", + "text.astromine.resources.rose_gold.page_three.text": "Rose Gold is often used for coins.", + "text.astromine.resources.rose_gold.page_four.title": "Statistics", + "text.astromine.resources.rose_gold.page_four.text": "$(l)Tools$()$(br)Mining Level: 1$(br)Base Durability: 64$(br)Mining Speed: 10$(br)Attack Damage: 0.5$(br)Enchantability: 24$(p)$(l)Armor$()$(br)Durability Multiplier: 9$(br)Total Defense: ?$(br)Toughness: 0.1$(br)Enchantability: 25", + "text.astromine.resources.sterling_silver.title": "Sterling Silver", + "text.astromine.resources.sterling_silver.page_one.title": "Sterling Silver", + "text.astromine.resources.sterling_silver.page_one.text": "A metal with significant electrical conductivity and silvery texture.", + "text.astromine.resources.sterling_silver.page_two.title": "Obtaining Sterling Silver", + "text.astromine.resources.sterling_silver.page_two.text": "Sterling Silver can be obtained by combining 3 Silver Ingots and 1 Copper Ingot in an $(item)$(l:machinery/alloy_smelter)Alloy Smelter$(). This produces 4 $(item)Sterling Silver Ingots$().", + "text.astromine.resources.sterling_silver.page_three.title": "Usages", + "text.astromine.resources.sterling_silver.page_three.text": "Sterling Silver is often used for tooling.", + "text.astromine.resources.sterling_silver.page_four.title": "Statistics", + "text.astromine.resources.sterling_silver.page_four.text": "$(l)Tools$()$(br)Mining Level: 2$(br)Base Durability: 697$(br)Mining Speed: 7$(br)Attack Damage: 2.5$(br)Enchantability: 20$(p)$(l)Armor$()$(br)Durability Multiplier: 18$(br)Total Defense: ?$(br)Toughness: 0.1$(br)Enchantability: 23", + "text.astromine.resources.asterite.title": "Asterite", + "text.astromine.resources.asterite.page_one.title": "Asterite", + "text.astromine.resources.asterite.page_one.text": "A fragment of a long dead star, this red gem may look frail to an untrained observer - one who does not know its significant strengths. $(p)Its properties allow for qualified craftsmen to create powerful tooling.", + "text.astromine.resources.asterite.page_two.title": "Obtaining Asterite", + "text.astromine.resources.asterite.page_two.text": "$(item)Asterite Ore$() can be found inside $(thing)$(l:world/asteroids)Asteroids$() in $(thing)Space$().$(p)Mining requires a $(item)Netherite Pickaxe$() (Mining Level 4) or better, usually resulting in a single $(item)Asterite Cluster$() which can forged into an $(item)Asterite$() gem.", + "text.astromine.resources.asterite.page_three.title": "Usages", + "text.astromine.resources.asterite.page_three.text": "Asterite can be used to create powerful tooling.", + "text.astromine.resources.asterite.page_four.title": "Statistics", + "text.astromine.resources.asterite.page_four.text": "$(l)Tools$()$(br)Mining Level: 5$(br)Base Durability: 2015$(br)Mining Speed: 10$(br)Attack Damage: 5$(br)Enchantability: 20$(p)$(l)Armor$()$(br)Durability Multiplier: 22$(br)Total Defense: 23$(br)Toughness: 4$(br)Enchantability: 20", + "text.astromine.resources.galaxium.title": "Galaxium", + "text.astromine.resources.galaxium.page_one.title": "Galaxium", + "text.astromine.resources.galaxium.page_one.text": "A rare gem with a deep, overwhelming dark shine. Extraordinarily dense, this material is theorised to be obtained from large clusters at the center of galaxies.$(p)There are no records of such phenomena, but one's journey holds the keys to many secrets never thought of before.", + "text.astromine.resources.galaxium.page_two.title": "Obtaining Galaxium", + "text.astromine.resources.galaxium.page_two.text": "$(item)Galaxium Ore$() can be rarely found inside $(thing)$(l:world/asteroids)Asteroids$() in $(thing)Space$().$(p)Galaxium Ore mining will require an $(item)Asterite Pickaxe$() (Mining Level 5) or better, usually resulting in a single $(item)$(l:world/ore_clusters)Galaxium Cluster$() which can be forged into a $(item)Galaxium$() gem.", + "text.astromine.resources.galaxium.page_three.title": "Usages", + "text.astromine.resources.galaxium.page_three.text": "Galaxium can be used to create extremely resistant tooling and exquisite technology.", + "text.astromine.resources.galaxium.page_four.title": "Statistics", + "text.astromine.resources.galaxium.page_four.text": "$(l)Tools$()$(br)Mining Level: 6$(br)Base Durability: 3072$(br)Mining Speed: 11$(br)Attack Damage: 5$(br)Enchantability: 18$(p)$(l)Armor$()$(br)Durability Multiplier: 44$(br)Total Defense: 25$(br)Toughness: 4.5$(br)Enchantability: 18", + "text.astromine.resources.metite.title": "Metite", + "text.astromine.resources.metite.page_one.title": "Metite", + "text.astromine.resources.metite.page_one.text": "A foreign metal, Metite withstands immense pressures; being essential in all areas of space travel.$(p)Acquiring it is considered a major stepping stone in one's interstellar journey.", + "text.astromine.resources.metite.page_two.title": "Obtaining Metite", + "text.astromine.resources.metite.page_two.text": "$(item)Metite Ore$() can be found inside $(thing)$(l:world/meteors)Meteors$() which have impacted on $(thing)Earth$(), or in $(thing)$(l:world/asteroids)Asteroids$() in $(thing)Space$().$(p)Mining requires a $(item)Netherite Pickaxe$() (Mining Level 4) or better, usually resulting in between 1 and 3 $(item)$(l:world/ore_clusters)Metite Clusters$() which can forged into a $(item)Metite Ingot$().", + "text.astromine.resources.metite.page_three.title": "Usages", + "text.astromine.resources.metite.page_three.text": "Metite can be used to create standard tooling; however, it is of much more use in creating astronautical technology.", + "text.astromine.resources.metite.page_four.title": "Statistics", + "text.astromine.resources.metite.page_four.text": "$(l)Tools$()$(br)Mining Level: 1$(br)Base Durability: 853$(br)Mining Speed: 13$(br)Attack Damage: 4$(br)Enchantability: 5$(p)$(l)Armor$()$(br)Durability Multiplier: 15$(br)Total Defense: 14$(br)Toughness: 0$(br)Enchantability: 7", + "text.astromine.resources.stellum.title": "Stellum", + "text.astromine.resources.stellum.page_one.title": "Stellum", + "text.astromine.resources.stellum.page_one.text": "A fragment of a living star, the raw energy contained within this material is surpassed only by few, every molecule of it vibrating with $(thing)Stellar Energy$().", + "text.astromine.resources.stellum.page_two.title": "Obtaining Stellum", + "text.astromine.resources.stellum.page_two.text": "$(item)Stellum Ore$() can be found inside $(thing)$(l:world/asteroids)Asteroids$() in $(thing)Space$().$(p)Mining requires an $(item)Asterite Pickaxe$() (Mining Level 5) or better, usually resulting in a single $(item)$(l:world/ore_clusters)Stellum Cluster$() which can be forged into a $(item)Stellum Ingot$().", + "text.astromine.resources.stellum.page_three.title": "Usages", + "text.astromine.resources.stellum.page_three.text": "Stellum can be used to create powerful tooling roughly equivalent to $(thing)$(l:resources/asterite)Asterite$(). Born from the heart of a living star, it is fire proof to an extent never seen before; and posses a power that, when harnessed, can power an entire civilisation.", + "text.astromine.resources.stellum.page_four.title": "Statistics", + "text.astromine.resources.stellum.page_four.text": "$(l)Tools$()$(br)Mining Level: 5$(br)Base Durability: 2643$(br)Mining Speed: 8$(br)Attack Damage: 6$(br)Enchantability: 15$(br)Fireproof$(p)$(l)Armor$()$(br)Durability Multiplier: 41$(br)Total Defense: 16$(br)Toughness: 6$(br)Enchantability: 15$(br)Fireproof", + "text.astromine.resources.univite.title": "Univite", + "text.astromine.resources.univite.page_one.title": "Univite", + "text.astromine.resources.univite.page_one.text": "A material so highly coveted it has sparked numerous interstellar wars; only a limited amount of it exists within this realm, thought to have originated at the heart of the universe, before any of us even dared the thought of existence. It is unknown whether any material conveys higher power than Univite.", + "text.astromine.resources.univite.page_two.title": "Obtaining Univite", + "text.astromine.resources.univite.page_two.text": "A theorised origin and limited existence means immense difficulty in being obtained; with no way but theft available to small civilisations.$(p)Or, y'know, the temporary recipe we added. But that's not canon.", + "text.astromine.resources.univite.page_three.title": "Usages", + "text.astromine.resources.univite.page_three.text": "Univite can be used to create the strongest tooling and weaponry known by all discovered civilisations.", + "text.astromine.resources.univite.page_four.title": "Statistics", + "text.astromine.resources.univite.page_four.text": "$(l)Tools$()$(br)Mining Level: 7$(br)Base Durability: 3918$(br)Mining Speed: 12$(br)Attack Damage: 6$(br)Enchantability: 22$(br)Fireproof$(p)$(l)Armor$()$(br)Durability Multiplier: 50$(br)Total Defense: 27$(br)Toughness: 5$(br)Enchantability: 22$(br)Fireproof", + "text.astromine.warfare.nuclear_warhead.title": "Nuclear Warhead", + "text.astromine.warfare.nuclear_warhead.page_one.title": "Nuclear Warhead", + "text.astromine.warfare.nuclear_warhead.page_one.text": "A bomb capable of devastating destruction, terminating all life-forms in the process.", + "text.astromine.warfare.nuclear_warhead.page_two.title": "Recipe", + "text.astromine.world.asteroid_ores.title": "Asteroid Ores", + "text.astromine.world.asteroid_ores.page_one.title": "Asteroid Ores", + "text.astromine.world.asteroid_ores.page_one.text": "Veins of ores found in $(thing)$(l:world/asteroids)asteroids$(), which may be harvested for resources.$(p)When mined, will drop their respective $(thing)$(l:world/ore_clusters)ore clusters$().", + "text.astromine.world.asteroids.title": "Asteroids", + "text.astromine.world.asteroids.page_one.title": "Asteroids", + "text.astromine.world.asteroids.page_one.text": "Foreign bodies found cruising through interstellar space, in rings, clusters and many other formations; said to contain large quantities of $(thing)$(l:world/asteroid_ores)ores$().", + "text.astromine.world.meteor_ores.title": "Meteor Ores", + "text.astromine.world.meteor_ores.page_one.title": "Meteor Ores", + "text.astromine.world.meteor_ores.page_one.text": "Veins of ores found in $(thing)$(l:world/meteors)meteors$(), which may be harvested for resources.$(p)When mined, will drop their respective $(thing)$(l:world/ore_clusters)ore clusters$().", + "text.astromine.world.meteors.title": "Meteors", + "text.astromine.world.meteors.page_one.title": "Meteors", + "text.astromine.world.meteors.page_one.text": "Foreign bodies that, cruising through the stairs, collided with a planetary body; said to contain $(thing)$(l:world/meteor_ores)extraterrestrial ores$().", + "text.astromine.world.ore_clusters.title": "Ore Clusters", + "text.astromine.world.ore_clusters.page_one.title": "Ore Clusters", + "text.astromine.world.ore_clusters.page_one.text": "Clusters of ores obtained from $(thing)$(l:world/asteroid_ores)asteroid ores$() or $(thing)$(l:world/meteor_ores)meteor ores$(), which may be processed for resources.", + "text.astromine.world.ore_clusters.page_two.title": "Processing", + "text.astromine.world.ore_clusters.page_two.text": "Triturating clusters will result in two of their respective $(thing)dusts$().", + "text.autoconfig.astromine/config.text": "Astromine Config", + "advancements.astromine.root.title": "Astromine", + "advancements.astromine.root.description": "Adventures to infinity and beyond", + "advancements.astromine.underestimate_metite.title": "Underestimating Alien Ores", + "advancements.astromine.underestimate_metite.description": "Attempt to mine Metite Ore with an insufficient pickaxe (You need Netherite!)", + "advancements.astromine.enter_space.title": "The Final Frontier", + "advancements.astromine.enter_space.description": "Enter Space", + "advancements.astromine.fall_to_earth.title": "Fall From The Heavens", + "advancements.astromine.fall_to_earth.description": "Fall back down to Earth", + "advancements.astromine.get_fire_extinguisher.title": "Fireman Steve", + "advancements.astromine.get_fire_extinguisher.description": "Craft a Fire Extinguisher", + "advancements.astromine.use_fire_extinguisher.title": "Realistic Physics", + "advancements.astromine.use_fire_extinguisher.description": "Propel yourself with a Fire Extinguisher", + "advancements.astromine.properly_use_fire_extinguisher.title": "The Hero Next Door", + "advancements.astromine.properly_use_fire_extinguisher.description": "Extinguish a mob that's on fire", + "advancements.astromine.get_meteor_stone.title": "(Space) Stone Age", + "advancements.astromine.get_meteor_stone.description": "Mine Meteor Stone with a strong pickaxe", + "advancements.astromine.get_metite_ingot.title": "Metal From The Stars", + "advancements.astromine.get_metite_ingot.description": "Obtain a Metite Ingot", + "advancements.astromine.get_stellum_ingot.title": "It's Full of Stars", + "advancements.astromine.get_stellum_ingot.description": "Obtain a Stellum Ingot", + "advancements.astromine.get_galaxium.title": "Hidden Gem", + "advancements.astromine.get_galaxium.description": "Obtain Galaxium", + "advancements.astromine.get_univite_ingot.title": "Univite Says Gay Rights", + "advancements.astromine.get_univite_ingot.description": "Obtain a Univite Ingot", + "advancements.astromine.get_univite_armor.title": "Cover Me in Rainbows", + "advancements.astromine.get_univite_armor.description": "Get a full suit of Univite Armor", + "advancements.astromine.get_space_suit.title": "Ready For The Unknown", + "advancements.astromine.get_space_suit.description": "Get a full Space Suit", + "advancements.astromine.launch_rocket.title": "We Have Liftoff", + "advancements.astromine.launch_rocket.description": "Launch a Rocket", + "advancements.astromine.tricked_piglin.title": "Shame On You", + "advancements.astromine.tricked_piglin.description": "Scam a Piglin with Fool's Gold", + "advancements.astromine.get_bronze_ingot.title": "Third Place", + "advancements.astromine.get_bronze_ingot.description": "Obtain a Bronze Ingot", + "advancements.astromine.get_fools_gold_ingot.title": "Only Fools", + "advancements.astromine.get_fools_gold_ingot.description": "Obtain a Fool's Gold Ingot", + "advancements.astromine.get_steel_ingot.title": "Steel Yourself", + "advancements.astromine.get_steel_ingot.description": "Obtain a Steel Ingot", + "advancements.astromine.get_sterling_silver_ingot.title": "Like Silver, But Sterling-er", + "advancements.astromine.get_sterling_silver_ingot.description": "Obtain a Sterling Silver Ingot", + "advancements.astromine.get_chassis.title": "Heart of the Machine", + "advancements.astromine.get_chassis.description": "Craft a Machine Chassis", + "advancements.astromine.get_alloy_smelter.title": "With Our Metals Combined", + "advancements.astromine.get_alloy_smelter.description": "Craft an Alloy Smelter", + "advancements.astromine.get_electric_smelter.title": "Hot Topic 2: Electric Boogaloo", + "advancements.astromine.get_electric_smelter.description": "Craft an Electric Smelter", + "advancements.astromine.get_presser.title": "Pressing Matters", + "advancements.astromine.get_presser.description": "Craft a Presser", + "advancements.astromine.get_triturator.title": "AKA Pulveriser", + "advancements.astromine.get_triturator.description": "Craft a Triturator", + "advancements.astromine.get_gear.title": "Grinds Your Gears", + "advancements.astromine.get_gear.description": "Craft a Gear", + "advancements.astromine.get_plates.title": "Flat Ingots", + "advancements.astromine.get_plates.description": "Craft some Plates", + "advancements.astromine.get_rose_gold_ingot.title": "Pretty in Pink", + "advancements.astromine.get_rose_gold_ingot.description": "Obtain a Rose Gold Ingot", + "advancements.astromine.get_basic_circuit.title": "Circuit Maker", + "advancements.astromine.get_basic_circuit.description": "Craft a Basic Circuit", + "advancements.astromine.get_advanced_circuit.title": "Super Circuit Maker", + "advancements.astromine.get_advanced_circuit.description": "Craft an Advanced Circuit", + "advancements.astromine.get_elite_circuit.title": "New Super Circuit Maker U Deluxe", + "advancements.astromine.get_elite_circuit.description": "Craft an Elite Circuit" +} \ No newline at end of file diff --git a/astromine-core/src/main/resources/assets/astromine/lang/en_ca.json b/astromine-core/src/main/resources/assets/astromine/lang/en_ca.json new file mode 100644 index 000000000..292a2ecfe --- /dev/null +++ b/astromine-core/src/main/resources/assets/astromine/lang/en_ca.json @@ -0,0 +1,1030 @@ +{ + "block.minecraft.empty": "Empty", + "entity.astromine.super_space_slime": "Jelanium: Super Space Slime", + "entity.astromine.space_slime": "Space Slime", + "entity.astromine.primitive_rocket": "Primitive Rocket", + "text.astromine.rocket.disassemble_empty_fuel": "Rocket experienced rapid unscheduled disassembly: no fuel loaded!", + "text.astromine.rocket.disassemble_collision": "Rocket experienced rapid unscheduled disassembly: trajectory obstructed!", + "text.astromine.rocket.disassemble_invalid_fuel": "Rocket experienced rapid unscheduled disassembly: incorrect fuel loaded!", + "text.astromine.message.holographic_connection_successful": "Succeeded in connecting projector at %s with projector at %s.", + "text.astromine.message.holographic_connection_failed": "Failed to connect projector at %s with projector at %s.", + "text.astromine.message.holographic_connection_clear": "Cleared selected projectors!", + "text.astromine.message.holographic_connector_select": "Selected projector at %s!", + "text.astromine.tooltip.fractional_bar": "%s of %s (%s)", + "text.astromine.tooltip.fractional_value": "%s/%s", + "text.astromine.tooltip.fractional_value_simple": "%s", + "text.astromine.tooltip.energy_value": "%s E", + "text.astromine.tooltip.compound_energy_value": "%s/%s E", + "text.astromine.tooltip.speed": "%sx speed", + "text.astromine.tooltip.cable.speed": "%s E/t", + "text.astromine.fluid": "Fluid", + "text.astromine.energy": "Energy", + "text.astromine.item": "Item", + "text.astromine.base": "Base", + "text.astromine.up": "Up", + "text.astromine.down": "Down", + "text.astromine.left": "Left", + "text.astromine.right": "Right", + "text.astromine.front": "Front", + "text.astromine.back": "Back", + "text.astromine.siding.input": "§bInput", + "text.astromine.siding.output": "§6Output", + "text.astromine.siding.input_output": "§bInput §7/ §6Output", + "text.astromine.siding.none": "§7None", + "text.astromine.siding.disabled": "§7§mDisabled", + "text.astromine.siding.west": "Right", + "text.astromine.siding.east": "Left", + "text.astromine.siding.up": "Top", + "text.astromine.siding.down": "Bottom", + "text.astromine.siding.north": "Front", + "text.astromine.siding.south": "Back", + "text.astromine.rocket.launch": "Launch", + "text.astromine.rocket.destroy": "Destroy!", + "text.astromine.rocket.fuel_status": "Fuel sufficient for %s of flight time.", + "item.astromine.primitive_machine_chassis": "Primitive Machine Chassis", + "item.astromine.basic_machine_chassis": "Basic Machine Chassis", + "item.astromine.advanced_machine_chassis": "Advanced Machine Chassis", + "item.astromine.elite_machine_chassis": "Elite Machine Chassis", + "item.astromine.graphite_sheet": "Graphite Sheet", + "item.astromine.gas_canister": "Gas Canister", + "item.astromine.pressurized_gas_canister": "Pressurised Gas Canister", + "item.astromine.basic_battery": "Basic Battery", + "item.astromine.advanced_battery": "Advanced Battery", + "item.astromine.elite_battery": "Elite Battery", + "item.astromine.creative_battery": "Creative Battery", + "item.astromine.fire_extinguisher": "Fire Extinguisher", + "item.astromine.holographic_connector": "Holographic Connector", + "item.astromine.holographic_bridge_projector": "Holographic Bridge Projector", + "item.astromine.primitive_rocket_fuel_tank": "Primitive Rocket Fuel Tank", + "item.astromine.primitive_rocket_hull": "Primitive Rocket Hull", + "item.astromine.primitive_rocket_plating": "Primitive Rocket Plating", + "item.astromine.primitive_rocket_booster": "Primitive Rocket Booster", + "itemGroup.astromine.core": "Astromine: Core", + "itemGroup.astromine.discoveries": "Astromine: Discoveries", + "itemGroup.astromine.foundations": "Astromine: Foundations", + "itemGroup.astromine.transportations": "Astromine: Transportations", + "itemGroup.astromine.technologies": "Astromine: Technologies", + "block.astromine.electrolyzer": "Electrolyser", + "block.astromine.fluid_mixer": "Fluid Mixer", + "block.astromine.creative_capacitor": "Creative Capacitor", + "block.astromine.creative_buffer": "Creative Buffer", + "block.astromine.primitive_buffer": "Primitive Buffer", + "block.astromine.basic_buffer": "Basic Buffer", + "block.astromine.advanced_buffer": "Advanced Buffer", + "block.astromine.elite_buffer": "Elite Buffer", + "block.astromine.vent": "Vent", + "block.astromine.primitive_solid_generator": "Primitive Solid Generator", + "block.astromine.basic_solid_generator": "Basic Solid Generator", + "block.astromine.advanced_solid_generator": "Advanced Solid Generator", + "block.astromine.elite_solid_generator": "Elite Solid Generator", + "block.astromine.primitive_liquid_generator": "Primitive Liquid Generator", + "block.astromine.basic_liquid_generator": "Basic Liquid Generator", + "block.astromine.advanced_liquid_generator": "Advanced Liquid Generator", + "block.astromine.elite_liquid_generator": "Elite Liquid Generator", + "block.astromine.primitive_presser": "Primitive Presser", + "block.astromine.basic_presser": "Basic Presser", + "block.astromine.advanced_presser": "Advanced Presser", + "block.astromine.elite_presser": "Elite Presser", + "block.astromine.primitive_triturator": "Primitive Triturator", + "block.astromine.basic_triturator": "Basic Triturator", + "block.astromine.advanced_triturator": "Advanced Triturator", + "block.astromine.elite_triturator": "Elite Triturator", + "block.astromine.primitive_electric_smelter": "Primitive Electric Smelter", + "block.astromine.basic_electric_smelter": "Basic Electric Smelter", + "block.astromine.advanced_electric_smelter": "Advanced Electric Smelter", + "block.astromine.elite_electric_smelter": "Elite Electric Smelter", + "block.astromine.primitive_alloy_smelter": "Primitive Alloy Smelter", + "block.astromine.basic_alloy_smelter": "Basic Alloy Smelter", + "block.astromine.advanced_alloy_smelter": "Advanced Alloy Smelter", + "block.astromine.elite_alloy_smelter": "Elite Alloy Smelter", + "block.astromine.primitive_electrolyzer": "Primitive Electrolyser", + "block.astromine.basic_electrolyzer": "Basic Electrolyser", + "block.astromine.advanced_electrolyzer": "Advanced Electrolyser", + "block.astromine.elite_electrolyzer": "Elite Electrolyser", + "block.astromine.primitive_refinery": "Primitive Refinery", + "block.astromine.basic_refinery": "Basic Refinery", + "block.astromine.advanced_refinery": "Advanced Refinery", + "block.astromine.elite_refinery": "Elite Refinery", + "block.astromine.primitive_fluid_mixer": "Primitive Fluid Mixer", + "block.astromine.basic_fluid_mixer": "Basic Fluid Mixer", + "block.astromine.advanced_fluid_mixer": "Advanced Fluid Mixer", + "block.astromine.elite_fluid_mixer": "Elite Fluid Mixer", + "block.astromine.fluid_cable": "Fluid Cable", + "block.astromine.primitive_energy_cable": "Primitive Energy Cable", + "block.astromine.basic_energy_cable": "Basic Energy Cable", + "block.astromine.advanced_energy_cable": "Advanced Energy Cable", + "block.astromine.elite_energy_cable": "Elite Energy Cable", + "block.astromine.primitive_capacitor": "Primitive Capacitor", + "block.astromine.basic_capacitor": "Basic Capacitor", + "block.astromine.advanced_capacitor": "Advanced Capacitor", + "block.astromine.elite_capacitor": "Elite Capacitor", + "block.astromine.airlock": "Airlock Door", + "block.astromine.altar_pedestal": "Altar Pedestal", + "block.astromine.altar": "Altar", + "item.astromine.tin_wire": "Tin Wire", + "item.astromine.copper_wire": "Copper Wire", + "item.astromine.silver_wire": "Silver Wire", + "item.astromine.lead_wire": "Lead Wire", + "item.astromine.gold_wire": "Gold Wire", + "item.astromine.steel_wire": "Steel Wire", + "item.astromine.electrum_wire": "Electrum Wire", + "block.astromine.primitive_tank": "Primitive Tank", + "block.astromine.basic_tank": "Basic Tank", + "block.astromine.advanced_tank": "Advanced Tank", + "block.astromine.elite_tank": "Elite Tank", + "block.astromine.creative_tank": "Creative Tank", + "block.astromine.fluid_extractor": "Fluid Extractor", + "block.astromine.fluid_inserter": "Fluid Inserter", + "block.astromine.block_breaker": "Block Breaker", + "block.astromine.block_placer": "Block Placer", + "block.astromine.nuclear_warhead": "Nuclear Warhead", + "block.astromine.holographic_bridge_projector": "Holographic Bridge Projector", + "block.astromine.asteroid_stone": "Asteroid Stone", + "block.astromine.moon_stone": "Moon Stone", + "block.astromine.blazing_asteroid_stone": "Blazing Asteroid Stone", + "block.astromine.meteor_stone": "Meteor Stone", + "block.astromine.tin_ore": "Tin Ore", + "block.astromine.copper_ore": "Copper Ore", + "block.astromine.silver_ore": "Silver Ore", + "block.astromine.lead_ore": "Lead Ore", + "block.astromine.asteroid_metite_ore": "Asteroid Metite Ore", + "block.astromine.meteor_metite_ore": "Meteor Metite Ore", + "block.astromine.asterite_block": "Block of Asterite", + "block.astromine.galaxium_block": "Block of Galaxium", + "block.astromine.metite_block": "Block of Metite", + "block.astromine.stellum_block": "Block of Stellum", + "block.astromine.univite_block": "Block of Univite", + "block.astromine.lunum_block": "Block of Lunum", + "block.astromine.tin_block": "Block of Tin", + "block.astromine.copper_block": "Block of Copper", + "block.astromine.silver_block": "Block of Silver", + "block.astromine.lead_block": "Block of Lead", + "block.astromine.bronze_block": "Block of Bronze", + "block.astromine.steel_block": "Block of Steel", + "block.astromine.electrum_block": "Block of Electrum", + "block.astromine.rose_gold_block": "Block of Rose Gold", + "block.astromine.sterling_silver_block": "Block of Sterling Silver", + "block.astromine.fools_gold_block": "Block of Fool's Gold", + "block.astromine.meteoric_steel_block": "Block of Meteoric Steel", + "block.astromine.asteroid_coal_ore": "Asteroid Coal Ore", + "block.astromine.asteroid_iron_ore": "Asteroid Iron Ore", + "block.astromine.asteroid_gold_ore": "Asteroid Gold Ore", + "block.astromine.asteroid_redstone_ore": "Asteroid Redstone Ore", + "block.astromine.asteroid_lapis_ore": "Asteroid Lapis Ore", + "block.astromine.asteroid_diamond_ore": "Asteroid Diamond Ore", + "block.astromine.asteroid_asterite_ore": "Asteroid Asterite Ore", + "block.astromine.asteroid_stellum_ore": "Asteroid Stellum Ore", + "block.astromine.asteroid_galaxium_ore": "Asteroid Galaxium Ore", + "block.astromine.asteroid_emerald_ore": "Asteroid Emerald Ore", + "block.astromine.asteroid_tin_ore": "Asteroid Tin Ore", + "block.astromine.asteroid_copper_ore": "Asteroid Copper Ore", + "block.astromine.asteroid_silver_ore": "Asteroid Silver Ore", + "block.astromine.asteroid_lead_ore": "Asteroid Lead Ore", + "block.astromine.moon_lunum_ore": "Lunum Ore", + "block.astromine.meteor_stone_slab": "Meteor Stone Slab", + "block.astromine.meteor_stone_stairs": "Meteor Stone Stairs", + "block.astromine.meteor_stone_wall": "Meteor Stone Wall", + "block.astromine.asteroid_stone_slab": "Asteroid Stone Slab", + "block.astromine.asteroid_stone_stairs": "Asteroid Stone Stairs", + "block.astromine.asteroid_stone_wall": "Asteroid Stone Wall", + "block.astromine.moon_stone_slab": "Moon Stone Slab", + "block.astromine.moon_stone_stairs": "Moon Stone Stairs", + "block.astromine.moon_stone_wall": "Moon Stone Wall", + "block.astromine.martian_stone_slab": "Martian Stone Slab", + "block.astromine.martian_stone_stairs": "Martian Stone Stairs", + "block.astromine.martian_stone_wall": "Martian Stone Wall", + "block.astromine.vulcan_stone_slab": "Vulcan Stone Slab", + "block.astromine.vulcan_stone_stairs": "Vulcan Stone Stairs", + "block.astromine.vulcan_stone_wall": "Vulcan Stone Wall", + "block.astromine.martian_soil": "Martian Soil", + "block.astromine.martian_stone": "Martian Stone", + "block.astromine.vulcan_stone": "Vulcan Stone", + "block.astromine.oxygen": "Oxygen", + "block.astromine.hydrogen": "Hydrogen", + "block.astromine.crude_oil": "Crude Oil", + "block.astromine.residual_fuel_oil": "Residual Fuel Oil", + "block.astromine.heavy_gas_oil": "Heavy Gas Oil", + "block.astromine.diesel": "Diesel", + "block.astromine.kerosene": "Kerosene", + "block.astromine.naphtha": "Naphtha", + "block.astromine.gasoline": "Petrol", + "block.astromine.butane": "Butane", + "block.astromine.kerosene_oxygen_fuel": "Kerosene-Oxygen Fuel", + "block.astromine.alternator": "Alternator", + "block.astromine.splitter": "Splitter", + "block.astromine.incinerator": "Incinerator", + "block.astromine.inserter": "Inserter", + "block.astromine.fast_inserter": "Fast Inserter", + "block.astromine.basic_conveyor": "Basic Conveyor", + "block.astromine.basic_vertical_conveyor": "Basic Vertical Conveyor", + "block.astromine.basic_downward_vertical_conveyor": "Basic Downward Vertical Conveyor", + "block.astromine.advanced_conveyor": "Advanced Conveyor", + "block.astromine.advanced_vertical_conveyor": "Advanced Vertical Conveyor", + "block.astromine.advanced_downward_vertical_conveyor": "Advanced Downward Vertical Conveyor", + "block.astromine.elite_conveyor": "Elite Conveyor", + "block.astromine.elite_vertical_conveyor": "Elite Vertical Conveyor", + "block.astromine.elite_downward_vertical_conveyor": "Elite Downward Vertical Conveyor", + "block.astromine.catwalk": "Catwalk", + "block.astromine.catwalk_stairs": "Catwalk Stairs", + "gas.astromine.oxygen": "Oxygen", + "gas.astromine.rocket_fuel": "Rocket Fuel", + "gas.minecraft.empty": "Vacuum", + "item.astromine.oxygen_bucket": "Oxygen Bucket", + "item.astromine.hydrogen_bucket": "Hydrogen Bucket", + "item.astromine.crude_oil_bucket": "Crude Oil Bucket", + "item.astromine.residual_fuel_oil_bucket": "Residual Fuel Oil Bucket", + "item.astromine.heavy_gas_oil_bucket": "Heavy Gas Oil Bucket", + "item.astromine.diesel_bucket": "Diesel Bucket", + "item.astromine.kerosene_bucket": "Kerosene Bucket", + "item.astromine.naphtha_bucket": "Naphtha Bucket", + "item.astromine.gasoline_bucket": "Petrol Bucket", + "item.astromine.butane_bucket": "Butane Bucket", + "item.astromine.kerosene_oxygen_fuel_bucket": "Kerosene-Oxygen Fuel Bucket", + "block.astromine.rocket_fuel": "Rocket Fuel Bucket", + "item.astromine.energy": "Energy", + "item.astromine.fluid": "Fluid", + "item.astromine.item": "Item", + "item.astromine.rocket_fuel_bucket": "Rocket Fuel Bucket", + "item.astromine.asterite_fragment": "Asterite Fragment", + "item.astromine.meteor_metite_cluster": "Meteor Metite Cluster", + "item.astromine.asteroid_metite_cluster": "Asteroid Metite Cluster", + "item.astromine.asteroid_coal_cluster": "Asteroid Coal Cluster", + "item.astromine.asteroid_iron_cluster": "Asteroid Iron Cluster", + "item.astromine.asteroid_gold_cluster": "Asteroid Gold Cluster", + "item.astromine.asteroid_redstone_cluster": "Asteroid Redstone Cluster", + "item.astromine.asteroid_lapis_cluster": "Asteroid Lapis Cluster", + "item.astromine.asteroid_diamond_cluster": "Asteroid Diamond Cluster", + "item.astromine.asteroid_emerald_cluster": "Asteroid Emerald Cluster", + "item.astromine.asteroid_asterite_cluster": "Asteroid Asterite Cluster", + "item.astromine.asteroid_stellum_cluster": "Asteroid Stellum Cluster", + "item.astromine.asteroid_galaxium_cluster": "Asteroid Galaxium Cluster", + "item.astromine.asteroid_tin_cluster": "Asteroid Tin Cluster", + "item.astromine.asteroid_copper_cluster": "Asteroid Copper Cluster", + "item.astromine.asteroid_silver_cluster": "Asteroid Silver Cluster", + "item.astromine.asteroid_lead_cluster": "Asteroid Lead Cluster", + "item.astromine.iron_dust": "Iron Dust", + "item.astromine.metite_dust": "Metite Dust", + "item.astromine.gold_dust": "Gold Dust", + "item.astromine.lapis_dust": "Lapis Dust", + "item.astromine.diamond_dust": "Diamond Dust", + "item.astromine.emerald_dust": "Emerald Dust", + "item.astromine.netherite_dust": "Netherite Dust", + "item.astromine.coal_dust": "Coal Dust", + "item.astromine.charcoal_dust": "Charcoal Dust", + "item.astromine.quartz_dust": "Quartz Dust", + "item.astromine.raw_netherite_dust": "Raw Netherite Dust", + "item.astromine.asterite_dust": "Asterite Dust", + "item.astromine.stellum_dust": "Stellum Dust", + "item.astromine.galaxium_dust": "Galaxium Dust", + "item.astromine.univite_dust": "Univite Dust", + "item.astromine.lunum_dust": "Lunum Dust", + "item.astromine.tin_dust": "Tin Dust", + "item.astromine.copper_dust": "Copper Dust", + "item.astromine.silver_dust": "Silver Dust", + "item.astromine.lead_dust": "Lead Dust", + "item.astromine.bronze_dust": "Bronze Dust", + "item.astromine.steel_dust": "Steel Dust", + "item.astromine.electrum_dust": "Electrum Dust", + "item.astromine.rose_gold_dust": "Rose Gold Dust", + "item.astromine.sterling_silver_dust": "Sterling Silver Dust", + "item.astromine.fools_gold_dust": "Fool's Gold Dust", + "item.astromine.meteoric_steel_dust": "Meteoric Steel Dust", + "item.astromine.redstone_tiny_dust": "Redstone Tiny Dust", + "item.astromine.iron_tiny_dust": "Iron Tiny Dust", + "item.astromine.metite_tiny_dust": "Metite Tiny Dust", + "item.astromine.gold_tiny_dust": "Gold Tiny Dust", + "item.astromine.lapis_tiny_dust": "Lapis Tiny Dust", + "item.astromine.diamond_tiny_dust": "Diamond Tiny Dust", + "item.astromine.emerald_tiny_dust": "Emerald Tiny Dust", + "item.astromine.netherite_tiny_dust": "Netherite Tiny Dust", + "item.astromine.coal_tiny_dust": "Coal Tiny Dust", + "item.astromine.charcoal_tiny_dust": "Charcoal Tiny Dust", + "item.astromine.quartz_tiny_dust": "Quartz Tiny Dust", + "item.astromine.raw_netherite_tiny_dust": "Raw Netherite Tiny Dust", + "item.astromine.asterite_tiny_dust": "Asterite Tiny Dust", + "item.astromine.stellum_tiny_dust": "Stellum Tiny Dust", + "item.astromine.galaxium_tiny_dust": "Galaxium Tiny Dust", + "item.astromine.univite_tiny_dust": "Univite Tiny Dust", + "item.astromine.lunum_tiny_dust": "Lunum Tiny Dust", + "item.astromine.tin_tiny_dust": "Tin Tiny Dust", + "item.astromine.copper_tiny_dust": "Copper Tiny Dust", + "item.astromine.silver_tiny_dust": "Silver Tiny Dust", + "item.astromine.lead_tiny_dust": "Lead Tiny Dust", + "item.astromine.bronze_tiny_dust": "Bronze Tiny Dust", + "item.astromine.steel_tiny_dust": "Steel Tiny Dust", + "item.astromine.electrum_tiny_dust": "Electrum Tiny Dust", + "item.astromine.rose_gold_tiny_dust": "Rose Gold Tiny Dust", + "item.astromine.sterling_silver_tiny_dust": "Sterling Silver Tiny Dust", + "item.astromine.fools_gold_tiny_dust": "Fool's Gold Tiny Dust", + "item.astromine.glowstone_tiny_dust": "Glowstone Tiny Dust", + "item.astromine.meteoric_steel_tiny_dust": "Meteoric Steel Tiny Dust", + "item.astromine.iron_plates": "Iron Plates", + "item.astromine.metite_plates": "Metite Plates", + "item.astromine.gold_plates": "Gold Plates", + "item.astromine.netherite_plates": "Netherite Plates", + "item.astromine.stellum_plates": "Stellum Plates", + "item.astromine.univite_plates": "Univite Plates", + "item.astromine.tin_plates": "Tin Plates", + "item.astromine.copper_plates": "Copper Plates", + "item.astromine.silver_plates": "Silver Plates", + "item.astromine.lead_plates": "Lead Plates", + "item.astromine.bronze_plates": "Bronze Plates", + "item.astromine.steel_plates": "Steel Plates", + "item.astromine.electrum_plates": "Electrum Plates", + "item.astromine.rose_gold_plates": "Rose Gold Plates", + "item.astromine.sterling_silver_plates": "Sterling Silver Plates", + "item.astromine.fools_gold_plates": "Fool's Gold Plates", + "item.astromine.lunum_plates": "Lunum Plates", + "item.astromine.meteoric_steel_plates": "Meteoric Steel Plates", + "item.astromine.iron_gear": "Iron Gear", + "item.astromine.metite_gear": "Metite Gear", + "item.astromine.gold_gear": "Gold Gear", + "item.astromine.netherite_gear": "Netherite Gear", + "item.astromine.stellum_gear": "Stellum Gear", + "item.astromine.univite_gear": "Univite Gear", + "item.astromine.tin_gear": "Tin Gear", + "item.astromine.copper_gear": "Copper Gear", + "item.astromine.silver_gear": "Silver Gear", + "item.astromine.lead_gear": "Lead Gear", + "item.astromine.bronze_gear": "Bronze Gear", + "item.astromine.steel_gear": "Steel Gear", + "item.astromine.electrum_gear": "Electrum Gear", + "item.astromine.rose_gold_gear": "Rose Gold Gear", + "item.astromine.sterling_silver_gear": "Sterling Silver Gear", + "item.astromine.fools_gold_gear": "Fool's Gold Gear", + "item.astromine.lunum_gear": "Lunum Gear", + "item.astromine.meteoric_steel_gear": "Meteoric Steel Gear", + "item.astromine.basic_circuit": "Basic Circuit", + "item.astromine.advanced_circuit": "Advanced Circuit", + "item.astromine.elite_circuit": "Elite Circuit", + "item.astromine.metite_ingot": "Metite Ingot", + "item.astromine.stellum_ingot": "Stellum Ingot", + "item.astromine.lunum_ingot": "Lunum Ingot", + "item.astromine.tin_ingot": "Tin Ingot", + "item.astromine.copper_ingot": "Copper Ingot", + "item.astromine.silver_ingot": "Silver Ingot", + "item.astromine.lead_ingot": "Lead Ingot", + "item.astromine.bronze_ingot": "Bronze Ingot", + "item.astromine.steel_ingot": "Steel Ingot", + "item.astromine.electrum_ingot": "Electrum Ingot", + "item.astromine.rose_gold_ingot": "Rose Gold Ingot", + "item.astromine.sterling_silver_ingot": "Sterling Silver Ingot", + "item.astromine.fools_gold_ingot": "Fool's Gold Ingot", + "item.astromine.meteoric_steel_ingot": "Meteoric Steel Ingot", + "item.astromine.univite_ingot": "Univite Ingot", + "item.astromine.galaxium_fragment": "Galaxium Fragment", + "item.astromine.diamond_fragment": "Diamond Fragment", + "item.astromine.emerald_fragment": "Emerald Fragment", + "item.astromine.quartz_fragment": "Quartz Fragment", + "item.astromine.raw_netherite_fragment": "Raw Netherite Fragment", + "item.astromine.asterite": "Asterite", + "item.astromine.galaxium": "Galaxium", + "item.astromine.metite_nugget": "Metite Nugget", + "item.astromine.stellum_nugget": "Stellum Nugget", + "item.astromine.univite_nugget": "Univite Nugget", + "item.astromine.lunum_nugget": "Lunum Nugget", + "item.astromine.netherite_nugget": "Netherite Nugget", + "item.astromine.tin_nugget": "Tin Nugget", + "item.astromine.copper_nugget": "Copper Nugget", + "item.astromine.silver_nugget": "Silver Nugget", + "item.astromine.lead_nugget": "Lead Nugget", + "item.astromine.bronze_nugget": "Bronze Nugget", + "item.astromine.steel_nugget": "Steel Nugget", + "item.astromine.electrum_nugget": "Electrum Nugget", + "item.astromine.rose_gold_nugget": "Rose Gold Nugget", + "item.astromine.sterling_silver_nugget": "Sterling Silver Nugget", + "item.astromine.fools_gold_nugget": "Fool's Gold Nugget", + "item.astromine.meteoric_steel_nugget": "Meteoric Steel Nugget", + "item.astromine.basic_drill": "Basic Drill", + "item.astromine.advanced_drill": "Advanced Drill", + "item.astromine.elite_drill": "Elite Drill", + "item.astromine.tin_pickaxe": "Tin Pickaxe", + "item.astromine.tin_axe": "Tin Axe", + "item.astromine.tin_shovel": "Tin Shovel", + "item.astromine.tin_hoe": "Tin Hoe", + "item.astromine.tin_sword": "Tin Sword", + "item.astromine.tin_mattock": "Tin Mattock", + "item.astromine.tin_mining_tool": "Tin Mining Tool", + "item.astromine.tin_hammer": "Tin Hammer", + "item.astromine.tin_excavator": "Tin Excavator", + "item.astromine.copper_pickaxe": "Copper Pickaxe", + "item.astromine.copper_axe": "Copper Axe", + "item.astromine.copper_shovel": "Copper Shovel", + "item.astromine.copper_hoe": "Copper Hoe", + "item.astromine.copper_sword": "Copper Sword", + "item.astromine.copper_mattock": "Copper Mattock", + "item.astromine.copper_mining_tool": "Copper Mining Tool", + "item.astromine.copper_hammer": "Copper Hammer", + "item.astromine.copper_excavator": "Copper Excavator", + "item.astromine.silver_pickaxe": "Silver Pickaxe", + "item.astromine.silver_axe": "Silver Axe", + "item.astromine.silver_shovel": "Silver Shovel", + "item.astromine.silver_hoe": "Silver Hoe", + "item.astromine.silver_sword": "Silver Sword", + "item.astromine.silver_mattock": "Silver Mattock", + "item.astromine.silver_mining_tool": "Silver Mining Tool", + "item.astromine.silver_hammer": "Silver Hammer", + "item.astromine.silver_excavator": "Silver Excavator", + "item.astromine.lead_pickaxe": "Lead Pickaxe", + "item.astromine.lead_axe": "Lead Axe", + "item.astromine.lead_shovel": "Lead Shovel", + "item.astromine.lead_hoe": "Lead Hoe", + "item.astromine.lead_sword": "Lead Sword", + "item.astromine.lead_mattock": "Lead Mattock", + "item.astromine.lead_mining_tool": "Lead Mining Tool", + "item.astromine.lead_hammer": "Lead Hammer", + "item.astromine.lead_excavator": "Lead Excavator", + "item.astromine.bronze_pickaxe": "Bronze Pickaxe", + "item.astromine.bronze_axe": "Bronze Axe", + "item.astromine.bronze_shovel": "Bronze Shovel", + "item.astromine.bronze_hoe": "Bronze Hoe", + "item.astromine.bronze_sword": "Bronze Sword", + "item.astromine.bronze_mattock": "Bronze Mattock", + "item.astromine.bronze_mining_tool": "Bronze Mining Tool", + "item.astromine.bronze_hammer": "Bronze Hammer", + "item.astromine.bronze_excavator": "Bronze Excavator", + "item.astromine.steel_pickaxe": "Steel Pickaxe", + "item.astromine.steel_axe": "Steel Axe", + "item.astromine.steel_shovel": "Steel Shovel", + "item.astromine.steel_hoe": "Steel Hoe", + "item.astromine.steel_sword": "Steel Sword", + "item.astromine.steel_mattock": "Steel Mattock", + "item.astromine.steel_mining_tool": "Steel Mining Tool", + "item.astromine.steel_hammer": "Steel Hammer", + "item.astromine.steel_excavator": "Steel Excavator", + "item.astromine.electrum_pickaxe": "Electrum Pickaxe", + "item.astromine.electrum_axe": "Electrum Axe", + "item.astromine.electrum_shovel": "Electrum Shovel", + "item.astromine.electrum_hoe": "Electrum Hoe", + "item.astromine.electrum_sword": "Electrum Sword", + "item.astromine.electrum_mattock": "Electrum Mattock", + "item.astromine.electrum_mining_tool": "Electrum Mining Tool", + "item.astromine.electrum_hammer": "Electrum Hammer", + "item.astromine.electrum_excavator": "Electrum Excavator", + "item.astromine.rose_gold_pickaxe": "Rose Gold Pickaxe", + "item.astromine.rose_gold_axe": "Rose Gold Axe", + "item.astromine.rose_gold_shovel": "Rose Gold Shovel", + "item.astromine.rose_gold_hoe": "Rose Gold Hoe", + "item.astromine.rose_gold_sword": "Rose Gold Sword", + "item.astromine.rose_gold_mattock": "Rose Gold Mattock", + "item.astromine.rose_gold_mining_tool": "Rose Gold Mining Tool", + "item.astromine.rose_gold_hammer": "Rose Gold Hammer", + "item.astromine.rose_gold_excavator": "Rose Gold Excavator", + "item.astromine.sterling_silver_pickaxe": "Sterling Silver Pickaxe", + "item.astromine.sterling_silver_axe": "Sterling Silver Silverver Axe", + "item.astromine.sterling_silver_shovel": "Sterling Silver Shovel", + "item.astromine.sterling_silver_hoe": "Sterling Silver Hoe", + "item.astromine.sterling_silver_sword": "Sterling Silver Sword", + "item.astromine.sterling_silver_mattock": "Sterling Silver Mattock", + "item.astromine.sterling_silver_mining_tool": "Sterling Silver Mining Tool", + "item.astromine.sterling_silver_hammer": "Sterling Silver Hammer", + "item.astromine.sterling_silver_excavator": "Sterling Silver Excavator", + "item.astromine.fools_gold_pickaxe": "Fool's Gold Pickaxe", + "item.astromine.fools_gold_axe": "Fool's Gold Axe", + "item.astromine.fools_gold_shovel": "Fool's Gold Shovel", + "item.astromine.fools_gold_hoe": "Fool's Gold Hoe", + "item.astromine.fools_gold_sword": "Fool's Gold Sword", + "item.astromine.fools_gold_mattock": "Fool's Gold Mattock", + "item.astromine.fools_gold_mining_tool": "Fool's Gold Mining Tool", + "item.astromine.fools_gold_hammer": "Fool's Gold Hammer", + "item.astromine.fools_gold_excavator": "Fool's Gold Excavator", + "item.astromine.metite_pickaxe": "Metite Pickaxe", + "item.astromine.metite_axe": "Metite Axe", + "item.astromine.metite_shovel": "Metite Shovel", + "item.astromine.metite_hoe": "Metite Hoe", + "item.astromine.metite_sword": "Metite Sword", + "item.astromine.metite_mattock": "Metite Mattock", + "item.astromine.metite_mining_tool": "Metite Mining Tool", + "item.astromine.metite_hammer": "Metite Hammer", + "item.astromine.metite_excavator": "Metite Excavator", + "item.astromine.asterite_pickaxe": "Asterite Pickaxe", + "item.astromine.asterite_axe": "Asterite Axe", + "item.astromine.asterite_shovel": "Asterite Shovel", + "item.astromine.asterite_hoe": "Asterite Hoe", + "item.astromine.asterite_sword": "Asterite Sword", + "item.astromine.asterite_mattock": "Asterite Mattock", + "item.astromine.asterite_mining_tool": "Asterite Mining Tool", + "item.astromine.asterite_hammer": "Asterite Hammer", + "item.astromine.asterite_excavator": "Asterite Excavator", + "item.astromine.stellum_pickaxe": "Stellum Pickaxe", + "item.astromine.stellum_axe": "Stellum Axe", + "item.astromine.stellum_shovel": "Stellum Shovel", + "item.astromine.stellum_hoe": "Stellum Hoe", + "item.astromine.stellum_sword": "Stellum Sword", + "item.astromine.stellum_mattock": "Stellum Mattock", + "item.astromine.stellum_mining_tool": "Stellum Mining Tool", + "item.astromine.stellum_hammer": "Stellum Hammer", + "item.astromine.stellum_excavator": "Stellum Excavator", + "item.astromine.galaxium_pickaxe": "Galaxium Pickaxe", + "item.astromine.galaxium_axe": "Galaxium Axe", + "item.astromine.galaxium_shovel": "Galaxium Shovel", + "item.astromine.galaxium_hoe": "Galaxium Hoe", + "item.astromine.galaxium_sword": "Galaxium Sword", + "item.astromine.galaxium_mattock": "Galaxium Mattock", + "item.astromine.galaxium_mining_tool": "Galaxium Mining Tool", + "item.astromine.galaxium_hammer": "Galaxium Hammer", + "item.astromine.galaxium_excavator": "Galaxium Excavator", + "item.astromine.univite_pickaxe": "Univite Pickaxe", + "item.astromine.univite_axe": "Univite Axe", + "item.astromine.univite_shovel": "Univite Shovel", + "item.astromine.univite_hoe": "Univite Hoe", + "item.astromine.univite_sword": "Univite Sword", + "item.astromine.univite_mattock": "Univite Mattock", + "item.astromine.univite_mining_tool": "Univite Mining Tool", + "item.astromine.univite_hammer": "Univite Hammer", + "item.astromine.univite_excavator": "Univite Excavator", + "item.astromine.lunum_pickaxe": "Lunum Pickaxe", + "item.astromine.lunum_axe": "Lunum Axe", + "item.astromine.lunum_shovel": "Lunum Shovel", + "item.astromine.lunum_hoe": "Lunum Hoe", + "item.astromine.lunum_sword": "Lunum Sword", + "item.astromine.lunum_mattock": "Lunum Mattock", + "item.astromine.lunum_mining_tool": "Lunum Mining Tool", + "item.astromine.lunum_hammer": "Lunum Hammer", + "item.astromine.lunum_excavator": "Lunum Excavator", + "item.astromine.meteoric_steel_pickaxe": "Meteoric Steel Pickaxe", + "item.astromine.meteoric_steel_axe": "Meteoric Steel Axe", + "item.astromine.meteoric_steel_shovel": "Meteoric Steel Shovel", + "item.astromine.meteoric_steel_hoe": "Meteoric Steel Hoe", + "item.astromine.meteoric_steel_sword": "Meteoric Steel Sword", + "item.astromine.meteoric_steel_mattock": "Meteoric Steel Mattock", + "item.astromine.meteoric_steel_mining_tool": "Meteoric Steel Mining Tool", + "item.astromine.meteoric_steel_hammer": "Meteoric Steel Hammer", + "item.astromine.meteoric_steel_excavator": "Meteoric Steel Excavator", + "item.astromine.wooden_mattock": "Wooden Mattock", + "item.astromine.wooden_mining_tool": "Wooden Mining Tool", + "item.astromine.stone_mattock": "Stone Mattock", + "item.astromine.stone_mining_tool": "Stone Mining Tool", + "item.astromine.iron_mattock": "Iron Mattock", + "item.astromine.iron_mining_tool": "Iron Mining Tool", + "item.astromine.golden_mattock": "Golden Mattock", + "item.astromine.golden_mining_tool": "Golden Mining Tool", + "item.astromine.diamond_mattock": "Diamond Mattock", + "item.astromine.diamond_mining_tool": "Diamond Mining Tool", + "item.astromine.netherite_mattock": "Netherite Mattock", + "item.astromine.netherite_mining_tool": "Netherite Mining Tool", + "item.astromine.tin_helmet": "Tin Helmet", + "item.astromine.tin_chestplate": "Tin Chestplate", + "item.astromine.tin_leggings": "Tin Leggings", + "item.astromine.tin_boots": "Tin Boots", + "item.astromine.copper_helmet": "Copper Helmet", + "item.astromine.copper_chestplate": "Copper Chestplate", + "item.astromine.copper_leggings": "Copper Leggings", + "item.astromine.copper_boots": "Copper Boots", + "item.astromine.silver_helmet": "Silver Helmet", + "item.astromine.silver_chestplate": "Silver Chestplate", + "item.astromine.silver_leggings": "Silver Leggings", + "item.astromine.silver_boots": "Silver Boots", + "item.astromine.lead_helmet": "Lead Helmet", + "item.astromine.lead_chestplate": "Lead Chestplate", + "item.astromine.lead_leggings": "Lead Leggings", + "item.astromine.lead_boots": "Lead Boots", + "item.astromine.bronze_helmet": "Bronze Helmet", + "item.astromine.bronze_chestplate": "Bronze Chestplate", + "item.astromine.bronze_leggings": "Bronze Leggings", + "item.astromine.bronze_boots": "Bronze Boots", + "item.astromine.steel_helmet": "Steel Helmet", + "item.astromine.steel_chestplate": "Steel Chestplate", + "item.astromine.steel_leggings": "Steel Leggings", + "item.astromine.steel_boots": "Steel Boots", + "item.astromine.electrum_helmet": "Electrum Helmet", + "item.astromine.electrum_chestplate": "Electrum Chestplate", + "item.astromine.electrum_leggings": "Electrum Leggings", + "item.astromine.electrum_boots": "Electrum Boots", + "item.astromine.rose_gold_helmet": "Rose Gold Helmet", + "item.astromine.rose_gold_chestplate": "Rose Gold Chestplate", + "item.astromine.rose_gold_leggings": "Rose Gold Leggings", + "item.astromine.rose_gold_boots": "Rose Gold Boots", + "item.astromine.sterling_silver_helmet": "Sterling Silver Helmet", + "item.astromine.sterling_silver_chestplate": "Sterling Silver Chestplate", + "item.astromine.sterling_silver_leggings": "Sterling Silver Leggings", + "item.astromine.sterling_silver_boots": "Sterling Silver Boots", + "item.astromine.fools_gold_helmet": "Fool's Gold Helmet", + "item.astromine.fools_gold_chestplate": "Fool's Gold Chestplate", + "item.astromine.fools_gold_leggings": "Fool's Gold Leggings", + "item.astromine.fools_gold_boots": "Fool's Gold Boots", + "item.astromine.metite_helmet": "Metite Helmet", + "item.astromine.metite_chestplate": "Metite Chestplate", + "item.astromine.metite_leggings": "Metite Leggings", + "item.astromine.metite_boots": "Metite Boots", + "item.astromine.asterite_helmet": "Asterite Helmet", + "item.astromine.asterite_chestplate": "Asterite Chestplate", + "item.astromine.asterite_leggings": "Asterite Leggings", + "item.astromine.asterite_boots": "Asterite Boots", + "item.astromine.stellum_helmet": "Stellum Helmet", + "item.astromine.stellum_chestplate": "Stellum Chestplate", + "item.astromine.stellum_leggings": "Stellum Leggings", + "item.astromine.stellum_boots": "Stellum Boots", + "item.astromine.galaxium_helmet": "Galaxium Helmet", + "item.astromine.galaxium_chestplate": "Galaxium Chestplate", + "item.astromine.galaxium_leggings": "Galaxium Leggings", + "item.astromine.galaxium_boots": "Galaxium Boots", + "item.astromine.univite_helmet": "Univite Helmet", + "item.astromine.univite_chestplate": "Univite Chestplate", + "item.astromine.univite_leggings": "Univite Leggings", + "item.astromine.univite_boots": "Univite Boots", + "item.astromine.lunum_helmet": "Lunum Helmet", + "item.astromine.lunum_chestplate": "Lunum Chestplate", + "item.astromine.lunum_leggings": "Lunum Leggings", + "item.astromine.lunum_boots": "Lunum Boots", + "item.astromine.meteoric_steel_helmet": "Meteoric Steel Helmet", + "item.astromine.meteoric_steel_chestplate": "Meteoric Steel Chestplate", + "item.astromine.meteoric_steel_leggings": "Meteoric Steel Leggings", + "item.astromine.meteoric_steel_boots": "Meteoric Steel Boots", + "item.astromine.space_suit_helmet": "Space Suit Helmet", + "item.astromine.space_suit_chestplate": "Space Suit Chest", + "item.astromine.space_suit_leggings": "Space Suit Pants", + "item.astromine.space_suit_boots": "Space Suit Boots", + "item.astromine.space_slime_spawn_egg": "Space Slime Spawn Egg", + "item.astromine.super_space_slime_shooter": "Super Space Slime Shooter", + "item.astromine.space_slime_ball": "Space Slimeball", + "item.astromine.manual": "Astromine Manual", + "item.astromine.yeast": "Yeast", + "item.astromine.rocket": "Rocket", + "item.astromine.copper_wrench": "Copper Spanner", + "item.astromine.bronze_wrench": "Bronze Spanner", + "item.astromine.steel_wrench": "Steel Spanner", + "item.astromine.rose_gold_apple": "Rose Gold Apple", + "item.astromine.fools_gold_apple": "Fool's Gold Apple", + "item.astromine.lead_apple": "Lead Apple", + "item.astromine.basic_machine_upgrade_kit": "Basic Machine Upgrade Kit", + "item.astromine.advanced_machine_upgrade_kit": "Advanced Machine Upgrade Kit", + "item.astromine.elite_machine_upgrade_kit": "Elite Machine Upgrade Kit", + "item.astromine.gravity_gauntlet": "Gravity Gauntlet", + "item.minecraft.potion.effect.rocket_fuel": "Rocket Fuel Bottle", + "item.minecraft.splash_potion.effect.rocket_fuel": "Splash Rocket Fuel Bottle", + "item.minecraft.lingering_potion.effect.rocket_fuel": "Lingering Rocket Fuel Bottle", + "item.minecraft.tipped_arrow.effect.rocket_fuel": "Arrow of Rocket Fuel", + "item.minecraft.potion.effect.sugar_water": "Sugar Water Bottle", + "item.minecraft.splash_potion.effect.sugar_water": "Splash Sugar Water Bottle", + "item.minecraft.lingering_potion.effect.sugar_water": "Lingering Sugar Water Bottle", + "item.minecraft.tipped_arrow.effect.sugar_water": "Arrow of Sugar Water", + "potion.potency.10": "X", + "subtitles.astromine.humming": "Humming", + "subtitles.astromine.holographic_connector_click": "Holographic Connector clicks", + "subtitles.astromine.fire_extinguisher_open": "Fire Extinguisher opens", + "subtitles.astromine.gunshot": "Gunshot", + "subtitles.astromine.empty_magazine": "Magazine is empty", + "text.astromine.manual.landing": "Your guide to the stars!", + "category.astromine.liquid_generating": "Liquid Generating", + "category.astromine.solid_generating": "Solid Generating", + "category.astromine.electric_smelting": "Electric Smelting", + "category.astromine.alloy_smelting": "Alloy Smelting", + "category.astromine.pressing": "Pressing", + "category.astromine.triturating": "Triturating", + "category.astromine.fluid_mixing": "Fluid Mixing", + "category.astromine.electrolyzing": "Electrolysing", + "category.astromine.refining": "Refining", + "category.astromine.infusing": "Infusing", + "category.astromine.cooking.time": "%s seconds", + "category.astromine.cooking.energy": "%s energy", + "category.astromine.generating.energy": "%s generated per tick", + "category.astromine.consuming.energy": "%s consumed", + "category.astromine.fluid.generating.consumed": "%s (%s) consumed per tick", + "category.astromine.fluid.generating.generated": "%s (%s) generated per tick", + "text.astromine.manual.obtain.info": "The Astromine Manual can be obtained by right clicking a Metite Axe on a Bookshelf.", + "text.astromine.selected.dimension.pos": "Selected %s (%d, %d, %d)", + "text.astromine.patchouli.astronautics.title": "Astronautics", + "text.astromine.patchouli.astronautics.description": "From where one dreams, to where their dreams come true.", + "text.astromine.patchouli.components.title": "Components", + "text.astromine.patchouli.components.description": "Components for crafting items to aid one in their journey.", + "text.astromine.patchouli.creatures.title": "Creatures", + "text.astromine.patchouli.creatures.description": "Those beyond our wildest realm of imagination.", + "text.astromine.patchouli.gadgets.title": "Gadgets", + "text.astromine.patchouli.gadgets.description": "One's physical assistance in their journey.", + "text.astromine.patchouli.machinery.title": "Machinery", + "text.astromine.patchouli.machinery.description": "What moves one's world.", + "text.astromine.patchouli.resources.title": "Resources", + "text.astromine.patchouli.resources.description": "The exquisite materials that one channels for power.", + "text.astromine.patchouli.warfare.title": "Warfare", + "text.astromine.patchouli.warfare.description": "What one uses to wipe away their foe.", + "text.astromine.patchouli.world.title": "World", + "text.astromine.patchouli.world.description": "What surrounds one.", + "text.astromine.astronautics.space_suit.title": "Space Suit", + "text.astromine.astronautics.space_suit.page_one.title": "Space Suit", + "text.astromine.astronautics.space_suit.page_one.text": "Vital for survival in hostile environments, a Space Suit is the most important thing one may carry. $(p)With internal tanks which may be pressurised in certain machines, it may be filled with (un-)breathable gases fit for whoever is wearing it.", + "text.astromine.astronautics.rocket.title": "Rocket", + "text.astromine.astronautics.rocket.page_one.title": "Rocket", + "text.astromine.astronautics.rocket.page_one.text": "Your ticket to the final frontier.", + "text.astromine.astronautics.rocket.page_two.title": "Crafting and Notes", + "text.astromine.astronautics.rocket.page_two.text": "Right click with a $(item)Flint and Steel$() to launch. Right click with a $(item)Stick$() to destroy. These are both temporary measures.", + "text.astromine.components.circuits.title": "Circuits", + "text.astromine.components.circuits.page_one.title": "Basic Circuit", + "text.astromine.components.circuits.page_one.text": "A basic electric circuit board, built for general systems with no special requirements, whose architecture is based on graphene.", + "text.astromine.components.circuits.page_two.title": "Basic Circuit Recipe", + "text.astromine.components.circuits.page_three.title": "Advanced Circuit", + "text.astromine.components.circuits.page_three.text": "A more advanced electric circuit board, built for systems with low latency in mind, whose architecture is based on graphene.", + "text.astromine.components.circuits.page_four.title": "Advanced Circuit Recipe", + "text.astromine.components.circuits.page_five.title": "Elite Circuit", + "text.astromine.components.circuits.page_five.text": "An elite electric circuit board, built for systems with high throughput and low latency in mind, whose architecture makes use of coveted, laboratory-made materials.", + "text.astromine.components.circuits.page_six.title": "Elite Circuit Recipe", + "text.astromine.components.gears.title": "Gears", + "text.astromine.components.gears.page_one.title": "Gears", + "text.astromine.components.gears.page_one.text": "A small wheel with teeth, gears interlocked with one another can turn to achieve any number of things.$(p)As such, they will have great use in constructing useful $(thing)machines$().", + "text.astromine.components.gears.page_two.title": "Recipe", + "text.astromine.components.gears.page_two.text": "While the recipe shown is clearly for an $(item)Iron Gear$(), simply substituting the $(item)Iron Ingots$() with any other $(thing)Ingots$() will create a gear of that type.", + "text.astromine.components.plates.title": "Plates", + "text.astromine.components.plates.page_one.title": "Plates", + "text.astromine.components.plates.page_one.text": "Thin sheets of metal, plates are useful for constructing $(thing)housing$() for $(thing)machinery$().", + "text.astromine.components.plates.page_two.title": "Recipe", + "text.astromine.components.plates.page_two.text": "While the recipe shown is clearly for $(item)Iron Plates$(), simply substituting the $(item)Iron Ingots$() with any other $(thing)Ingots$() will create plates of that type.", + "text.astromine.creatures.space_slime.title": "Space Slime", + "text.astromine.creatures.space_slime.page_one.title": "Space Slime", + "text.astromine.creatures.space_slime.page_one.text": "A fierce adversary which inhabits large sections of traversable space.", + "text.astromine.creatures.space_slime.page_two.title": "Drops", + "text.astromine.creatures.space_slime.page_two.text": "Upon defeat, a $(thing)Space Slime$() will drop $(thing)Space Slime Balls$().", + "text.astromine.gadgets.fire_extinguisher.title": "Fire Extinguisher", + "text.astromine.gadgets.fire_extinguisher.page_one.title": "Fire Extinguisher", + "text.astromine.gadgets.fire_extinguisher.page_one.text": "An important tool in one's space journeys, it is responsible for providing maneuverable thrust.$(p)Surprisingly, it can also extinguish fire.", + "text.astromine.gadgets.fire_extinguisher.page_two.title": "Recipe", + "text.astromine.gadgets.gravity_gauntlet.title": "Gravity Gauntlets", + "text.astromine.gadgets.gravity_gauntlet.page_one.title": "Gravity Gauntlets", + "text.astromine.gadgets.gravity_gauntlet.page_one.text": "Gauntlets which can repel opponents. One must be worn on each hand, and they must be charged before they can activate$(p)Charging is done by holding right click with one in each hand, and takes energy.", + "text.astromine.gadgets.gravity_gauntlet.page_two.title": "Recipe", + "text.astromine.machinery.holographic_bridge_projector.title": "Holographic Bridge Projector", + "text.astromine.machinery.holographic_bridge_projector.page_one.title": "Holographic Bridge Projector", + "text.astromine.machinery.holographic_bridge_projector.page_one.text": "A machine which generates a holographic bridge between it and another one of its kind; linkable with a $(item)$(l:gadgets/holographic_connector)Holographic Connector$().", + "text.astromine.machinery.holographic_bridge_projector.page_two.title": "Recipe", + "text.astromine.gadgets.holographic_connector.title": "Holographic Connector", + "text.astromine.gadgets.holographic_connector.page_one.title": "Holographic Connector", + "text.astromine.gadgets.holographic_connector.page_one.text": "A remote controller which allows you to link together $(item)$(l:machinery/holographic_bridge_projector)Holographic Bridge Projectors$(). They must be facing each other in the same line, but can have different heights.", + "text.astromine.gadgets.holographic_connector.page_two.title": "Recipe", + "text.astromine.machinery.creative_buffer.title": "Creative Buffer", + "text.astromine.machinery.creative_buffer.page_one.title": "Creative Buffer", + "text.astromine.machinery.creative_buffer.page_one.text": "A machine which produces a specified $(thing)item$() infinitely.", + "text.astromine.machinery.creative_capacitor.title": "Creative Capacitor", + "text.astromine.machinery.creative_capacitor.page_one.title": "Creative Capacitor", + "text.astromine.machinery.creative_capacitor.page_one.text": "A machine which produces $(thing)energy$() infinitely.", + "text.astromine.machinery.creative_tank.title": "Creative Tank", + "text.astromine.machinery.creative_tank.page_one.title": "Creative Tank", + "text.astromine.machinery.creative_tank.page_one.text": "A machine which produces a specified $(thing)fluid$() infinitely.", + "text.astromine.machinery.electric_smelter.title": "Electric Smelter", + "text.astromine.machinery.electric_smelter.page_one.title": "Electric Smelter", + "text.astromine.machinery.electric_smelter.page_one.text": "A machine which consumes $(thing)energy$() to smelt $(thing)items$() into useful materials.", + "text.astromine.machinery.electric_smelter.page_two.title": "Recipe", + "text.astromine.machinery.electrolyzer.title": "Electrolyser", + "text.astromine.machinery.electrolyzer.page_one.title": "Electrolyser", + "text.astromine.machinery.electrolyzer.page_one.text": "A machine which consumes $(thing)energy$() to electrolyse $(thing)fluids$() into useful materials.", + "text.astromine.machinery.electrolyzer.page_two.title": "Recipe", + "text.astromine.machinery.energy_cable.title": "Energy Cable", + "text.astromine.machinery.energy_cable.page_one.title": "Energy Cable", + "text.astromine.machinery.energy_cable.page_one.text": "A cable which transports $(thing)energy$(); no buffering or path-finding involved.", + "text.astromine.machinery.energy_cable.page_two.title": "Recipe", + "text.astromine.machinery.fluid_cable.title": "Fluid Cable", + "text.astromine.machinery.fluid_cable.page_one.title": "Fluid Cable", + "text.astromine.machinery.fluid_cable.page_one.text": "A cable which transports $(thing)fluids$(); no buffering or path-finding involved.", + "text.astromine.machinery.fluid_cable.page_two.title": "Recipe", + "text.astromine.machinery.fluid_extractor.title": "Fluid Extractor", + "text.astromine.machinery.fluid_extractor.page_one.title": "Fluid Extractor", + "text.astromine.machinery.fluid_extractor.page_one.text": "A machine which consumes $(thing)energy$() to pick up $(thing)fluids$() from the world.", + "text.astromine.machinery.fluid_extractor.page_two.title": "Recipe", + "text.astromine.machinery.fluid_inserter.title": "Fluid Inserter", + "text.astromine.machinery.fluid_inserter.page_one.title": "Fluid Inserter", + "text.astromine.machinery.fluid_inserter.page_one.text": "A machine which consumes $(thing)energy$() to place $(thing)fluids$() in the world.", + "text.astromine.machinery.fluid_inserter.page_two.title": "Recipe", + "text.astromine.machinery.fluid_mixer.title": "Fuel Mixer", + "text.astromine.machinery.fluid_mixer.page_one.title": "Fuel Mixer", + "text.astromine.machinery.fluid_mixer.page_one.text": "A machine which consumes $(thing)energy$() to mix $(thing)fluids$() into useful materials.", + "text.astromine.machinery.fluid_mixer.page_two.title": "Recipe", + "text.astromine.machinery.block_breaker.title": "Block Breaker", + "text.astromine.machinery.block_breaker.page_one.title": "Block Breaker", + "text.astromine.machinery.block_breaker.page_one.text": "A machine which consumes $(thing)energy$() to break and pick up $(thing)blocks$() from the world.", + "text.astromine.machinery.block_breaker.page_two.title": "Recipe", + "text.astromine.machinery.block_placer.title": "Block Placer", + "text.astromine.machinery.block_placer.page_one.title": "Block Placer", + "text.astromine.machinery.block_placer.page_one.text": "A machine which consumes $(thing)energy$() to place $(thing)blocks$() in the world.", + "text.astromine.machinery.block_placer.page_two.title": "Recipe", + "text.astromine.machinery.inserter.title": "Inserter", + "text.astromine.machinery.inserter.page_one.title": "Inserter", + "text.astromine.machinery.inserter.page_one.text": "A machine which picks up items from its front and places them at its back, for item transportation.", + "text.astromine.machinery.inserter.page_two.title": "Recipe", + "text.astromine.machinery.inserter.page_three.title": "Recipe", + "text.astromine.machinery.conveyor.title": "Conveyor", + "text.astromine.machinery.conveyor.page_one.title": "Conveyor", + "text.astromine.machinery.conveyor.page_one.text": "A machine which transports items.", + "text.astromine.machinery.conveyor.page_two.title": "Recipe", + "text.astromine.machinery.conveyor.page_three.title": "Recipe", + "text.astromine.machinery.conveyor.page_four.title": "Recipe", + "text.astromine.machinery.triturator.title": "Triturator", + "text.astromine.machinery.triturator.page_one.title": "Triturator", + "text.astromine.machinery.triturator.page_one.text": "A machine which consumes $(thing)energy$() to pulverise $(thing)items$() into useful materials.", + "text.astromine.machinery.triturator.page_two.title": "Recipe", + "text.astromine.machinery.presser.title": "Presser", + "text.astromine.machinery.presser.page_one.title": "Presser", + "text.astromine.machinery.presser.page_one.text": "A machine which consumes $(thing)energy$() to press $(thing)items$() into useful materials.", + "text.astromine.machinery.presser.page_two.title": "Recipe", + "text.astromine.machinery.vent.title": "Vent", + "text.astromine.machinery.vent.page_one.title": "Vent", + "text.astromine.machinery.vent.page_one.text": "A machine which consumes energy to ventilate fluids into the atmosphere.", + "text.astromine.machinery.vent.page_two.title": "Recipe", + "text.astromine.resources.copper.title": "Copper", + "text.astromine.resources.copper.page_one.title": "Copper", + "text.astromine.resources.copper.page_one.text": "A very common metal with high thermal and electrical conductivity and a distinct orange hue.", + "text.astromine.resources.copper.page_two.title": "Obtaining Copper", + "text.astromine.resources.copper.page_two.text": "$(item)Copper Ore$() can be commonly found $(thing)underground$() in $(thing)The Overworld$().$(p)Mining requires only a $(item)Stone Pickaxe$() (Mining Level 1) or better, and can then be $(thing)smelted$() into a $(item)Copper Ingot$().", + "text.astromine.resources.copper.page_three.title": "Usages", + "text.astromine.resources.copper.page_three.text": "Copper is very useful for basic electronics and tools. When combined with $(item)$(l:resources/tin)Tin$() in an $(item)$(l:machinery/alloy_smelter)Alloy Smelter$(), it can make $(item)$(l:resources/bronze)Bronze$().", + "text.astromine.resources.copper.page_four.title": "Statistics", + "text.astromine.resources.copper.page_four.text": "$(l)Tools$()$(br)Mining Level: 1$(br)Base Durability: 200$(br)Mining Speed: 4$(br)Attack Damage: 1.5$(br)Enchantability: 10$(p)$(l)Armor$()$(br)Durability Multiplier: 12$(br)Total Defense: 12$(br)Toughness: 0$(br)Enchantability: 15", + "text.astromine.resources.tin.title": "Tin", + "text.astromine.resources.tin.page_one.title": "Tin", + "text.astromine.resources.tin.page_one.text": "A common metal with a silvery sheen and a soft composition.", + "text.astromine.resources.tin.page_two.title": "Obtaining Tin", + "text.astromine.resources.tin.page_two.text": "$(item)Tin Ore$() can be commonly found $(thing)underground$() in $(thing)The Overworld$().$(p)Mining requires only a $(item)Stone Pickaxe$() (Mining Level 1) or better, and can then be $(thing)smelted$() into a $(item)Tin Ingot$().", + "text.astromine.resources.tin.page_three.title": "Usages", + "text.astromine.resources.tin.page_three.text": "Tin is useful for plating to prevent corrosion. When combined with $(item)$(l:resources/copper)Copper$() in an $(item)$(l:machinery/alloy_smelter)Alloy Smelter$(), it can make $(item)$(l:resources/bronze)Bronze$().", + "text.astromine.resources.tin.page_four.title": "Statistics", + "text.astromine.resources.tin.page_four.text": "$(l)Tools$()$(br)Mining Level: 1$(br)Base Durability: 200$(br)Mining Speed: 5$(br)Attack Damage: 1.0$(br)Enchantability: 10$(p)$(l)Armor$()$(br)Durability Multiplier: 12$(br)Total Defense: 12$(br)Toughness: 0$(br)Enchantability: 15", + "text.astromine.resources.bronze.title": "Bronze", + "text.astromine.resources.bronze.page_one.title": "Bronze", + "text.astromine.resources.bronze.page_one.text": "An alloy of $(item)$(l:resources/copper)Copper$() and $(item)$(l:resources/tin)Tin$(), Bronze manages to be stronger and more durable than either of them.", + "text.astromine.resources.bronze.page_two.title": "Obtaining Bronze", + "text.astromine.resources.bronze.page_two.text": "Bronze can be obtained by combining 3 Copper Ingots and 1 Tin Ingot in an $(item)$(l:machinery/alloy_smelter)Alloy Smelter$(). This produces 4 $(item)Bronze Ingots$().", + "text.astromine.resources.bronze.page_three.title": "Usages", + "text.astromine.resources.bronze.page_three.text": "Bronze is useful for creating tools, and is also used in construction of more advanced machines.", + "text.astromine.resources.bronze.page_four.title": "Statistics", + "text.astromine.resources.bronze.page_four.text": "$(l)Tools$()$(br)Mining Level: 2$(br)Base Durability: 539$(br)Mining Speed: 7$(br)Attack Damage: 2.5$(br)Enchantability: 20$(p)$(l)Armor$()$(br)Durability Multiplier: 20$(br)Total Defense: 15$(br)Toughness: 0.7$(br)Enchantability: 18", + "text.astromine.resources.steel.title": "Steel", + "text.astromine.resources.steel.page_one.title": "Steel", + "text.astromine.resources.steel.page_one.text": "An alloy of $(item)Iron$() and $(thing)Carbon$(), Steel is incredibly strong for a metal of terrestrial origin.", + "text.astromine.resources.steel.page_two.title": "Obtaining Steel", + "text.astromine.resources.steel.page_two.text": "Steel can be obtained by combining an Iron Ingot and 2 $(item)Coal Dust$() or $(item)Charcoal Dust$() in an $(item)$(l:machinery/alloy_smelter)Alloy Smelter$(). This produces a single $(item)Steel Ingot$().", + "text.astromine.resources.steel.page_three.title": "Usages", + "text.astromine.resources.steel.page_three.text": "Steel is useful for creating tools, and is also used in construction of more advanced machines.", + "text.astromine.resources.steel.page_four.title": "Statistics", + "text.astromine.resources.steel.page_four.text": "$(l)Tools$()$(br)Mining Level: 3$(br)Base Durability: 1043$(br)Mining Speed: 7.5$(br)Attack Damage: 3$(br)Enchantability: 24$(p)$(l)Armor$()$(br)Durability Multiplier: 24$(br)Total Defense: 17$(br)Toughness: 0.5$(br)Enchantability: 18", + "text.astromine.resources.silver.title": "Silver", + "text.astromine.resources.silver.page_one.title": "Silver", + "text.astromine.resources.silver.page_one.text": "A metal with high electrical conductivity and a distinct white, lustrous texture.", + "text.astromine.resources.silver.page_two.title": "Obtaining Silver", + "text.astromine.resources.silver.page_two.text": "$(item)Silver Ore$() can be found $(thing)underground$() in $(thing)The Overworld$().$(p)Mining requires only a $(item)Iron Pickaxe$() (Mining Level 2) or better, and can then be $(thing)smelted$() into a $(item)Silver Ingot$().", + "text.astromine.resources.silver.page_three.title": "Usages", + "text.astromine.resources.silver.page_three.text": "Silver is very useful for basic electronics and tools. When combined with $(item)$(l:resources/copper)Copper$() in an $(item)$(l:machinery/alloy_smelter)Alloy Smelter$(), it can make $(item)$(l:resources/electrum)Electrum$(). When combined with $(item)$(l:resources/copper)Copper$() in an $(item)$(l:machinery/alloy_smelter)Alloy Smelter$(), it can make $(item)$(l:resources/sterling_silver)Sterling Silver$().", + "text.astromine.resources.silver.page_four.title": "Statistics", + "text.astromine.resources.silver.page_four.text": "$(l)Tools$()$(br)Mining Level: 2$(br)Base Durability: 462$(br)Mining Speed: 6.5$(br)Attack Damage: 2.0$(br)Enchantability: 20$(p)$(l)Armor$()$(br)Durability Multiplier: 17$(br)Total Defense: ?$(br)Toughness: 0$(br)Enchantability: 22", + "text.astromine.resources.electrum.title": "Electrum", + "text.astromine.resources.electrum.page_one.title": "Electrum", + "text.astromine.resources.electrum.page_one.text": "A metal with significant electrical conductivity and golden texture.", + "text.astromine.resources.electrum.page_two.title": "Obtaining Electrum", + "text.astromine.resources.electrum.page_two.text": "Electrum can be obtained by combining 1 Gold Ingot and 1 Silver Ingot in an $(item)$(l:machinery/alloy_smelter)Alloy Smelter$(). This produces 2 $(item)Electrum Ingots$().", + "text.astromine.resources.electrum.page_three.title": "Usages", + "text.astromine.resources.electrum.page_three.text": "Electrum is often used for coins.", + "text.astromine.resources.electrum.page_four.title": "Statistics", + "text.astromine.resources.electrum.page_four.text": "$(l)Tools$()$(br)Mining Level: 2$(br)Base Durability: 185$(br)Mining Speed: 11$(br)Attack Damage: 1.0$(br)Enchantability: 21$(p)$(l)Armor$()$(br)Durability Multiplier: 13$(br)Total Defense: ?$(br)Toughness: 0$(br)Enchantability: 25", + "text.astromine.resources.fools_gold.title": "Fool's Gold", + "text.astromine.resources.fools_gold.page_one.title": "Fool's Gold", + "text.astromine.resources.fools_gold.page_one.text": "A metal with used to obtain sulfur dioxide, which, due to its golden colour, often confuses the unprepared traveller.", + "text.astromine.resources.fools_gold.page_two.title": "Obtaining Fool's Gold", + "text.astromine.resources.fools_gold.page_two.text": "Fool's Gold can be obtained by combining 1 Iron Ingot and 1 Gunpowder in an $(item)$(l:machinery/alloy_smelter)Alloy Smelter$(). This produces 2 $(item)Fool's Gold Ingots$().", + "text.astromine.resources.fools_gold.page_three.title": "Usages", + "text.astromine.resources.fools_gold.page_three.text": "Fool's Gold is often used for coins.", + "text.astromine.resources.fools_gold.page_four.title": "Statistics", + "text.astromine.resources.fools_gold.page_four.text": "$(l)Tools$()$(br)Mining Level: 2$(br)Base Durability: 250$(br)Mining Speed: 6.5$(br)Attack Damage: 2.0$(br)Enchantability: 16$(p)$(l)Armor$()$(br)Durability Multiplier: 15$(br)Total Defense: ?$(br)Toughness: 0$(br)Enchantability: 10", + "text.astromine.resources.rose_gold.title": "Rose Gold", + "text.astromine.resources.rose_gold.page_one.title": "Rose Gold", + "text.astromine.resources.rose_gold.page_one.text": "A metal with significant electrical conductivity and rose, pink texture.", + "text.astromine.resources.rose_gold.page_two.title": "Obtaining Rose Gold", + "text.astromine.resources.rose_gold.page_two.text": "Rose Gold can be obtained by combining 1 Gold Ingot and 1 Silver Ingot in an $(item)$(l:machinery/alloy_smelter)Alloy Smelter$(). This produces 2 $(item)Rose Gold Ingots$().", + "text.astromine.resources.rose_gold.page_three.title": "Usages", + "text.astromine.resources.rose_gold.page_three.text": "Rose Gold is often used for coins.", + "text.astromine.resources.rose_gold.page_four.title": "Statistics", + "text.astromine.resources.rose_gold.page_four.text": "$(l)Tools$()$(br)Mining Level: 1$(br)Base Durability: 64$(br)Mining Speed: 10$(br)Attack Damage: 0.5$(br)Enchantability: 24$(p)$(l)Armor$()$(br)Durability Multiplier: 9$(br)Total Defense: ?$(br)Toughness: 0.1$(br)Enchantability: 25", + "text.astromine.resources.sterling_silver.title": "Sterling Silver", + "text.astromine.resources.sterling_silver.page_one.title": "Sterling Silver", + "text.astromine.resources.sterling_silver.page_one.text": "A metal with significant electrical conductivity and silvery texture.", + "text.astromine.resources.sterling_silver.page_two.title": "Obtaining Sterling Silver", + "text.astromine.resources.sterling_silver.page_two.text": "Sterling Silver can be obtained by combining 3 Silver Ingots and 1 Copper Ingot in an $(item)$(l:machinery/alloy_smelter)Alloy Smelter$(). This produces 4 $(item)Sterling Silver Ingots$().", + "text.astromine.resources.sterling_silver.page_three.title": "Usages", + "text.astromine.resources.sterling_silver.page_three.text": "Sterling Silver is often used for tooling.", + "text.astromine.resources.sterling_silver.page_four.title": "Statistics", + "text.astromine.resources.sterling_silver.page_four.text": "$(l)Tools$()$(br)Mining Level: 2$(br)Base Durability: 697$(br)Mining Speed: 7$(br)Attack Damage: 2.5$(br)Enchantability: 20$(p)$(l)Armor$()$(br)Durability Multiplier: 18$(br)Total Defense: ?$(br)Toughness: 0.1$(br)Enchantability: 23", + "text.astromine.resources.asterite.title": "Asterite", + "text.astromine.resources.asterite.page_one.title": "Asterite", + "text.astromine.resources.asterite.page_one.text": "A fragment of a long dead star, this red gem may look frail to an untrained observer - one who does not know its significant strengths. $(p)Its properties allow for qualified craftsmen to create powerful tooling.", + "text.astromine.resources.asterite.page_two.title": "Obtaining Asterite", + "text.astromine.resources.asterite.page_two.text": "$(item)Asterite Ore$() can be found inside $(thing)$(l:world/asteroids)Asteroids$() in $(thing)Space$().$(p)Mining requires a $(item)Netherite Pickaxe$() (Mining Level 4) or better, usually resulting in a single $(item)Asterite Cluster$() which can forged into an $(item)Asterite$() gem.", + "text.astromine.resources.asterite.page_three.title": "Usages", + "text.astromine.resources.asterite.page_three.text": "Asterite can be used to create powerful tooling.", + "text.astromine.resources.asterite.page_four.title": "Statistics", + "text.astromine.resources.asterite.page_four.text": "$(l)Tools$()$(br)Mining Level: 5$(br)Base Durability: 2015$(br)Mining Speed: 10$(br)Attack Damage: 5$(br)Enchantability: 20$(p)$(l)Armor$()$(br)Durability Multiplier: 22$(br)Total Defense: 23$(br)Toughness: 4$(br)Enchantability: 20", + "text.astromine.resources.galaxium.title": "Galaxium", + "text.astromine.resources.galaxium.page_one.title": "Galaxium", + "text.astromine.resources.galaxium.page_one.text": "A rare gem with a deep, overwhelming dark shine. Extraordinarily dense, this material is theorised to be obtained from large clusters at the center of galaxies.$(p)There are no records of such phenomena, but one's journey holds the keys to many secrets never thought of before.", + "text.astromine.resources.galaxium.page_two.title": "Obtaining Galaxium", + "text.astromine.resources.galaxium.page_two.text": "$(item)Galaxium Ore$() can be rarely found inside $(thing)$(l:world/asteroids)Asteroids$() in $(thing)Space$().$(p)Galaxium Ore mining will require an $(item)Asterite Pickaxe$() (Mining Level 5) or better, usually resulting in a single $(item)$(l:world/ore_clusters)Galaxium Cluster$() which can be forged into a $(item)Galaxium$() gem.", + "text.astromine.resources.galaxium.page_three.title": "Usages", + "text.astromine.resources.galaxium.page_three.text": "Galaxium can be used to create extremely resistant tooling and exquisite technology.", + "text.astromine.resources.galaxium.page_four.title": "Statistics", + "text.astromine.resources.galaxium.page_four.text": "$(l)Tools$()$(br)Mining Level: 6$(br)Base Durability: 3072$(br)Mining Speed: 11$(br)Attack Damage: 5$(br)Enchantability: 18$(p)$(l)Armor$()$(br)Durability Multiplier: 44$(br)Total Defense: 25$(br)Toughness: 4.5$(br)Enchantability: 18", + "text.astromine.resources.metite.title": "Metite", + "text.astromine.resources.metite.page_one.title": "Metite", + "text.astromine.resources.metite.page_one.text": "A foreign metal, Metite withstands immense pressures; being essential in all areas of space travel.$(p)Acquiring it is considered a major stepping stone in one's interstellar journey.", + "text.astromine.resources.metite.page_two.title": "Obtaining Metite", + "text.astromine.resources.metite.page_two.text": "$(item)Metite Ore$() can be found inside $(thing)$(l:world/meteors)Meteors$() which have impacted on $(thing)Earth$(), or in $(thing)$(l:world/asteroids)Asteroids$() in $(thing)Space$().$(p)Mining requires a $(item)Netherite Pickaxe$() (Mining Level 4) or better, usually resulting in between 1 and 3 $(item)$(l:world/ore_clusters)Metite Clusters$() which can forged into a $(item)Metite Ingot$().", + "text.astromine.resources.metite.page_three.title": "Usages", + "text.astromine.resources.metite.page_three.text": "Metite can be used to create standard tooling; however, it is of much more use in creating astronautical technology.", + "text.astromine.resources.metite.page_four.title": "Statistics", + "text.astromine.resources.metite.page_four.text": "$(l)Tools$()$(br)Mining Level: 1$(br)Base Durability: 853$(br)Mining Speed: 13$(br)Attack Damage: 4$(br)Enchantability: 5$(p)$(l)Armor$()$(br)Durability Multiplier: 15$(br)Total Defense: 14$(br)Toughness: 0$(br)Enchantability: 7", + "text.astromine.resources.stellum.title": "Stellum", + "text.astromine.resources.stellum.page_one.title": "Stellum", + "text.astromine.resources.stellum.page_one.text": "A fragment of a living star, the raw energy contained within this material is surpassed only by few, every molecule of it vibrating with $(thing)Stellar Energy$().", + "text.astromine.resources.stellum.page_two.title": "Obtaining Stellum", + "text.astromine.resources.stellum.page_two.text": "$(item)Stellum Ore$() can be found inside $(thing)$(l:world/asteroids)Asteroids$() in $(thing)Space$().$(p)Mining requires an $(item)Asterite Pickaxe$() (Mining Level 5) or better, usually resulting in a single $(item)$(l:world/ore_clusters)Stellum Cluster$() which can be forged into a $(item)Stellum Ingot$().", + "text.astromine.resources.stellum.page_three.title": "Usages", + "text.astromine.resources.stellum.page_three.text": "Stellum can be used to create powerful tooling roughly equivalent to $(thing)$(l:resources/asterite)Asterite$(). Born from the heart of a living star, it is fire proof to an extent never seen before; and posses a power that, when harnessed, can power an entire civilisation.", + "text.astromine.resources.stellum.page_four.title": "Statistics", + "text.astromine.resources.stellum.page_four.text": "$(l)Tools$()$(br)Mining Level: 5$(br)Base Durability: 2643$(br)Mining Speed: 8$(br)Attack Damage: 6$(br)Enchantability: 15$(br)Fireproof$(p)$(l)Armor$()$(br)Durability Multiplier: 41$(br)Total Defense: 16$(br)Toughness: 6$(br)Enchantability: 15$(br)Fireproof", + "text.astromine.resources.univite.title": "Univite", + "text.astromine.resources.univite.page_one.title": "Univite", + "text.astromine.resources.univite.page_one.text": "A material so highly coveted it has sparked numerous interstellar wars; only a limited amount of it exists within this realm, thought to have originated at the heart of the universe, before any of us even dared the thought of existence. It is unknown whether any material conveys higher power than Univite.", + "text.astromine.resources.univite.page_two.title": "Obtaining Univite", + "text.astromine.resources.univite.page_two.text": "A theorised origin and limited existence means immense difficulty in being obtained; with no way but theft available to small civilisations.$(p)Or, y'know, the temporary recipe we added. But that's not canon.", + "text.astromine.resources.univite.page_three.title": "Usages", + "text.astromine.resources.univite.page_three.text": "Univite can be used to create the strongest tooling and weaponry known by all discovered civilisations.", + "text.astromine.resources.univite.page_four.title": "Statistics", + "text.astromine.resources.univite.page_four.text": "$(l)Tools$()$(br)Mining Level: 7$(br)Base Durability: 3918$(br)Mining Speed: 12$(br)Attack Damage: 6$(br)Enchantability: 22$(br)Fireproof$(p)$(l)Armor$()$(br)Durability Multiplier: 50$(br)Total Defense: 27$(br)Toughness: 5$(br)Enchantability: 22$(br)Fireproof", + "text.astromine.warfare.nuclear_warhead.title": "Nuclear Warhead", + "text.astromine.warfare.nuclear_warhead.page_one.title": "Nuclear Warhead", + "text.astromine.warfare.nuclear_warhead.page_one.text": "A bomb capable of devastating destruction, terminating all life-forms in the process.", + "text.astromine.warfare.nuclear_warhead.page_two.title": "Recipe", + "text.astromine.world.asteroid_ores.title": "Asteroid Ores", + "text.astromine.world.asteroid_ores.page_one.title": "Asteroid Ores", + "text.astromine.world.asteroid_ores.page_one.text": "Veins of ores found in $(thing)$(l:world/asteroids)asteroids$(), which may be harvested for resources.$(p)When mined, will drop their respective $(thing)$(l:world/ore_clusters)ore clusters$().", + "text.astromine.world.asteroids.title": "Asteroids", + "text.astromine.world.asteroids.page_one.title": "Asteroids", + "text.astromine.world.asteroids.page_one.text": "Foreign bodies found cruising through interstellar space, in rings, clusters and many other formations; said to contain large quantities of $(thing)$(l:world/asteroid_ores)ores$().", + "text.astromine.world.meteor_ores.title": "Meteor Ores", + "text.astromine.world.meteor_ores.page_one.title": "Meteor Ores", + "text.astromine.world.meteor_ores.page_one.text": "Veins of ores found in $(thing)$(l:world/meteors)meteors$(), which may be harvested for resources.$(p)When mined, will drop their respective $(thing)$(l:world/ore_clusters)ore clusters$().", + "text.astromine.world.meteors.title": "Meteors", + "text.astromine.world.meteors.page_one.title": "Meteors", + "text.astromine.world.meteors.page_one.text": "Foreign bodies that, cruising through the stairs, collided with a planetary body; said to contain $(thing)$(l:world/meteor_ores)extraterrestrial ores$().", + "text.astromine.world.ore_clusters.title": "Ore Clusters", + "text.astromine.world.ore_clusters.page_one.title": "Ore Clusters", + "text.astromine.world.ore_clusters.page_one.text": "Clusters of ores obtained from $(thing)$(l:world/asteroid_ores)asteroid ores$() or $(thing)$(l:world/meteor_ores)meteor ores$(), which may be processed for resources.", + "text.astromine.world.ore_clusters.page_two.title": "Processing", + "text.astromine.world.ore_clusters.page_two.text": "Triturating clusters will result in two of their respective $(thing)dusts$().", + "text.autoconfig.astromine/config.text": "Astromine Config", + "advancements.astromine.root.title": "Astromine", + "advancements.astromine.root.description": "Adventures to infinity and beyond", + "advancements.astromine.underestimate_metite.title": "Underestimating Alien Ores", + "advancements.astromine.underestimate_metite.description": "Attempt to mine Metite Ore with an insufficient pickaxe (You need Netherite!)", + "advancements.astromine.enter_space.title": "The Final Frontier", + "advancements.astromine.enter_space.description": "Enter Space", + "advancements.astromine.fall_to_earth.title": "Fall From The Heavens", + "advancements.astromine.fall_to_earth.description": "Fall back down to Earth", + "advancements.astromine.get_fire_extinguisher.title": "Fireman Steve", + "advancements.astromine.get_fire_extinguisher.description": "Craft a Fire Extinguisher", + "advancements.astromine.use_fire_extinguisher.title": "Realistic Physics", + "advancements.astromine.use_fire_extinguisher.description": "Propel yourself with a Fire Extinguisher", + "advancements.astromine.properly_use_fire_extinguisher.title": "The Hero Next Door", + "advancements.astromine.properly_use_fire_extinguisher.description": "Extinguish a mob that's on fire", + "advancements.astromine.get_meteor_stone.title": "(Space) Stone Age", + "advancements.astromine.get_meteor_stone.description": "Mine Meteor Stone with a strong pickaxe", + "advancements.astromine.get_metite_ingot.title": "Metal From The Stars", + "advancements.astromine.get_metite_ingot.description": "Obtain a Metite Ingot", + "advancements.astromine.get_stellum_ingot.title": "It's Full of Stars", + "advancements.astromine.get_stellum_ingot.description": "Obtain a Stellum Ingot", + "advancements.astromine.get_galaxium.title": "Hidden Gem", + "advancements.astromine.get_galaxium.description": "Obtain Galaxium", + "advancements.astromine.get_univite_ingot.title": "Univite Says Gay Rights", + "advancements.astromine.get_univite_ingot.description": "Obtain a Univite Ingot", + "advancements.astromine.get_univite_armor.title": "Cover Me in Rainbows", + "advancements.astromine.get_univite_armor.description": "Get a full suit of Univite Armor", + "advancements.astromine.get_space_suit.title": "Ready For The Unknown", + "advancements.astromine.get_space_suit.description": "Get a full Space Suit", + "advancements.astromine.launch_rocket.title": "We Have Liftoff", + "advancements.astromine.launch_rocket.description": "Launch a Rocket", + "advancements.astromine.tricked_piglin.title": "Shame On You", + "advancements.astromine.tricked_piglin.description": "Scam a Piglin with Fool's Gold", + "advancements.astromine.get_bronze_ingot.title": "Third Place", + "advancements.astromine.get_bronze_ingot.description": "Obtain a Bronze Ingot", + "advancements.astromine.get_fools_gold_ingot.title": "Only Fools", + "advancements.astromine.get_fools_gold_ingot.description": "Obtain a Fool's Gold Ingot", + "advancements.astromine.get_steel_ingot.title": "Steel Yourself", + "advancements.astromine.get_steel_ingot.description": "Obtain a Steel Ingot", + "advancements.astromine.get_sterling_silver_ingot.title": "Like Silver, But Sterling-er", + "advancements.astromine.get_sterling_silver_ingot.description": "Obtain a Sterling Silver Ingot", + "advancements.astromine.get_chassis.title": "Heart of the Machine", + "advancements.astromine.get_chassis.description": "Craft a Machine Chassis", + "advancements.astromine.get_alloy_smelter.title": "With Our Metals Combined", + "advancements.astromine.get_alloy_smelter.description": "Craft an Alloy Smelter", + "advancements.astromine.get_electric_smelter.title": "Hot Topic 2: Electric Boogaloo", + "advancements.astromine.get_electric_smelter.description": "Craft an Electric Smelter", + "advancements.astromine.get_presser.title": "Pressing Matters", + "advancements.astromine.get_presser.description": "Craft a Presser", + "advancements.astromine.get_triturator.title": "AKA Pulveriser", + "advancements.astromine.get_triturator.description": "Craft a Triturator", + "advancements.astromine.get_gear.title": "Grinds Your Gears", + "advancements.astromine.get_gear.description": "Craft a Gear", + "advancements.astromine.get_plates.title": "Flat Ingots", + "advancements.astromine.get_plates.description": "Craft some Plates", + "advancements.astromine.get_rose_gold_ingot.title": "Pretty in Pink", + "advancements.astromine.get_rose_gold_ingot.description": "Obtain a Rose Gold Ingot", + "advancements.astromine.get_basic_circuit.title": "Circuit Maker", + "advancements.astromine.get_basic_circuit.description": "Craft a Basic Circuit", + "advancements.astromine.get_advanced_circuit.title": "Super Circuit Maker", + "advancements.astromine.get_advanced_circuit.description": "Craft an Advanced Circuit", + "advancements.astromine.get_elite_circuit.title": "New Super Circuit Maker U Deluxe", + "advancements.astromine.get_elite_circuit.description": "Craft an Elite Circuit" +} \ No newline at end of file diff --git a/astromine-core/src/main/resources/assets/astromine/lang/en_gb.json b/astromine-core/src/main/resources/assets/astromine/lang/en_gb.json new file mode 100644 index 000000000..292a2ecfe --- /dev/null +++ b/astromine-core/src/main/resources/assets/astromine/lang/en_gb.json @@ -0,0 +1,1030 @@ +{ + "block.minecraft.empty": "Empty", + "entity.astromine.super_space_slime": "Jelanium: Super Space Slime", + "entity.astromine.space_slime": "Space Slime", + "entity.astromine.primitive_rocket": "Primitive Rocket", + "text.astromine.rocket.disassemble_empty_fuel": "Rocket experienced rapid unscheduled disassembly: no fuel loaded!", + "text.astromine.rocket.disassemble_collision": "Rocket experienced rapid unscheduled disassembly: trajectory obstructed!", + "text.astromine.rocket.disassemble_invalid_fuel": "Rocket experienced rapid unscheduled disassembly: incorrect fuel loaded!", + "text.astromine.message.holographic_connection_successful": "Succeeded in connecting projector at %s with projector at %s.", + "text.astromine.message.holographic_connection_failed": "Failed to connect projector at %s with projector at %s.", + "text.astromine.message.holographic_connection_clear": "Cleared selected projectors!", + "text.astromine.message.holographic_connector_select": "Selected projector at %s!", + "text.astromine.tooltip.fractional_bar": "%s of %s (%s)", + "text.astromine.tooltip.fractional_value": "%s/%s", + "text.astromine.tooltip.fractional_value_simple": "%s", + "text.astromine.tooltip.energy_value": "%s E", + "text.astromine.tooltip.compound_energy_value": "%s/%s E", + "text.astromine.tooltip.speed": "%sx speed", + "text.astromine.tooltip.cable.speed": "%s E/t", + "text.astromine.fluid": "Fluid", + "text.astromine.energy": "Energy", + "text.astromine.item": "Item", + "text.astromine.base": "Base", + "text.astromine.up": "Up", + "text.astromine.down": "Down", + "text.astromine.left": "Left", + "text.astromine.right": "Right", + "text.astromine.front": "Front", + "text.astromine.back": "Back", + "text.astromine.siding.input": "§bInput", + "text.astromine.siding.output": "§6Output", + "text.astromine.siding.input_output": "§bInput §7/ §6Output", + "text.astromine.siding.none": "§7None", + "text.astromine.siding.disabled": "§7§mDisabled", + "text.astromine.siding.west": "Right", + "text.astromine.siding.east": "Left", + "text.astromine.siding.up": "Top", + "text.astromine.siding.down": "Bottom", + "text.astromine.siding.north": "Front", + "text.astromine.siding.south": "Back", + "text.astromine.rocket.launch": "Launch", + "text.astromine.rocket.destroy": "Destroy!", + "text.astromine.rocket.fuel_status": "Fuel sufficient for %s of flight time.", + "item.astromine.primitive_machine_chassis": "Primitive Machine Chassis", + "item.astromine.basic_machine_chassis": "Basic Machine Chassis", + "item.astromine.advanced_machine_chassis": "Advanced Machine Chassis", + "item.astromine.elite_machine_chassis": "Elite Machine Chassis", + "item.astromine.graphite_sheet": "Graphite Sheet", + "item.astromine.gas_canister": "Gas Canister", + "item.astromine.pressurized_gas_canister": "Pressurised Gas Canister", + "item.astromine.basic_battery": "Basic Battery", + "item.astromine.advanced_battery": "Advanced Battery", + "item.astromine.elite_battery": "Elite Battery", + "item.astromine.creative_battery": "Creative Battery", + "item.astromine.fire_extinguisher": "Fire Extinguisher", + "item.astromine.holographic_connector": "Holographic Connector", + "item.astromine.holographic_bridge_projector": "Holographic Bridge Projector", + "item.astromine.primitive_rocket_fuel_tank": "Primitive Rocket Fuel Tank", + "item.astromine.primitive_rocket_hull": "Primitive Rocket Hull", + "item.astromine.primitive_rocket_plating": "Primitive Rocket Plating", + "item.astromine.primitive_rocket_booster": "Primitive Rocket Booster", + "itemGroup.astromine.core": "Astromine: Core", + "itemGroup.astromine.discoveries": "Astromine: Discoveries", + "itemGroup.astromine.foundations": "Astromine: Foundations", + "itemGroup.astromine.transportations": "Astromine: Transportations", + "itemGroup.astromine.technologies": "Astromine: Technologies", + "block.astromine.electrolyzer": "Electrolyser", + "block.astromine.fluid_mixer": "Fluid Mixer", + "block.astromine.creative_capacitor": "Creative Capacitor", + "block.astromine.creative_buffer": "Creative Buffer", + "block.astromine.primitive_buffer": "Primitive Buffer", + "block.astromine.basic_buffer": "Basic Buffer", + "block.astromine.advanced_buffer": "Advanced Buffer", + "block.astromine.elite_buffer": "Elite Buffer", + "block.astromine.vent": "Vent", + "block.astromine.primitive_solid_generator": "Primitive Solid Generator", + "block.astromine.basic_solid_generator": "Basic Solid Generator", + "block.astromine.advanced_solid_generator": "Advanced Solid Generator", + "block.astromine.elite_solid_generator": "Elite Solid Generator", + "block.astromine.primitive_liquid_generator": "Primitive Liquid Generator", + "block.astromine.basic_liquid_generator": "Basic Liquid Generator", + "block.astromine.advanced_liquid_generator": "Advanced Liquid Generator", + "block.astromine.elite_liquid_generator": "Elite Liquid Generator", + "block.astromine.primitive_presser": "Primitive Presser", + "block.astromine.basic_presser": "Basic Presser", + "block.astromine.advanced_presser": "Advanced Presser", + "block.astromine.elite_presser": "Elite Presser", + "block.astromine.primitive_triturator": "Primitive Triturator", + "block.astromine.basic_triturator": "Basic Triturator", + "block.astromine.advanced_triturator": "Advanced Triturator", + "block.astromine.elite_triturator": "Elite Triturator", + "block.astromine.primitive_electric_smelter": "Primitive Electric Smelter", + "block.astromine.basic_electric_smelter": "Basic Electric Smelter", + "block.astromine.advanced_electric_smelter": "Advanced Electric Smelter", + "block.astromine.elite_electric_smelter": "Elite Electric Smelter", + "block.astromine.primitive_alloy_smelter": "Primitive Alloy Smelter", + "block.astromine.basic_alloy_smelter": "Basic Alloy Smelter", + "block.astromine.advanced_alloy_smelter": "Advanced Alloy Smelter", + "block.astromine.elite_alloy_smelter": "Elite Alloy Smelter", + "block.astromine.primitive_electrolyzer": "Primitive Electrolyser", + "block.astromine.basic_electrolyzer": "Basic Electrolyser", + "block.astromine.advanced_electrolyzer": "Advanced Electrolyser", + "block.astromine.elite_electrolyzer": "Elite Electrolyser", + "block.astromine.primitive_refinery": "Primitive Refinery", + "block.astromine.basic_refinery": "Basic Refinery", + "block.astromine.advanced_refinery": "Advanced Refinery", + "block.astromine.elite_refinery": "Elite Refinery", + "block.astromine.primitive_fluid_mixer": "Primitive Fluid Mixer", + "block.astromine.basic_fluid_mixer": "Basic Fluid Mixer", + "block.astromine.advanced_fluid_mixer": "Advanced Fluid Mixer", + "block.astromine.elite_fluid_mixer": "Elite Fluid Mixer", + "block.astromine.fluid_cable": "Fluid Cable", + "block.astromine.primitive_energy_cable": "Primitive Energy Cable", + "block.astromine.basic_energy_cable": "Basic Energy Cable", + "block.astromine.advanced_energy_cable": "Advanced Energy Cable", + "block.astromine.elite_energy_cable": "Elite Energy Cable", + "block.astromine.primitive_capacitor": "Primitive Capacitor", + "block.astromine.basic_capacitor": "Basic Capacitor", + "block.astromine.advanced_capacitor": "Advanced Capacitor", + "block.astromine.elite_capacitor": "Elite Capacitor", + "block.astromine.airlock": "Airlock Door", + "block.astromine.altar_pedestal": "Altar Pedestal", + "block.astromine.altar": "Altar", + "item.astromine.tin_wire": "Tin Wire", + "item.astromine.copper_wire": "Copper Wire", + "item.astromine.silver_wire": "Silver Wire", + "item.astromine.lead_wire": "Lead Wire", + "item.astromine.gold_wire": "Gold Wire", + "item.astromine.steel_wire": "Steel Wire", + "item.astromine.electrum_wire": "Electrum Wire", + "block.astromine.primitive_tank": "Primitive Tank", + "block.astromine.basic_tank": "Basic Tank", + "block.astromine.advanced_tank": "Advanced Tank", + "block.astromine.elite_tank": "Elite Tank", + "block.astromine.creative_tank": "Creative Tank", + "block.astromine.fluid_extractor": "Fluid Extractor", + "block.astromine.fluid_inserter": "Fluid Inserter", + "block.astromine.block_breaker": "Block Breaker", + "block.astromine.block_placer": "Block Placer", + "block.astromine.nuclear_warhead": "Nuclear Warhead", + "block.astromine.holographic_bridge_projector": "Holographic Bridge Projector", + "block.astromine.asteroid_stone": "Asteroid Stone", + "block.astromine.moon_stone": "Moon Stone", + "block.astromine.blazing_asteroid_stone": "Blazing Asteroid Stone", + "block.astromine.meteor_stone": "Meteor Stone", + "block.astromine.tin_ore": "Tin Ore", + "block.astromine.copper_ore": "Copper Ore", + "block.astromine.silver_ore": "Silver Ore", + "block.astromine.lead_ore": "Lead Ore", + "block.astromine.asteroid_metite_ore": "Asteroid Metite Ore", + "block.astromine.meteor_metite_ore": "Meteor Metite Ore", + "block.astromine.asterite_block": "Block of Asterite", + "block.astromine.galaxium_block": "Block of Galaxium", + "block.astromine.metite_block": "Block of Metite", + "block.astromine.stellum_block": "Block of Stellum", + "block.astromine.univite_block": "Block of Univite", + "block.astromine.lunum_block": "Block of Lunum", + "block.astromine.tin_block": "Block of Tin", + "block.astromine.copper_block": "Block of Copper", + "block.astromine.silver_block": "Block of Silver", + "block.astromine.lead_block": "Block of Lead", + "block.astromine.bronze_block": "Block of Bronze", + "block.astromine.steel_block": "Block of Steel", + "block.astromine.electrum_block": "Block of Electrum", + "block.astromine.rose_gold_block": "Block of Rose Gold", + "block.astromine.sterling_silver_block": "Block of Sterling Silver", + "block.astromine.fools_gold_block": "Block of Fool's Gold", + "block.astromine.meteoric_steel_block": "Block of Meteoric Steel", + "block.astromine.asteroid_coal_ore": "Asteroid Coal Ore", + "block.astromine.asteroid_iron_ore": "Asteroid Iron Ore", + "block.astromine.asteroid_gold_ore": "Asteroid Gold Ore", + "block.astromine.asteroid_redstone_ore": "Asteroid Redstone Ore", + "block.astromine.asteroid_lapis_ore": "Asteroid Lapis Ore", + "block.astromine.asteroid_diamond_ore": "Asteroid Diamond Ore", + "block.astromine.asteroid_asterite_ore": "Asteroid Asterite Ore", + "block.astromine.asteroid_stellum_ore": "Asteroid Stellum Ore", + "block.astromine.asteroid_galaxium_ore": "Asteroid Galaxium Ore", + "block.astromine.asteroid_emerald_ore": "Asteroid Emerald Ore", + "block.astromine.asteroid_tin_ore": "Asteroid Tin Ore", + "block.astromine.asteroid_copper_ore": "Asteroid Copper Ore", + "block.astromine.asteroid_silver_ore": "Asteroid Silver Ore", + "block.astromine.asteroid_lead_ore": "Asteroid Lead Ore", + "block.astromine.moon_lunum_ore": "Lunum Ore", + "block.astromine.meteor_stone_slab": "Meteor Stone Slab", + "block.astromine.meteor_stone_stairs": "Meteor Stone Stairs", + "block.astromine.meteor_stone_wall": "Meteor Stone Wall", + "block.astromine.asteroid_stone_slab": "Asteroid Stone Slab", + "block.astromine.asteroid_stone_stairs": "Asteroid Stone Stairs", + "block.astromine.asteroid_stone_wall": "Asteroid Stone Wall", + "block.astromine.moon_stone_slab": "Moon Stone Slab", + "block.astromine.moon_stone_stairs": "Moon Stone Stairs", + "block.astromine.moon_stone_wall": "Moon Stone Wall", + "block.astromine.martian_stone_slab": "Martian Stone Slab", + "block.astromine.martian_stone_stairs": "Martian Stone Stairs", + "block.astromine.martian_stone_wall": "Martian Stone Wall", + "block.astromine.vulcan_stone_slab": "Vulcan Stone Slab", + "block.astromine.vulcan_stone_stairs": "Vulcan Stone Stairs", + "block.astromine.vulcan_stone_wall": "Vulcan Stone Wall", + "block.astromine.martian_soil": "Martian Soil", + "block.astromine.martian_stone": "Martian Stone", + "block.astromine.vulcan_stone": "Vulcan Stone", + "block.astromine.oxygen": "Oxygen", + "block.astromine.hydrogen": "Hydrogen", + "block.astromine.crude_oil": "Crude Oil", + "block.astromine.residual_fuel_oil": "Residual Fuel Oil", + "block.astromine.heavy_gas_oil": "Heavy Gas Oil", + "block.astromine.diesel": "Diesel", + "block.astromine.kerosene": "Kerosene", + "block.astromine.naphtha": "Naphtha", + "block.astromine.gasoline": "Petrol", + "block.astromine.butane": "Butane", + "block.astromine.kerosene_oxygen_fuel": "Kerosene-Oxygen Fuel", + "block.astromine.alternator": "Alternator", + "block.astromine.splitter": "Splitter", + "block.astromine.incinerator": "Incinerator", + "block.astromine.inserter": "Inserter", + "block.astromine.fast_inserter": "Fast Inserter", + "block.astromine.basic_conveyor": "Basic Conveyor", + "block.astromine.basic_vertical_conveyor": "Basic Vertical Conveyor", + "block.astromine.basic_downward_vertical_conveyor": "Basic Downward Vertical Conveyor", + "block.astromine.advanced_conveyor": "Advanced Conveyor", + "block.astromine.advanced_vertical_conveyor": "Advanced Vertical Conveyor", + "block.astromine.advanced_downward_vertical_conveyor": "Advanced Downward Vertical Conveyor", + "block.astromine.elite_conveyor": "Elite Conveyor", + "block.astromine.elite_vertical_conveyor": "Elite Vertical Conveyor", + "block.astromine.elite_downward_vertical_conveyor": "Elite Downward Vertical Conveyor", + "block.astromine.catwalk": "Catwalk", + "block.astromine.catwalk_stairs": "Catwalk Stairs", + "gas.astromine.oxygen": "Oxygen", + "gas.astromine.rocket_fuel": "Rocket Fuel", + "gas.minecraft.empty": "Vacuum", + "item.astromine.oxygen_bucket": "Oxygen Bucket", + "item.astromine.hydrogen_bucket": "Hydrogen Bucket", + "item.astromine.crude_oil_bucket": "Crude Oil Bucket", + "item.astromine.residual_fuel_oil_bucket": "Residual Fuel Oil Bucket", + "item.astromine.heavy_gas_oil_bucket": "Heavy Gas Oil Bucket", + "item.astromine.diesel_bucket": "Diesel Bucket", + "item.astromine.kerosene_bucket": "Kerosene Bucket", + "item.astromine.naphtha_bucket": "Naphtha Bucket", + "item.astromine.gasoline_bucket": "Petrol Bucket", + "item.astromine.butane_bucket": "Butane Bucket", + "item.astromine.kerosene_oxygen_fuel_bucket": "Kerosene-Oxygen Fuel Bucket", + "block.astromine.rocket_fuel": "Rocket Fuel Bucket", + "item.astromine.energy": "Energy", + "item.astromine.fluid": "Fluid", + "item.astromine.item": "Item", + "item.astromine.rocket_fuel_bucket": "Rocket Fuel Bucket", + "item.astromine.asterite_fragment": "Asterite Fragment", + "item.astromine.meteor_metite_cluster": "Meteor Metite Cluster", + "item.astromine.asteroid_metite_cluster": "Asteroid Metite Cluster", + "item.astromine.asteroid_coal_cluster": "Asteroid Coal Cluster", + "item.astromine.asteroid_iron_cluster": "Asteroid Iron Cluster", + "item.astromine.asteroid_gold_cluster": "Asteroid Gold Cluster", + "item.astromine.asteroid_redstone_cluster": "Asteroid Redstone Cluster", + "item.astromine.asteroid_lapis_cluster": "Asteroid Lapis Cluster", + "item.astromine.asteroid_diamond_cluster": "Asteroid Diamond Cluster", + "item.astromine.asteroid_emerald_cluster": "Asteroid Emerald Cluster", + "item.astromine.asteroid_asterite_cluster": "Asteroid Asterite Cluster", + "item.astromine.asteroid_stellum_cluster": "Asteroid Stellum Cluster", + "item.astromine.asteroid_galaxium_cluster": "Asteroid Galaxium Cluster", + "item.astromine.asteroid_tin_cluster": "Asteroid Tin Cluster", + "item.astromine.asteroid_copper_cluster": "Asteroid Copper Cluster", + "item.astromine.asteroid_silver_cluster": "Asteroid Silver Cluster", + "item.astromine.asteroid_lead_cluster": "Asteroid Lead Cluster", + "item.astromine.iron_dust": "Iron Dust", + "item.astromine.metite_dust": "Metite Dust", + "item.astromine.gold_dust": "Gold Dust", + "item.astromine.lapis_dust": "Lapis Dust", + "item.astromine.diamond_dust": "Diamond Dust", + "item.astromine.emerald_dust": "Emerald Dust", + "item.astromine.netherite_dust": "Netherite Dust", + "item.astromine.coal_dust": "Coal Dust", + "item.astromine.charcoal_dust": "Charcoal Dust", + "item.astromine.quartz_dust": "Quartz Dust", + "item.astromine.raw_netherite_dust": "Raw Netherite Dust", + "item.astromine.asterite_dust": "Asterite Dust", + "item.astromine.stellum_dust": "Stellum Dust", + "item.astromine.galaxium_dust": "Galaxium Dust", + "item.astromine.univite_dust": "Univite Dust", + "item.astromine.lunum_dust": "Lunum Dust", + "item.astromine.tin_dust": "Tin Dust", + "item.astromine.copper_dust": "Copper Dust", + "item.astromine.silver_dust": "Silver Dust", + "item.astromine.lead_dust": "Lead Dust", + "item.astromine.bronze_dust": "Bronze Dust", + "item.astromine.steel_dust": "Steel Dust", + "item.astromine.electrum_dust": "Electrum Dust", + "item.astromine.rose_gold_dust": "Rose Gold Dust", + "item.astromine.sterling_silver_dust": "Sterling Silver Dust", + "item.astromine.fools_gold_dust": "Fool's Gold Dust", + "item.astromine.meteoric_steel_dust": "Meteoric Steel Dust", + "item.astromine.redstone_tiny_dust": "Redstone Tiny Dust", + "item.astromine.iron_tiny_dust": "Iron Tiny Dust", + "item.astromine.metite_tiny_dust": "Metite Tiny Dust", + "item.astromine.gold_tiny_dust": "Gold Tiny Dust", + "item.astromine.lapis_tiny_dust": "Lapis Tiny Dust", + "item.astromine.diamond_tiny_dust": "Diamond Tiny Dust", + "item.astromine.emerald_tiny_dust": "Emerald Tiny Dust", + "item.astromine.netherite_tiny_dust": "Netherite Tiny Dust", + "item.astromine.coal_tiny_dust": "Coal Tiny Dust", + "item.astromine.charcoal_tiny_dust": "Charcoal Tiny Dust", + "item.astromine.quartz_tiny_dust": "Quartz Tiny Dust", + "item.astromine.raw_netherite_tiny_dust": "Raw Netherite Tiny Dust", + "item.astromine.asterite_tiny_dust": "Asterite Tiny Dust", + "item.astromine.stellum_tiny_dust": "Stellum Tiny Dust", + "item.astromine.galaxium_tiny_dust": "Galaxium Tiny Dust", + "item.astromine.univite_tiny_dust": "Univite Tiny Dust", + "item.astromine.lunum_tiny_dust": "Lunum Tiny Dust", + "item.astromine.tin_tiny_dust": "Tin Tiny Dust", + "item.astromine.copper_tiny_dust": "Copper Tiny Dust", + "item.astromine.silver_tiny_dust": "Silver Tiny Dust", + "item.astromine.lead_tiny_dust": "Lead Tiny Dust", + "item.astromine.bronze_tiny_dust": "Bronze Tiny Dust", + "item.astromine.steel_tiny_dust": "Steel Tiny Dust", + "item.astromine.electrum_tiny_dust": "Electrum Tiny Dust", + "item.astromine.rose_gold_tiny_dust": "Rose Gold Tiny Dust", + "item.astromine.sterling_silver_tiny_dust": "Sterling Silver Tiny Dust", + "item.astromine.fools_gold_tiny_dust": "Fool's Gold Tiny Dust", + "item.astromine.glowstone_tiny_dust": "Glowstone Tiny Dust", + "item.astromine.meteoric_steel_tiny_dust": "Meteoric Steel Tiny Dust", + "item.astromine.iron_plates": "Iron Plates", + "item.astromine.metite_plates": "Metite Plates", + "item.astromine.gold_plates": "Gold Plates", + "item.astromine.netherite_plates": "Netherite Plates", + "item.astromine.stellum_plates": "Stellum Plates", + "item.astromine.univite_plates": "Univite Plates", + "item.astromine.tin_plates": "Tin Plates", + "item.astromine.copper_plates": "Copper Plates", + "item.astromine.silver_plates": "Silver Plates", + "item.astromine.lead_plates": "Lead Plates", + "item.astromine.bronze_plates": "Bronze Plates", + "item.astromine.steel_plates": "Steel Plates", + "item.astromine.electrum_plates": "Electrum Plates", + "item.astromine.rose_gold_plates": "Rose Gold Plates", + "item.astromine.sterling_silver_plates": "Sterling Silver Plates", + "item.astromine.fools_gold_plates": "Fool's Gold Plates", + "item.astromine.lunum_plates": "Lunum Plates", + "item.astromine.meteoric_steel_plates": "Meteoric Steel Plates", + "item.astromine.iron_gear": "Iron Gear", + "item.astromine.metite_gear": "Metite Gear", + "item.astromine.gold_gear": "Gold Gear", + "item.astromine.netherite_gear": "Netherite Gear", + "item.astromine.stellum_gear": "Stellum Gear", + "item.astromine.univite_gear": "Univite Gear", + "item.astromine.tin_gear": "Tin Gear", + "item.astromine.copper_gear": "Copper Gear", + "item.astromine.silver_gear": "Silver Gear", + "item.astromine.lead_gear": "Lead Gear", + "item.astromine.bronze_gear": "Bronze Gear", + "item.astromine.steel_gear": "Steel Gear", + "item.astromine.electrum_gear": "Electrum Gear", + "item.astromine.rose_gold_gear": "Rose Gold Gear", + "item.astromine.sterling_silver_gear": "Sterling Silver Gear", + "item.astromine.fools_gold_gear": "Fool's Gold Gear", + "item.astromine.lunum_gear": "Lunum Gear", + "item.astromine.meteoric_steel_gear": "Meteoric Steel Gear", + "item.astromine.basic_circuit": "Basic Circuit", + "item.astromine.advanced_circuit": "Advanced Circuit", + "item.astromine.elite_circuit": "Elite Circuit", + "item.astromine.metite_ingot": "Metite Ingot", + "item.astromine.stellum_ingot": "Stellum Ingot", + "item.astromine.lunum_ingot": "Lunum Ingot", + "item.astromine.tin_ingot": "Tin Ingot", + "item.astromine.copper_ingot": "Copper Ingot", + "item.astromine.silver_ingot": "Silver Ingot", + "item.astromine.lead_ingot": "Lead Ingot", + "item.astromine.bronze_ingot": "Bronze Ingot", + "item.astromine.steel_ingot": "Steel Ingot", + "item.astromine.electrum_ingot": "Electrum Ingot", + "item.astromine.rose_gold_ingot": "Rose Gold Ingot", + "item.astromine.sterling_silver_ingot": "Sterling Silver Ingot", + "item.astromine.fools_gold_ingot": "Fool's Gold Ingot", + "item.astromine.meteoric_steel_ingot": "Meteoric Steel Ingot", + "item.astromine.univite_ingot": "Univite Ingot", + "item.astromine.galaxium_fragment": "Galaxium Fragment", + "item.astromine.diamond_fragment": "Diamond Fragment", + "item.astromine.emerald_fragment": "Emerald Fragment", + "item.astromine.quartz_fragment": "Quartz Fragment", + "item.astromine.raw_netherite_fragment": "Raw Netherite Fragment", + "item.astromine.asterite": "Asterite", + "item.astromine.galaxium": "Galaxium", + "item.astromine.metite_nugget": "Metite Nugget", + "item.astromine.stellum_nugget": "Stellum Nugget", + "item.astromine.univite_nugget": "Univite Nugget", + "item.astromine.lunum_nugget": "Lunum Nugget", + "item.astromine.netherite_nugget": "Netherite Nugget", + "item.astromine.tin_nugget": "Tin Nugget", + "item.astromine.copper_nugget": "Copper Nugget", + "item.astromine.silver_nugget": "Silver Nugget", + "item.astromine.lead_nugget": "Lead Nugget", + "item.astromine.bronze_nugget": "Bronze Nugget", + "item.astromine.steel_nugget": "Steel Nugget", + "item.astromine.electrum_nugget": "Electrum Nugget", + "item.astromine.rose_gold_nugget": "Rose Gold Nugget", + "item.astromine.sterling_silver_nugget": "Sterling Silver Nugget", + "item.astromine.fools_gold_nugget": "Fool's Gold Nugget", + "item.astromine.meteoric_steel_nugget": "Meteoric Steel Nugget", + "item.astromine.basic_drill": "Basic Drill", + "item.astromine.advanced_drill": "Advanced Drill", + "item.astromine.elite_drill": "Elite Drill", + "item.astromine.tin_pickaxe": "Tin Pickaxe", + "item.astromine.tin_axe": "Tin Axe", + "item.astromine.tin_shovel": "Tin Shovel", + "item.astromine.tin_hoe": "Tin Hoe", + "item.astromine.tin_sword": "Tin Sword", + "item.astromine.tin_mattock": "Tin Mattock", + "item.astromine.tin_mining_tool": "Tin Mining Tool", + "item.astromine.tin_hammer": "Tin Hammer", + "item.astromine.tin_excavator": "Tin Excavator", + "item.astromine.copper_pickaxe": "Copper Pickaxe", + "item.astromine.copper_axe": "Copper Axe", + "item.astromine.copper_shovel": "Copper Shovel", + "item.astromine.copper_hoe": "Copper Hoe", + "item.astromine.copper_sword": "Copper Sword", + "item.astromine.copper_mattock": "Copper Mattock", + "item.astromine.copper_mining_tool": "Copper Mining Tool", + "item.astromine.copper_hammer": "Copper Hammer", + "item.astromine.copper_excavator": "Copper Excavator", + "item.astromine.silver_pickaxe": "Silver Pickaxe", + "item.astromine.silver_axe": "Silver Axe", + "item.astromine.silver_shovel": "Silver Shovel", + "item.astromine.silver_hoe": "Silver Hoe", + "item.astromine.silver_sword": "Silver Sword", + "item.astromine.silver_mattock": "Silver Mattock", + "item.astromine.silver_mining_tool": "Silver Mining Tool", + "item.astromine.silver_hammer": "Silver Hammer", + "item.astromine.silver_excavator": "Silver Excavator", + "item.astromine.lead_pickaxe": "Lead Pickaxe", + "item.astromine.lead_axe": "Lead Axe", + "item.astromine.lead_shovel": "Lead Shovel", + "item.astromine.lead_hoe": "Lead Hoe", + "item.astromine.lead_sword": "Lead Sword", + "item.astromine.lead_mattock": "Lead Mattock", + "item.astromine.lead_mining_tool": "Lead Mining Tool", + "item.astromine.lead_hammer": "Lead Hammer", + "item.astromine.lead_excavator": "Lead Excavator", + "item.astromine.bronze_pickaxe": "Bronze Pickaxe", + "item.astromine.bronze_axe": "Bronze Axe", + "item.astromine.bronze_shovel": "Bronze Shovel", + "item.astromine.bronze_hoe": "Bronze Hoe", + "item.astromine.bronze_sword": "Bronze Sword", + "item.astromine.bronze_mattock": "Bronze Mattock", + "item.astromine.bronze_mining_tool": "Bronze Mining Tool", + "item.astromine.bronze_hammer": "Bronze Hammer", + "item.astromine.bronze_excavator": "Bronze Excavator", + "item.astromine.steel_pickaxe": "Steel Pickaxe", + "item.astromine.steel_axe": "Steel Axe", + "item.astromine.steel_shovel": "Steel Shovel", + "item.astromine.steel_hoe": "Steel Hoe", + "item.astromine.steel_sword": "Steel Sword", + "item.astromine.steel_mattock": "Steel Mattock", + "item.astromine.steel_mining_tool": "Steel Mining Tool", + "item.astromine.steel_hammer": "Steel Hammer", + "item.astromine.steel_excavator": "Steel Excavator", + "item.astromine.electrum_pickaxe": "Electrum Pickaxe", + "item.astromine.electrum_axe": "Electrum Axe", + "item.astromine.electrum_shovel": "Electrum Shovel", + "item.astromine.electrum_hoe": "Electrum Hoe", + "item.astromine.electrum_sword": "Electrum Sword", + "item.astromine.electrum_mattock": "Electrum Mattock", + "item.astromine.electrum_mining_tool": "Electrum Mining Tool", + "item.astromine.electrum_hammer": "Electrum Hammer", + "item.astromine.electrum_excavator": "Electrum Excavator", + "item.astromine.rose_gold_pickaxe": "Rose Gold Pickaxe", + "item.astromine.rose_gold_axe": "Rose Gold Axe", + "item.astromine.rose_gold_shovel": "Rose Gold Shovel", + "item.astromine.rose_gold_hoe": "Rose Gold Hoe", + "item.astromine.rose_gold_sword": "Rose Gold Sword", + "item.astromine.rose_gold_mattock": "Rose Gold Mattock", + "item.astromine.rose_gold_mining_tool": "Rose Gold Mining Tool", + "item.astromine.rose_gold_hammer": "Rose Gold Hammer", + "item.astromine.rose_gold_excavator": "Rose Gold Excavator", + "item.astromine.sterling_silver_pickaxe": "Sterling Silver Pickaxe", + "item.astromine.sterling_silver_axe": "Sterling Silver Silverver Axe", + "item.astromine.sterling_silver_shovel": "Sterling Silver Shovel", + "item.astromine.sterling_silver_hoe": "Sterling Silver Hoe", + "item.astromine.sterling_silver_sword": "Sterling Silver Sword", + "item.astromine.sterling_silver_mattock": "Sterling Silver Mattock", + "item.astromine.sterling_silver_mining_tool": "Sterling Silver Mining Tool", + "item.astromine.sterling_silver_hammer": "Sterling Silver Hammer", + "item.astromine.sterling_silver_excavator": "Sterling Silver Excavator", + "item.astromine.fools_gold_pickaxe": "Fool's Gold Pickaxe", + "item.astromine.fools_gold_axe": "Fool's Gold Axe", + "item.astromine.fools_gold_shovel": "Fool's Gold Shovel", + "item.astromine.fools_gold_hoe": "Fool's Gold Hoe", + "item.astromine.fools_gold_sword": "Fool's Gold Sword", + "item.astromine.fools_gold_mattock": "Fool's Gold Mattock", + "item.astromine.fools_gold_mining_tool": "Fool's Gold Mining Tool", + "item.astromine.fools_gold_hammer": "Fool's Gold Hammer", + "item.astromine.fools_gold_excavator": "Fool's Gold Excavator", + "item.astromine.metite_pickaxe": "Metite Pickaxe", + "item.astromine.metite_axe": "Metite Axe", + "item.astromine.metite_shovel": "Metite Shovel", + "item.astromine.metite_hoe": "Metite Hoe", + "item.astromine.metite_sword": "Metite Sword", + "item.astromine.metite_mattock": "Metite Mattock", + "item.astromine.metite_mining_tool": "Metite Mining Tool", + "item.astromine.metite_hammer": "Metite Hammer", + "item.astromine.metite_excavator": "Metite Excavator", + "item.astromine.asterite_pickaxe": "Asterite Pickaxe", + "item.astromine.asterite_axe": "Asterite Axe", + "item.astromine.asterite_shovel": "Asterite Shovel", + "item.astromine.asterite_hoe": "Asterite Hoe", + "item.astromine.asterite_sword": "Asterite Sword", + "item.astromine.asterite_mattock": "Asterite Mattock", + "item.astromine.asterite_mining_tool": "Asterite Mining Tool", + "item.astromine.asterite_hammer": "Asterite Hammer", + "item.astromine.asterite_excavator": "Asterite Excavator", + "item.astromine.stellum_pickaxe": "Stellum Pickaxe", + "item.astromine.stellum_axe": "Stellum Axe", + "item.astromine.stellum_shovel": "Stellum Shovel", + "item.astromine.stellum_hoe": "Stellum Hoe", + "item.astromine.stellum_sword": "Stellum Sword", + "item.astromine.stellum_mattock": "Stellum Mattock", + "item.astromine.stellum_mining_tool": "Stellum Mining Tool", + "item.astromine.stellum_hammer": "Stellum Hammer", + "item.astromine.stellum_excavator": "Stellum Excavator", + "item.astromine.galaxium_pickaxe": "Galaxium Pickaxe", + "item.astromine.galaxium_axe": "Galaxium Axe", + "item.astromine.galaxium_shovel": "Galaxium Shovel", + "item.astromine.galaxium_hoe": "Galaxium Hoe", + "item.astromine.galaxium_sword": "Galaxium Sword", + "item.astromine.galaxium_mattock": "Galaxium Mattock", + "item.astromine.galaxium_mining_tool": "Galaxium Mining Tool", + "item.astromine.galaxium_hammer": "Galaxium Hammer", + "item.astromine.galaxium_excavator": "Galaxium Excavator", + "item.astromine.univite_pickaxe": "Univite Pickaxe", + "item.astromine.univite_axe": "Univite Axe", + "item.astromine.univite_shovel": "Univite Shovel", + "item.astromine.univite_hoe": "Univite Hoe", + "item.astromine.univite_sword": "Univite Sword", + "item.astromine.univite_mattock": "Univite Mattock", + "item.astromine.univite_mining_tool": "Univite Mining Tool", + "item.astromine.univite_hammer": "Univite Hammer", + "item.astromine.univite_excavator": "Univite Excavator", + "item.astromine.lunum_pickaxe": "Lunum Pickaxe", + "item.astromine.lunum_axe": "Lunum Axe", + "item.astromine.lunum_shovel": "Lunum Shovel", + "item.astromine.lunum_hoe": "Lunum Hoe", + "item.astromine.lunum_sword": "Lunum Sword", + "item.astromine.lunum_mattock": "Lunum Mattock", + "item.astromine.lunum_mining_tool": "Lunum Mining Tool", + "item.astromine.lunum_hammer": "Lunum Hammer", + "item.astromine.lunum_excavator": "Lunum Excavator", + "item.astromine.meteoric_steel_pickaxe": "Meteoric Steel Pickaxe", + "item.astromine.meteoric_steel_axe": "Meteoric Steel Axe", + "item.astromine.meteoric_steel_shovel": "Meteoric Steel Shovel", + "item.astromine.meteoric_steel_hoe": "Meteoric Steel Hoe", + "item.astromine.meteoric_steel_sword": "Meteoric Steel Sword", + "item.astromine.meteoric_steel_mattock": "Meteoric Steel Mattock", + "item.astromine.meteoric_steel_mining_tool": "Meteoric Steel Mining Tool", + "item.astromine.meteoric_steel_hammer": "Meteoric Steel Hammer", + "item.astromine.meteoric_steel_excavator": "Meteoric Steel Excavator", + "item.astromine.wooden_mattock": "Wooden Mattock", + "item.astromine.wooden_mining_tool": "Wooden Mining Tool", + "item.astromine.stone_mattock": "Stone Mattock", + "item.astromine.stone_mining_tool": "Stone Mining Tool", + "item.astromine.iron_mattock": "Iron Mattock", + "item.astromine.iron_mining_tool": "Iron Mining Tool", + "item.astromine.golden_mattock": "Golden Mattock", + "item.astromine.golden_mining_tool": "Golden Mining Tool", + "item.astromine.diamond_mattock": "Diamond Mattock", + "item.astromine.diamond_mining_tool": "Diamond Mining Tool", + "item.astromine.netherite_mattock": "Netherite Mattock", + "item.astromine.netherite_mining_tool": "Netherite Mining Tool", + "item.astromine.tin_helmet": "Tin Helmet", + "item.astromine.tin_chestplate": "Tin Chestplate", + "item.astromine.tin_leggings": "Tin Leggings", + "item.astromine.tin_boots": "Tin Boots", + "item.astromine.copper_helmet": "Copper Helmet", + "item.astromine.copper_chestplate": "Copper Chestplate", + "item.astromine.copper_leggings": "Copper Leggings", + "item.astromine.copper_boots": "Copper Boots", + "item.astromine.silver_helmet": "Silver Helmet", + "item.astromine.silver_chestplate": "Silver Chestplate", + "item.astromine.silver_leggings": "Silver Leggings", + "item.astromine.silver_boots": "Silver Boots", + "item.astromine.lead_helmet": "Lead Helmet", + "item.astromine.lead_chestplate": "Lead Chestplate", + "item.astromine.lead_leggings": "Lead Leggings", + "item.astromine.lead_boots": "Lead Boots", + "item.astromine.bronze_helmet": "Bronze Helmet", + "item.astromine.bronze_chestplate": "Bronze Chestplate", + "item.astromine.bronze_leggings": "Bronze Leggings", + "item.astromine.bronze_boots": "Bronze Boots", + "item.astromine.steel_helmet": "Steel Helmet", + "item.astromine.steel_chestplate": "Steel Chestplate", + "item.astromine.steel_leggings": "Steel Leggings", + "item.astromine.steel_boots": "Steel Boots", + "item.astromine.electrum_helmet": "Electrum Helmet", + "item.astromine.electrum_chestplate": "Electrum Chestplate", + "item.astromine.electrum_leggings": "Electrum Leggings", + "item.astromine.electrum_boots": "Electrum Boots", + "item.astromine.rose_gold_helmet": "Rose Gold Helmet", + "item.astromine.rose_gold_chestplate": "Rose Gold Chestplate", + "item.astromine.rose_gold_leggings": "Rose Gold Leggings", + "item.astromine.rose_gold_boots": "Rose Gold Boots", + "item.astromine.sterling_silver_helmet": "Sterling Silver Helmet", + "item.astromine.sterling_silver_chestplate": "Sterling Silver Chestplate", + "item.astromine.sterling_silver_leggings": "Sterling Silver Leggings", + "item.astromine.sterling_silver_boots": "Sterling Silver Boots", + "item.astromine.fools_gold_helmet": "Fool's Gold Helmet", + "item.astromine.fools_gold_chestplate": "Fool's Gold Chestplate", + "item.astromine.fools_gold_leggings": "Fool's Gold Leggings", + "item.astromine.fools_gold_boots": "Fool's Gold Boots", + "item.astromine.metite_helmet": "Metite Helmet", + "item.astromine.metite_chestplate": "Metite Chestplate", + "item.astromine.metite_leggings": "Metite Leggings", + "item.astromine.metite_boots": "Metite Boots", + "item.astromine.asterite_helmet": "Asterite Helmet", + "item.astromine.asterite_chestplate": "Asterite Chestplate", + "item.astromine.asterite_leggings": "Asterite Leggings", + "item.astromine.asterite_boots": "Asterite Boots", + "item.astromine.stellum_helmet": "Stellum Helmet", + "item.astromine.stellum_chestplate": "Stellum Chestplate", + "item.astromine.stellum_leggings": "Stellum Leggings", + "item.astromine.stellum_boots": "Stellum Boots", + "item.astromine.galaxium_helmet": "Galaxium Helmet", + "item.astromine.galaxium_chestplate": "Galaxium Chestplate", + "item.astromine.galaxium_leggings": "Galaxium Leggings", + "item.astromine.galaxium_boots": "Galaxium Boots", + "item.astromine.univite_helmet": "Univite Helmet", + "item.astromine.univite_chestplate": "Univite Chestplate", + "item.astromine.univite_leggings": "Univite Leggings", + "item.astromine.univite_boots": "Univite Boots", + "item.astromine.lunum_helmet": "Lunum Helmet", + "item.astromine.lunum_chestplate": "Lunum Chestplate", + "item.astromine.lunum_leggings": "Lunum Leggings", + "item.astromine.lunum_boots": "Lunum Boots", + "item.astromine.meteoric_steel_helmet": "Meteoric Steel Helmet", + "item.astromine.meteoric_steel_chestplate": "Meteoric Steel Chestplate", + "item.astromine.meteoric_steel_leggings": "Meteoric Steel Leggings", + "item.astromine.meteoric_steel_boots": "Meteoric Steel Boots", + "item.astromine.space_suit_helmet": "Space Suit Helmet", + "item.astromine.space_suit_chestplate": "Space Suit Chest", + "item.astromine.space_suit_leggings": "Space Suit Pants", + "item.astromine.space_suit_boots": "Space Suit Boots", + "item.astromine.space_slime_spawn_egg": "Space Slime Spawn Egg", + "item.astromine.super_space_slime_shooter": "Super Space Slime Shooter", + "item.astromine.space_slime_ball": "Space Slimeball", + "item.astromine.manual": "Astromine Manual", + "item.astromine.yeast": "Yeast", + "item.astromine.rocket": "Rocket", + "item.astromine.copper_wrench": "Copper Spanner", + "item.astromine.bronze_wrench": "Bronze Spanner", + "item.astromine.steel_wrench": "Steel Spanner", + "item.astromine.rose_gold_apple": "Rose Gold Apple", + "item.astromine.fools_gold_apple": "Fool's Gold Apple", + "item.astromine.lead_apple": "Lead Apple", + "item.astromine.basic_machine_upgrade_kit": "Basic Machine Upgrade Kit", + "item.astromine.advanced_machine_upgrade_kit": "Advanced Machine Upgrade Kit", + "item.astromine.elite_machine_upgrade_kit": "Elite Machine Upgrade Kit", + "item.astromine.gravity_gauntlet": "Gravity Gauntlet", + "item.minecraft.potion.effect.rocket_fuel": "Rocket Fuel Bottle", + "item.minecraft.splash_potion.effect.rocket_fuel": "Splash Rocket Fuel Bottle", + "item.minecraft.lingering_potion.effect.rocket_fuel": "Lingering Rocket Fuel Bottle", + "item.minecraft.tipped_arrow.effect.rocket_fuel": "Arrow of Rocket Fuel", + "item.minecraft.potion.effect.sugar_water": "Sugar Water Bottle", + "item.minecraft.splash_potion.effect.sugar_water": "Splash Sugar Water Bottle", + "item.minecraft.lingering_potion.effect.sugar_water": "Lingering Sugar Water Bottle", + "item.minecraft.tipped_arrow.effect.sugar_water": "Arrow of Sugar Water", + "potion.potency.10": "X", + "subtitles.astromine.humming": "Humming", + "subtitles.astromine.holographic_connector_click": "Holographic Connector clicks", + "subtitles.astromine.fire_extinguisher_open": "Fire Extinguisher opens", + "subtitles.astromine.gunshot": "Gunshot", + "subtitles.astromine.empty_magazine": "Magazine is empty", + "text.astromine.manual.landing": "Your guide to the stars!", + "category.astromine.liquid_generating": "Liquid Generating", + "category.astromine.solid_generating": "Solid Generating", + "category.astromine.electric_smelting": "Electric Smelting", + "category.astromine.alloy_smelting": "Alloy Smelting", + "category.astromine.pressing": "Pressing", + "category.astromine.triturating": "Triturating", + "category.astromine.fluid_mixing": "Fluid Mixing", + "category.astromine.electrolyzing": "Electrolysing", + "category.astromine.refining": "Refining", + "category.astromine.infusing": "Infusing", + "category.astromine.cooking.time": "%s seconds", + "category.astromine.cooking.energy": "%s energy", + "category.astromine.generating.energy": "%s generated per tick", + "category.astromine.consuming.energy": "%s consumed", + "category.astromine.fluid.generating.consumed": "%s (%s) consumed per tick", + "category.astromine.fluid.generating.generated": "%s (%s) generated per tick", + "text.astromine.manual.obtain.info": "The Astromine Manual can be obtained by right clicking a Metite Axe on a Bookshelf.", + "text.astromine.selected.dimension.pos": "Selected %s (%d, %d, %d)", + "text.astromine.patchouli.astronautics.title": "Astronautics", + "text.astromine.patchouli.astronautics.description": "From where one dreams, to where their dreams come true.", + "text.astromine.patchouli.components.title": "Components", + "text.astromine.patchouli.components.description": "Components for crafting items to aid one in their journey.", + "text.astromine.patchouli.creatures.title": "Creatures", + "text.astromine.patchouli.creatures.description": "Those beyond our wildest realm of imagination.", + "text.astromine.patchouli.gadgets.title": "Gadgets", + "text.astromine.patchouli.gadgets.description": "One's physical assistance in their journey.", + "text.astromine.patchouli.machinery.title": "Machinery", + "text.astromine.patchouli.machinery.description": "What moves one's world.", + "text.astromine.patchouli.resources.title": "Resources", + "text.astromine.patchouli.resources.description": "The exquisite materials that one channels for power.", + "text.astromine.patchouli.warfare.title": "Warfare", + "text.astromine.patchouli.warfare.description": "What one uses to wipe away their foe.", + "text.astromine.patchouli.world.title": "World", + "text.astromine.patchouli.world.description": "What surrounds one.", + "text.astromine.astronautics.space_suit.title": "Space Suit", + "text.astromine.astronautics.space_suit.page_one.title": "Space Suit", + "text.astromine.astronautics.space_suit.page_one.text": "Vital for survival in hostile environments, a Space Suit is the most important thing one may carry. $(p)With internal tanks which may be pressurised in certain machines, it may be filled with (un-)breathable gases fit for whoever is wearing it.", + "text.astromine.astronautics.rocket.title": "Rocket", + "text.astromine.astronautics.rocket.page_one.title": "Rocket", + "text.astromine.astronautics.rocket.page_one.text": "Your ticket to the final frontier.", + "text.astromine.astronautics.rocket.page_two.title": "Crafting and Notes", + "text.astromine.astronautics.rocket.page_two.text": "Right click with a $(item)Flint and Steel$() to launch. Right click with a $(item)Stick$() to destroy. These are both temporary measures.", + "text.astromine.components.circuits.title": "Circuits", + "text.astromine.components.circuits.page_one.title": "Basic Circuit", + "text.astromine.components.circuits.page_one.text": "A basic electric circuit board, built for general systems with no special requirements, whose architecture is based on graphene.", + "text.astromine.components.circuits.page_two.title": "Basic Circuit Recipe", + "text.astromine.components.circuits.page_three.title": "Advanced Circuit", + "text.astromine.components.circuits.page_three.text": "A more advanced electric circuit board, built for systems with low latency in mind, whose architecture is based on graphene.", + "text.astromine.components.circuits.page_four.title": "Advanced Circuit Recipe", + "text.astromine.components.circuits.page_five.title": "Elite Circuit", + "text.astromine.components.circuits.page_five.text": "An elite electric circuit board, built for systems with high throughput and low latency in mind, whose architecture makes use of coveted, laboratory-made materials.", + "text.astromine.components.circuits.page_six.title": "Elite Circuit Recipe", + "text.astromine.components.gears.title": "Gears", + "text.astromine.components.gears.page_one.title": "Gears", + "text.astromine.components.gears.page_one.text": "A small wheel with teeth, gears interlocked with one another can turn to achieve any number of things.$(p)As such, they will have great use in constructing useful $(thing)machines$().", + "text.astromine.components.gears.page_two.title": "Recipe", + "text.astromine.components.gears.page_two.text": "While the recipe shown is clearly for an $(item)Iron Gear$(), simply substituting the $(item)Iron Ingots$() with any other $(thing)Ingots$() will create a gear of that type.", + "text.astromine.components.plates.title": "Plates", + "text.astromine.components.plates.page_one.title": "Plates", + "text.astromine.components.plates.page_one.text": "Thin sheets of metal, plates are useful for constructing $(thing)housing$() for $(thing)machinery$().", + "text.astromine.components.plates.page_two.title": "Recipe", + "text.astromine.components.plates.page_two.text": "While the recipe shown is clearly for $(item)Iron Plates$(), simply substituting the $(item)Iron Ingots$() with any other $(thing)Ingots$() will create plates of that type.", + "text.astromine.creatures.space_slime.title": "Space Slime", + "text.astromine.creatures.space_slime.page_one.title": "Space Slime", + "text.astromine.creatures.space_slime.page_one.text": "A fierce adversary which inhabits large sections of traversable space.", + "text.astromine.creatures.space_slime.page_two.title": "Drops", + "text.astromine.creatures.space_slime.page_two.text": "Upon defeat, a $(thing)Space Slime$() will drop $(thing)Space Slime Balls$().", + "text.astromine.gadgets.fire_extinguisher.title": "Fire Extinguisher", + "text.astromine.gadgets.fire_extinguisher.page_one.title": "Fire Extinguisher", + "text.astromine.gadgets.fire_extinguisher.page_one.text": "An important tool in one's space journeys, it is responsible for providing maneuverable thrust.$(p)Surprisingly, it can also extinguish fire.", + "text.astromine.gadgets.fire_extinguisher.page_two.title": "Recipe", + "text.astromine.gadgets.gravity_gauntlet.title": "Gravity Gauntlets", + "text.astromine.gadgets.gravity_gauntlet.page_one.title": "Gravity Gauntlets", + "text.astromine.gadgets.gravity_gauntlet.page_one.text": "Gauntlets which can repel opponents. One must be worn on each hand, and they must be charged before they can activate$(p)Charging is done by holding right click with one in each hand, and takes energy.", + "text.astromine.gadgets.gravity_gauntlet.page_two.title": "Recipe", + "text.astromine.machinery.holographic_bridge_projector.title": "Holographic Bridge Projector", + "text.astromine.machinery.holographic_bridge_projector.page_one.title": "Holographic Bridge Projector", + "text.astromine.machinery.holographic_bridge_projector.page_one.text": "A machine which generates a holographic bridge between it and another one of its kind; linkable with a $(item)$(l:gadgets/holographic_connector)Holographic Connector$().", + "text.astromine.machinery.holographic_bridge_projector.page_two.title": "Recipe", + "text.astromine.gadgets.holographic_connector.title": "Holographic Connector", + "text.astromine.gadgets.holographic_connector.page_one.title": "Holographic Connector", + "text.astromine.gadgets.holographic_connector.page_one.text": "A remote controller which allows you to link together $(item)$(l:machinery/holographic_bridge_projector)Holographic Bridge Projectors$(). They must be facing each other in the same line, but can have different heights.", + "text.astromine.gadgets.holographic_connector.page_two.title": "Recipe", + "text.astromine.machinery.creative_buffer.title": "Creative Buffer", + "text.astromine.machinery.creative_buffer.page_one.title": "Creative Buffer", + "text.astromine.machinery.creative_buffer.page_one.text": "A machine which produces a specified $(thing)item$() infinitely.", + "text.astromine.machinery.creative_capacitor.title": "Creative Capacitor", + "text.astromine.machinery.creative_capacitor.page_one.title": "Creative Capacitor", + "text.astromine.machinery.creative_capacitor.page_one.text": "A machine which produces $(thing)energy$() infinitely.", + "text.astromine.machinery.creative_tank.title": "Creative Tank", + "text.astromine.machinery.creative_tank.page_one.title": "Creative Tank", + "text.astromine.machinery.creative_tank.page_one.text": "A machine which produces a specified $(thing)fluid$() infinitely.", + "text.astromine.machinery.electric_smelter.title": "Electric Smelter", + "text.astromine.machinery.electric_smelter.page_one.title": "Electric Smelter", + "text.astromine.machinery.electric_smelter.page_one.text": "A machine which consumes $(thing)energy$() to smelt $(thing)items$() into useful materials.", + "text.astromine.machinery.electric_smelter.page_two.title": "Recipe", + "text.astromine.machinery.electrolyzer.title": "Electrolyser", + "text.astromine.machinery.electrolyzer.page_one.title": "Electrolyser", + "text.astromine.machinery.electrolyzer.page_one.text": "A machine which consumes $(thing)energy$() to electrolyse $(thing)fluids$() into useful materials.", + "text.astromine.machinery.electrolyzer.page_two.title": "Recipe", + "text.astromine.machinery.energy_cable.title": "Energy Cable", + "text.astromine.machinery.energy_cable.page_one.title": "Energy Cable", + "text.astromine.machinery.energy_cable.page_one.text": "A cable which transports $(thing)energy$(); no buffering or path-finding involved.", + "text.astromine.machinery.energy_cable.page_two.title": "Recipe", + "text.astromine.machinery.fluid_cable.title": "Fluid Cable", + "text.astromine.machinery.fluid_cable.page_one.title": "Fluid Cable", + "text.astromine.machinery.fluid_cable.page_one.text": "A cable which transports $(thing)fluids$(); no buffering or path-finding involved.", + "text.astromine.machinery.fluid_cable.page_two.title": "Recipe", + "text.astromine.machinery.fluid_extractor.title": "Fluid Extractor", + "text.astromine.machinery.fluid_extractor.page_one.title": "Fluid Extractor", + "text.astromine.machinery.fluid_extractor.page_one.text": "A machine which consumes $(thing)energy$() to pick up $(thing)fluids$() from the world.", + "text.astromine.machinery.fluid_extractor.page_two.title": "Recipe", + "text.astromine.machinery.fluid_inserter.title": "Fluid Inserter", + "text.astromine.machinery.fluid_inserter.page_one.title": "Fluid Inserter", + "text.astromine.machinery.fluid_inserter.page_one.text": "A machine which consumes $(thing)energy$() to place $(thing)fluids$() in the world.", + "text.astromine.machinery.fluid_inserter.page_two.title": "Recipe", + "text.astromine.machinery.fluid_mixer.title": "Fuel Mixer", + "text.astromine.machinery.fluid_mixer.page_one.title": "Fuel Mixer", + "text.astromine.machinery.fluid_mixer.page_one.text": "A machine which consumes $(thing)energy$() to mix $(thing)fluids$() into useful materials.", + "text.astromine.machinery.fluid_mixer.page_two.title": "Recipe", + "text.astromine.machinery.block_breaker.title": "Block Breaker", + "text.astromine.machinery.block_breaker.page_one.title": "Block Breaker", + "text.astromine.machinery.block_breaker.page_one.text": "A machine which consumes $(thing)energy$() to break and pick up $(thing)blocks$() from the world.", + "text.astromine.machinery.block_breaker.page_two.title": "Recipe", + "text.astromine.machinery.block_placer.title": "Block Placer", + "text.astromine.machinery.block_placer.page_one.title": "Block Placer", + "text.astromine.machinery.block_placer.page_one.text": "A machine which consumes $(thing)energy$() to place $(thing)blocks$() in the world.", + "text.astromine.machinery.block_placer.page_two.title": "Recipe", + "text.astromine.machinery.inserter.title": "Inserter", + "text.astromine.machinery.inserter.page_one.title": "Inserter", + "text.astromine.machinery.inserter.page_one.text": "A machine which picks up items from its front and places them at its back, for item transportation.", + "text.astromine.machinery.inserter.page_two.title": "Recipe", + "text.astromine.machinery.inserter.page_three.title": "Recipe", + "text.astromine.machinery.conveyor.title": "Conveyor", + "text.astromine.machinery.conveyor.page_one.title": "Conveyor", + "text.astromine.machinery.conveyor.page_one.text": "A machine which transports items.", + "text.astromine.machinery.conveyor.page_two.title": "Recipe", + "text.astromine.machinery.conveyor.page_three.title": "Recipe", + "text.astromine.machinery.conveyor.page_four.title": "Recipe", + "text.astromine.machinery.triturator.title": "Triturator", + "text.astromine.machinery.triturator.page_one.title": "Triturator", + "text.astromine.machinery.triturator.page_one.text": "A machine which consumes $(thing)energy$() to pulverise $(thing)items$() into useful materials.", + "text.astromine.machinery.triturator.page_two.title": "Recipe", + "text.astromine.machinery.presser.title": "Presser", + "text.astromine.machinery.presser.page_one.title": "Presser", + "text.astromine.machinery.presser.page_one.text": "A machine which consumes $(thing)energy$() to press $(thing)items$() into useful materials.", + "text.astromine.machinery.presser.page_two.title": "Recipe", + "text.astromine.machinery.vent.title": "Vent", + "text.astromine.machinery.vent.page_one.title": "Vent", + "text.astromine.machinery.vent.page_one.text": "A machine which consumes energy to ventilate fluids into the atmosphere.", + "text.astromine.machinery.vent.page_two.title": "Recipe", + "text.astromine.resources.copper.title": "Copper", + "text.astromine.resources.copper.page_one.title": "Copper", + "text.astromine.resources.copper.page_one.text": "A very common metal with high thermal and electrical conductivity and a distinct orange hue.", + "text.astromine.resources.copper.page_two.title": "Obtaining Copper", + "text.astromine.resources.copper.page_two.text": "$(item)Copper Ore$() can be commonly found $(thing)underground$() in $(thing)The Overworld$().$(p)Mining requires only a $(item)Stone Pickaxe$() (Mining Level 1) or better, and can then be $(thing)smelted$() into a $(item)Copper Ingot$().", + "text.astromine.resources.copper.page_three.title": "Usages", + "text.astromine.resources.copper.page_three.text": "Copper is very useful for basic electronics and tools. When combined with $(item)$(l:resources/tin)Tin$() in an $(item)$(l:machinery/alloy_smelter)Alloy Smelter$(), it can make $(item)$(l:resources/bronze)Bronze$().", + "text.astromine.resources.copper.page_four.title": "Statistics", + "text.astromine.resources.copper.page_four.text": "$(l)Tools$()$(br)Mining Level: 1$(br)Base Durability: 200$(br)Mining Speed: 4$(br)Attack Damage: 1.5$(br)Enchantability: 10$(p)$(l)Armor$()$(br)Durability Multiplier: 12$(br)Total Defense: 12$(br)Toughness: 0$(br)Enchantability: 15", + "text.astromine.resources.tin.title": "Tin", + "text.astromine.resources.tin.page_one.title": "Tin", + "text.astromine.resources.tin.page_one.text": "A common metal with a silvery sheen and a soft composition.", + "text.astromine.resources.tin.page_two.title": "Obtaining Tin", + "text.astromine.resources.tin.page_two.text": "$(item)Tin Ore$() can be commonly found $(thing)underground$() in $(thing)The Overworld$().$(p)Mining requires only a $(item)Stone Pickaxe$() (Mining Level 1) or better, and can then be $(thing)smelted$() into a $(item)Tin Ingot$().", + "text.astromine.resources.tin.page_three.title": "Usages", + "text.astromine.resources.tin.page_three.text": "Tin is useful for plating to prevent corrosion. When combined with $(item)$(l:resources/copper)Copper$() in an $(item)$(l:machinery/alloy_smelter)Alloy Smelter$(), it can make $(item)$(l:resources/bronze)Bronze$().", + "text.astromine.resources.tin.page_four.title": "Statistics", + "text.astromine.resources.tin.page_four.text": "$(l)Tools$()$(br)Mining Level: 1$(br)Base Durability: 200$(br)Mining Speed: 5$(br)Attack Damage: 1.0$(br)Enchantability: 10$(p)$(l)Armor$()$(br)Durability Multiplier: 12$(br)Total Defense: 12$(br)Toughness: 0$(br)Enchantability: 15", + "text.astromine.resources.bronze.title": "Bronze", + "text.astromine.resources.bronze.page_one.title": "Bronze", + "text.astromine.resources.bronze.page_one.text": "An alloy of $(item)$(l:resources/copper)Copper$() and $(item)$(l:resources/tin)Tin$(), Bronze manages to be stronger and more durable than either of them.", + "text.astromine.resources.bronze.page_two.title": "Obtaining Bronze", + "text.astromine.resources.bronze.page_two.text": "Bronze can be obtained by combining 3 Copper Ingots and 1 Tin Ingot in an $(item)$(l:machinery/alloy_smelter)Alloy Smelter$(). This produces 4 $(item)Bronze Ingots$().", + "text.astromine.resources.bronze.page_three.title": "Usages", + "text.astromine.resources.bronze.page_three.text": "Bronze is useful for creating tools, and is also used in construction of more advanced machines.", + "text.astromine.resources.bronze.page_four.title": "Statistics", + "text.astromine.resources.bronze.page_four.text": "$(l)Tools$()$(br)Mining Level: 2$(br)Base Durability: 539$(br)Mining Speed: 7$(br)Attack Damage: 2.5$(br)Enchantability: 20$(p)$(l)Armor$()$(br)Durability Multiplier: 20$(br)Total Defense: 15$(br)Toughness: 0.7$(br)Enchantability: 18", + "text.astromine.resources.steel.title": "Steel", + "text.astromine.resources.steel.page_one.title": "Steel", + "text.astromine.resources.steel.page_one.text": "An alloy of $(item)Iron$() and $(thing)Carbon$(), Steel is incredibly strong for a metal of terrestrial origin.", + "text.astromine.resources.steel.page_two.title": "Obtaining Steel", + "text.astromine.resources.steel.page_two.text": "Steel can be obtained by combining an Iron Ingot and 2 $(item)Coal Dust$() or $(item)Charcoal Dust$() in an $(item)$(l:machinery/alloy_smelter)Alloy Smelter$(). This produces a single $(item)Steel Ingot$().", + "text.astromine.resources.steel.page_three.title": "Usages", + "text.astromine.resources.steel.page_three.text": "Steel is useful for creating tools, and is also used in construction of more advanced machines.", + "text.astromine.resources.steel.page_four.title": "Statistics", + "text.astromine.resources.steel.page_four.text": "$(l)Tools$()$(br)Mining Level: 3$(br)Base Durability: 1043$(br)Mining Speed: 7.5$(br)Attack Damage: 3$(br)Enchantability: 24$(p)$(l)Armor$()$(br)Durability Multiplier: 24$(br)Total Defense: 17$(br)Toughness: 0.5$(br)Enchantability: 18", + "text.astromine.resources.silver.title": "Silver", + "text.astromine.resources.silver.page_one.title": "Silver", + "text.astromine.resources.silver.page_one.text": "A metal with high electrical conductivity and a distinct white, lustrous texture.", + "text.astromine.resources.silver.page_two.title": "Obtaining Silver", + "text.astromine.resources.silver.page_two.text": "$(item)Silver Ore$() can be found $(thing)underground$() in $(thing)The Overworld$().$(p)Mining requires only a $(item)Iron Pickaxe$() (Mining Level 2) or better, and can then be $(thing)smelted$() into a $(item)Silver Ingot$().", + "text.astromine.resources.silver.page_three.title": "Usages", + "text.astromine.resources.silver.page_three.text": "Silver is very useful for basic electronics and tools. When combined with $(item)$(l:resources/copper)Copper$() in an $(item)$(l:machinery/alloy_smelter)Alloy Smelter$(), it can make $(item)$(l:resources/electrum)Electrum$(). When combined with $(item)$(l:resources/copper)Copper$() in an $(item)$(l:machinery/alloy_smelter)Alloy Smelter$(), it can make $(item)$(l:resources/sterling_silver)Sterling Silver$().", + "text.astromine.resources.silver.page_four.title": "Statistics", + "text.astromine.resources.silver.page_four.text": "$(l)Tools$()$(br)Mining Level: 2$(br)Base Durability: 462$(br)Mining Speed: 6.5$(br)Attack Damage: 2.0$(br)Enchantability: 20$(p)$(l)Armor$()$(br)Durability Multiplier: 17$(br)Total Defense: ?$(br)Toughness: 0$(br)Enchantability: 22", + "text.astromine.resources.electrum.title": "Electrum", + "text.astromine.resources.electrum.page_one.title": "Electrum", + "text.astromine.resources.electrum.page_one.text": "A metal with significant electrical conductivity and golden texture.", + "text.astromine.resources.electrum.page_two.title": "Obtaining Electrum", + "text.astromine.resources.electrum.page_two.text": "Electrum can be obtained by combining 1 Gold Ingot and 1 Silver Ingot in an $(item)$(l:machinery/alloy_smelter)Alloy Smelter$(). This produces 2 $(item)Electrum Ingots$().", + "text.astromine.resources.electrum.page_three.title": "Usages", + "text.astromine.resources.electrum.page_three.text": "Electrum is often used for coins.", + "text.astromine.resources.electrum.page_four.title": "Statistics", + "text.astromine.resources.electrum.page_four.text": "$(l)Tools$()$(br)Mining Level: 2$(br)Base Durability: 185$(br)Mining Speed: 11$(br)Attack Damage: 1.0$(br)Enchantability: 21$(p)$(l)Armor$()$(br)Durability Multiplier: 13$(br)Total Defense: ?$(br)Toughness: 0$(br)Enchantability: 25", + "text.astromine.resources.fools_gold.title": "Fool's Gold", + "text.astromine.resources.fools_gold.page_one.title": "Fool's Gold", + "text.astromine.resources.fools_gold.page_one.text": "A metal with used to obtain sulfur dioxide, which, due to its golden colour, often confuses the unprepared traveller.", + "text.astromine.resources.fools_gold.page_two.title": "Obtaining Fool's Gold", + "text.astromine.resources.fools_gold.page_two.text": "Fool's Gold can be obtained by combining 1 Iron Ingot and 1 Gunpowder in an $(item)$(l:machinery/alloy_smelter)Alloy Smelter$(). This produces 2 $(item)Fool's Gold Ingots$().", + "text.astromine.resources.fools_gold.page_three.title": "Usages", + "text.astromine.resources.fools_gold.page_three.text": "Fool's Gold is often used for coins.", + "text.astromine.resources.fools_gold.page_four.title": "Statistics", + "text.astromine.resources.fools_gold.page_four.text": "$(l)Tools$()$(br)Mining Level: 2$(br)Base Durability: 250$(br)Mining Speed: 6.5$(br)Attack Damage: 2.0$(br)Enchantability: 16$(p)$(l)Armor$()$(br)Durability Multiplier: 15$(br)Total Defense: ?$(br)Toughness: 0$(br)Enchantability: 10", + "text.astromine.resources.rose_gold.title": "Rose Gold", + "text.astromine.resources.rose_gold.page_one.title": "Rose Gold", + "text.astromine.resources.rose_gold.page_one.text": "A metal with significant electrical conductivity and rose, pink texture.", + "text.astromine.resources.rose_gold.page_two.title": "Obtaining Rose Gold", + "text.astromine.resources.rose_gold.page_two.text": "Rose Gold can be obtained by combining 1 Gold Ingot and 1 Silver Ingot in an $(item)$(l:machinery/alloy_smelter)Alloy Smelter$(). This produces 2 $(item)Rose Gold Ingots$().", + "text.astromine.resources.rose_gold.page_three.title": "Usages", + "text.astromine.resources.rose_gold.page_three.text": "Rose Gold is often used for coins.", + "text.astromine.resources.rose_gold.page_four.title": "Statistics", + "text.astromine.resources.rose_gold.page_four.text": "$(l)Tools$()$(br)Mining Level: 1$(br)Base Durability: 64$(br)Mining Speed: 10$(br)Attack Damage: 0.5$(br)Enchantability: 24$(p)$(l)Armor$()$(br)Durability Multiplier: 9$(br)Total Defense: ?$(br)Toughness: 0.1$(br)Enchantability: 25", + "text.astromine.resources.sterling_silver.title": "Sterling Silver", + "text.astromine.resources.sterling_silver.page_one.title": "Sterling Silver", + "text.astromine.resources.sterling_silver.page_one.text": "A metal with significant electrical conductivity and silvery texture.", + "text.astromine.resources.sterling_silver.page_two.title": "Obtaining Sterling Silver", + "text.astromine.resources.sterling_silver.page_two.text": "Sterling Silver can be obtained by combining 3 Silver Ingots and 1 Copper Ingot in an $(item)$(l:machinery/alloy_smelter)Alloy Smelter$(). This produces 4 $(item)Sterling Silver Ingots$().", + "text.astromine.resources.sterling_silver.page_three.title": "Usages", + "text.astromine.resources.sterling_silver.page_three.text": "Sterling Silver is often used for tooling.", + "text.astromine.resources.sterling_silver.page_four.title": "Statistics", + "text.astromine.resources.sterling_silver.page_four.text": "$(l)Tools$()$(br)Mining Level: 2$(br)Base Durability: 697$(br)Mining Speed: 7$(br)Attack Damage: 2.5$(br)Enchantability: 20$(p)$(l)Armor$()$(br)Durability Multiplier: 18$(br)Total Defense: ?$(br)Toughness: 0.1$(br)Enchantability: 23", + "text.astromine.resources.asterite.title": "Asterite", + "text.astromine.resources.asterite.page_one.title": "Asterite", + "text.astromine.resources.asterite.page_one.text": "A fragment of a long dead star, this red gem may look frail to an untrained observer - one who does not know its significant strengths. $(p)Its properties allow for qualified craftsmen to create powerful tooling.", + "text.astromine.resources.asterite.page_two.title": "Obtaining Asterite", + "text.astromine.resources.asterite.page_two.text": "$(item)Asterite Ore$() can be found inside $(thing)$(l:world/asteroids)Asteroids$() in $(thing)Space$().$(p)Mining requires a $(item)Netherite Pickaxe$() (Mining Level 4) or better, usually resulting in a single $(item)Asterite Cluster$() which can forged into an $(item)Asterite$() gem.", + "text.astromine.resources.asterite.page_three.title": "Usages", + "text.astromine.resources.asterite.page_three.text": "Asterite can be used to create powerful tooling.", + "text.astromine.resources.asterite.page_four.title": "Statistics", + "text.astromine.resources.asterite.page_four.text": "$(l)Tools$()$(br)Mining Level: 5$(br)Base Durability: 2015$(br)Mining Speed: 10$(br)Attack Damage: 5$(br)Enchantability: 20$(p)$(l)Armor$()$(br)Durability Multiplier: 22$(br)Total Defense: 23$(br)Toughness: 4$(br)Enchantability: 20", + "text.astromine.resources.galaxium.title": "Galaxium", + "text.astromine.resources.galaxium.page_one.title": "Galaxium", + "text.astromine.resources.galaxium.page_one.text": "A rare gem with a deep, overwhelming dark shine. Extraordinarily dense, this material is theorised to be obtained from large clusters at the center of galaxies.$(p)There are no records of such phenomena, but one's journey holds the keys to many secrets never thought of before.", + "text.astromine.resources.galaxium.page_two.title": "Obtaining Galaxium", + "text.astromine.resources.galaxium.page_two.text": "$(item)Galaxium Ore$() can be rarely found inside $(thing)$(l:world/asteroids)Asteroids$() in $(thing)Space$().$(p)Galaxium Ore mining will require an $(item)Asterite Pickaxe$() (Mining Level 5) or better, usually resulting in a single $(item)$(l:world/ore_clusters)Galaxium Cluster$() which can be forged into a $(item)Galaxium$() gem.", + "text.astromine.resources.galaxium.page_three.title": "Usages", + "text.astromine.resources.galaxium.page_three.text": "Galaxium can be used to create extremely resistant tooling and exquisite technology.", + "text.astromine.resources.galaxium.page_four.title": "Statistics", + "text.astromine.resources.galaxium.page_four.text": "$(l)Tools$()$(br)Mining Level: 6$(br)Base Durability: 3072$(br)Mining Speed: 11$(br)Attack Damage: 5$(br)Enchantability: 18$(p)$(l)Armor$()$(br)Durability Multiplier: 44$(br)Total Defense: 25$(br)Toughness: 4.5$(br)Enchantability: 18", + "text.astromine.resources.metite.title": "Metite", + "text.astromine.resources.metite.page_one.title": "Metite", + "text.astromine.resources.metite.page_one.text": "A foreign metal, Metite withstands immense pressures; being essential in all areas of space travel.$(p)Acquiring it is considered a major stepping stone in one's interstellar journey.", + "text.astromine.resources.metite.page_two.title": "Obtaining Metite", + "text.astromine.resources.metite.page_two.text": "$(item)Metite Ore$() can be found inside $(thing)$(l:world/meteors)Meteors$() which have impacted on $(thing)Earth$(), or in $(thing)$(l:world/asteroids)Asteroids$() in $(thing)Space$().$(p)Mining requires a $(item)Netherite Pickaxe$() (Mining Level 4) or better, usually resulting in between 1 and 3 $(item)$(l:world/ore_clusters)Metite Clusters$() which can forged into a $(item)Metite Ingot$().", + "text.astromine.resources.metite.page_three.title": "Usages", + "text.astromine.resources.metite.page_three.text": "Metite can be used to create standard tooling; however, it is of much more use in creating astronautical technology.", + "text.astromine.resources.metite.page_four.title": "Statistics", + "text.astromine.resources.metite.page_four.text": "$(l)Tools$()$(br)Mining Level: 1$(br)Base Durability: 853$(br)Mining Speed: 13$(br)Attack Damage: 4$(br)Enchantability: 5$(p)$(l)Armor$()$(br)Durability Multiplier: 15$(br)Total Defense: 14$(br)Toughness: 0$(br)Enchantability: 7", + "text.astromine.resources.stellum.title": "Stellum", + "text.astromine.resources.stellum.page_one.title": "Stellum", + "text.astromine.resources.stellum.page_one.text": "A fragment of a living star, the raw energy contained within this material is surpassed only by few, every molecule of it vibrating with $(thing)Stellar Energy$().", + "text.astromine.resources.stellum.page_two.title": "Obtaining Stellum", + "text.astromine.resources.stellum.page_two.text": "$(item)Stellum Ore$() can be found inside $(thing)$(l:world/asteroids)Asteroids$() in $(thing)Space$().$(p)Mining requires an $(item)Asterite Pickaxe$() (Mining Level 5) or better, usually resulting in a single $(item)$(l:world/ore_clusters)Stellum Cluster$() which can be forged into a $(item)Stellum Ingot$().", + "text.astromine.resources.stellum.page_three.title": "Usages", + "text.astromine.resources.stellum.page_three.text": "Stellum can be used to create powerful tooling roughly equivalent to $(thing)$(l:resources/asterite)Asterite$(). Born from the heart of a living star, it is fire proof to an extent never seen before; and posses a power that, when harnessed, can power an entire civilisation.", + "text.astromine.resources.stellum.page_four.title": "Statistics", + "text.astromine.resources.stellum.page_four.text": "$(l)Tools$()$(br)Mining Level: 5$(br)Base Durability: 2643$(br)Mining Speed: 8$(br)Attack Damage: 6$(br)Enchantability: 15$(br)Fireproof$(p)$(l)Armor$()$(br)Durability Multiplier: 41$(br)Total Defense: 16$(br)Toughness: 6$(br)Enchantability: 15$(br)Fireproof", + "text.astromine.resources.univite.title": "Univite", + "text.astromine.resources.univite.page_one.title": "Univite", + "text.astromine.resources.univite.page_one.text": "A material so highly coveted it has sparked numerous interstellar wars; only a limited amount of it exists within this realm, thought to have originated at the heart of the universe, before any of us even dared the thought of existence. It is unknown whether any material conveys higher power than Univite.", + "text.astromine.resources.univite.page_two.title": "Obtaining Univite", + "text.astromine.resources.univite.page_two.text": "A theorised origin and limited existence means immense difficulty in being obtained; with no way but theft available to small civilisations.$(p)Or, y'know, the temporary recipe we added. But that's not canon.", + "text.astromine.resources.univite.page_three.title": "Usages", + "text.astromine.resources.univite.page_three.text": "Univite can be used to create the strongest tooling and weaponry known by all discovered civilisations.", + "text.astromine.resources.univite.page_four.title": "Statistics", + "text.astromine.resources.univite.page_four.text": "$(l)Tools$()$(br)Mining Level: 7$(br)Base Durability: 3918$(br)Mining Speed: 12$(br)Attack Damage: 6$(br)Enchantability: 22$(br)Fireproof$(p)$(l)Armor$()$(br)Durability Multiplier: 50$(br)Total Defense: 27$(br)Toughness: 5$(br)Enchantability: 22$(br)Fireproof", + "text.astromine.warfare.nuclear_warhead.title": "Nuclear Warhead", + "text.astromine.warfare.nuclear_warhead.page_one.title": "Nuclear Warhead", + "text.astromine.warfare.nuclear_warhead.page_one.text": "A bomb capable of devastating destruction, terminating all life-forms in the process.", + "text.astromine.warfare.nuclear_warhead.page_two.title": "Recipe", + "text.astromine.world.asteroid_ores.title": "Asteroid Ores", + "text.astromine.world.asteroid_ores.page_one.title": "Asteroid Ores", + "text.astromine.world.asteroid_ores.page_one.text": "Veins of ores found in $(thing)$(l:world/asteroids)asteroids$(), which may be harvested for resources.$(p)When mined, will drop their respective $(thing)$(l:world/ore_clusters)ore clusters$().", + "text.astromine.world.asteroids.title": "Asteroids", + "text.astromine.world.asteroids.page_one.title": "Asteroids", + "text.astromine.world.asteroids.page_one.text": "Foreign bodies found cruising through interstellar space, in rings, clusters and many other formations; said to contain large quantities of $(thing)$(l:world/asteroid_ores)ores$().", + "text.astromine.world.meteor_ores.title": "Meteor Ores", + "text.astromine.world.meteor_ores.page_one.title": "Meteor Ores", + "text.astromine.world.meteor_ores.page_one.text": "Veins of ores found in $(thing)$(l:world/meteors)meteors$(), which may be harvested for resources.$(p)When mined, will drop their respective $(thing)$(l:world/ore_clusters)ore clusters$().", + "text.astromine.world.meteors.title": "Meteors", + "text.astromine.world.meteors.page_one.title": "Meteors", + "text.astromine.world.meteors.page_one.text": "Foreign bodies that, cruising through the stairs, collided with a planetary body; said to contain $(thing)$(l:world/meteor_ores)extraterrestrial ores$().", + "text.astromine.world.ore_clusters.title": "Ore Clusters", + "text.astromine.world.ore_clusters.page_one.title": "Ore Clusters", + "text.astromine.world.ore_clusters.page_one.text": "Clusters of ores obtained from $(thing)$(l:world/asteroid_ores)asteroid ores$() or $(thing)$(l:world/meteor_ores)meteor ores$(), which may be processed for resources.", + "text.astromine.world.ore_clusters.page_two.title": "Processing", + "text.astromine.world.ore_clusters.page_two.text": "Triturating clusters will result in two of their respective $(thing)dusts$().", + "text.autoconfig.astromine/config.text": "Astromine Config", + "advancements.astromine.root.title": "Astromine", + "advancements.astromine.root.description": "Adventures to infinity and beyond", + "advancements.astromine.underestimate_metite.title": "Underestimating Alien Ores", + "advancements.astromine.underestimate_metite.description": "Attempt to mine Metite Ore with an insufficient pickaxe (You need Netherite!)", + "advancements.astromine.enter_space.title": "The Final Frontier", + "advancements.astromine.enter_space.description": "Enter Space", + "advancements.astromine.fall_to_earth.title": "Fall From The Heavens", + "advancements.astromine.fall_to_earth.description": "Fall back down to Earth", + "advancements.astromine.get_fire_extinguisher.title": "Fireman Steve", + "advancements.astromine.get_fire_extinguisher.description": "Craft a Fire Extinguisher", + "advancements.astromine.use_fire_extinguisher.title": "Realistic Physics", + "advancements.astromine.use_fire_extinguisher.description": "Propel yourself with a Fire Extinguisher", + "advancements.astromine.properly_use_fire_extinguisher.title": "The Hero Next Door", + "advancements.astromine.properly_use_fire_extinguisher.description": "Extinguish a mob that's on fire", + "advancements.astromine.get_meteor_stone.title": "(Space) Stone Age", + "advancements.astromine.get_meteor_stone.description": "Mine Meteor Stone with a strong pickaxe", + "advancements.astromine.get_metite_ingot.title": "Metal From The Stars", + "advancements.astromine.get_metite_ingot.description": "Obtain a Metite Ingot", + "advancements.astromine.get_stellum_ingot.title": "It's Full of Stars", + "advancements.astromine.get_stellum_ingot.description": "Obtain a Stellum Ingot", + "advancements.astromine.get_galaxium.title": "Hidden Gem", + "advancements.astromine.get_galaxium.description": "Obtain Galaxium", + "advancements.astromine.get_univite_ingot.title": "Univite Says Gay Rights", + "advancements.astromine.get_univite_ingot.description": "Obtain a Univite Ingot", + "advancements.astromine.get_univite_armor.title": "Cover Me in Rainbows", + "advancements.astromine.get_univite_armor.description": "Get a full suit of Univite Armor", + "advancements.astromine.get_space_suit.title": "Ready For The Unknown", + "advancements.astromine.get_space_suit.description": "Get a full Space Suit", + "advancements.astromine.launch_rocket.title": "We Have Liftoff", + "advancements.astromine.launch_rocket.description": "Launch a Rocket", + "advancements.astromine.tricked_piglin.title": "Shame On You", + "advancements.astromine.tricked_piglin.description": "Scam a Piglin with Fool's Gold", + "advancements.astromine.get_bronze_ingot.title": "Third Place", + "advancements.astromine.get_bronze_ingot.description": "Obtain a Bronze Ingot", + "advancements.astromine.get_fools_gold_ingot.title": "Only Fools", + "advancements.astromine.get_fools_gold_ingot.description": "Obtain a Fool's Gold Ingot", + "advancements.astromine.get_steel_ingot.title": "Steel Yourself", + "advancements.astromine.get_steel_ingot.description": "Obtain a Steel Ingot", + "advancements.astromine.get_sterling_silver_ingot.title": "Like Silver, But Sterling-er", + "advancements.astromine.get_sterling_silver_ingot.description": "Obtain a Sterling Silver Ingot", + "advancements.astromine.get_chassis.title": "Heart of the Machine", + "advancements.astromine.get_chassis.description": "Craft a Machine Chassis", + "advancements.astromine.get_alloy_smelter.title": "With Our Metals Combined", + "advancements.astromine.get_alloy_smelter.description": "Craft an Alloy Smelter", + "advancements.astromine.get_electric_smelter.title": "Hot Topic 2: Electric Boogaloo", + "advancements.astromine.get_electric_smelter.description": "Craft an Electric Smelter", + "advancements.astromine.get_presser.title": "Pressing Matters", + "advancements.astromine.get_presser.description": "Craft a Presser", + "advancements.astromine.get_triturator.title": "AKA Pulveriser", + "advancements.astromine.get_triturator.description": "Craft a Triturator", + "advancements.astromine.get_gear.title": "Grinds Your Gears", + "advancements.astromine.get_gear.description": "Craft a Gear", + "advancements.astromine.get_plates.title": "Flat Ingots", + "advancements.astromine.get_plates.description": "Craft some Plates", + "advancements.astromine.get_rose_gold_ingot.title": "Pretty in Pink", + "advancements.astromine.get_rose_gold_ingot.description": "Obtain a Rose Gold Ingot", + "advancements.astromine.get_basic_circuit.title": "Circuit Maker", + "advancements.astromine.get_basic_circuit.description": "Craft a Basic Circuit", + "advancements.astromine.get_advanced_circuit.title": "Super Circuit Maker", + "advancements.astromine.get_advanced_circuit.description": "Craft an Advanced Circuit", + "advancements.astromine.get_elite_circuit.title": "New Super Circuit Maker U Deluxe", + "advancements.astromine.get_elite_circuit.description": "Craft an Elite Circuit" +} \ No newline at end of file diff --git a/astromine-core/src/main/resources/assets/astromine/lang/en_nz.json b/astromine-core/src/main/resources/assets/astromine/lang/en_nz.json new file mode 100644 index 000000000..292a2ecfe --- /dev/null +++ b/astromine-core/src/main/resources/assets/astromine/lang/en_nz.json @@ -0,0 +1,1030 @@ +{ + "block.minecraft.empty": "Empty", + "entity.astromine.super_space_slime": "Jelanium: Super Space Slime", + "entity.astromine.space_slime": "Space Slime", + "entity.astromine.primitive_rocket": "Primitive Rocket", + "text.astromine.rocket.disassemble_empty_fuel": "Rocket experienced rapid unscheduled disassembly: no fuel loaded!", + "text.astromine.rocket.disassemble_collision": "Rocket experienced rapid unscheduled disassembly: trajectory obstructed!", + "text.astromine.rocket.disassemble_invalid_fuel": "Rocket experienced rapid unscheduled disassembly: incorrect fuel loaded!", + "text.astromine.message.holographic_connection_successful": "Succeeded in connecting projector at %s with projector at %s.", + "text.astromine.message.holographic_connection_failed": "Failed to connect projector at %s with projector at %s.", + "text.astromine.message.holographic_connection_clear": "Cleared selected projectors!", + "text.astromine.message.holographic_connector_select": "Selected projector at %s!", + "text.astromine.tooltip.fractional_bar": "%s of %s (%s)", + "text.astromine.tooltip.fractional_value": "%s/%s", + "text.astromine.tooltip.fractional_value_simple": "%s", + "text.astromine.tooltip.energy_value": "%s E", + "text.astromine.tooltip.compound_energy_value": "%s/%s E", + "text.astromine.tooltip.speed": "%sx speed", + "text.astromine.tooltip.cable.speed": "%s E/t", + "text.astromine.fluid": "Fluid", + "text.astromine.energy": "Energy", + "text.astromine.item": "Item", + "text.astromine.base": "Base", + "text.astromine.up": "Up", + "text.astromine.down": "Down", + "text.astromine.left": "Left", + "text.astromine.right": "Right", + "text.astromine.front": "Front", + "text.astromine.back": "Back", + "text.astromine.siding.input": "§bInput", + "text.astromine.siding.output": "§6Output", + "text.astromine.siding.input_output": "§bInput §7/ §6Output", + "text.astromine.siding.none": "§7None", + "text.astromine.siding.disabled": "§7§mDisabled", + "text.astromine.siding.west": "Right", + "text.astromine.siding.east": "Left", + "text.astromine.siding.up": "Top", + "text.astromine.siding.down": "Bottom", + "text.astromine.siding.north": "Front", + "text.astromine.siding.south": "Back", + "text.astromine.rocket.launch": "Launch", + "text.astromine.rocket.destroy": "Destroy!", + "text.astromine.rocket.fuel_status": "Fuel sufficient for %s of flight time.", + "item.astromine.primitive_machine_chassis": "Primitive Machine Chassis", + "item.astromine.basic_machine_chassis": "Basic Machine Chassis", + "item.astromine.advanced_machine_chassis": "Advanced Machine Chassis", + "item.astromine.elite_machine_chassis": "Elite Machine Chassis", + "item.astromine.graphite_sheet": "Graphite Sheet", + "item.astromine.gas_canister": "Gas Canister", + "item.astromine.pressurized_gas_canister": "Pressurised Gas Canister", + "item.astromine.basic_battery": "Basic Battery", + "item.astromine.advanced_battery": "Advanced Battery", + "item.astromine.elite_battery": "Elite Battery", + "item.astromine.creative_battery": "Creative Battery", + "item.astromine.fire_extinguisher": "Fire Extinguisher", + "item.astromine.holographic_connector": "Holographic Connector", + "item.astromine.holographic_bridge_projector": "Holographic Bridge Projector", + "item.astromine.primitive_rocket_fuel_tank": "Primitive Rocket Fuel Tank", + "item.astromine.primitive_rocket_hull": "Primitive Rocket Hull", + "item.astromine.primitive_rocket_plating": "Primitive Rocket Plating", + "item.astromine.primitive_rocket_booster": "Primitive Rocket Booster", + "itemGroup.astromine.core": "Astromine: Core", + "itemGroup.astromine.discoveries": "Astromine: Discoveries", + "itemGroup.astromine.foundations": "Astromine: Foundations", + "itemGroup.astromine.transportations": "Astromine: Transportations", + "itemGroup.astromine.technologies": "Astromine: Technologies", + "block.astromine.electrolyzer": "Electrolyser", + "block.astromine.fluid_mixer": "Fluid Mixer", + "block.astromine.creative_capacitor": "Creative Capacitor", + "block.astromine.creative_buffer": "Creative Buffer", + "block.astromine.primitive_buffer": "Primitive Buffer", + "block.astromine.basic_buffer": "Basic Buffer", + "block.astromine.advanced_buffer": "Advanced Buffer", + "block.astromine.elite_buffer": "Elite Buffer", + "block.astromine.vent": "Vent", + "block.astromine.primitive_solid_generator": "Primitive Solid Generator", + "block.astromine.basic_solid_generator": "Basic Solid Generator", + "block.astromine.advanced_solid_generator": "Advanced Solid Generator", + "block.astromine.elite_solid_generator": "Elite Solid Generator", + "block.astromine.primitive_liquid_generator": "Primitive Liquid Generator", + "block.astromine.basic_liquid_generator": "Basic Liquid Generator", + "block.astromine.advanced_liquid_generator": "Advanced Liquid Generator", + "block.astromine.elite_liquid_generator": "Elite Liquid Generator", + "block.astromine.primitive_presser": "Primitive Presser", + "block.astromine.basic_presser": "Basic Presser", + "block.astromine.advanced_presser": "Advanced Presser", + "block.astromine.elite_presser": "Elite Presser", + "block.astromine.primitive_triturator": "Primitive Triturator", + "block.astromine.basic_triturator": "Basic Triturator", + "block.astromine.advanced_triturator": "Advanced Triturator", + "block.astromine.elite_triturator": "Elite Triturator", + "block.astromine.primitive_electric_smelter": "Primitive Electric Smelter", + "block.astromine.basic_electric_smelter": "Basic Electric Smelter", + "block.astromine.advanced_electric_smelter": "Advanced Electric Smelter", + "block.astromine.elite_electric_smelter": "Elite Electric Smelter", + "block.astromine.primitive_alloy_smelter": "Primitive Alloy Smelter", + "block.astromine.basic_alloy_smelter": "Basic Alloy Smelter", + "block.astromine.advanced_alloy_smelter": "Advanced Alloy Smelter", + "block.astromine.elite_alloy_smelter": "Elite Alloy Smelter", + "block.astromine.primitive_electrolyzer": "Primitive Electrolyser", + "block.astromine.basic_electrolyzer": "Basic Electrolyser", + "block.astromine.advanced_electrolyzer": "Advanced Electrolyser", + "block.astromine.elite_electrolyzer": "Elite Electrolyser", + "block.astromine.primitive_refinery": "Primitive Refinery", + "block.astromine.basic_refinery": "Basic Refinery", + "block.astromine.advanced_refinery": "Advanced Refinery", + "block.astromine.elite_refinery": "Elite Refinery", + "block.astromine.primitive_fluid_mixer": "Primitive Fluid Mixer", + "block.astromine.basic_fluid_mixer": "Basic Fluid Mixer", + "block.astromine.advanced_fluid_mixer": "Advanced Fluid Mixer", + "block.astromine.elite_fluid_mixer": "Elite Fluid Mixer", + "block.astromine.fluid_cable": "Fluid Cable", + "block.astromine.primitive_energy_cable": "Primitive Energy Cable", + "block.astromine.basic_energy_cable": "Basic Energy Cable", + "block.astromine.advanced_energy_cable": "Advanced Energy Cable", + "block.astromine.elite_energy_cable": "Elite Energy Cable", + "block.astromine.primitive_capacitor": "Primitive Capacitor", + "block.astromine.basic_capacitor": "Basic Capacitor", + "block.astromine.advanced_capacitor": "Advanced Capacitor", + "block.astromine.elite_capacitor": "Elite Capacitor", + "block.astromine.airlock": "Airlock Door", + "block.astromine.altar_pedestal": "Altar Pedestal", + "block.astromine.altar": "Altar", + "item.astromine.tin_wire": "Tin Wire", + "item.astromine.copper_wire": "Copper Wire", + "item.astromine.silver_wire": "Silver Wire", + "item.astromine.lead_wire": "Lead Wire", + "item.astromine.gold_wire": "Gold Wire", + "item.astromine.steel_wire": "Steel Wire", + "item.astromine.electrum_wire": "Electrum Wire", + "block.astromine.primitive_tank": "Primitive Tank", + "block.astromine.basic_tank": "Basic Tank", + "block.astromine.advanced_tank": "Advanced Tank", + "block.astromine.elite_tank": "Elite Tank", + "block.astromine.creative_tank": "Creative Tank", + "block.astromine.fluid_extractor": "Fluid Extractor", + "block.astromine.fluid_inserter": "Fluid Inserter", + "block.astromine.block_breaker": "Block Breaker", + "block.astromine.block_placer": "Block Placer", + "block.astromine.nuclear_warhead": "Nuclear Warhead", + "block.astromine.holographic_bridge_projector": "Holographic Bridge Projector", + "block.astromine.asteroid_stone": "Asteroid Stone", + "block.astromine.moon_stone": "Moon Stone", + "block.astromine.blazing_asteroid_stone": "Blazing Asteroid Stone", + "block.astromine.meteor_stone": "Meteor Stone", + "block.astromine.tin_ore": "Tin Ore", + "block.astromine.copper_ore": "Copper Ore", + "block.astromine.silver_ore": "Silver Ore", + "block.astromine.lead_ore": "Lead Ore", + "block.astromine.asteroid_metite_ore": "Asteroid Metite Ore", + "block.astromine.meteor_metite_ore": "Meteor Metite Ore", + "block.astromine.asterite_block": "Block of Asterite", + "block.astromine.galaxium_block": "Block of Galaxium", + "block.astromine.metite_block": "Block of Metite", + "block.astromine.stellum_block": "Block of Stellum", + "block.astromine.univite_block": "Block of Univite", + "block.astromine.lunum_block": "Block of Lunum", + "block.astromine.tin_block": "Block of Tin", + "block.astromine.copper_block": "Block of Copper", + "block.astromine.silver_block": "Block of Silver", + "block.astromine.lead_block": "Block of Lead", + "block.astromine.bronze_block": "Block of Bronze", + "block.astromine.steel_block": "Block of Steel", + "block.astromine.electrum_block": "Block of Electrum", + "block.astromine.rose_gold_block": "Block of Rose Gold", + "block.astromine.sterling_silver_block": "Block of Sterling Silver", + "block.astromine.fools_gold_block": "Block of Fool's Gold", + "block.astromine.meteoric_steel_block": "Block of Meteoric Steel", + "block.astromine.asteroid_coal_ore": "Asteroid Coal Ore", + "block.astromine.asteroid_iron_ore": "Asteroid Iron Ore", + "block.astromine.asteroid_gold_ore": "Asteroid Gold Ore", + "block.astromine.asteroid_redstone_ore": "Asteroid Redstone Ore", + "block.astromine.asteroid_lapis_ore": "Asteroid Lapis Ore", + "block.astromine.asteroid_diamond_ore": "Asteroid Diamond Ore", + "block.astromine.asteroid_asterite_ore": "Asteroid Asterite Ore", + "block.astromine.asteroid_stellum_ore": "Asteroid Stellum Ore", + "block.astromine.asteroid_galaxium_ore": "Asteroid Galaxium Ore", + "block.astromine.asteroid_emerald_ore": "Asteroid Emerald Ore", + "block.astromine.asteroid_tin_ore": "Asteroid Tin Ore", + "block.astromine.asteroid_copper_ore": "Asteroid Copper Ore", + "block.astromine.asteroid_silver_ore": "Asteroid Silver Ore", + "block.astromine.asteroid_lead_ore": "Asteroid Lead Ore", + "block.astromine.moon_lunum_ore": "Lunum Ore", + "block.astromine.meteor_stone_slab": "Meteor Stone Slab", + "block.astromine.meteor_stone_stairs": "Meteor Stone Stairs", + "block.astromine.meteor_stone_wall": "Meteor Stone Wall", + "block.astromine.asteroid_stone_slab": "Asteroid Stone Slab", + "block.astromine.asteroid_stone_stairs": "Asteroid Stone Stairs", + "block.astromine.asteroid_stone_wall": "Asteroid Stone Wall", + "block.astromine.moon_stone_slab": "Moon Stone Slab", + "block.astromine.moon_stone_stairs": "Moon Stone Stairs", + "block.astromine.moon_stone_wall": "Moon Stone Wall", + "block.astromine.martian_stone_slab": "Martian Stone Slab", + "block.astromine.martian_stone_stairs": "Martian Stone Stairs", + "block.astromine.martian_stone_wall": "Martian Stone Wall", + "block.astromine.vulcan_stone_slab": "Vulcan Stone Slab", + "block.astromine.vulcan_stone_stairs": "Vulcan Stone Stairs", + "block.astromine.vulcan_stone_wall": "Vulcan Stone Wall", + "block.astromine.martian_soil": "Martian Soil", + "block.astromine.martian_stone": "Martian Stone", + "block.astromine.vulcan_stone": "Vulcan Stone", + "block.astromine.oxygen": "Oxygen", + "block.astromine.hydrogen": "Hydrogen", + "block.astromine.crude_oil": "Crude Oil", + "block.astromine.residual_fuel_oil": "Residual Fuel Oil", + "block.astromine.heavy_gas_oil": "Heavy Gas Oil", + "block.astromine.diesel": "Diesel", + "block.astromine.kerosene": "Kerosene", + "block.astromine.naphtha": "Naphtha", + "block.astromine.gasoline": "Petrol", + "block.astromine.butane": "Butane", + "block.astromine.kerosene_oxygen_fuel": "Kerosene-Oxygen Fuel", + "block.astromine.alternator": "Alternator", + "block.astromine.splitter": "Splitter", + "block.astromine.incinerator": "Incinerator", + "block.astromine.inserter": "Inserter", + "block.astromine.fast_inserter": "Fast Inserter", + "block.astromine.basic_conveyor": "Basic Conveyor", + "block.astromine.basic_vertical_conveyor": "Basic Vertical Conveyor", + "block.astromine.basic_downward_vertical_conveyor": "Basic Downward Vertical Conveyor", + "block.astromine.advanced_conveyor": "Advanced Conveyor", + "block.astromine.advanced_vertical_conveyor": "Advanced Vertical Conveyor", + "block.astromine.advanced_downward_vertical_conveyor": "Advanced Downward Vertical Conveyor", + "block.astromine.elite_conveyor": "Elite Conveyor", + "block.astromine.elite_vertical_conveyor": "Elite Vertical Conveyor", + "block.astromine.elite_downward_vertical_conveyor": "Elite Downward Vertical Conveyor", + "block.astromine.catwalk": "Catwalk", + "block.astromine.catwalk_stairs": "Catwalk Stairs", + "gas.astromine.oxygen": "Oxygen", + "gas.astromine.rocket_fuel": "Rocket Fuel", + "gas.minecraft.empty": "Vacuum", + "item.astromine.oxygen_bucket": "Oxygen Bucket", + "item.astromine.hydrogen_bucket": "Hydrogen Bucket", + "item.astromine.crude_oil_bucket": "Crude Oil Bucket", + "item.astromine.residual_fuel_oil_bucket": "Residual Fuel Oil Bucket", + "item.astromine.heavy_gas_oil_bucket": "Heavy Gas Oil Bucket", + "item.astromine.diesel_bucket": "Diesel Bucket", + "item.astromine.kerosene_bucket": "Kerosene Bucket", + "item.astromine.naphtha_bucket": "Naphtha Bucket", + "item.astromine.gasoline_bucket": "Petrol Bucket", + "item.astromine.butane_bucket": "Butane Bucket", + "item.astromine.kerosene_oxygen_fuel_bucket": "Kerosene-Oxygen Fuel Bucket", + "block.astromine.rocket_fuel": "Rocket Fuel Bucket", + "item.astromine.energy": "Energy", + "item.astromine.fluid": "Fluid", + "item.astromine.item": "Item", + "item.astromine.rocket_fuel_bucket": "Rocket Fuel Bucket", + "item.astromine.asterite_fragment": "Asterite Fragment", + "item.astromine.meteor_metite_cluster": "Meteor Metite Cluster", + "item.astromine.asteroid_metite_cluster": "Asteroid Metite Cluster", + "item.astromine.asteroid_coal_cluster": "Asteroid Coal Cluster", + "item.astromine.asteroid_iron_cluster": "Asteroid Iron Cluster", + "item.astromine.asteroid_gold_cluster": "Asteroid Gold Cluster", + "item.astromine.asteroid_redstone_cluster": "Asteroid Redstone Cluster", + "item.astromine.asteroid_lapis_cluster": "Asteroid Lapis Cluster", + "item.astromine.asteroid_diamond_cluster": "Asteroid Diamond Cluster", + "item.astromine.asteroid_emerald_cluster": "Asteroid Emerald Cluster", + "item.astromine.asteroid_asterite_cluster": "Asteroid Asterite Cluster", + "item.astromine.asteroid_stellum_cluster": "Asteroid Stellum Cluster", + "item.astromine.asteroid_galaxium_cluster": "Asteroid Galaxium Cluster", + "item.astromine.asteroid_tin_cluster": "Asteroid Tin Cluster", + "item.astromine.asteroid_copper_cluster": "Asteroid Copper Cluster", + "item.astromine.asteroid_silver_cluster": "Asteroid Silver Cluster", + "item.astromine.asteroid_lead_cluster": "Asteroid Lead Cluster", + "item.astromine.iron_dust": "Iron Dust", + "item.astromine.metite_dust": "Metite Dust", + "item.astromine.gold_dust": "Gold Dust", + "item.astromine.lapis_dust": "Lapis Dust", + "item.astromine.diamond_dust": "Diamond Dust", + "item.astromine.emerald_dust": "Emerald Dust", + "item.astromine.netherite_dust": "Netherite Dust", + "item.astromine.coal_dust": "Coal Dust", + "item.astromine.charcoal_dust": "Charcoal Dust", + "item.astromine.quartz_dust": "Quartz Dust", + "item.astromine.raw_netherite_dust": "Raw Netherite Dust", + "item.astromine.asterite_dust": "Asterite Dust", + "item.astromine.stellum_dust": "Stellum Dust", + "item.astromine.galaxium_dust": "Galaxium Dust", + "item.astromine.univite_dust": "Univite Dust", + "item.astromine.lunum_dust": "Lunum Dust", + "item.astromine.tin_dust": "Tin Dust", + "item.astromine.copper_dust": "Copper Dust", + "item.astromine.silver_dust": "Silver Dust", + "item.astromine.lead_dust": "Lead Dust", + "item.astromine.bronze_dust": "Bronze Dust", + "item.astromine.steel_dust": "Steel Dust", + "item.astromine.electrum_dust": "Electrum Dust", + "item.astromine.rose_gold_dust": "Rose Gold Dust", + "item.astromine.sterling_silver_dust": "Sterling Silver Dust", + "item.astromine.fools_gold_dust": "Fool's Gold Dust", + "item.astromine.meteoric_steel_dust": "Meteoric Steel Dust", + "item.astromine.redstone_tiny_dust": "Redstone Tiny Dust", + "item.astromine.iron_tiny_dust": "Iron Tiny Dust", + "item.astromine.metite_tiny_dust": "Metite Tiny Dust", + "item.astromine.gold_tiny_dust": "Gold Tiny Dust", + "item.astromine.lapis_tiny_dust": "Lapis Tiny Dust", + "item.astromine.diamond_tiny_dust": "Diamond Tiny Dust", + "item.astromine.emerald_tiny_dust": "Emerald Tiny Dust", + "item.astromine.netherite_tiny_dust": "Netherite Tiny Dust", + "item.astromine.coal_tiny_dust": "Coal Tiny Dust", + "item.astromine.charcoal_tiny_dust": "Charcoal Tiny Dust", + "item.astromine.quartz_tiny_dust": "Quartz Tiny Dust", + "item.astromine.raw_netherite_tiny_dust": "Raw Netherite Tiny Dust", + "item.astromine.asterite_tiny_dust": "Asterite Tiny Dust", + "item.astromine.stellum_tiny_dust": "Stellum Tiny Dust", + "item.astromine.galaxium_tiny_dust": "Galaxium Tiny Dust", + "item.astromine.univite_tiny_dust": "Univite Tiny Dust", + "item.astromine.lunum_tiny_dust": "Lunum Tiny Dust", + "item.astromine.tin_tiny_dust": "Tin Tiny Dust", + "item.astromine.copper_tiny_dust": "Copper Tiny Dust", + "item.astromine.silver_tiny_dust": "Silver Tiny Dust", + "item.astromine.lead_tiny_dust": "Lead Tiny Dust", + "item.astromine.bronze_tiny_dust": "Bronze Tiny Dust", + "item.astromine.steel_tiny_dust": "Steel Tiny Dust", + "item.astromine.electrum_tiny_dust": "Electrum Tiny Dust", + "item.astromine.rose_gold_tiny_dust": "Rose Gold Tiny Dust", + "item.astromine.sterling_silver_tiny_dust": "Sterling Silver Tiny Dust", + "item.astromine.fools_gold_tiny_dust": "Fool's Gold Tiny Dust", + "item.astromine.glowstone_tiny_dust": "Glowstone Tiny Dust", + "item.astromine.meteoric_steel_tiny_dust": "Meteoric Steel Tiny Dust", + "item.astromine.iron_plates": "Iron Plates", + "item.astromine.metite_plates": "Metite Plates", + "item.astromine.gold_plates": "Gold Plates", + "item.astromine.netherite_plates": "Netherite Plates", + "item.astromine.stellum_plates": "Stellum Plates", + "item.astromine.univite_plates": "Univite Plates", + "item.astromine.tin_plates": "Tin Plates", + "item.astromine.copper_plates": "Copper Plates", + "item.astromine.silver_plates": "Silver Plates", + "item.astromine.lead_plates": "Lead Plates", + "item.astromine.bronze_plates": "Bronze Plates", + "item.astromine.steel_plates": "Steel Plates", + "item.astromine.electrum_plates": "Electrum Plates", + "item.astromine.rose_gold_plates": "Rose Gold Plates", + "item.astromine.sterling_silver_plates": "Sterling Silver Plates", + "item.astromine.fools_gold_plates": "Fool's Gold Plates", + "item.astromine.lunum_plates": "Lunum Plates", + "item.astromine.meteoric_steel_plates": "Meteoric Steel Plates", + "item.astromine.iron_gear": "Iron Gear", + "item.astromine.metite_gear": "Metite Gear", + "item.astromine.gold_gear": "Gold Gear", + "item.astromine.netherite_gear": "Netherite Gear", + "item.astromine.stellum_gear": "Stellum Gear", + "item.astromine.univite_gear": "Univite Gear", + "item.astromine.tin_gear": "Tin Gear", + "item.astromine.copper_gear": "Copper Gear", + "item.astromine.silver_gear": "Silver Gear", + "item.astromine.lead_gear": "Lead Gear", + "item.astromine.bronze_gear": "Bronze Gear", + "item.astromine.steel_gear": "Steel Gear", + "item.astromine.electrum_gear": "Electrum Gear", + "item.astromine.rose_gold_gear": "Rose Gold Gear", + "item.astromine.sterling_silver_gear": "Sterling Silver Gear", + "item.astromine.fools_gold_gear": "Fool's Gold Gear", + "item.astromine.lunum_gear": "Lunum Gear", + "item.astromine.meteoric_steel_gear": "Meteoric Steel Gear", + "item.astromine.basic_circuit": "Basic Circuit", + "item.astromine.advanced_circuit": "Advanced Circuit", + "item.astromine.elite_circuit": "Elite Circuit", + "item.astromine.metite_ingot": "Metite Ingot", + "item.astromine.stellum_ingot": "Stellum Ingot", + "item.astromine.lunum_ingot": "Lunum Ingot", + "item.astromine.tin_ingot": "Tin Ingot", + "item.astromine.copper_ingot": "Copper Ingot", + "item.astromine.silver_ingot": "Silver Ingot", + "item.astromine.lead_ingot": "Lead Ingot", + "item.astromine.bronze_ingot": "Bronze Ingot", + "item.astromine.steel_ingot": "Steel Ingot", + "item.astromine.electrum_ingot": "Electrum Ingot", + "item.astromine.rose_gold_ingot": "Rose Gold Ingot", + "item.astromine.sterling_silver_ingot": "Sterling Silver Ingot", + "item.astromine.fools_gold_ingot": "Fool's Gold Ingot", + "item.astromine.meteoric_steel_ingot": "Meteoric Steel Ingot", + "item.astromine.univite_ingot": "Univite Ingot", + "item.astromine.galaxium_fragment": "Galaxium Fragment", + "item.astromine.diamond_fragment": "Diamond Fragment", + "item.astromine.emerald_fragment": "Emerald Fragment", + "item.astromine.quartz_fragment": "Quartz Fragment", + "item.astromine.raw_netherite_fragment": "Raw Netherite Fragment", + "item.astromine.asterite": "Asterite", + "item.astromine.galaxium": "Galaxium", + "item.astromine.metite_nugget": "Metite Nugget", + "item.astromine.stellum_nugget": "Stellum Nugget", + "item.astromine.univite_nugget": "Univite Nugget", + "item.astromine.lunum_nugget": "Lunum Nugget", + "item.astromine.netherite_nugget": "Netherite Nugget", + "item.astromine.tin_nugget": "Tin Nugget", + "item.astromine.copper_nugget": "Copper Nugget", + "item.astromine.silver_nugget": "Silver Nugget", + "item.astromine.lead_nugget": "Lead Nugget", + "item.astromine.bronze_nugget": "Bronze Nugget", + "item.astromine.steel_nugget": "Steel Nugget", + "item.astromine.electrum_nugget": "Electrum Nugget", + "item.astromine.rose_gold_nugget": "Rose Gold Nugget", + "item.astromine.sterling_silver_nugget": "Sterling Silver Nugget", + "item.astromine.fools_gold_nugget": "Fool's Gold Nugget", + "item.astromine.meteoric_steel_nugget": "Meteoric Steel Nugget", + "item.astromine.basic_drill": "Basic Drill", + "item.astromine.advanced_drill": "Advanced Drill", + "item.astromine.elite_drill": "Elite Drill", + "item.astromine.tin_pickaxe": "Tin Pickaxe", + "item.astromine.tin_axe": "Tin Axe", + "item.astromine.tin_shovel": "Tin Shovel", + "item.astromine.tin_hoe": "Tin Hoe", + "item.astromine.tin_sword": "Tin Sword", + "item.astromine.tin_mattock": "Tin Mattock", + "item.astromine.tin_mining_tool": "Tin Mining Tool", + "item.astromine.tin_hammer": "Tin Hammer", + "item.astromine.tin_excavator": "Tin Excavator", + "item.astromine.copper_pickaxe": "Copper Pickaxe", + "item.astromine.copper_axe": "Copper Axe", + "item.astromine.copper_shovel": "Copper Shovel", + "item.astromine.copper_hoe": "Copper Hoe", + "item.astromine.copper_sword": "Copper Sword", + "item.astromine.copper_mattock": "Copper Mattock", + "item.astromine.copper_mining_tool": "Copper Mining Tool", + "item.astromine.copper_hammer": "Copper Hammer", + "item.astromine.copper_excavator": "Copper Excavator", + "item.astromine.silver_pickaxe": "Silver Pickaxe", + "item.astromine.silver_axe": "Silver Axe", + "item.astromine.silver_shovel": "Silver Shovel", + "item.astromine.silver_hoe": "Silver Hoe", + "item.astromine.silver_sword": "Silver Sword", + "item.astromine.silver_mattock": "Silver Mattock", + "item.astromine.silver_mining_tool": "Silver Mining Tool", + "item.astromine.silver_hammer": "Silver Hammer", + "item.astromine.silver_excavator": "Silver Excavator", + "item.astromine.lead_pickaxe": "Lead Pickaxe", + "item.astromine.lead_axe": "Lead Axe", + "item.astromine.lead_shovel": "Lead Shovel", + "item.astromine.lead_hoe": "Lead Hoe", + "item.astromine.lead_sword": "Lead Sword", + "item.astromine.lead_mattock": "Lead Mattock", + "item.astromine.lead_mining_tool": "Lead Mining Tool", + "item.astromine.lead_hammer": "Lead Hammer", + "item.astromine.lead_excavator": "Lead Excavator", + "item.astromine.bronze_pickaxe": "Bronze Pickaxe", + "item.astromine.bronze_axe": "Bronze Axe", + "item.astromine.bronze_shovel": "Bronze Shovel", + "item.astromine.bronze_hoe": "Bronze Hoe", + "item.astromine.bronze_sword": "Bronze Sword", + "item.astromine.bronze_mattock": "Bronze Mattock", + "item.astromine.bronze_mining_tool": "Bronze Mining Tool", + "item.astromine.bronze_hammer": "Bronze Hammer", + "item.astromine.bronze_excavator": "Bronze Excavator", + "item.astromine.steel_pickaxe": "Steel Pickaxe", + "item.astromine.steel_axe": "Steel Axe", + "item.astromine.steel_shovel": "Steel Shovel", + "item.astromine.steel_hoe": "Steel Hoe", + "item.astromine.steel_sword": "Steel Sword", + "item.astromine.steel_mattock": "Steel Mattock", + "item.astromine.steel_mining_tool": "Steel Mining Tool", + "item.astromine.steel_hammer": "Steel Hammer", + "item.astromine.steel_excavator": "Steel Excavator", + "item.astromine.electrum_pickaxe": "Electrum Pickaxe", + "item.astromine.electrum_axe": "Electrum Axe", + "item.astromine.electrum_shovel": "Electrum Shovel", + "item.astromine.electrum_hoe": "Electrum Hoe", + "item.astromine.electrum_sword": "Electrum Sword", + "item.astromine.electrum_mattock": "Electrum Mattock", + "item.astromine.electrum_mining_tool": "Electrum Mining Tool", + "item.astromine.electrum_hammer": "Electrum Hammer", + "item.astromine.electrum_excavator": "Electrum Excavator", + "item.astromine.rose_gold_pickaxe": "Rose Gold Pickaxe", + "item.astromine.rose_gold_axe": "Rose Gold Axe", + "item.astromine.rose_gold_shovel": "Rose Gold Shovel", + "item.astromine.rose_gold_hoe": "Rose Gold Hoe", + "item.astromine.rose_gold_sword": "Rose Gold Sword", + "item.astromine.rose_gold_mattock": "Rose Gold Mattock", + "item.astromine.rose_gold_mining_tool": "Rose Gold Mining Tool", + "item.astromine.rose_gold_hammer": "Rose Gold Hammer", + "item.astromine.rose_gold_excavator": "Rose Gold Excavator", + "item.astromine.sterling_silver_pickaxe": "Sterling Silver Pickaxe", + "item.astromine.sterling_silver_axe": "Sterling Silver Silverver Axe", + "item.astromine.sterling_silver_shovel": "Sterling Silver Shovel", + "item.astromine.sterling_silver_hoe": "Sterling Silver Hoe", + "item.astromine.sterling_silver_sword": "Sterling Silver Sword", + "item.astromine.sterling_silver_mattock": "Sterling Silver Mattock", + "item.astromine.sterling_silver_mining_tool": "Sterling Silver Mining Tool", + "item.astromine.sterling_silver_hammer": "Sterling Silver Hammer", + "item.astromine.sterling_silver_excavator": "Sterling Silver Excavator", + "item.astromine.fools_gold_pickaxe": "Fool's Gold Pickaxe", + "item.astromine.fools_gold_axe": "Fool's Gold Axe", + "item.astromine.fools_gold_shovel": "Fool's Gold Shovel", + "item.astromine.fools_gold_hoe": "Fool's Gold Hoe", + "item.astromine.fools_gold_sword": "Fool's Gold Sword", + "item.astromine.fools_gold_mattock": "Fool's Gold Mattock", + "item.astromine.fools_gold_mining_tool": "Fool's Gold Mining Tool", + "item.astromine.fools_gold_hammer": "Fool's Gold Hammer", + "item.astromine.fools_gold_excavator": "Fool's Gold Excavator", + "item.astromine.metite_pickaxe": "Metite Pickaxe", + "item.astromine.metite_axe": "Metite Axe", + "item.astromine.metite_shovel": "Metite Shovel", + "item.astromine.metite_hoe": "Metite Hoe", + "item.astromine.metite_sword": "Metite Sword", + "item.astromine.metite_mattock": "Metite Mattock", + "item.astromine.metite_mining_tool": "Metite Mining Tool", + "item.astromine.metite_hammer": "Metite Hammer", + "item.astromine.metite_excavator": "Metite Excavator", + "item.astromine.asterite_pickaxe": "Asterite Pickaxe", + "item.astromine.asterite_axe": "Asterite Axe", + "item.astromine.asterite_shovel": "Asterite Shovel", + "item.astromine.asterite_hoe": "Asterite Hoe", + "item.astromine.asterite_sword": "Asterite Sword", + "item.astromine.asterite_mattock": "Asterite Mattock", + "item.astromine.asterite_mining_tool": "Asterite Mining Tool", + "item.astromine.asterite_hammer": "Asterite Hammer", + "item.astromine.asterite_excavator": "Asterite Excavator", + "item.astromine.stellum_pickaxe": "Stellum Pickaxe", + "item.astromine.stellum_axe": "Stellum Axe", + "item.astromine.stellum_shovel": "Stellum Shovel", + "item.astromine.stellum_hoe": "Stellum Hoe", + "item.astromine.stellum_sword": "Stellum Sword", + "item.astromine.stellum_mattock": "Stellum Mattock", + "item.astromine.stellum_mining_tool": "Stellum Mining Tool", + "item.astromine.stellum_hammer": "Stellum Hammer", + "item.astromine.stellum_excavator": "Stellum Excavator", + "item.astromine.galaxium_pickaxe": "Galaxium Pickaxe", + "item.astromine.galaxium_axe": "Galaxium Axe", + "item.astromine.galaxium_shovel": "Galaxium Shovel", + "item.astromine.galaxium_hoe": "Galaxium Hoe", + "item.astromine.galaxium_sword": "Galaxium Sword", + "item.astromine.galaxium_mattock": "Galaxium Mattock", + "item.astromine.galaxium_mining_tool": "Galaxium Mining Tool", + "item.astromine.galaxium_hammer": "Galaxium Hammer", + "item.astromine.galaxium_excavator": "Galaxium Excavator", + "item.astromine.univite_pickaxe": "Univite Pickaxe", + "item.astromine.univite_axe": "Univite Axe", + "item.astromine.univite_shovel": "Univite Shovel", + "item.astromine.univite_hoe": "Univite Hoe", + "item.astromine.univite_sword": "Univite Sword", + "item.astromine.univite_mattock": "Univite Mattock", + "item.astromine.univite_mining_tool": "Univite Mining Tool", + "item.astromine.univite_hammer": "Univite Hammer", + "item.astromine.univite_excavator": "Univite Excavator", + "item.astromine.lunum_pickaxe": "Lunum Pickaxe", + "item.astromine.lunum_axe": "Lunum Axe", + "item.astromine.lunum_shovel": "Lunum Shovel", + "item.astromine.lunum_hoe": "Lunum Hoe", + "item.astromine.lunum_sword": "Lunum Sword", + "item.astromine.lunum_mattock": "Lunum Mattock", + "item.astromine.lunum_mining_tool": "Lunum Mining Tool", + "item.astromine.lunum_hammer": "Lunum Hammer", + "item.astromine.lunum_excavator": "Lunum Excavator", + "item.astromine.meteoric_steel_pickaxe": "Meteoric Steel Pickaxe", + "item.astromine.meteoric_steel_axe": "Meteoric Steel Axe", + "item.astromine.meteoric_steel_shovel": "Meteoric Steel Shovel", + "item.astromine.meteoric_steel_hoe": "Meteoric Steel Hoe", + "item.astromine.meteoric_steel_sword": "Meteoric Steel Sword", + "item.astromine.meteoric_steel_mattock": "Meteoric Steel Mattock", + "item.astromine.meteoric_steel_mining_tool": "Meteoric Steel Mining Tool", + "item.astromine.meteoric_steel_hammer": "Meteoric Steel Hammer", + "item.astromine.meteoric_steel_excavator": "Meteoric Steel Excavator", + "item.astromine.wooden_mattock": "Wooden Mattock", + "item.astromine.wooden_mining_tool": "Wooden Mining Tool", + "item.astromine.stone_mattock": "Stone Mattock", + "item.astromine.stone_mining_tool": "Stone Mining Tool", + "item.astromine.iron_mattock": "Iron Mattock", + "item.astromine.iron_mining_tool": "Iron Mining Tool", + "item.astromine.golden_mattock": "Golden Mattock", + "item.astromine.golden_mining_tool": "Golden Mining Tool", + "item.astromine.diamond_mattock": "Diamond Mattock", + "item.astromine.diamond_mining_tool": "Diamond Mining Tool", + "item.astromine.netherite_mattock": "Netherite Mattock", + "item.astromine.netherite_mining_tool": "Netherite Mining Tool", + "item.astromine.tin_helmet": "Tin Helmet", + "item.astromine.tin_chestplate": "Tin Chestplate", + "item.astromine.tin_leggings": "Tin Leggings", + "item.astromine.tin_boots": "Tin Boots", + "item.astromine.copper_helmet": "Copper Helmet", + "item.astromine.copper_chestplate": "Copper Chestplate", + "item.astromine.copper_leggings": "Copper Leggings", + "item.astromine.copper_boots": "Copper Boots", + "item.astromine.silver_helmet": "Silver Helmet", + "item.astromine.silver_chestplate": "Silver Chestplate", + "item.astromine.silver_leggings": "Silver Leggings", + "item.astromine.silver_boots": "Silver Boots", + "item.astromine.lead_helmet": "Lead Helmet", + "item.astromine.lead_chestplate": "Lead Chestplate", + "item.astromine.lead_leggings": "Lead Leggings", + "item.astromine.lead_boots": "Lead Boots", + "item.astromine.bronze_helmet": "Bronze Helmet", + "item.astromine.bronze_chestplate": "Bronze Chestplate", + "item.astromine.bronze_leggings": "Bronze Leggings", + "item.astromine.bronze_boots": "Bronze Boots", + "item.astromine.steel_helmet": "Steel Helmet", + "item.astromine.steel_chestplate": "Steel Chestplate", + "item.astromine.steel_leggings": "Steel Leggings", + "item.astromine.steel_boots": "Steel Boots", + "item.astromine.electrum_helmet": "Electrum Helmet", + "item.astromine.electrum_chestplate": "Electrum Chestplate", + "item.astromine.electrum_leggings": "Electrum Leggings", + "item.astromine.electrum_boots": "Electrum Boots", + "item.astromine.rose_gold_helmet": "Rose Gold Helmet", + "item.astromine.rose_gold_chestplate": "Rose Gold Chestplate", + "item.astromine.rose_gold_leggings": "Rose Gold Leggings", + "item.astromine.rose_gold_boots": "Rose Gold Boots", + "item.astromine.sterling_silver_helmet": "Sterling Silver Helmet", + "item.astromine.sterling_silver_chestplate": "Sterling Silver Chestplate", + "item.astromine.sterling_silver_leggings": "Sterling Silver Leggings", + "item.astromine.sterling_silver_boots": "Sterling Silver Boots", + "item.astromine.fools_gold_helmet": "Fool's Gold Helmet", + "item.astromine.fools_gold_chestplate": "Fool's Gold Chestplate", + "item.astromine.fools_gold_leggings": "Fool's Gold Leggings", + "item.astromine.fools_gold_boots": "Fool's Gold Boots", + "item.astromine.metite_helmet": "Metite Helmet", + "item.astromine.metite_chestplate": "Metite Chestplate", + "item.astromine.metite_leggings": "Metite Leggings", + "item.astromine.metite_boots": "Metite Boots", + "item.astromine.asterite_helmet": "Asterite Helmet", + "item.astromine.asterite_chestplate": "Asterite Chestplate", + "item.astromine.asterite_leggings": "Asterite Leggings", + "item.astromine.asterite_boots": "Asterite Boots", + "item.astromine.stellum_helmet": "Stellum Helmet", + "item.astromine.stellum_chestplate": "Stellum Chestplate", + "item.astromine.stellum_leggings": "Stellum Leggings", + "item.astromine.stellum_boots": "Stellum Boots", + "item.astromine.galaxium_helmet": "Galaxium Helmet", + "item.astromine.galaxium_chestplate": "Galaxium Chestplate", + "item.astromine.galaxium_leggings": "Galaxium Leggings", + "item.astromine.galaxium_boots": "Galaxium Boots", + "item.astromine.univite_helmet": "Univite Helmet", + "item.astromine.univite_chestplate": "Univite Chestplate", + "item.astromine.univite_leggings": "Univite Leggings", + "item.astromine.univite_boots": "Univite Boots", + "item.astromine.lunum_helmet": "Lunum Helmet", + "item.astromine.lunum_chestplate": "Lunum Chestplate", + "item.astromine.lunum_leggings": "Lunum Leggings", + "item.astromine.lunum_boots": "Lunum Boots", + "item.astromine.meteoric_steel_helmet": "Meteoric Steel Helmet", + "item.astromine.meteoric_steel_chestplate": "Meteoric Steel Chestplate", + "item.astromine.meteoric_steel_leggings": "Meteoric Steel Leggings", + "item.astromine.meteoric_steel_boots": "Meteoric Steel Boots", + "item.astromine.space_suit_helmet": "Space Suit Helmet", + "item.astromine.space_suit_chestplate": "Space Suit Chest", + "item.astromine.space_suit_leggings": "Space Suit Pants", + "item.astromine.space_suit_boots": "Space Suit Boots", + "item.astromine.space_slime_spawn_egg": "Space Slime Spawn Egg", + "item.astromine.super_space_slime_shooter": "Super Space Slime Shooter", + "item.astromine.space_slime_ball": "Space Slimeball", + "item.astromine.manual": "Astromine Manual", + "item.astromine.yeast": "Yeast", + "item.astromine.rocket": "Rocket", + "item.astromine.copper_wrench": "Copper Spanner", + "item.astromine.bronze_wrench": "Bronze Spanner", + "item.astromine.steel_wrench": "Steel Spanner", + "item.astromine.rose_gold_apple": "Rose Gold Apple", + "item.astromine.fools_gold_apple": "Fool's Gold Apple", + "item.astromine.lead_apple": "Lead Apple", + "item.astromine.basic_machine_upgrade_kit": "Basic Machine Upgrade Kit", + "item.astromine.advanced_machine_upgrade_kit": "Advanced Machine Upgrade Kit", + "item.astromine.elite_machine_upgrade_kit": "Elite Machine Upgrade Kit", + "item.astromine.gravity_gauntlet": "Gravity Gauntlet", + "item.minecraft.potion.effect.rocket_fuel": "Rocket Fuel Bottle", + "item.minecraft.splash_potion.effect.rocket_fuel": "Splash Rocket Fuel Bottle", + "item.minecraft.lingering_potion.effect.rocket_fuel": "Lingering Rocket Fuel Bottle", + "item.minecraft.tipped_arrow.effect.rocket_fuel": "Arrow of Rocket Fuel", + "item.minecraft.potion.effect.sugar_water": "Sugar Water Bottle", + "item.minecraft.splash_potion.effect.sugar_water": "Splash Sugar Water Bottle", + "item.minecraft.lingering_potion.effect.sugar_water": "Lingering Sugar Water Bottle", + "item.minecraft.tipped_arrow.effect.sugar_water": "Arrow of Sugar Water", + "potion.potency.10": "X", + "subtitles.astromine.humming": "Humming", + "subtitles.astromine.holographic_connector_click": "Holographic Connector clicks", + "subtitles.astromine.fire_extinguisher_open": "Fire Extinguisher opens", + "subtitles.astromine.gunshot": "Gunshot", + "subtitles.astromine.empty_magazine": "Magazine is empty", + "text.astromine.manual.landing": "Your guide to the stars!", + "category.astromine.liquid_generating": "Liquid Generating", + "category.astromine.solid_generating": "Solid Generating", + "category.astromine.electric_smelting": "Electric Smelting", + "category.astromine.alloy_smelting": "Alloy Smelting", + "category.astromine.pressing": "Pressing", + "category.astromine.triturating": "Triturating", + "category.astromine.fluid_mixing": "Fluid Mixing", + "category.astromine.electrolyzing": "Electrolysing", + "category.astromine.refining": "Refining", + "category.astromine.infusing": "Infusing", + "category.astromine.cooking.time": "%s seconds", + "category.astromine.cooking.energy": "%s energy", + "category.astromine.generating.energy": "%s generated per tick", + "category.astromine.consuming.energy": "%s consumed", + "category.astromine.fluid.generating.consumed": "%s (%s) consumed per tick", + "category.astromine.fluid.generating.generated": "%s (%s) generated per tick", + "text.astromine.manual.obtain.info": "The Astromine Manual can be obtained by right clicking a Metite Axe on a Bookshelf.", + "text.astromine.selected.dimension.pos": "Selected %s (%d, %d, %d)", + "text.astromine.patchouli.astronautics.title": "Astronautics", + "text.astromine.patchouli.astronautics.description": "From where one dreams, to where their dreams come true.", + "text.astromine.patchouli.components.title": "Components", + "text.astromine.patchouli.components.description": "Components for crafting items to aid one in their journey.", + "text.astromine.patchouli.creatures.title": "Creatures", + "text.astromine.patchouli.creatures.description": "Those beyond our wildest realm of imagination.", + "text.astromine.patchouli.gadgets.title": "Gadgets", + "text.astromine.patchouli.gadgets.description": "One's physical assistance in their journey.", + "text.astromine.patchouli.machinery.title": "Machinery", + "text.astromine.patchouli.machinery.description": "What moves one's world.", + "text.astromine.patchouli.resources.title": "Resources", + "text.astromine.patchouli.resources.description": "The exquisite materials that one channels for power.", + "text.astromine.patchouli.warfare.title": "Warfare", + "text.astromine.patchouli.warfare.description": "What one uses to wipe away their foe.", + "text.astromine.patchouli.world.title": "World", + "text.astromine.patchouli.world.description": "What surrounds one.", + "text.astromine.astronautics.space_suit.title": "Space Suit", + "text.astromine.astronautics.space_suit.page_one.title": "Space Suit", + "text.astromine.astronautics.space_suit.page_one.text": "Vital for survival in hostile environments, a Space Suit is the most important thing one may carry. $(p)With internal tanks which may be pressurised in certain machines, it may be filled with (un-)breathable gases fit for whoever is wearing it.", + "text.astromine.astronautics.rocket.title": "Rocket", + "text.astromine.astronautics.rocket.page_one.title": "Rocket", + "text.astromine.astronautics.rocket.page_one.text": "Your ticket to the final frontier.", + "text.astromine.astronautics.rocket.page_two.title": "Crafting and Notes", + "text.astromine.astronautics.rocket.page_two.text": "Right click with a $(item)Flint and Steel$() to launch. Right click with a $(item)Stick$() to destroy. These are both temporary measures.", + "text.astromine.components.circuits.title": "Circuits", + "text.astromine.components.circuits.page_one.title": "Basic Circuit", + "text.astromine.components.circuits.page_one.text": "A basic electric circuit board, built for general systems with no special requirements, whose architecture is based on graphene.", + "text.astromine.components.circuits.page_two.title": "Basic Circuit Recipe", + "text.astromine.components.circuits.page_three.title": "Advanced Circuit", + "text.astromine.components.circuits.page_three.text": "A more advanced electric circuit board, built for systems with low latency in mind, whose architecture is based on graphene.", + "text.astromine.components.circuits.page_four.title": "Advanced Circuit Recipe", + "text.astromine.components.circuits.page_five.title": "Elite Circuit", + "text.astromine.components.circuits.page_five.text": "An elite electric circuit board, built for systems with high throughput and low latency in mind, whose architecture makes use of coveted, laboratory-made materials.", + "text.astromine.components.circuits.page_six.title": "Elite Circuit Recipe", + "text.astromine.components.gears.title": "Gears", + "text.astromine.components.gears.page_one.title": "Gears", + "text.astromine.components.gears.page_one.text": "A small wheel with teeth, gears interlocked with one another can turn to achieve any number of things.$(p)As such, they will have great use in constructing useful $(thing)machines$().", + "text.astromine.components.gears.page_two.title": "Recipe", + "text.astromine.components.gears.page_two.text": "While the recipe shown is clearly for an $(item)Iron Gear$(), simply substituting the $(item)Iron Ingots$() with any other $(thing)Ingots$() will create a gear of that type.", + "text.astromine.components.plates.title": "Plates", + "text.astromine.components.plates.page_one.title": "Plates", + "text.astromine.components.plates.page_one.text": "Thin sheets of metal, plates are useful for constructing $(thing)housing$() for $(thing)machinery$().", + "text.astromine.components.plates.page_two.title": "Recipe", + "text.astromine.components.plates.page_two.text": "While the recipe shown is clearly for $(item)Iron Plates$(), simply substituting the $(item)Iron Ingots$() with any other $(thing)Ingots$() will create plates of that type.", + "text.astromine.creatures.space_slime.title": "Space Slime", + "text.astromine.creatures.space_slime.page_one.title": "Space Slime", + "text.astromine.creatures.space_slime.page_one.text": "A fierce adversary which inhabits large sections of traversable space.", + "text.astromine.creatures.space_slime.page_two.title": "Drops", + "text.astromine.creatures.space_slime.page_two.text": "Upon defeat, a $(thing)Space Slime$() will drop $(thing)Space Slime Balls$().", + "text.astromine.gadgets.fire_extinguisher.title": "Fire Extinguisher", + "text.astromine.gadgets.fire_extinguisher.page_one.title": "Fire Extinguisher", + "text.astromine.gadgets.fire_extinguisher.page_one.text": "An important tool in one's space journeys, it is responsible for providing maneuverable thrust.$(p)Surprisingly, it can also extinguish fire.", + "text.astromine.gadgets.fire_extinguisher.page_two.title": "Recipe", + "text.astromine.gadgets.gravity_gauntlet.title": "Gravity Gauntlets", + "text.astromine.gadgets.gravity_gauntlet.page_one.title": "Gravity Gauntlets", + "text.astromine.gadgets.gravity_gauntlet.page_one.text": "Gauntlets which can repel opponents. One must be worn on each hand, and they must be charged before they can activate$(p)Charging is done by holding right click with one in each hand, and takes energy.", + "text.astromine.gadgets.gravity_gauntlet.page_two.title": "Recipe", + "text.astromine.machinery.holographic_bridge_projector.title": "Holographic Bridge Projector", + "text.astromine.machinery.holographic_bridge_projector.page_one.title": "Holographic Bridge Projector", + "text.astromine.machinery.holographic_bridge_projector.page_one.text": "A machine which generates a holographic bridge between it and another one of its kind; linkable with a $(item)$(l:gadgets/holographic_connector)Holographic Connector$().", + "text.astromine.machinery.holographic_bridge_projector.page_two.title": "Recipe", + "text.astromine.gadgets.holographic_connector.title": "Holographic Connector", + "text.astromine.gadgets.holographic_connector.page_one.title": "Holographic Connector", + "text.astromine.gadgets.holographic_connector.page_one.text": "A remote controller which allows you to link together $(item)$(l:machinery/holographic_bridge_projector)Holographic Bridge Projectors$(). They must be facing each other in the same line, but can have different heights.", + "text.astromine.gadgets.holographic_connector.page_two.title": "Recipe", + "text.astromine.machinery.creative_buffer.title": "Creative Buffer", + "text.astromine.machinery.creative_buffer.page_one.title": "Creative Buffer", + "text.astromine.machinery.creative_buffer.page_one.text": "A machine which produces a specified $(thing)item$() infinitely.", + "text.astromine.machinery.creative_capacitor.title": "Creative Capacitor", + "text.astromine.machinery.creative_capacitor.page_one.title": "Creative Capacitor", + "text.astromine.machinery.creative_capacitor.page_one.text": "A machine which produces $(thing)energy$() infinitely.", + "text.astromine.machinery.creative_tank.title": "Creative Tank", + "text.astromine.machinery.creative_tank.page_one.title": "Creative Tank", + "text.astromine.machinery.creative_tank.page_one.text": "A machine which produces a specified $(thing)fluid$() infinitely.", + "text.astromine.machinery.electric_smelter.title": "Electric Smelter", + "text.astromine.machinery.electric_smelter.page_one.title": "Electric Smelter", + "text.astromine.machinery.electric_smelter.page_one.text": "A machine which consumes $(thing)energy$() to smelt $(thing)items$() into useful materials.", + "text.astromine.machinery.electric_smelter.page_two.title": "Recipe", + "text.astromine.machinery.electrolyzer.title": "Electrolyser", + "text.astromine.machinery.electrolyzer.page_one.title": "Electrolyser", + "text.astromine.machinery.electrolyzer.page_one.text": "A machine which consumes $(thing)energy$() to electrolyse $(thing)fluids$() into useful materials.", + "text.astromine.machinery.electrolyzer.page_two.title": "Recipe", + "text.astromine.machinery.energy_cable.title": "Energy Cable", + "text.astromine.machinery.energy_cable.page_one.title": "Energy Cable", + "text.astromine.machinery.energy_cable.page_one.text": "A cable which transports $(thing)energy$(); no buffering or path-finding involved.", + "text.astromine.machinery.energy_cable.page_two.title": "Recipe", + "text.astromine.machinery.fluid_cable.title": "Fluid Cable", + "text.astromine.machinery.fluid_cable.page_one.title": "Fluid Cable", + "text.astromine.machinery.fluid_cable.page_one.text": "A cable which transports $(thing)fluids$(); no buffering or path-finding involved.", + "text.astromine.machinery.fluid_cable.page_two.title": "Recipe", + "text.astromine.machinery.fluid_extractor.title": "Fluid Extractor", + "text.astromine.machinery.fluid_extractor.page_one.title": "Fluid Extractor", + "text.astromine.machinery.fluid_extractor.page_one.text": "A machine which consumes $(thing)energy$() to pick up $(thing)fluids$() from the world.", + "text.astromine.machinery.fluid_extractor.page_two.title": "Recipe", + "text.astromine.machinery.fluid_inserter.title": "Fluid Inserter", + "text.astromine.machinery.fluid_inserter.page_one.title": "Fluid Inserter", + "text.astromine.machinery.fluid_inserter.page_one.text": "A machine which consumes $(thing)energy$() to place $(thing)fluids$() in the world.", + "text.astromine.machinery.fluid_inserter.page_two.title": "Recipe", + "text.astromine.machinery.fluid_mixer.title": "Fuel Mixer", + "text.astromine.machinery.fluid_mixer.page_one.title": "Fuel Mixer", + "text.astromine.machinery.fluid_mixer.page_one.text": "A machine which consumes $(thing)energy$() to mix $(thing)fluids$() into useful materials.", + "text.astromine.machinery.fluid_mixer.page_two.title": "Recipe", + "text.astromine.machinery.block_breaker.title": "Block Breaker", + "text.astromine.machinery.block_breaker.page_one.title": "Block Breaker", + "text.astromine.machinery.block_breaker.page_one.text": "A machine which consumes $(thing)energy$() to break and pick up $(thing)blocks$() from the world.", + "text.astromine.machinery.block_breaker.page_two.title": "Recipe", + "text.astromine.machinery.block_placer.title": "Block Placer", + "text.astromine.machinery.block_placer.page_one.title": "Block Placer", + "text.astromine.machinery.block_placer.page_one.text": "A machine which consumes $(thing)energy$() to place $(thing)blocks$() in the world.", + "text.astromine.machinery.block_placer.page_two.title": "Recipe", + "text.astromine.machinery.inserter.title": "Inserter", + "text.astromine.machinery.inserter.page_one.title": "Inserter", + "text.astromine.machinery.inserter.page_one.text": "A machine which picks up items from its front and places them at its back, for item transportation.", + "text.astromine.machinery.inserter.page_two.title": "Recipe", + "text.astromine.machinery.inserter.page_three.title": "Recipe", + "text.astromine.machinery.conveyor.title": "Conveyor", + "text.astromine.machinery.conveyor.page_one.title": "Conveyor", + "text.astromine.machinery.conveyor.page_one.text": "A machine which transports items.", + "text.astromine.machinery.conveyor.page_two.title": "Recipe", + "text.astromine.machinery.conveyor.page_three.title": "Recipe", + "text.astromine.machinery.conveyor.page_four.title": "Recipe", + "text.astromine.machinery.triturator.title": "Triturator", + "text.astromine.machinery.triturator.page_one.title": "Triturator", + "text.astromine.machinery.triturator.page_one.text": "A machine which consumes $(thing)energy$() to pulverise $(thing)items$() into useful materials.", + "text.astromine.machinery.triturator.page_two.title": "Recipe", + "text.astromine.machinery.presser.title": "Presser", + "text.astromine.machinery.presser.page_one.title": "Presser", + "text.astromine.machinery.presser.page_one.text": "A machine which consumes $(thing)energy$() to press $(thing)items$() into useful materials.", + "text.astromine.machinery.presser.page_two.title": "Recipe", + "text.astromine.machinery.vent.title": "Vent", + "text.astromine.machinery.vent.page_one.title": "Vent", + "text.astromine.machinery.vent.page_one.text": "A machine which consumes energy to ventilate fluids into the atmosphere.", + "text.astromine.machinery.vent.page_two.title": "Recipe", + "text.astromine.resources.copper.title": "Copper", + "text.astromine.resources.copper.page_one.title": "Copper", + "text.astromine.resources.copper.page_one.text": "A very common metal with high thermal and electrical conductivity and a distinct orange hue.", + "text.astromine.resources.copper.page_two.title": "Obtaining Copper", + "text.astromine.resources.copper.page_two.text": "$(item)Copper Ore$() can be commonly found $(thing)underground$() in $(thing)The Overworld$().$(p)Mining requires only a $(item)Stone Pickaxe$() (Mining Level 1) or better, and can then be $(thing)smelted$() into a $(item)Copper Ingot$().", + "text.astromine.resources.copper.page_three.title": "Usages", + "text.astromine.resources.copper.page_three.text": "Copper is very useful for basic electronics and tools. When combined with $(item)$(l:resources/tin)Tin$() in an $(item)$(l:machinery/alloy_smelter)Alloy Smelter$(), it can make $(item)$(l:resources/bronze)Bronze$().", + "text.astromine.resources.copper.page_four.title": "Statistics", + "text.astromine.resources.copper.page_four.text": "$(l)Tools$()$(br)Mining Level: 1$(br)Base Durability: 200$(br)Mining Speed: 4$(br)Attack Damage: 1.5$(br)Enchantability: 10$(p)$(l)Armor$()$(br)Durability Multiplier: 12$(br)Total Defense: 12$(br)Toughness: 0$(br)Enchantability: 15", + "text.astromine.resources.tin.title": "Tin", + "text.astromine.resources.tin.page_one.title": "Tin", + "text.astromine.resources.tin.page_one.text": "A common metal with a silvery sheen and a soft composition.", + "text.astromine.resources.tin.page_two.title": "Obtaining Tin", + "text.astromine.resources.tin.page_two.text": "$(item)Tin Ore$() can be commonly found $(thing)underground$() in $(thing)The Overworld$().$(p)Mining requires only a $(item)Stone Pickaxe$() (Mining Level 1) or better, and can then be $(thing)smelted$() into a $(item)Tin Ingot$().", + "text.astromine.resources.tin.page_three.title": "Usages", + "text.astromine.resources.tin.page_three.text": "Tin is useful for plating to prevent corrosion. When combined with $(item)$(l:resources/copper)Copper$() in an $(item)$(l:machinery/alloy_smelter)Alloy Smelter$(), it can make $(item)$(l:resources/bronze)Bronze$().", + "text.astromine.resources.tin.page_four.title": "Statistics", + "text.astromine.resources.tin.page_four.text": "$(l)Tools$()$(br)Mining Level: 1$(br)Base Durability: 200$(br)Mining Speed: 5$(br)Attack Damage: 1.0$(br)Enchantability: 10$(p)$(l)Armor$()$(br)Durability Multiplier: 12$(br)Total Defense: 12$(br)Toughness: 0$(br)Enchantability: 15", + "text.astromine.resources.bronze.title": "Bronze", + "text.astromine.resources.bronze.page_one.title": "Bronze", + "text.astromine.resources.bronze.page_one.text": "An alloy of $(item)$(l:resources/copper)Copper$() and $(item)$(l:resources/tin)Tin$(), Bronze manages to be stronger and more durable than either of them.", + "text.astromine.resources.bronze.page_two.title": "Obtaining Bronze", + "text.astromine.resources.bronze.page_two.text": "Bronze can be obtained by combining 3 Copper Ingots and 1 Tin Ingot in an $(item)$(l:machinery/alloy_smelter)Alloy Smelter$(). This produces 4 $(item)Bronze Ingots$().", + "text.astromine.resources.bronze.page_three.title": "Usages", + "text.astromine.resources.bronze.page_three.text": "Bronze is useful for creating tools, and is also used in construction of more advanced machines.", + "text.astromine.resources.bronze.page_four.title": "Statistics", + "text.astromine.resources.bronze.page_four.text": "$(l)Tools$()$(br)Mining Level: 2$(br)Base Durability: 539$(br)Mining Speed: 7$(br)Attack Damage: 2.5$(br)Enchantability: 20$(p)$(l)Armor$()$(br)Durability Multiplier: 20$(br)Total Defense: 15$(br)Toughness: 0.7$(br)Enchantability: 18", + "text.astromine.resources.steel.title": "Steel", + "text.astromine.resources.steel.page_one.title": "Steel", + "text.astromine.resources.steel.page_one.text": "An alloy of $(item)Iron$() and $(thing)Carbon$(), Steel is incredibly strong for a metal of terrestrial origin.", + "text.astromine.resources.steel.page_two.title": "Obtaining Steel", + "text.astromine.resources.steel.page_two.text": "Steel can be obtained by combining an Iron Ingot and 2 $(item)Coal Dust$() or $(item)Charcoal Dust$() in an $(item)$(l:machinery/alloy_smelter)Alloy Smelter$(). This produces a single $(item)Steel Ingot$().", + "text.astromine.resources.steel.page_three.title": "Usages", + "text.astromine.resources.steel.page_three.text": "Steel is useful for creating tools, and is also used in construction of more advanced machines.", + "text.astromine.resources.steel.page_four.title": "Statistics", + "text.astromine.resources.steel.page_four.text": "$(l)Tools$()$(br)Mining Level: 3$(br)Base Durability: 1043$(br)Mining Speed: 7.5$(br)Attack Damage: 3$(br)Enchantability: 24$(p)$(l)Armor$()$(br)Durability Multiplier: 24$(br)Total Defense: 17$(br)Toughness: 0.5$(br)Enchantability: 18", + "text.astromine.resources.silver.title": "Silver", + "text.astromine.resources.silver.page_one.title": "Silver", + "text.astromine.resources.silver.page_one.text": "A metal with high electrical conductivity and a distinct white, lustrous texture.", + "text.astromine.resources.silver.page_two.title": "Obtaining Silver", + "text.astromine.resources.silver.page_two.text": "$(item)Silver Ore$() can be found $(thing)underground$() in $(thing)The Overworld$().$(p)Mining requires only a $(item)Iron Pickaxe$() (Mining Level 2) or better, and can then be $(thing)smelted$() into a $(item)Silver Ingot$().", + "text.astromine.resources.silver.page_three.title": "Usages", + "text.astromine.resources.silver.page_three.text": "Silver is very useful for basic electronics and tools. When combined with $(item)$(l:resources/copper)Copper$() in an $(item)$(l:machinery/alloy_smelter)Alloy Smelter$(), it can make $(item)$(l:resources/electrum)Electrum$(). When combined with $(item)$(l:resources/copper)Copper$() in an $(item)$(l:machinery/alloy_smelter)Alloy Smelter$(), it can make $(item)$(l:resources/sterling_silver)Sterling Silver$().", + "text.astromine.resources.silver.page_four.title": "Statistics", + "text.astromine.resources.silver.page_four.text": "$(l)Tools$()$(br)Mining Level: 2$(br)Base Durability: 462$(br)Mining Speed: 6.5$(br)Attack Damage: 2.0$(br)Enchantability: 20$(p)$(l)Armor$()$(br)Durability Multiplier: 17$(br)Total Defense: ?$(br)Toughness: 0$(br)Enchantability: 22", + "text.astromine.resources.electrum.title": "Electrum", + "text.astromine.resources.electrum.page_one.title": "Electrum", + "text.astromine.resources.electrum.page_one.text": "A metal with significant electrical conductivity and golden texture.", + "text.astromine.resources.electrum.page_two.title": "Obtaining Electrum", + "text.astromine.resources.electrum.page_two.text": "Electrum can be obtained by combining 1 Gold Ingot and 1 Silver Ingot in an $(item)$(l:machinery/alloy_smelter)Alloy Smelter$(). This produces 2 $(item)Electrum Ingots$().", + "text.astromine.resources.electrum.page_three.title": "Usages", + "text.astromine.resources.electrum.page_three.text": "Electrum is often used for coins.", + "text.astromine.resources.electrum.page_four.title": "Statistics", + "text.astromine.resources.electrum.page_four.text": "$(l)Tools$()$(br)Mining Level: 2$(br)Base Durability: 185$(br)Mining Speed: 11$(br)Attack Damage: 1.0$(br)Enchantability: 21$(p)$(l)Armor$()$(br)Durability Multiplier: 13$(br)Total Defense: ?$(br)Toughness: 0$(br)Enchantability: 25", + "text.astromine.resources.fools_gold.title": "Fool's Gold", + "text.astromine.resources.fools_gold.page_one.title": "Fool's Gold", + "text.astromine.resources.fools_gold.page_one.text": "A metal with used to obtain sulfur dioxide, which, due to its golden colour, often confuses the unprepared traveller.", + "text.astromine.resources.fools_gold.page_two.title": "Obtaining Fool's Gold", + "text.astromine.resources.fools_gold.page_two.text": "Fool's Gold can be obtained by combining 1 Iron Ingot and 1 Gunpowder in an $(item)$(l:machinery/alloy_smelter)Alloy Smelter$(). This produces 2 $(item)Fool's Gold Ingots$().", + "text.astromine.resources.fools_gold.page_three.title": "Usages", + "text.astromine.resources.fools_gold.page_three.text": "Fool's Gold is often used for coins.", + "text.astromine.resources.fools_gold.page_four.title": "Statistics", + "text.astromine.resources.fools_gold.page_four.text": "$(l)Tools$()$(br)Mining Level: 2$(br)Base Durability: 250$(br)Mining Speed: 6.5$(br)Attack Damage: 2.0$(br)Enchantability: 16$(p)$(l)Armor$()$(br)Durability Multiplier: 15$(br)Total Defense: ?$(br)Toughness: 0$(br)Enchantability: 10", + "text.astromine.resources.rose_gold.title": "Rose Gold", + "text.astromine.resources.rose_gold.page_one.title": "Rose Gold", + "text.astromine.resources.rose_gold.page_one.text": "A metal with significant electrical conductivity and rose, pink texture.", + "text.astromine.resources.rose_gold.page_two.title": "Obtaining Rose Gold", + "text.astromine.resources.rose_gold.page_two.text": "Rose Gold can be obtained by combining 1 Gold Ingot and 1 Silver Ingot in an $(item)$(l:machinery/alloy_smelter)Alloy Smelter$(). This produces 2 $(item)Rose Gold Ingots$().", + "text.astromine.resources.rose_gold.page_three.title": "Usages", + "text.astromine.resources.rose_gold.page_three.text": "Rose Gold is often used for coins.", + "text.astromine.resources.rose_gold.page_four.title": "Statistics", + "text.astromine.resources.rose_gold.page_four.text": "$(l)Tools$()$(br)Mining Level: 1$(br)Base Durability: 64$(br)Mining Speed: 10$(br)Attack Damage: 0.5$(br)Enchantability: 24$(p)$(l)Armor$()$(br)Durability Multiplier: 9$(br)Total Defense: ?$(br)Toughness: 0.1$(br)Enchantability: 25", + "text.astromine.resources.sterling_silver.title": "Sterling Silver", + "text.astromine.resources.sterling_silver.page_one.title": "Sterling Silver", + "text.astromine.resources.sterling_silver.page_one.text": "A metal with significant electrical conductivity and silvery texture.", + "text.astromine.resources.sterling_silver.page_two.title": "Obtaining Sterling Silver", + "text.astromine.resources.sterling_silver.page_two.text": "Sterling Silver can be obtained by combining 3 Silver Ingots and 1 Copper Ingot in an $(item)$(l:machinery/alloy_smelter)Alloy Smelter$(). This produces 4 $(item)Sterling Silver Ingots$().", + "text.astromine.resources.sterling_silver.page_three.title": "Usages", + "text.astromine.resources.sterling_silver.page_three.text": "Sterling Silver is often used for tooling.", + "text.astromine.resources.sterling_silver.page_four.title": "Statistics", + "text.astromine.resources.sterling_silver.page_four.text": "$(l)Tools$()$(br)Mining Level: 2$(br)Base Durability: 697$(br)Mining Speed: 7$(br)Attack Damage: 2.5$(br)Enchantability: 20$(p)$(l)Armor$()$(br)Durability Multiplier: 18$(br)Total Defense: ?$(br)Toughness: 0.1$(br)Enchantability: 23", + "text.astromine.resources.asterite.title": "Asterite", + "text.astromine.resources.asterite.page_one.title": "Asterite", + "text.astromine.resources.asterite.page_one.text": "A fragment of a long dead star, this red gem may look frail to an untrained observer - one who does not know its significant strengths. $(p)Its properties allow for qualified craftsmen to create powerful tooling.", + "text.astromine.resources.asterite.page_two.title": "Obtaining Asterite", + "text.astromine.resources.asterite.page_two.text": "$(item)Asterite Ore$() can be found inside $(thing)$(l:world/asteroids)Asteroids$() in $(thing)Space$().$(p)Mining requires a $(item)Netherite Pickaxe$() (Mining Level 4) or better, usually resulting in a single $(item)Asterite Cluster$() which can forged into an $(item)Asterite$() gem.", + "text.astromine.resources.asterite.page_three.title": "Usages", + "text.astromine.resources.asterite.page_three.text": "Asterite can be used to create powerful tooling.", + "text.astromine.resources.asterite.page_four.title": "Statistics", + "text.astromine.resources.asterite.page_four.text": "$(l)Tools$()$(br)Mining Level: 5$(br)Base Durability: 2015$(br)Mining Speed: 10$(br)Attack Damage: 5$(br)Enchantability: 20$(p)$(l)Armor$()$(br)Durability Multiplier: 22$(br)Total Defense: 23$(br)Toughness: 4$(br)Enchantability: 20", + "text.astromine.resources.galaxium.title": "Galaxium", + "text.astromine.resources.galaxium.page_one.title": "Galaxium", + "text.astromine.resources.galaxium.page_one.text": "A rare gem with a deep, overwhelming dark shine. Extraordinarily dense, this material is theorised to be obtained from large clusters at the center of galaxies.$(p)There are no records of such phenomena, but one's journey holds the keys to many secrets never thought of before.", + "text.astromine.resources.galaxium.page_two.title": "Obtaining Galaxium", + "text.astromine.resources.galaxium.page_two.text": "$(item)Galaxium Ore$() can be rarely found inside $(thing)$(l:world/asteroids)Asteroids$() in $(thing)Space$().$(p)Galaxium Ore mining will require an $(item)Asterite Pickaxe$() (Mining Level 5) or better, usually resulting in a single $(item)$(l:world/ore_clusters)Galaxium Cluster$() which can be forged into a $(item)Galaxium$() gem.", + "text.astromine.resources.galaxium.page_three.title": "Usages", + "text.astromine.resources.galaxium.page_three.text": "Galaxium can be used to create extremely resistant tooling and exquisite technology.", + "text.astromine.resources.galaxium.page_four.title": "Statistics", + "text.astromine.resources.galaxium.page_four.text": "$(l)Tools$()$(br)Mining Level: 6$(br)Base Durability: 3072$(br)Mining Speed: 11$(br)Attack Damage: 5$(br)Enchantability: 18$(p)$(l)Armor$()$(br)Durability Multiplier: 44$(br)Total Defense: 25$(br)Toughness: 4.5$(br)Enchantability: 18", + "text.astromine.resources.metite.title": "Metite", + "text.astromine.resources.metite.page_one.title": "Metite", + "text.astromine.resources.metite.page_one.text": "A foreign metal, Metite withstands immense pressures; being essential in all areas of space travel.$(p)Acquiring it is considered a major stepping stone in one's interstellar journey.", + "text.astromine.resources.metite.page_two.title": "Obtaining Metite", + "text.astromine.resources.metite.page_two.text": "$(item)Metite Ore$() can be found inside $(thing)$(l:world/meteors)Meteors$() which have impacted on $(thing)Earth$(), or in $(thing)$(l:world/asteroids)Asteroids$() in $(thing)Space$().$(p)Mining requires a $(item)Netherite Pickaxe$() (Mining Level 4) or better, usually resulting in between 1 and 3 $(item)$(l:world/ore_clusters)Metite Clusters$() which can forged into a $(item)Metite Ingot$().", + "text.astromine.resources.metite.page_three.title": "Usages", + "text.astromine.resources.metite.page_three.text": "Metite can be used to create standard tooling; however, it is of much more use in creating astronautical technology.", + "text.astromine.resources.metite.page_four.title": "Statistics", + "text.astromine.resources.metite.page_four.text": "$(l)Tools$()$(br)Mining Level: 1$(br)Base Durability: 853$(br)Mining Speed: 13$(br)Attack Damage: 4$(br)Enchantability: 5$(p)$(l)Armor$()$(br)Durability Multiplier: 15$(br)Total Defense: 14$(br)Toughness: 0$(br)Enchantability: 7", + "text.astromine.resources.stellum.title": "Stellum", + "text.astromine.resources.stellum.page_one.title": "Stellum", + "text.astromine.resources.stellum.page_one.text": "A fragment of a living star, the raw energy contained within this material is surpassed only by few, every molecule of it vibrating with $(thing)Stellar Energy$().", + "text.astromine.resources.stellum.page_two.title": "Obtaining Stellum", + "text.astromine.resources.stellum.page_two.text": "$(item)Stellum Ore$() can be found inside $(thing)$(l:world/asteroids)Asteroids$() in $(thing)Space$().$(p)Mining requires an $(item)Asterite Pickaxe$() (Mining Level 5) or better, usually resulting in a single $(item)$(l:world/ore_clusters)Stellum Cluster$() which can be forged into a $(item)Stellum Ingot$().", + "text.astromine.resources.stellum.page_three.title": "Usages", + "text.astromine.resources.stellum.page_three.text": "Stellum can be used to create powerful tooling roughly equivalent to $(thing)$(l:resources/asterite)Asterite$(). Born from the heart of a living star, it is fire proof to an extent never seen before; and posses a power that, when harnessed, can power an entire civilisation.", + "text.astromine.resources.stellum.page_four.title": "Statistics", + "text.astromine.resources.stellum.page_four.text": "$(l)Tools$()$(br)Mining Level: 5$(br)Base Durability: 2643$(br)Mining Speed: 8$(br)Attack Damage: 6$(br)Enchantability: 15$(br)Fireproof$(p)$(l)Armor$()$(br)Durability Multiplier: 41$(br)Total Defense: 16$(br)Toughness: 6$(br)Enchantability: 15$(br)Fireproof", + "text.astromine.resources.univite.title": "Univite", + "text.astromine.resources.univite.page_one.title": "Univite", + "text.astromine.resources.univite.page_one.text": "A material so highly coveted it has sparked numerous interstellar wars; only a limited amount of it exists within this realm, thought to have originated at the heart of the universe, before any of us even dared the thought of existence. It is unknown whether any material conveys higher power than Univite.", + "text.astromine.resources.univite.page_two.title": "Obtaining Univite", + "text.astromine.resources.univite.page_two.text": "A theorised origin and limited existence means immense difficulty in being obtained; with no way but theft available to small civilisations.$(p)Or, y'know, the temporary recipe we added. But that's not canon.", + "text.astromine.resources.univite.page_three.title": "Usages", + "text.astromine.resources.univite.page_three.text": "Univite can be used to create the strongest tooling and weaponry known by all discovered civilisations.", + "text.astromine.resources.univite.page_four.title": "Statistics", + "text.astromine.resources.univite.page_four.text": "$(l)Tools$()$(br)Mining Level: 7$(br)Base Durability: 3918$(br)Mining Speed: 12$(br)Attack Damage: 6$(br)Enchantability: 22$(br)Fireproof$(p)$(l)Armor$()$(br)Durability Multiplier: 50$(br)Total Defense: 27$(br)Toughness: 5$(br)Enchantability: 22$(br)Fireproof", + "text.astromine.warfare.nuclear_warhead.title": "Nuclear Warhead", + "text.astromine.warfare.nuclear_warhead.page_one.title": "Nuclear Warhead", + "text.astromine.warfare.nuclear_warhead.page_one.text": "A bomb capable of devastating destruction, terminating all life-forms in the process.", + "text.astromine.warfare.nuclear_warhead.page_two.title": "Recipe", + "text.astromine.world.asteroid_ores.title": "Asteroid Ores", + "text.astromine.world.asteroid_ores.page_one.title": "Asteroid Ores", + "text.astromine.world.asteroid_ores.page_one.text": "Veins of ores found in $(thing)$(l:world/asteroids)asteroids$(), which may be harvested for resources.$(p)When mined, will drop their respective $(thing)$(l:world/ore_clusters)ore clusters$().", + "text.astromine.world.asteroids.title": "Asteroids", + "text.astromine.world.asteroids.page_one.title": "Asteroids", + "text.astromine.world.asteroids.page_one.text": "Foreign bodies found cruising through interstellar space, in rings, clusters and many other formations; said to contain large quantities of $(thing)$(l:world/asteroid_ores)ores$().", + "text.astromine.world.meteor_ores.title": "Meteor Ores", + "text.astromine.world.meteor_ores.page_one.title": "Meteor Ores", + "text.astromine.world.meteor_ores.page_one.text": "Veins of ores found in $(thing)$(l:world/meteors)meteors$(), which may be harvested for resources.$(p)When mined, will drop their respective $(thing)$(l:world/ore_clusters)ore clusters$().", + "text.astromine.world.meteors.title": "Meteors", + "text.astromine.world.meteors.page_one.title": "Meteors", + "text.astromine.world.meteors.page_one.text": "Foreign bodies that, cruising through the stairs, collided with a planetary body; said to contain $(thing)$(l:world/meteor_ores)extraterrestrial ores$().", + "text.astromine.world.ore_clusters.title": "Ore Clusters", + "text.astromine.world.ore_clusters.page_one.title": "Ore Clusters", + "text.astromine.world.ore_clusters.page_one.text": "Clusters of ores obtained from $(thing)$(l:world/asteroid_ores)asteroid ores$() or $(thing)$(l:world/meteor_ores)meteor ores$(), which may be processed for resources.", + "text.astromine.world.ore_clusters.page_two.title": "Processing", + "text.astromine.world.ore_clusters.page_two.text": "Triturating clusters will result in two of their respective $(thing)dusts$().", + "text.autoconfig.astromine/config.text": "Astromine Config", + "advancements.astromine.root.title": "Astromine", + "advancements.astromine.root.description": "Adventures to infinity and beyond", + "advancements.astromine.underestimate_metite.title": "Underestimating Alien Ores", + "advancements.astromine.underestimate_metite.description": "Attempt to mine Metite Ore with an insufficient pickaxe (You need Netherite!)", + "advancements.astromine.enter_space.title": "The Final Frontier", + "advancements.astromine.enter_space.description": "Enter Space", + "advancements.astromine.fall_to_earth.title": "Fall From The Heavens", + "advancements.astromine.fall_to_earth.description": "Fall back down to Earth", + "advancements.astromine.get_fire_extinguisher.title": "Fireman Steve", + "advancements.astromine.get_fire_extinguisher.description": "Craft a Fire Extinguisher", + "advancements.astromine.use_fire_extinguisher.title": "Realistic Physics", + "advancements.astromine.use_fire_extinguisher.description": "Propel yourself with a Fire Extinguisher", + "advancements.astromine.properly_use_fire_extinguisher.title": "The Hero Next Door", + "advancements.astromine.properly_use_fire_extinguisher.description": "Extinguish a mob that's on fire", + "advancements.astromine.get_meteor_stone.title": "(Space) Stone Age", + "advancements.astromine.get_meteor_stone.description": "Mine Meteor Stone with a strong pickaxe", + "advancements.astromine.get_metite_ingot.title": "Metal From The Stars", + "advancements.astromine.get_metite_ingot.description": "Obtain a Metite Ingot", + "advancements.astromine.get_stellum_ingot.title": "It's Full of Stars", + "advancements.astromine.get_stellum_ingot.description": "Obtain a Stellum Ingot", + "advancements.astromine.get_galaxium.title": "Hidden Gem", + "advancements.astromine.get_galaxium.description": "Obtain Galaxium", + "advancements.astromine.get_univite_ingot.title": "Univite Says Gay Rights", + "advancements.astromine.get_univite_ingot.description": "Obtain a Univite Ingot", + "advancements.astromine.get_univite_armor.title": "Cover Me in Rainbows", + "advancements.astromine.get_univite_armor.description": "Get a full suit of Univite Armor", + "advancements.astromine.get_space_suit.title": "Ready For The Unknown", + "advancements.astromine.get_space_suit.description": "Get a full Space Suit", + "advancements.astromine.launch_rocket.title": "We Have Liftoff", + "advancements.astromine.launch_rocket.description": "Launch a Rocket", + "advancements.astromine.tricked_piglin.title": "Shame On You", + "advancements.astromine.tricked_piglin.description": "Scam a Piglin with Fool's Gold", + "advancements.astromine.get_bronze_ingot.title": "Third Place", + "advancements.astromine.get_bronze_ingot.description": "Obtain a Bronze Ingot", + "advancements.astromine.get_fools_gold_ingot.title": "Only Fools", + "advancements.astromine.get_fools_gold_ingot.description": "Obtain a Fool's Gold Ingot", + "advancements.astromine.get_steel_ingot.title": "Steel Yourself", + "advancements.astromine.get_steel_ingot.description": "Obtain a Steel Ingot", + "advancements.astromine.get_sterling_silver_ingot.title": "Like Silver, But Sterling-er", + "advancements.astromine.get_sterling_silver_ingot.description": "Obtain a Sterling Silver Ingot", + "advancements.astromine.get_chassis.title": "Heart of the Machine", + "advancements.astromine.get_chassis.description": "Craft a Machine Chassis", + "advancements.astromine.get_alloy_smelter.title": "With Our Metals Combined", + "advancements.astromine.get_alloy_smelter.description": "Craft an Alloy Smelter", + "advancements.astromine.get_electric_smelter.title": "Hot Topic 2: Electric Boogaloo", + "advancements.astromine.get_electric_smelter.description": "Craft an Electric Smelter", + "advancements.astromine.get_presser.title": "Pressing Matters", + "advancements.astromine.get_presser.description": "Craft a Presser", + "advancements.astromine.get_triturator.title": "AKA Pulveriser", + "advancements.astromine.get_triturator.description": "Craft a Triturator", + "advancements.astromine.get_gear.title": "Grinds Your Gears", + "advancements.astromine.get_gear.description": "Craft a Gear", + "advancements.astromine.get_plates.title": "Flat Ingots", + "advancements.astromine.get_plates.description": "Craft some Plates", + "advancements.astromine.get_rose_gold_ingot.title": "Pretty in Pink", + "advancements.astromine.get_rose_gold_ingot.description": "Obtain a Rose Gold Ingot", + "advancements.astromine.get_basic_circuit.title": "Circuit Maker", + "advancements.astromine.get_basic_circuit.description": "Craft a Basic Circuit", + "advancements.astromine.get_advanced_circuit.title": "Super Circuit Maker", + "advancements.astromine.get_advanced_circuit.description": "Craft an Advanced Circuit", + "advancements.astromine.get_elite_circuit.title": "New Super Circuit Maker U Deluxe", + "advancements.astromine.get_elite_circuit.description": "Craft an Elite Circuit" +} \ No newline at end of file diff --git a/astromine-core/src/main/resources/assets/astromine/lang/en_us.json b/astromine-core/src/main/resources/assets/astromine/lang/en_us.json index 3779bcdbb..985479618 100644 --- a/astromine-core/src/main/resources/assets/astromine/lang/en_us.json +++ b/astromine-core/src/main/resources/assets/astromine/lang/en_us.json @@ -1026,5 +1026,9 @@ "advancements.astromine.get_advanced_circuit.title": "Super Circuit Maker", "advancements.astromine.get_advanced_circuit.description": "Craft an Advanced Circuit", "advancements.astromine.get_elite_circuit.title": "New Super Circuit Maker U Deluxe", - "advancements.astromine.get_elite_circuit.description": "Craft an Elite Circuit" + "advancements.astromine.get_elite_circuit.description": "Craft an Elite Circuit", + "advancements.astromine.destroy_rocket.title": "We Have a Problem", + "advancements.astromine.destroy_rocket.description": "Have a Rocket you're riding experience rapid unscheduled disassembly", + "advancements.astromine.eat_lead_apple.title": "Why Would You Do That?", + "advancements.astromine.eat_lead_apple.description": "Get lead poisoning by ingesting a Lead Apple" } diff --git a/astromine-discoveries/src/main/java/com/github/chainmailstudios/astromine/discoveries/common/advancement/DestroyRocketCriterion.java b/astromine-discoveries/src/main/java/com/github/chainmailstudios/astromine/discoveries/common/advancement/DestroyRocketCriterion.java new file mode 100644 index 000000000..8b1fcd735 --- /dev/null +++ b/astromine-discoveries/src/main/java/com/github/chainmailstudios/astromine/discoveries/common/advancement/DestroyRocketCriterion.java @@ -0,0 +1,85 @@ +/* + * MIT License + * + * Copyright (c) 2020 Chainmail Studios + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ + +package com.github.chainmailstudios.astromine.discoveries.common.advancement; + +import net.minecraft.advancement.criterion.AbstractCriterion; +import net.minecraft.advancement.criterion.AbstractCriterionConditions; +import net.minecraft.predicate.entity.AdvancementEntityPredicateDeserializer; +import net.minecraft.predicate.entity.EntityPredicate; +import net.minecraft.server.network.ServerPlayerEntity; +import net.minecraft.util.Identifier; + +import com.github.chainmailstudios.astromine.discoveries.registry.AstromineDiscoveriesCriteria; + +import com.google.gson.JsonObject; + +public class DestroyRocketCriterion extends AbstractCriterion { + public final Identifier id; + + public DestroyRocketCriterion(Identifier id) { + this.id = id; + } + + @Override + protected DestroyRocketCriterion.Conditions conditionsFromJson(JsonObject obj, EntityPredicate.Extended playerPredicate, AdvancementEntityPredicateDeserializer predicateDeserializer) { + if(obj.has("intentional")) return new Conditions(this.id, playerPredicate, obj.get("intentional").getAsBoolean()); + else return new Conditions(this.id, playerPredicate); + } + + @Override + public Identifier getId() { + return id; + } + + public void trigger(ServerPlayerEntity player, boolean intentional) { + this.test(player, conditions -> conditions.matches(intentional)); + } + + public static class Conditions extends AbstractCriterionConditions { + private final Boolean intentional; + + public Conditions(Identifier id, EntityPredicate.Extended playerPredicate, Boolean intentional) { + super(id, playerPredicate); + this.intentional = intentional; + } + + public Conditions(Identifier id, EntityPredicate.Extended playerPredicate) { + super(id, playerPredicate); + this.intentional = null; + } + + public boolean matches(boolean intentional) { + return intentional() == null || intentional == intentional(); + } + + public Boolean intentional() { + return intentional; + } + + public static Conditions create(boolean intentional) { + return new Conditions(AstromineDiscoveriesCriteria.DESTROY_ROCKET.getId(), EntityPredicate.Extended.EMPTY, intentional); + } + } +} diff --git a/astromine-discoveries/src/main/java/com/github/chainmailstudios/astromine/discoveries/common/entity/base/RocketEntity.java b/astromine-discoveries/src/main/java/com/github/chainmailstudios/astromine/discoveries/common/entity/base/RocketEntity.java index 31f89be92..d9a5d8bbf 100644 --- a/astromine-discoveries/src/main/java/com/github/chainmailstudios/astromine/discoveries/common/entity/base/RocketEntity.java +++ b/astromine-discoveries/src/main/java/com/github/chainmailstudios/astromine/discoveries/common/entity/base/RocketEntity.java @@ -35,6 +35,7 @@ import net.minecraft.item.BucketItem; import net.minecraft.item.ItemStack; import net.minecraft.item.Items; +import net.minecraft.server.network.ServerPlayerEntity; import net.minecraft.server.world.ServerWorld; import net.minecraft.text.TranslatableText; import net.minecraft.util.Arm; @@ -51,6 +52,7 @@ import com.github.chainmailstudios.astromine.common.volume.fraction.Fraction; import com.github.chainmailstudios.astromine.common.volume.handler.FluidHandler; import com.github.chainmailstudios.astromine.common.volume.handler.ItemHandler; +import com.github.chainmailstudios.astromine.discoveries.registry.AstromineDiscoveriesCriteria; import com.github.chainmailstudios.astromine.discoveries.registry.AstromineDiscoveriesParticles; import org.joml.Vector3d; import org.joml.Vector3f; @@ -108,7 +110,7 @@ public void tick() { if (tank.isEmpty() && !world.isClient) { this.world.getPlayers().forEach(player -> player.sendMessage(new TranslatableText("text.astromine.rocket.disassemble_empty_fuel").formatted(Formatting.RED), false)); - this.tryDisassemble(); + this.tryDisassemble(false); } else { Vector3d acceleration = accelerationFunction.apply(this); @@ -131,12 +133,12 @@ public void tick() { if (BlockPos.Mutable.method_29715(getBoundingBox()).anyMatch(pos -> world.getBlockState(pos).isFullCube(world, pos)) && !world.isClient) { this.world.getPlayers().forEach(player -> player.sendMessage(new TranslatableText("text.astromine.rocket.disassemble_collision").formatted(Formatting.RED), false)); - this.tryDisassemble(); + this.tryDisassemble(false); } } else if (!world.isClient) { this.world.getPlayers().forEach(player -> player.sendMessage(new TranslatableText("text.astromine.rocket.disassemble_invalid_fuel").formatted(Formatting.RED), false)); - this.tryDisassemble(); + this.tryDisassemble(false); } } else { setVelocity(Vec3d.ZERO); @@ -190,10 +192,16 @@ private FluidVolume getTank() { return getFluidComponent().getVolume(0); } - public void tryDisassemble() { + public void tryDisassemble(boolean intentional) { this.tryExplode(); this.explosionRemains.forEach(stack -> ItemScatterer.spawn(world, getX(), getY(), getZ(), stack.copy())); - this.getPassengersDeep().forEach(Entity::stopRiding); + Collection passengers = this.getPassengersDeep(); + for(Entity passenger:passengers) { + if (passenger instanceof ServerPlayerEntity) { + AstromineDiscoveriesCriteria.DESTROY_ROCKET.trigger((ServerPlayerEntity) passenger, intentional); + } + passenger.stopRiding(); + } this.remove(); } @@ -207,4 +215,13 @@ public Vec3d updatePassengerForDismount(LivingEntity passenger) { } public abstract void openInventory(PlayerEntity player); + + public void tryLaunch(PlayerEntity launcher) { + if (this.getFluidComponent().getVolume(0).biggerThan(Fraction.empty())) { + this.getDataTracker().set(RocketEntity.IS_RUNNING, true); + if(launcher instanceof ServerPlayerEntity) { + AstromineDiscoveriesCriteria.LAUNCH_ROCKET.trigger((ServerPlayerEntity) launcher); + } + } + } } diff --git a/astromine-discoveries/src/main/java/com/github/chainmailstudios/astromine/discoveries/common/screenhandler/RocketScreenHandler.java b/astromine-discoveries/src/main/java/com/github/chainmailstudios/astromine/discoveries/common/screenhandler/RocketScreenHandler.java index fba301f9b..48d9e8299 100644 --- a/astromine-discoveries/src/main/java/com/github/chainmailstudios/astromine/discoveries/common/screenhandler/RocketScreenHandler.java +++ b/astromine-discoveries/src/main/java/com/github/chainmailstudios/astromine/discoveries/common/screenhandler/RocketScreenHandler.java @@ -58,8 +58,7 @@ public void initialize(int width, int height) { super.initialize(width, height); ButtonWidget launchButtonWidget = new ButtonWidget(() -> { - if (entity.getFluidComponent().getVolume(0).biggerThan(Fraction.empty())) - entity.getDataTracker().set(RocketEntity.IS_RUNNING, true); + ((RocketEntity) entity).tryLaunch(this.getPlayer()); return null; }); @@ -70,7 +69,7 @@ public void initialize(int width, int height) { launchButtonWidget.setDisabled(() -> entity.getDataTracker().get(RocketEntity.IS_RUNNING) || entity.getFluidComponent().getVolume(0).smallerOrEqualThan(Fraction.empty())); ButtonWidget abortButtonWidget = new ButtonWidget(() -> { - ((RocketEntity) entity).tryDisassemble(); + ((RocketEntity) entity).tryDisassemble(true); return null; }); diff --git a/astromine-discoveries/src/main/java/com/github/chainmailstudios/astromine/discoveries/registry/AstromineDiscoveriesCriteria.java b/astromine-discoveries/src/main/java/com/github/chainmailstudios/astromine/discoveries/registry/AstromineDiscoveriesCriteria.java index 273a0749f..6416a119e 100644 --- a/astromine-discoveries/src/main/java/com/github/chainmailstudios/astromine/discoveries/registry/AstromineDiscoveriesCriteria.java +++ b/astromine-discoveries/src/main/java/com/github/chainmailstudios/astromine/discoveries/registry/AstromineDiscoveriesCriteria.java @@ -25,11 +25,13 @@ package com.github.chainmailstudios.astromine.discoveries.registry; import com.github.chainmailstudios.astromine.AstromineCommon; +import com.github.chainmailstudios.astromine.discoveries.common.advancement.DestroyRocketCriterion; import com.github.chainmailstudios.astromine.discoveries.common.advancement.LaunchRocketCriterion; import com.github.chainmailstudios.astromine.registry.AstromineCriteria; public class AstromineDiscoveriesCriteria extends AstromineCriteria { public static final LaunchRocketCriterion LAUNCH_ROCKET = register(new LaunchRocketCriterion(AstromineCommon.identifier("launch_rocket"))); + public static final DestroyRocketCriterion DESTROY_ROCKET = register(new DestroyRocketCriterion(AstromineCommon.identifier("destroy_rocket"))); public static void initialize() { diff --git a/astromine-discoveries/src/main/resources/data/astromine/advancements/astromine/destroy_rocket_unintentionally.json b/astromine-discoveries/src/main/resources/data/astromine/advancements/astromine/destroy_rocket_unintentionally.json new file mode 100644 index 000000000..2d4d73278 --- /dev/null +++ b/astromine-discoveries/src/main/resources/data/astromine/advancements/astromine/destroy_rocket_unintentionally.json @@ -0,0 +1,26 @@ +{ + "parent": "astromine:astromine/launch_rocket", + "display": { + "icon": { + "item": "astromine:rocket" + }, + "title": { + "translate": "advancements.astromine.destroy_rocket.title" + }, + "description": { + "translate": "advancements.astromine.destroy_rocket.description" + }, + "frame": "task", + "show_toast": true, + "announce_to_chat": true, + "hidden": false + }, + "criteria": { + "destroy_rocket": { + "trigger": "astromine:destroy_rocket", + "conditions": { + "intentional": false + } + } + } +} \ No newline at end of file diff --git a/astromine-foundations/src/main/resources/data/astromine/advancements/astromine/eat_lead_apple.json b/astromine-foundations/src/main/resources/data/astromine/advancements/astromine/eat_lead_apple.json new file mode 100644 index 000000000..ac7fe896a --- /dev/null +++ b/astromine-foundations/src/main/resources/data/astromine/advancements/astromine/eat_lead_apple.json @@ -0,0 +1,30 @@ +{ + "parent": "astromine:astromine/root", + "display": { + "icon": { + "item": "astromine:lead_apple" + }, + "title": { + "translate": "advancements.astromine.eat_lead_apple.title" + }, + "description": { + "translate": "advancements.astromine.eat_lead_apple.description" + }, + "frame": "task", + "show_toast": true, + "announce_to_chat": true, + "hidden": false + }, + "criteria": { + "eat_lead_apple": { + "trigger": "minecraft:consume_item", + "conditions": { + "items": [ + { + "item": "astromine:lead_apple" + } + ] + } + } + } +} \ No newline at end of file From c242cde428774ef351245edd911e275815f2a73e Mon Sep 17 00:00:00 2001 From: Shnupbups Date: Tue, 13 Oct 2020 03:42:35 +1100 Subject: [PATCH 16/16] bump version, fix typo --- astromine-discoveries/src/main/resources/fabric.mod.json | 2 +- gradle.properties | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/astromine-discoveries/src/main/resources/fabric.mod.json b/astromine-discoveries/src/main/resources/fabric.mod.json index 1379bdbd8..3455ac603 100644 --- a/astromine-discoveries/src/main/resources/fabric.mod.json +++ b/astromine-discoveries/src/main/resources/fabric.mod.json @@ -23,7 +23,7 @@ }, "license": "MIT", "icon": "assets/astromine-discoveries/icon.png", - "environxment": "*", + "environment": "*", "entrypoints": { "main": ["com.github.chainmailstudios.astromine.discoveries.AstromineDiscoveriesCommon"], "client": ["com.github.chainmailstudios.astromine.discoveries.AstromineDiscoveriesClient"], diff --git a/gradle.properties b/gradle.properties index d8b42130c..435b47ae9 100644 --- a/gradle.properties +++ b/gradle.properties @@ -9,7 +9,7 @@ loader_version=0.10.1+build.209 api_version=0.23.0+build.410-1.16 # Mod mod_name=astromine -mod_version=1.11.0 +mod_version=1.11.1 mod_group=com.github.chainmailstudios.astromine version_meta=fabric-1.16.3 # CurseForge