From 2dca6ac7574ad8278c76caad5a0f700c5ead6f29 Mon Sep 17 00:00:00 2001 From: Bob Date: Sun, 30 Jan 2022 21:54:28 +0100 Subject: [PATCH] patching up some garbage, recipes and lang keys --- .../com/hbm/blocks/machine/MachineFEL.java | 13 +++++++++++++ .../java/com/hbm/crafting/WeaponRecipes.java | 10 +++++++++- .../inventory/recipes/AssemblerRecipes.java | 3 ++- src/main/java/com/hbm/items/ModItems.java | 3 ++- .../java/com/hbm/items/weapon/ItemClip.java | 6 +++--- src/main/java/com/hbm/lib/RefStrings.java | 2 +- .../java/com/hbm/main/ModEventHandler.java | 18 +++++++++--------- .../hbm/tileentity/machine/TileEntityFEL.java | 4 ++-- .../machine/TileEntityMachineLiquefactor.java | 11 +++++++++++ src/main/resources/assets/hbm/lang/de_DE.lang | 16 +++++++++++++++- src/main/resources/assets/hbm/lang/en_US.lang | 13 ++++++++++--- .../textures/models/machines/liquefactor.png | Bin 2503 -> 2502 bytes src/main/resources/mcmod.info | 2 +- 13 files changed, 78 insertions(+), 23 deletions(-) diff --git a/src/main/java/com/hbm/blocks/machine/MachineFEL.java b/src/main/java/com/hbm/blocks/machine/MachineFEL.java index 129c25a6b..7f558e973 100644 --- a/src/main/java/com/hbm/blocks/machine/MachineFEL.java +++ b/src/main/java/com/hbm/blocks/machine/MachineFEL.java @@ -3,13 +3,16 @@ package com.hbm.blocks.machine; import com.hbm.blocks.BlockDummyable; import com.hbm.blocks.ModBlocks; import com.hbm.main.MainRegistry; +import com.hbm.tileentity.TileEntityProxyEnergy; import com.hbm.tileentity.machine.TileEntityFEL; import cpw.mods.fml.common.network.internal.FMLNetworkHandler; import net.minecraft.block.material.Material; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.Blocks; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; +import net.minecraftforge.common.util.ForgeDirection; public class MachineFEL extends BlockDummyable { @@ -22,6 +25,10 @@ public class MachineFEL extends BlockDummyable { if(meta >= 12) return new TileEntityFEL(); + + if(meta >= extra) + return new TileEntityProxyEnergy(); + return null; } @@ -53,4 +60,10 @@ public class MachineFEL extends BlockDummyable { return false; } } + + @Override + public void fillSpace(World world, int x, int y, int z, ForgeDirection dir, int o) { + super.fillSpace(world, x, y, z, dir, o); + this.makeExtra(world, x + dir.offsetX * (o - 4), y + 1, z + dir.offsetZ * (o - 4)); + } } diff --git a/src/main/java/com/hbm/crafting/WeaponRecipes.java b/src/main/java/com/hbm/crafting/WeaponRecipes.java index f5249172e..e7f7c306a 100644 --- a/src/main/java/com/hbm/crafting/WeaponRecipes.java +++ b/src/main/java/com/hbm/crafting/WeaponRecipes.java @@ -70,7 +70,7 @@ public class WeaponRecipes { CraftingManager.addRecipeAuto(new ItemStack(ModItems.gun_quadro, 1), new Object[] { "SSS", "SSS", "CM ", 'S', ModItems.hull_small_steel, 'C', ModItems.circuit_targeting_tier3, 'M', ModItems.mechanism_launcher_2 }); CraftingManager.addRecipeAuto(new ItemStack(ModItems.gun_hk69, 1), new Object[] { "SSI", " MB", 'S', ModItems.hull_small_steel, 'I', IRON.ingot(), 'M', ModItems.mechanism_launcher_1, 'B', ModItems.bolt_tungsten }); CraftingManager.addRecipeAuto(new ItemStack(ModItems.gun_stinger, 1), new Object[] { "SSW", "CMW", 'S', STEEL.plate(), 'W', TI.plate(), 'C', ModItems.circuit_red_copper, 'M', ModItems.mechanism_launcher_2 }); - CraftingManager.addRecipeAuto(new ItemStack(ModItems.gun_stinger_ammo, 4), new Object[] { "SS ", "STI", " IR", 'S', STEEL.plate(), 'T', Item.getItemFromBlock(Blocks.tnt), 'I', AL.plate(), 'R', REDSTONE.dust() }); + CraftingManager.addRecipeAuto(new ItemStack(ModItems.ammo_stinger_rocket, 4), new Object[] { "SS ", "STI", " IR", 'S', STEEL.plate(), 'T', Item.getItemFromBlock(Blocks.tnt), 'I', AL.plate(), 'R', REDSTONE.dust() }); CraftingManager.addRecipeAuto(new ItemStack(ModItems.gun_revolver, 1), new Object[] { "SSM", " RW", 'S', STEEL.plate(), 'W', KEY_PLANKS, 'R', ModItems.wire_aluminium, 'M', ModItems.mechanism_revolver_1 }); CraftingManager.addRecipeAuto(new ItemStack(ModItems.gun_revolver_saturnite, 1), new Object[] { "SSM", " RW", 'S', BIGMT.plate(), 'W', KEY_PLANKS, 'R', ModItems.wire_tungsten, 'M', ModItems.mechanism_revolver_2 }); CraftingManager.addRecipeAuto(new ItemStack(ModItems.gun_revolver_iron, 1), new Object[] { "SSM", " RW", 'S', IRON.plate(), 'W', KEY_PLANKS, 'R', ModItems.wire_aluminium, 'M', ModItems.mechanism_revolver_1 }); @@ -162,6 +162,7 @@ public class WeaponRecipes { CraftingManager.addShapelessAuto(new ItemStack(ModItems.ammo_20gauge_slug, 1), new Object[] { ModItems.gun_bolt_action_ammo }); CraftingManager.addShapelessAuto(new ItemStack(ModItems.ammo_nuke_high, 1), new Object[] { ModItems.gun_fatman_ammo }); CraftingManager.addShapelessAuto(new ItemStack(ModItems.ammo_mirv_high, 1), new Object[] { ModItems.gun_mirv_ammo }); + CraftingManager.addShapelessAuto(new ItemStack(ModItems.ammo_stinger_rocket, 1), new Object[] { ModItems.gun_stinger_ammo }); //Ammo assemblies CraftingManager.addRecipeAuto(new ItemStack(ModItems.pellet_flechette, 1), new Object[] { " L ", " L ", "LLL", 'L', PB.nugget() }); @@ -202,6 +203,7 @@ public class WeaponRecipes { CraftingManager.addRecipeAuto(new ItemStack(ModItems.ammo_4gauge_explosive, 6), new Object[] { " I ", "GCL", " P ", 'I', ModItems.ingot_semtex, 'G', ModItems.ballistite, 'C', ModItems.casing_50, 'P', ModItems.primer_50, 'L', ModItems.plate_polymer }); CraftingManager.addRecipeAuto(new ItemStack(ModItems.ammo_4gauge_semtex, 4), new Object[] { " I ", "GCL", " P ", 'I', ModBlocks.det_miner, 'G', ModItems.cordite, 'C', ModItems.casing_50, 'P', ModItems.primer_50, 'L', ModItems.plate_polymer }); CraftingManager.addRecipeAuto(new ItemStack(ModItems.ammo_4gauge_semtex, 4), new Object[] { " I ", "GCL", " P ", 'I', ModBlocks.det_miner, 'G', ModItems.ballistite, 'C', ModItems.casing_50, 'P', ModItems.primer_50, 'L', ModItems.plate_polymer }); + CraftingManager.addShapelessAuto(new ItemStack(ModItems.ammo_4gauge_titan, 1), new Object[] { ModItems.ammo_4gauge, ModItems.peas }); CraftingManager.addRecipeAuto(new ItemStack(ModItems.ammo_20gauge, 12), new Object[] { " I ", "GCL", " P ", 'I', ModItems.pellet_buckshot, 'G', ModItems.cordite, 'C', ModItems.casing_buckshot, 'P', ModItems.primer_buckshot, 'L', CU.plate() }); CraftingManager.addRecipeAuto(new ItemStack(ModItems.ammo_20gauge, 12), new Object[] { " I ", "GCL", " P ", 'I', ModItems.pellet_buckshot, 'G', ModItems.ballistite, 'C', ModItems.casing_buckshot, 'P', ModItems.primer_buckshot, 'L', CU.plate() }); CraftingManager.addRecipeAuto(new ItemStack(ModItems.ammo_20gauge_slug, 12), new Object[] { " I ", "GCL", " P ", 'I', PB.ingot(), 'G', ModItems.cordite, 'C', ModItems.casing_buckshot, 'P', ModItems.primer_buckshot, 'L', CU.plate() }); @@ -242,6 +244,12 @@ public class WeaponRecipes { CraftingManager.addRecipeAuto(new ItemStack(ModItems.ammo_rocket_rpc, 2), new Object[] { "BP ", "CBH", " DR", 'B', ModItems.blades_steel, 'P', STEEL.plate(), 'C', ModItems.canister_petroil, 'H', ModItems.hull_small_steel, 'D', ModItems.piston_selenium, 'R', ModItems.ammo_rocket }); CraftingManager.addRecipeAuto(new ItemStack(ModItems.ammo_rocket_rpc, 2), new Object[] { "BP ", "CBH", " DR", 'B', ModItems.blades_steel, 'P', STEEL.plate(), 'C', ModItems.canister_biofuel, 'H', ModItems.hull_small_steel, 'D', ModItems.piston_selenium, 'R', ModItems.ammo_rocket }); + //Stinger Rockets + CraftingManager.addRecipeAuto(new ItemStack(ModItems.ammo_stinger_rocket_he, 1), new Object[] { "S", "R", 'S', ModItems.ingot_semtex, 'R', ModItems.ammo_stinger_rocket }); + CraftingManager.addRecipeAuto(new ItemStack(ModItems.ammo_stinger_rocket_incendiary, 1), new Object[] { "S", "R", 'S', P_RED.dust(), 'R', ModItems.ammo_stinger_rocket }); + CraftingManager.addRecipeAuto(new ItemStack(ModItems.ammo_stinger_rocket_nuclear, 1), new Object[] { "RPR", "PSP", "RPR", 'R', ModItems.neutron_reflector, 'P', PU239.nugget(), 'S', ModItems.ammo_stinger_rocket }); + CraftingManager.addRecipeAuto(new ItemStack(ModItems.ammo_stinger_rocket_bones, 1), new Object[] { " C ", "SKR", " P ", 'C', ModItems.fallout, 'S', SR90.dust(), 'K', ModItems.ammo_stinger_rocket, 'R', RA226.dust(), 'P', PU.dust() }); + //40mm grenades CraftingManager.addRecipeAuto(new ItemStack(ModItems.ammo_grenade, 2), new Object[] { " T ", "GCI", " P ", 'T', Items.gunpowder, 'G', ModItems.cordite, 'C', ModItems.casing_50, 'P', ModItems.primer_50, 'I', IRON.plate() }); CraftingManager.addRecipeAuto(new ItemStack(ModItems.ammo_grenade, 2), new Object[] { " T ", "GCI", " P ", 'T', Items.gunpowder, 'G', ModItems.ballistite, 'C', ModItems.casing_50, 'P', ModItems.primer_50, 'I', IRON.plate() }); diff --git a/src/main/java/com/hbm/inventory/recipes/AssemblerRecipes.java b/src/main/java/com/hbm/inventory/recipes/AssemblerRecipes.java index 5e9b5fbbd..7482e56cc 100644 --- a/src/main/java/com/hbm/inventory/recipes/AssemblerRecipes.java +++ b/src/main/java/com/hbm/inventory/recipes/AssemblerRecipes.java @@ -926,7 +926,8 @@ public class AssemblerRecipes { new OreDictStack(ANY_TAR.any(), 8), new ComparableStack(ModItems.catalyst_clay, 4), new ComparableStack(ModItems.coil_tungsten, 8), - new ComparableStack(ModItems.tank_steel, 2) + new ComparableStack(ModItems.tank_steel, 2), + new ComparableStack(ModItems.inf_water_mk2, 2) }, 200); if(Loader.isModLoaded("Mekanism")) { diff --git a/src/main/java/com/hbm/items/ModItems.java b/src/main/java/com/hbm/items/ModItems.java index 419835a58..bceaf6a48 100644 --- a/src/main/java/com/hbm/items/ModItems.java +++ b/src/main/java/com/hbm/items/ModItems.java @@ -4209,7 +4209,8 @@ public class ModItems { gun_rpg_ammo = new Item().setUnlocalizedName("gun_rpg_ammo").setCreativeTab(null).setTextureName(RefStrings.MODID + ":gun_rpg_ammo_alt"); gun_hk69 = new ItemGunBase(GunGrenadeFactory.getHK69Config()).setUnlocalizedName("gun_hk69").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_hk69"); gun_stinger = new ItemGunBase(GunRocketHomingFactory.getStingerConfig()).setUnlocalizedName("gun_stinger").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_stinger"); - gun_skystinger = new ItemGunBase(GunRocketHomingFactory.getSkyStingerConfig()).setUnlocalizedName("gun_skystinger").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_skystinger"); gun_stinger_ammo = new Item().setUnlocalizedName("gun_stinger_ammo").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_stinger_ammo"); + gun_skystinger = new ItemGunBase(GunRocketHomingFactory.getSkyStingerConfig()).setUnlocalizedName("gun_skystinger").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_skystinger"); + gun_stinger_ammo = new Item().setUnlocalizedName("gun_stinger_ammo").setCreativeTab(null).setTextureName(RefStrings.MODID + ":gun_stinger_ammo"); gun_revolver_ammo = new Item().setUnlocalizedName("gun_revolver_ammo").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_revolver_ammo"); gun_revolver = new ItemGunBase(Gun357MagnumFactory.getRevolverConfig()).setUnlocalizedName("gun_revolver").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_revolver"); gun_revolver_saturnite = new ItemGunBase(Gun357MagnumFactory.getRevolverSaturniteConfig()).setUnlocalizedName("gun_revolver_saturnite").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_revolver_saturnite"); diff --git a/src/main/java/com/hbm/items/weapon/ItemClip.java b/src/main/java/com/hbm/items/weapon/ItemClip.java index cf0b5605d..5199e2f63 100644 --- a/src/main/java/com/hbm/items/weapon/ItemClip.java +++ b/src/main/java/com/hbm/items/weapon/ItemClip.java @@ -228,7 +228,7 @@ public class ItemClip extends Item { if(this == ModItems.clip_stinger) { - if (!player.inventory.addItemStackToInventory(new ItemStack(ModItems.gun_stinger_ammo, 3))) + if (!player.inventory.addItemStackToInventory(new ItemStack(ModItems.ammo_stinger_rocket, 3))) { //player.dropPlayerItemWithRandomChoice(new ItemStack(ModItems.gun_mp40_ammo, 32), false); } @@ -322,9 +322,9 @@ public class ItemClip extends Item { if(player.inventory.hasItem(ModItems.gun_rpg)) player.inventory.addItemStackToInventory(new ItemStack(ModItems.ammo_rocket, 3)); if(player.inventory.hasItem(ModItems.gun_stinger)) - player.inventory.addItemStackToInventory(new ItemStack(ModItems.gun_stinger_ammo, 2)); + player.inventory.addItemStackToInventory(new ItemStack(ModItems.ammo_stinger_rocket, 2)); if(player.inventory.hasItem(ModItems.gun_skystinger)) - player.inventory.addItemStackToInventory(new ItemStack(ModItems.gun_stinger_ammo, 2)); + player.inventory.addItemStackToInventory(new ItemStack(ModItems.ammo_stinger_rocket_he, 2)); if(player.inventory.hasItem(ModItems.gun_fatman)) player.inventory.addItemStackToInventory(new ItemStack(ModItems.ammo_nuke, 2)); if(player.inventory.hasItem(ModItems.gun_proto)) diff --git a/src/main/java/com/hbm/lib/RefStrings.java b/src/main/java/com/hbm/lib/RefStrings.java index 523ff2a36..938564432 100644 --- a/src/main/java/com/hbm/lib/RefStrings.java +++ b/src/main/java/com/hbm/lib/RefStrings.java @@ -3,7 +3,7 @@ package com.hbm.lib; public class RefStrings { public static final String MODID = "hbm"; public static final String NAME = "Hbm's Nuclear Tech Mod"; - public static final String VERSION = "1.0.27 BETA (4116)"; + public static final String VERSION = "1.0.27 BETA (4130)"; //HBM's Beta Naming Convention: //V T (X) //V -> next release version diff --git a/src/main/java/com/hbm/main/ModEventHandler.java b/src/main/java/com/hbm/main/ModEventHandler.java index 5c85e2a64..f5525c804 100644 --- a/src/main/java/com/hbm/main/ModEventHandler.java +++ b/src/main/java/com/hbm/main/ModEventHandler.java @@ -65,12 +65,10 @@ import cpw.mods.fml.common.eventhandler.EventPriority; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.gameevent.PlayerEvent; import cpw.mods.fml.common.gameevent.TickEvent; -import cpw.mods.fml.common.gameevent.TickEvent.ClientTickEvent; import cpw.mods.fml.common.gameevent.TickEvent.Phase; import cpw.mods.fml.common.gameevent.TickEvent.WorldTickEvent; import cpw.mods.fml.common.network.NetworkRegistry.TargetPoint; import cpw.mods.fml.relauncher.ReflectionHelper; -import cpw.mods.fml.relauncher.Side; import net.minecraft.block.Block; import net.minecraft.block.BlockBush; import net.minecraft.block.BlockCrops; @@ -78,7 +76,6 @@ import net.minecraft.block.BlockDoor; import net.minecraft.block.BlockLeaves; import net.minecraft.block.BlockLog; import net.minecraft.block.material.Material; -import net.minecraft.client.Minecraft; import net.minecraft.enchantment.Enchantment; import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.entity.Entity; @@ -114,7 +111,6 @@ import net.minecraft.util.DamageSource; import net.minecraft.util.EntityDamageSource; import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.FoodStats; -import net.minecraft.util.MathHelper; import net.minecraft.util.Vec3; import net.minecraft.world.EnumSkyBlock; import net.minecraft.world.World; @@ -165,12 +161,16 @@ public class ModEventHandler { if(HTTPHandler.newVersion) { event.player.addChatMessage( - new ChatComponentText("New version " + HTTPHandler.versionNumber + " is available!") - .setChatStyle(new ChatStyle() - .setChatClickEvent(new ClickEvent(ClickEvent.Action.OPEN_URL, "https://github.com/HbmMods/Hbm-s-Nuclear-Tech-GIT/releases")) - .setUnderlined(true) - .setColor(EnumChatFormatting.YELLOW) + new ChatComponentText("New version " + HTTPHandler.versionNumber + " is available! Click ") + .setChatStyle(new ChatStyle().setColor(EnumChatFormatting.YELLOW)) + .appendSibling(new ChatComponentText("[here]") + .setChatStyle(new ChatStyle() + .setChatClickEvent(new ClickEvent(ClickEvent.Action.OPEN_URL, "https://github.com/HbmMods/Hbm-s-Nuclear-Tech-GIT/releases")) + .setUnderlined(true) + .setColor(EnumChatFormatting.RED) ) + ) + .appendSibling(new ChatComponentText(" to download!").setChatStyle(new ChatStyle().setColor(EnumChatFormatting.YELLOW))) ); } diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityFEL.java b/src/main/java/com/hbm/tileentity/machine/TileEntityFEL.java index 53e8ae51e..b4a45dd98 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityFEL.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityFEL.java @@ -67,7 +67,8 @@ public class TileEntityFEL extends TileEntityMachineBase implements IEnergyUser if(!worldObj.isRemote) { - //this.trySubscribe(world, x, y, z, dir); TODO + ForgeDirection dir = ForgeDirection.getOrientation(this.getBlockMetadata() - BlockDummyable.offset); + this.trySubscribe(worldObj, xCoord + dir.offsetX * -5, yCoord + 1, zCoord + dir.offsetZ * -5, dir); this.power = Library.chargeTEFromItems(slots, 0, power, maxPower); if(this.isOn && !(this.slots[1] == null)) { @@ -82,7 +83,6 @@ public class TileEntityFEL extends TileEntityMachineBase implements IEnergyUser } else { this.mode = EnumWavelengths.NULL; } int range = 24; - ForgeDirection dir = ForgeDirection.getOrientation(this.getBlockMetadata() - BlockDummyable.offset); int length = 3; boolean silexSpacing = false; if(this.isOn && power >= powerReq * Math.pow(3, mode.ordinal()) && this.mode != EnumWavelengths.NULL) { diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineLiquefactor.java b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineLiquefactor.java index 7a2053b8a..c466e4229 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineLiquefactor.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineLiquefactor.java @@ -16,6 +16,7 @@ import com.hbm.tileentity.TileEntityMachineBase; import api.hbm.energy.IEnergyUser; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.AxisAlignedBB; @@ -66,6 +67,16 @@ public class TileEntityMachineLiquefactor extends TileEntityMachineBase implemen this.networkPack(data, 50); } } + + @Override + public boolean isItemValidForSlot(int i, ItemStack itemStack) { + return i == 0 && LiquefactionRecipes.getOutput(itemStack) != null; + } + + @Override + public int[] getAccessibleSlotsFromSide(int side) { + return new int[] { 0 }; + } public boolean canProcess() { diff --git a/src/main/resources/assets/hbm/lang/de_DE.lang b/src/main/resources/assets/hbm/lang/de_DE.lang index c24752bcf..062523395 100644 --- a/src/main/resources/assets/hbm/lang/de_DE.lang +++ b/src/main/resources/assets/hbm/lang/de_DE.lang @@ -578,6 +578,7 @@ item.ammo_4gauge_kampf.name=23mm Rakete item.ammo_4gauge_semtex.name=23mm Bergbauladung item.ammo_4gauge_sleek.name=Kaliber 4 Schrot (IF-F&E) item.ammo_4gauge_slug.name=Kaliber 4 Brenneke +item.ammo_4gauge_titan.name=Kaliber 4 Quak-Geschoss item.ammo_4gauge_vampire.name=Kaliber 4 Schrot (Holzpflöcke) item.ammo_4gauge_void.name=Kaliber 4 Schrot (Leere) item.ammo_50ae.name=.50 AE Patrone @@ -681,6 +682,11 @@ item.ammo_shell.name=240mm Geschoss item.ammo_shell_apfsds_du.name=240mm APFSDS-DU item.ammo_shell_apfsds_t.name=240mm APFSDS-T item.ammo_shell_explosive.name=240mm HE-Geschoss +item.ammo_stinger_rocket.name=Stinger-Rakete +item.ammo_stinger_rocket_he.name=Stinger-Rakete (HE) +item.ammo_stinger_rocket_incendiary.name=Stinger-Rakete (Brand) +item.ammo_stinger_rocket_nuclear.name=Stinger-Rakete (Привет) +item.ammo_stinger_rocket_bones.name=Stinger-Rakete (Knochensuchend) item.ammo_shell_w9.name=240mm W9 Atomares Geschoss item.ams_catalyst_aluminium.name=Aluminium-Reaktionskatalysator item.ams_catalyst_beryllium.name=Beryllium-Reaktionskatalysator @@ -805,6 +811,8 @@ item.billet_balefire_gold.name=Flammgoldbillet item.billet_beryllium.name=Berylliumbillet item.billet_bismuth.name=Bismutbillet item.billet_co60.name=Kobalt-60-Billet +item.billet_gh336.name=Ghiorsium-336-Billet +item.billet_gh336.desc=Seaborgiums Kolleague. item.billet_hes.name=Stark angereichertes Schrabidiumkernbrennstoffbillet item.billet_les.name=Schwach angereichertes Schrabidiumkernbrennstoffbillet item.billet_mox_fuel.name=MOX-Kernbrennstoffbillet @@ -1057,6 +1065,7 @@ item.circuit_targeting_tier4.name=Militärische Schaltplatte (Stufe 4) item.circuit_targeting_tier5.name=Militärische Schaltplatte (Stufe 5) item.circuit_targeting_tier6.name=Militärische Schaltplatte (Stufe 6) item.cladding_desh.name=Deshbeschläge +item.cladding_ghiorsium.name=Ghiorsiumbeschläge item.cladding_iron.name=Eisenbeschläge item.cladding_lead.name=Bleibeschläge item.cladding_obsidian.name=Obsidianhaut @@ -1487,7 +1496,7 @@ item.gun_skystinger.name=The One Sky Stinger item.gun_spark.name=Die Zündkerze item.gun_spark_ammo.name=Elektromagnetische Katusche item.gun_stinger.name=FIM-92 Stinger -item.gun_stinger_ammo.name=Stinger-Rakete +item.gun_stinger_ammo.name=Stinger-Rakete (LEGACY) item.gun_super_shotgun.name=Super Shotgun item.gun_supershotgun.name=Super Shotgun item.gun_thompson.name=Thompson Maschinenpistole @@ -1577,6 +1586,8 @@ item.ingot_dura_steel.name=Schnellarbeitsstahlbarren item.ingot_electronium.name=Elektroniumbarren item.ingot_euphemium.name=Euphemiumbarren item.ingot_fiberglass.name=Fiberglasstafel +item.ingot_gh336.name=Ghiorsium-336-Barren +item.ingot_gh336.desc=Seaborgiums Kollege. item.ingot_graphite.name=Graphitbarren item.ingot_hes.name=Stark angereicherter Schrabidiumkernbrennstoffbarren item.ingot_lanthanium.name=Semistabiler Lanthanbarren @@ -1637,6 +1648,7 @@ item.insert_doxium.name=Astolfium-dottierte Doxiumeinlage item.insert_du.name=DU-Einlage item.insert_era.name=Explosive Reaktivpaanzerungseinlage item.insert_esapi.name=ESAPI-Einlage +item.insert_ghiorsium.name=Ghiorsium-Einlage item.insert_kevlar.name=Kevlareinlage item.insert_sapi.name=SAPI-Einlage item.insert_polonium.name=Poloniumeinlage @@ -1951,6 +1963,8 @@ item.nugget_daffergon.name=Daffergonnugget item.nugget_desh.name=Deshnugget item.nugget_dineutronium.name=Dineutroniumnugget item.nugget_euphemium.name=Euphemiumnugget +item.nugget_gh336.name=Ghiorsium-336-Nugget +item.nugget_gh336.desc=Seaborgiums Kolleague. item.nugget_hes.name=Stark angereichertes Schrabidiumkernbrennstoffnugget item.nugget_lead.name=Bleinugget item.nugget_les.name=Schwach angereichertes Schrabidiumkernbrennstoffnugget diff --git a/src/main/resources/assets/hbm/lang/en_US.lang b/src/main/resources/assets/hbm/lang/en_US.lang index f25995c9f..0f89df8c3 100644 --- a/src/main/resources/assets/hbm/lang/en_US.lang +++ b/src/main/resources/assets/hbm/lang/en_US.lang @@ -715,6 +715,7 @@ item.ammo_4gauge_kampf.name=23mm Rocket item.ammo_4gauge_semtex.name=23mm Mining Charge item.ammo_4gauge_sleek.name=4 Gauge Buckshot (IF-R&D) item.ammo_4gauge_slug.name=4 Gauge Solid Steel Slug +item.ammo_4gauge_titan.name=4 Gauge Quacker Round item.ammo_4gauge_vampire.name=4 Gauge Wooden Stake Shell item.ammo_4gauge_void.name=4 Gauge Void Shell item.ammo_50ae.name=.50 AE Round @@ -819,6 +820,11 @@ item.ammo_shell_apfsds_du.name=240mm APFSDS-DU item.ammo_shell_apfsds_t.name=240mm APFSDS-T item.ammo_shell_explosive.name=240mm HE Shell item.ammo_shell_w9.name=240mm W9 Nuclear Shell +item.ammo_stinger_rocket.name=Stinger Rocket +item.ammo_stinger_rocket_he.name=Stinger Rocket (HE) +item.ammo_stinger_rocket_incendiary.name=Stinger Rocket (Incendiary) +item.ammo_stinger_rocket_nuclear.name=Stinger Rocket (Привет) +item.ammo_stinger_rocket_bones.name=Stinger Rocket (Bone-Seeking) item.ams_catalyst_aluminium.name=Aluminium Reaction Catalyst item.ams_catalyst_beryllium.name=Beryllium Reaction Catalyst item.ams_catalyst_blank.name=Blank Reaction Catalyst @@ -1211,7 +1217,7 @@ item.circuit_targeting_tier4.name=Military Grade Circuit Board (Tier 4) item.circuit_targeting_tier5.name=Military Grade Circuit Board (Tier 5) item.circuit_targeting_tier6.name=Military Grade Circuit Board (Tier 6) item.cladding_desh.name=Desh Cladding -item.cladding_ghiorsium.name=Ghiorsium-336 Cladding +item.cladding_ghiorsium.name=Ghiorsium Cladding item.cladding_iron.name=Iron Cladding item.cladding_lead.name=Lead Cladding item.cladding_obsidian.name=Obsidian Skin @@ -1658,7 +1664,7 @@ item.gun_skystinger.name=The One Sky Stinger item.gun_spark.name=Spark Plug item.gun_spark_ammo.name=Electromagnetic Cartridge item.gun_stinger.name=FIM-92 Stinger -item.gun_stinger_ammo.name=Stinger Rocket +item.gun_stinger_ammo.name=Stinger Rocket (LEGACY) item.gun_super_shotgun.name=Super Shotgun item.gun_super_shotgun.desc=It's super broken! item.gun_supershotgun.name=Super Shotgun @@ -1826,7 +1832,7 @@ item.insert_doxium.name=Astolfium-Doped Doxium Insert item.insert_du.name=DU Insert item.insert_era.name=Explosive Reactive Armor Insert item.insert_esapi.name=ESAPI Insert -item.insert_ghiorsium.name= Ghiorsium Insert +item.insert_ghiorsium.name=Ghiorsium Insert item.insert_kevlar.name=Kevlar Insert item.insert_sapi.name=SAPI Insert item.insert_polonium.name=Polonium Insert @@ -3528,6 +3534,7 @@ tile.machine_geo.name=Geothermal Electric Generator tile.machine_industrial_generator.name=Industrial Generator tile.machine_keyforge.name=Locksmith Table tile.machine_large_turbine.name=Industrial Steam Turbine +tile.machine_liquefactor.name=Industrial Liquefaction Machine tile.machine_lithium_battery.name=Li-Ion Energy Storage Block tile.machine_microwave.name=Microwave tile.machine_mining_laser.name=Mining Laser diff --git a/src/main/resources/assets/hbm/textures/models/machines/liquefactor.png b/src/main/resources/assets/hbm/textures/models/machines/liquefactor.png index 579ffdbb0060f3b3726d6570cc64c6f1d5225466..e6ab167f4b186e5907ebfe95b0f2ba00f9286a16 100644 GIT binary patch delta 2476 zcmV;d2~+mR6UGyeG=F_bL_t(|ob8=WXdKBE$N$ycBYWd9EA(-&!@$TlvFIe$h&k-Q z+RPF=-V8NDA2@>F$ImuH^p|N7Od5`&Fet$)U??^jn>nf)4qh>X?1 z?8ZhAVUa`+fEa8Pr$U;!h@|N8ul$UQd@>>ojx(5HM24~1-xK-gyOoE$)7eF5XBXex ze<*BHARmlKl|Vii&0IuOB&V>%>gp=9`dZfa6viOJAOS$5(daQ0Ynfj?kw3ni|C)Vu zM`a@YFW`fLHGiAU9)oH&o90D+^#tLD1OTe4GP^;ks%l!kUp+y%VLnCL4a$C@Up+xM z;rJ9u1n2Q1)zcUK>dyK8Wi)57Fit%=_(V|5r^ql)y}h33(%I=o&WTeL;M8e1;##Vz zGF3gD`u*y|@ZHKo&vswVf1RkL_(@n&SPiSQvy0J@;eRY{n|l<%-Kn=4lvjP8868dc zi|%y1XDqvcpEsY3)*=(aI%Co7bxP)u{7z@r^VQFcjtrA=*)V;uMx()3R#pJGJN0h$ zURZsuAO`gKk;<*I7S|{1ccblhOdl+aQ*W;i%l|svpXGAd><<90jz;Oto4-8$XY!qf z;D;Yyhx^|x=|j$~xZ%gblpFDxuX>4wNTu_O88eYSBc3rd*&jDHY{2>&p4B!6;p(({!!#>U2ajKixu z>GoM;kI!X|kVwAK*TlpGCMG7%l%+{f14^s?c_elue`{;Y^9GlHUT`d5SXk(B^0UM) z?SB7{q}yl3=*X~miHwq-W0Z}Lk9)qHxH{T>9ql!7wAVD>r-^lDaT=Gk%uNF0v=@oU z_W6eF7|w(PGzF7#;KfUU2B_G-Tv_7YXIWh8N~^CNG|Hs=k~2dmfX%sN9^1FL@ZBAL5Y z@vQ&Pf8S>`62b{OU57}O*g5&4<9}dtw<bKL6l3auH6#mol_lb&O( z7aa$iyHzpAX5{x9W4t=rUu%Pd2&>gp(8 z{;$`uKA<2A+|<8&{{!KJc@ftK+uYoQvBsGOgWkWdA62bZeT`^sZB2+j7G!KQGc&R7 zA^HpI_x=Md6t%E^z<|@l}acS z3clmo-``JjC`14h0C@K7*%@Ev#*G`Mkra!?P){MnVllOuEQl=H#*)S`h!7}t;{v({ zXEm~*GL)uVk}UQot`cb&-rc)*eWl1s8gdy%7Ojv(ibrX+TAmk#m48TE+t@Q%SXs2) zKhCX*1aO_fjJ3vUwaVM=wkdx>vC3tf0Y;U@-QE7rXCDLy88yg#JW@bkCYQuR(@!JDguh-ee#s(`E zi;<-&OWN%=TCEn+4u6*r!B9%2QlJah*4CIIcVXo+D|UBx(Q37XEnN}4gxXaUM=sOG zDvP4WLY$)P?CgYUkVm;BSTP5~&i~z(^tqFJc=QNhIM#Y$qQei6q>K?d0cOB9l74DeYsR2DN|RO&@;bT_Te> zzA5b^pa!}Bfq#mmW6Z^(7#lnm7Z=au=0AAwAW)V<-X$`vQ)P%?m@`<^St#!kNr=TX zuqd;Tu_;!RM1Ph_B_T&g5y3GHEbJ^4bvu8OWO=F&5sgR^8D~3xTBLcZ4-uWv5}C(S zZbTe{M+763MCL&j-5|NlCxIn0kFw|n$z^_E0Pve%{gQKVaGis5j^mRPFvjqwKmXM{ zVaJfge!#j{^4`6Bbohxt*stfl;Jj;I&@>&Ira_Xre}5y3F@|QVjW~NBU%Yq`Yk*Pj zZS0x6dGlth`xEg{G);r1>yRZ05@V2*u4-z!4xk&%j3SFkZRd}3OhMdrRw6#i!Qml> zhK9@nCNVHDoM;*t>)J+?!{3tH&Y!1a3W)G1ilRW4BrwKInUp07oO5WJ7J98QjqUtV zk13#xSAX#+7cLCp_~;m542mp6VyCkgV=UBKW16SjL^;)m)+)uL9335lF@}Po;PB`O z1w{d447#pE3L%kMoN_~Q*?%ayu48DZ0M0oSS%&t(u(%|FBUn04mZ#i=kxPzh delta 2477 zcmV;e2~zgP6UP&fG=F|cL_t(|ob8=GY#YfH$N#gtlUsb8WAq82ynnPws9%WtJ*~jxQYvdYJ{Y?00HuWC~yEZMj${Jz($}dFdYVA zAyKAn*_K4@P6~Qgt0njQW0utW0R*)>JF^4wasF@LycsdrsDD$qYOGpBNq`Deg2h~agk3(1YzI^W*CuSZ1!U!`+T$dfVbNnw0ArB z>fQrkg97h*e`p;*s(l@rHaaABUlipo*aC_FXmHZ5U1W=PV{K+_9ExRF$!?(v>S0P zRaKd)9uNIqPZz(8RZ_epEH12u)!yx(Fn=+g#%(i?0ysPMR)caY&oYHV zvR`z&?LK1J4g9qEWHc8U6V?%nMz3R1kL0)89oN?|Q`pYfOKXXa;SoCARE*KaU&@q$^;>DYL;*0r~{{rU~Qz4AlX zex>CLnt|3JPQA7K)~#EijBI6P<;3yQ(o&dah>R0Cl0P*y6}XNua=m!*0st^QJ&jVS zgu}OusNM0+e%A3DTYsLVpqAA4ZPk|MFbJ^_4XyCnx)i!|iFH@qPfwpXmn41-D5?6Vk;sw!?bmNY-FRtfsn5wz6T7r;Z*Qks zKP?Iq_+ssWRj2Zx5}EYeU>32*um+V4;;)6P#|H)5yBj{PdGt`_ zY5bTIkL0Jt{QNwhoSeke)D*V2xAFM#fBl!fFLcm3QCQdWd=W7df5t~HLa@AtX$*b=TEVvL|pPX7G-ywI%MuRrMmfPd#x zqVAZQ! zBnvmouI2y!?}wCnLJWd-*C7%ma(_;~=s4KI%`#6j$DasBY`g1-j)SeNtYCS08OzJd zefj=`I3hnqis-bJg_~uJeYb?=<>eDO{`c^H=0;Q>Y-?)^#vEr7jC%W?epIDW@ie0K^>rcsn4iAQ z&CNx+hv+Y8*xUCtRdnszHOI16tA$FX!qYagN~OY!#Ud_Uy5xAx#>Pg9Jt79-%fLQ- zaF&_z@m}6|nnq?A*ZBCjYk%Je@pu~8-rgSGy?f_+O)i&1u~@|H>@45h+)UKSW@l%4 zu~ag<2I@b28X<0(Z}l90P8;P zg36-p{!wmC#DL=nX3RBKDiz*pwM_Z*i&ZY8bTF(eb~?kK&prw$MjEp9q;(>DeSMwH z&d&0ySFa+M%LQsYm&@VGl`D}u8AKKVpxfRK(uM5}L*O?)ALFFQFLF3W0c+9-9QzxD3>IQ*+rR{m4Kk}PJQNGrPyxpYhC zNs^6?4Kl8b6U){CG&e{%5!lJM<0qXbDQK=S`-F1xtwfotjDHHvHD(`@NFq^4B8fyH zi6jz*B$7y!$Oc9dNw^W&z(^tqHzGUv07)d_Ok^iN>k=8)_DxA|12wAcdoKF$BI^8rI2-rOlnsd!XM@c7IqZMx(6@Mj>#bQy&)=`9iOalu#3WZ(HA17(<>O+Jhlte~Z&Yu)X?&?E?C$L0j zahDqro8S@t2qckNkVPj*F0+YmiOixbIze)o9T))o;%7hQ92{Kd;GCm-bOgp2e*cF* znLF$lvN#M_*Gk^KdzUsp5eWPF!cREwnHMxoho)(eq<`N3$YPA4(QF~g+Q(0_ zOA?NbG;`GAoFjMUj2WuP=kqv!{=8!Y#>kas^nctcmu@2&Nu+obNs^%H$MG*kmZ9sq zX>b7W{P}a&Mnpu-4Y{OHM7B|M&cPUi{L#VJbsf2}oM~J$Gc%rz%*@PWHd;>qvs)~R zrfC2GS(dSXaDeZeJBM!f2(m0ek|ex;|Gux1;rnpjv#b66eX~s0b;z;|S(bg*Q