From b80861f39851494d253ca981bcaeba0de050e124 Mon Sep 17 00:00:00 2001 From: HbmMods Date: Tue, 5 Apr 2016 22:21:38 +0200 Subject: [PATCH] Finished power converters --- assets/hbm/lang/de_DE.lang | 6 +++++- assets/hbm/lang/en_US.lang | 6 +++++- com/hbm/items/ModItems.java | 2 +- com/hbm/lib/RefStrings.java | 4 ++-- com/hbm/main/CraftingManager.java | 2 ++ 5 files changed, 15 insertions(+), 5 deletions(-) diff --git a/assets/hbm/lang/de_DE.lang b/assets/hbm/lang/de_DE.lang index f5cd94926..cab168b9c 100644 --- a/assets/hbm/lang/de_DE.lang +++ b/assets/hbm/lang/de_DE.lang @@ -626,4 +626,8 @@ tile.block_meteor.name=Meteoritenblock item.cape_radiation.name=Cape (Radioaktiv) item.cape_gasmask.name=Cape (Gasmaske) item.cape_schrabidium.name=Cape (Schrabidisch) -item.cape_hbm.name=Hbms Cape \ No newline at end of file +item.cape_hbm.name=Hbms Cape +item.cape_dafnik.name=Dafniks Cape + +tile.machine_converter_he_rf.name=HE zu RF Konverter +tile.machine_converter_rf_he.name=RF zu HE Konverter \ No newline at end of file diff --git a/assets/hbm/lang/en_US.lang b/assets/hbm/lang/en_US.lang index f258c35f4..f43a958e0 100644 --- a/assets/hbm/lang/en_US.lang +++ b/assets/hbm/lang/en_US.lang @@ -627,4 +627,8 @@ tile.block_meteor.name=Meteor Block item.cape_radiation.name=Cape (Radiation) item.cape_gasmask.name=Cape (Gas Mask) item.cape_schrabidium.name=Cape (Schrabidic) -item.cape_hbm.name=Hbm's Cape \ No newline at end of file +item.cape_hbm.name=Hbm's Cape +item.cape_dafnik.name=Dafnik's Cape + +tile.machine_converter_he_rf.name=HE to RF Converter +tile.machine_converter_rf_he.name=RF to HE Converter \ No newline at end of file diff --git a/com/hbm/items/ModItems.java b/com/hbm/items/ModItems.java index 5a111a72a..4bb3df25a 100644 --- a/com/hbm/items/ModItems.java +++ b/com/hbm/items/ModItems.java @@ -945,7 +945,7 @@ public class ModItems { cape_gasmask = new ArmorModel(ArmorMaterial.CHAIN, 9, 1).setUnlocalizedName("cape_gasmask").setCreativeTab(MainRegistry.tabNuke).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":cape_gasmask"); cape_schrabidium = new ArmorModel(MainRegistry.enumArmorMaterialSchrabidium, 9, 1).setUnlocalizedName("cape_schrabidium").setCreativeTab(MainRegistry.tabNuke).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":cape_schrabidium"); cape_hbm = new ArmorModel(MainRegistry.enumArmorMaterialEuphemium, 9, 1).setUnlocalizedName("cape_hbm").setCreativeTab(MainRegistry.tabNuke).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":cape_unknown"); - cape_dafnik = new ArmorModel(MainRegistry.enumArmorMaterialEmerald, 9, 1).setUnlocalizedName("cape_dafnik").setCreativeTab(MainRegistry.tabNuke).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":cape_dafnik"); + cape_dafnik = new ArmorModel(MainRegistry.enumArmorMaterialEmerald, 9, 1).setUnlocalizedName("cape_dafnik").setCreativeTab(MainRegistry.tabNuke).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":cape_unknown"); smoke1 = new Item().setUnlocalizedName("smoke1").setTextureName(RefStrings.MODID + ":smoke1"); smoke2 = new Item().setUnlocalizedName("smoke2").setTextureName(RefStrings.MODID + ":smoke2"); diff --git a/com/hbm/lib/RefStrings.java b/com/hbm/lib/RefStrings.java index 2b4f540e6..fd1c55fda 100644 --- a/com/hbm/lib/RefStrings.java +++ b/com/hbm/lib/RefStrings.java @@ -2,8 +2,8 @@ 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.17"; + public static final String NAME = "Hbm's Nuclear Tech Mod"; + public static final String VERSION = "1.0.18"; public static final String CLIENTSIDE = "com.hbm.main.ClientProxy"; public static final String SERVERSIDE = "com.hbm.main.ServerProxy"; } diff --git a/com/hbm/main/CraftingManager.java b/com/hbm/main/CraftingManager.java index 639a26953..b459e66cc 100644 --- a/com/hbm/main/CraftingManager.java +++ b/com/hbm/main/CraftingManager.java @@ -349,6 +349,8 @@ public class CraftingManager { GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.machine_battery), 1), new Object[] { "TST", "RIR", "TLT", 'T', ModItems.ingot_tungsten, 'I', ModItems.ingot_red_copper, 'R', ModItems.wire_red_copper, 'S', Item.getItemFromBlock(ModBlocks.block_sulfur), 'L', Item.getItemFromBlock(ModBlocks.block_lead) }); GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.machine_battery), 1), new Object[] { "TLT", "RIR", "TST", 'T', ModItems.ingot_tungsten, 'I', ModItems.ingot_red_copper, 'R', ModItems.wire_red_copper, 'S', Item.getItemFromBlock(ModBlocks.block_sulfur), 'L', Item.getItemFromBlock(ModBlocks.block_lead) }); GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.machine_coal_off), 1), new Object[] { "STS", "SCS", "SFS", 'S', ModItems.ingot_steel, 'T', ModItems.tank_steel, 'C', ModItems.ingot_red_copper, 'F', Item.getItemFromBlock(ModBlocks.machine_electric_furnace_off) }); + GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.machine_converter_he_rf), 1), new Object[] { "SSS", "CRC", "SSS", 'S', ModItems.ingot_steel, 'C', ModItems.coil_copper, 'R', ModItems.coil_copper_torus }); + GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.machine_converter_rf_he), 1), new Object[] { "SSS", "CRC", "SSS", 'S', ModItems.ingot_beryllium, 'C', ModItems.coil_copper, 'R', ModItems.coil_copper_torus }); GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.factory_titanium_hull), 1), new Object[] { "PIP", "I I", "PIP", 'P', ModItems.plate_titanium, 'I', ModItems.ingot_titanium }); GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.factory_titanium_furnace), 1), new Object[] { "HMH", "MFM", "HMH", 'H', Item.getItemFromBlock(ModBlocks.factory_titanium_hull), 'M', ModItems.motor, 'F', Item.getItemFromBlock(Blocks.furnace) });