From c2eac4f3e487ab77da652bb84ce1c0002158709e Mon Sep 17 00:00:00 2001 From: Bob Date: Sun, 27 Dec 2020 17:43:12 +0100 Subject: [PATCH] biscuits --- src/main/java/assets/hbm/lang/de_DE.lang | 19 +++++-- src/main/java/assets/hbm/lang/en_US.lang | 9 ++- .../assets/hbm/textures/armor/ajr_helmet.png | Bin 2460 -> 2179 bytes .../assets/hbm/textures/armor/hev_chest.png | Bin 1721 -> 1704 bytes .../assets/hbm/textures/armor/hev_helmet.png | Bin 791 -> 792 bytes .../java/assets/hbm/textures/items/beta.png | Bin 0 -> 214 bytes .../assets/hbm/textures/items/canteen_fab.png | Bin 0 -> 208 bytes .../com/hbm/crafting/ConsumableRecipes.java | 1 + .../java/com/hbm/entity/mob/EntityFBI.java | 13 ++--- .../com/hbm/inventory/AssemblerRecipes.java | 3 +- .../com/hbm/inventory/BreederRecipes.java | 2 + src/main/java/com/hbm/items/ModItems.java | 22 +++++++- .../java/com/hbm/items/armor/ArmorFSB.java | 7 +-- .../java/com/hbm/items/food/ItemCanteen.java | 14 ++++- .../com/hbm/items/special/ItemCustomLore.java | 4 +- .../java/com/hbm/items/special/ItemDrop.java | 5 ++ .../hbm/items/tool/ItemSwordMeteorite.java | 53 ++++++++++++++++++ src/main/java/com/hbm/lib/RefStrings.java | 2 +- src/main/java/com/hbm/main/ClientProxy.java | 4 ++ src/main/java/com/hbm/main/MainRegistry.java | 3 + .../java/com/hbm/main/ModEventHandler.java | 5 +- .../item/weapon/ItemRenderWeaponQuadro.java | 2 +- .../tileentity/machine/TileEntityITER.java | 6 ++ .../machine/TileEntityMachineRadar.java | 14 +++-- .../TileEntityMachineReactorLarge.java | 4 ++ .../TileEntityMachineReactorSmall.java | 10 +++- .../machine/TileEntityMachineShredder.java | 6 +- .../machine/TileEntityMicrowave.java | 16 ++++++ src/main/resources/mcmod.info | 2 +- 29 files changed, 185 insertions(+), 41 deletions(-) create mode 100644 src/main/java/assets/hbm/textures/items/beta.png create mode 100644 src/main/java/assets/hbm/textures/items/canteen_fab.png diff --git a/src/main/java/assets/hbm/lang/de_DE.lang b/src/main/java/assets/hbm/lang/de_DE.lang index 8bc46d6ae..8a49694e0 100644 --- a/src/main/java/assets/hbm/lang/de_DE.lang +++ b/src/main/java/assets/hbm/lang/de_DE.lang @@ -587,6 +587,7 @@ item.battery_steam_large.name=Großer dampfbetriebener Energiespeichertank item.battery_su.name=Einwegbatterie item.battery_su_l.name=Große Einwegbatterie item.battery_trixite.name=Billige Spark-Batterie-Nachmache +item.beta.name=Beta-Features item.big_sword.name=Großes Schwert item.biomass.name=Biomasse item.biomass_compressed.name=Verdichtete Biomasse @@ -700,6 +701,7 @@ item.canned_tube.name=Tube (Astronautenessen) item.canned_tuna.name=Konservendose (Tunfisch) item.canned_yogurt.name=Konservendose (Jogurt) item.canteen_13.name=Vault 13 Kantine +item.canteen_fab.name=Fabulöser Wodka item.canteen_vodka.name=Stylischer Flachmann item.cap_aluminium.name=Aluminiumdeckel item.cap_fritz.name=Fritz-Kola Kronkorken @@ -1284,12 +1286,16 @@ item.mese_pickaxe.name=Mesespitzhacke item.meteor_remote.name=Meteoritenkontroller item.meteorite_sword.name=Meteoritenschwert item.meteorite_sword_seared.name=Meteoritenschwert (Versengt) -item.meteorite_sword_reforged.name=Meteorite Sword (Nachgeschmiedet) -item.meteorite_sword_hardened.name=Meteorite Sword (Gehärtet) -item.meteorite_sword_alloyed.name=Meteorite Sword (Legiert) -item.meteorite_sword_machined.name=Meteorite Sword (Maschninenverarbeitet) -item.meteorite_sword_treated.name=Meteorite Sword (Behandelt) -item.meteorite_sword_etched.name=Meteorite Sword (Geätzt) +item.meteorite_sword_reforged.name=Meteoritenschwert (Nachgeschmiedet) +item.meteorite_sword_hardened.name=Meteoritenschwert (Gehärtet) +item.meteorite_sword_alloyed.name=Meteoritenschwert (Legiert) +item.meteorite_sword_machined.name=Meteoritenschwert (Maschninenverarbeitet) +item.meteorite_sword_treated.name=Meteoritenschwert (Behandelt) +item.meteorite_sword_etched.name=Meteoritenschwert (Geätzt) +item.meteorite_sword_bred.name=Meteoritenschwert (Gebrütet) +item.meteorite_sword_irradiated.name=Meteoritenschwert (Bestrahlt) +item.meteorite_sword_fused.name=Meteoritenschwert (Fusioniert) +item.meteorite_sword_baleful.name=Meteoritenschwert (Unheilvoll) item.mike_cooling_unit.name=Deuteriumkühleinheit item.mike_core.name=Mit Uran ummantelter Deuteriumtank item.mike_deut.name=Deuteriumtank @@ -2420,6 +2426,7 @@ tile.mine_fat.name=Fatmine tile.mine_he.name=Antipanzermine tile.mine_shrap.name=Schrapnellmine tile.mud_block.name=Giftiger Schlamm +tile.muffler.name=Schalldämpfer tile.mush.name=Leuchtender Pilz tile.ntm_dirt.name=Erde tile.nuke_boy.name=Little Boy diff --git a/src/main/java/assets/hbm/lang/en_US.lang b/src/main/java/assets/hbm/lang/en_US.lang index 05d8efdb2..b1b0f8867 100644 --- a/src/main/java/assets/hbm/lang/en_US.lang +++ b/src/main/java/assets/hbm/lang/en_US.lang @@ -587,6 +587,7 @@ item.battery_steam_large.name=Large Steam Powered Energy Storage Tank item.battery_su.name=SU-Battery item.battery_su_l.name=Large SU-Battery item.battery_trixite.name=Off-Brand Spark Battery +item.beta.name=Beta Features item.big_sword.name=Great Sword item.biomass.name=Biomass item.biomass_compressed.name=Compressed Biomass @@ -700,6 +701,7 @@ item.canned_tube.name=Astronaut Food Tube item.canned_tuna.name=Canned Tuna item.canned_yogurt.name=Canned Yogurt item.canteen_13.name=Vault 13 Canteen +item.canteen_fab.name=Fabulous Vodka item.canteen_vodka.name=Stylish Flask item.cap_aluminium.name=Aluminium Cap item.cap_fritz.name=Fritz Cola Bottle Cap @@ -1290,8 +1292,10 @@ item.meteorite_sword_alloyed.name=Meteorite Sword (Alloyed) item.meteorite_sword_machined.name=Meteorite Sword (Machined) item.meteorite_sword_treated.name=Meteorite Sword (Treated) item.meteorite_sword_etched.name=Meteorite Sword (Etched) -item.meteorite_sword.name=Meteorite Sword -item.meteorite_sword.name=Meteorite Sword +item.meteorite_sword_bred.name=Meteorite Sword (Bred) +item.meteorite_sword_irradiated.name=Meteorite Sword (Irradiated) +item.meteorite_sword_fused.name=Meteorite Sword (Fused) +item.meteorite_sword_baleful.name=Meteorite Sword (Baleful) item.mike_cooling_unit.name=Deuterium Cooling Unit item.mike_core.name=Uranium Coated Deuterium Tank item.mike_deut.name=Deuterium Tank @@ -2422,6 +2426,7 @@ tile.mine_fat.name=Fat Mine tile.mine_he.name=Anti-Tank Mine tile.mine_shrap.name=Shrapnel Mine tile.mud_block.name=Poisonous Mud +tile.muffler.name=Muffler tile.mush.name=Glowing Mushroom tile.ntm_dirt.name=Dirt tile.nuke_boy.name=Little Boy diff --git a/src/main/java/assets/hbm/textures/armor/ajr_helmet.png b/src/main/java/assets/hbm/textures/armor/ajr_helmet.png index 262b4b849e1fe4a2a087d1bbd1f58eafa45801a0..736d96b9214db374e1c88a0fc6735e761f619412 100644 GIT binary patch delta 2166 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 diff --git a/src/main/java/assets/hbm/textures/armor/hev_chest.png b/src/main/java/assets/hbm/textures/armor/hev_chest.png index baebc613bef801d02c283643bf093aaf4709b82b..3ea25953382116439a2a039153bc3e5ede76b1ef 100644 GIT binary patch delta 1688 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 diff --git a/src/main/java/assets/hbm/textures/armor/hev_helmet.png b/src/main/java/assets/hbm/textures/armor/hev_helmet.png index 8eae7108dc957c559764b029908224e5e76e1042..3f1e6302f46ad43bdd6fcc67ad39046bea773e74 100644 GIT binary patch delta 752 zcmV8f zLH8MBzjyb(c|Xoh7&sV)G2&gLV45bI_WApb>q35SKmRt>?|(c=guUP*B1Iw~MIsckl!d!ylzlc)t5t2apQ<6FJ&Ax6iGUP|fE0;< z6p4Toi9jOEbIqcjp*#`4TqNPh%kC6ZwnBat!}wdWBlk>Uz>y2+{b7vTwXn%<(*?0lK{^(Si2^JkhS zljTMr^tS*!c;#KKR$Uu$xm;#$_Ol@L5}C*J@k5Y3Mv_VEsUOH{IUFAKkWQ=6Rq118KznfG&b%IoxZ_<}ot&pSjxib~drP zn&w`gMU_PU?8XaXTs*f-^71naA{U8*uIs2&Dv_gki7% delta 751 zcmV3$!7vOq>+|+qQ)q^QYr?A-_?ec-^3?sxOD4;>Hoza`P)tP@A|TdlCUD5&vvgG7<#MnH;0K#D}bRiq$|c3GRV8=j5(e+=3$+)1;j zUrUw|*^>xJk$(upN~B`3I2I{$QF|V-5-F~5r<9?sWa+^=AeEFCN_D2E6rh zcjmXh^MA!+0C4Aq%C)V1I+$teH(mw+JNGY#I+ox4EC~Bh6a`u?2TjXC%V`)6N9eR$ zXt&yEw_6yEM*rB{-e?9}3jp%@l-Q1aU|G)TX3N|Ao;`wkm~>+@34+8LdQUppq-8m$ zn?EboWKcZ-jYb3YdVR`IsZ@fl>r?l-`4LG3255-?0bK;ka=6z_vyaT(r>^$BHxIGC zp5|VkN0mhW?8XaXQaraz^71neA{U8*uIs2)tC6k06e3YFX^||2NKt1J3;T@Z2h;46 h?sIG0qLjDy*&o+S1sF?&ln(#^002ovPDHLkV1l+6U?%_o diff --git a/src/main/java/assets/hbm/textures/items/beta.png b/src/main/java/assets/hbm/textures/items/beta.png new file mode 100644 index 0000000000000000000000000000000000000000..7c05cb7ecd1cfa33361e1299f98dea5f5bcc60de GIT binary patch literal 214 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vfrf~!U~hF#r!4HzfW&G*yXk`kip{5JH-?Kt#`0~@lijY zHG#{Wk@xD!%~DGac^(kHD|hMIfrsB?Tlh3rsqZgjHD)v@`|-`^F3?E~p00i_>zopr E0E9eFE&u=k literal 0 HcmV?d00001 diff --git a/src/main/java/com/hbm/crafting/ConsumableRecipes.java b/src/main/java/com/hbm/crafting/ConsumableRecipes.java index cfa87d27e..0d9f2c46c 100644 --- a/src/main/java/com/hbm/crafting/ConsumableRecipes.java +++ b/src/main/java/com/hbm/crafting/ConsumableRecipes.java @@ -63,6 +63,7 @@ public class ConsumableRecipes { //Canteens GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.canteen_13, 1), new Object[] { "O", "P", 'O', Items.potionitem, 'P', "plateSteel" })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.canteen_vodka, 1), new Object[] { "O", "P", 'O', Items.potato, 'P', "plateSteel" })); + GameRegistry.addRecipe(new ItemStack(ModItems.canteen_fab, 1), new Object[] { "VMV", "MVM", "VMV", 'V', ModItems.canteen_vodka, 'M', ModItems.powder_magic }); //Soda GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.bottle_empty, 6), new Object[] { " G ", "G G", "GGG", 'G', "paneGlass" })); diff --git a/src/main/java/com/hbm/entity/mob/EntityFBI.java b/src/main/java/com/hbm/entity/mob/EntityFBI.java index bad915921..9da94ca51 100644 --- a/src/main/java/com/hbm/entity/mob/EntityFBI.java +++ b/src/main/java/com/hbm/entity/mob/EntityFBI.java @@ -185,15 +185,10 @@ public class EntityFBI extends EntityMob implements IRangedAttackMob { public boolean isPotionApplicable(PotionEffect potion) { - if(Potion.potionTypes[potion.getPotionID()].isBadEffect()) { - - if(this.getEquipmentInSlot(4) == null) - this.setCurrentItemOrArmor(4, new ItemStack(ModItems.gas_mask_m65)); - - return false; - } - - return true; + if(this.getEquipmentInSlot(4) == null) + this.setCurrentItemOrArmor(4, new ItemStack(ModItems.gas_mask_m65)); + + return false; } public void onLivingUpdate() { diff --git a/src/main/java/com/hbm/inventory/AssemblerRecipes.java b/src/main/java/com/hbm/inventory/AssemblerRecipes.java index 852c1b985..29650412c 100644 --- a/src/main/java/com/hbm/inventory/AssemblerRecipes.java +++ b/src/main/java/com/hbm/inventory/AssemblerRecipes.java @@ -33,7 +33,6 @@ import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.item.crafting.IRecipe; import net.minecraftforge.oredict.OreDictionary; @Untested @@ -284,7 +283,7 @@ public class AssemblerRecipes { makeRecipe(new ComparableStack(ModBlocks.machine_crystallizer, 1), new AStack[] {new ComparableStack(ModItems.hull_big_steel, 4), new ComparableStack(ModItems.pipes_steel, 4), new OreDictStack("ingotDesh", 4), new ComparableStack(ModItems.motor, 2), new ComparableStack(ModItems.blades_advanced_alloy, 2), new OreDictStack("ingotSteel", 16), new OreDictStack("plateTitanium", 16), new ComparableStack(Blocks.glass, 4), new ComparableStack(ModItems.circuit_gold, 1), },400); makeRecipe(new ComparableStack(ModBlocks.machine_fluidtank, 1), new AStack[] {new OreDictStack("ingotSteel", 2), new OreDictStack("plateSteel", 6), new ComparableStack(ModItems.hull_big_steel, 4), },150); makeRecipe(new ComparableStack(ModBlocks.machine_drill, 1), new AStack[] {new ComparableStack(ModBlocks.steel_scaffold, 6), new OreDictStack("ingotSteel", 4), new ComparableStack(ModItems.wire_red_copper, 4), new ComparableStack(ModItems.circuit_copper, 1), new ComparableStack(ModItems.motor, 1), new ComparableStack(ModItems.ingot_dura_steel, 2), new ComparableStack(ModItems.bolt_dura_steel, 2), new ComparableStack(ModItems.drill_titanium, 1), },200); - makeRecipe(new ComparableStack(ModBlocks.machine_mining_laser, 1), new AStack[] {new ComparableStack(ModItems.tank_steel, 3), new OreDictStack("ingotSteel", 8), new OreDictStack("plateSteel", 12), new ComparableStack(ModItems.crystal_redstone, 3), new ComparableStack(Items.diamond, 5), new ComparableStack(ModItems.ingot_polymer, 8), new ComparableStack(ModItems.motor, 3), new ComparableStack(ModItems.ingot_dura_steel, 4), new ComparableStack(ModItems.bolt_dura_steel, 6), new ComparableStack(ModBlocks.machine_lithium_battery, 3), },400); + makeRecipe(new ComparableStack(ModBlocks.machine_mining_laser, 1), new AStack[] {new ComparableStack(ModItems.tank_steel, 3), new OreDictStack("ingotSteel", 8), new OreDictStack("plateSteel", 12), new ComparableStack(ModItems.crystal_redstone, 3), new ComparableStack(Items.diamond, 5), new ComparableStack(ModItems.ingot_polymer, 4), new ComparableStack(ModItems.motor, 3), new ComparableStack(ModItems.ingot_dura_steel, 4), new ComparableStack(ModItems.bolt_dura_steel, 6), new ComparableStack(ModBlocks.machine_lithium_battery, 1), },400); makeRecipe(new ComparableStack(ModBlocks.machine_turbofan, 1), new AStack[] {new ComparableStack(ModItems.hull_big_steel, 1), new ComparableStack(ModItems.hull_big_titanium, 3), new ComparableStack(ModItems.hull_small_steel, 2), new ComparableStack(ModItems.turbine_tungsten, 1), new ComparableStack(ModItems.turbine_titanium, 7), new ComparableStack(ModItems.bolt_compound, 8), new OreDictStack("ingotRedCopperAlloy", 12), new ComparableStack(ModItems.wire_red_copper, 24), },500); makeRecipe(new ComparableStack(ModBlocks.machine_teleporter, 1), new AStack[] {new OreDictStack("ingotTitanium", 6), new ComparableStack(ModItems.plate_advanced_alloy, 12), new ComparableStack(ModItems.plate_combine_steel, 4), new ComparableStack(ModItems.telepad, 1), new ComparableStack(ModItems.entanglement_kit, 1), new ComparableStack(ModBlocks.machine_battery, 2), new ComparableStack(ModItems.coil_magnetized_tungsten, 4), },300); makeRecipe(new ComparableStack(ModBlocks.machine_schrabidium_transmutator, 1), new AStack[] {new ComparableStack(ModItems.ingot_magnetized_tungsten, 1), new OreDictStack("ingotTitanium", 24), new ComparableStack(ModItems.plate_advanced_alloy, 18), new OreDictStack("plateSteel", 12), new ComparableStack(ModItems.plate_desh, 6), new ComparableStack(ModItems.plate_polymer, 8), new ComparableStack(ModBlocks.machine_battery, 5), new ComparableStack(ModItems.circuit_gold, 5), },500); diff --git a/src/main/java/com/hbm/inventory/BreederRecipes.java b/src/main/java/com/hbm/inventory/BreederRecipes.java index f3e63a9bf..fb7daef1a 100644 --- a/src/main/java/com/hbm/inventory/BreederRecipes.java +++ b/src/main/java/com/hbm/inventory/BreederRecipes.java @@ -75,6 +75,8 @@ public class BreederRecipes { recipes.put(new ComparableStack(ModBlocks.sellafield_2), new BreederRecipe(new ItemStack(ModBlocks.sellafield_3), 3)); recipes.put(new ComparableStack(ModBlocks.sellafield_3), new BreederRecipe(new ItemStack(ModBlocks.sellafield_4), 4)); recipes.put(new ComparableStack(ModBlocks.sellafield_4), new BreederRecipe(new ItemStack(ModBlocks.sellafield_core), 4)); + + recipes.put(new ComparableStack(ModItems.meteorite_sword_etched), new BreederRecipe(new ItemStack(ModItems.meteorite_sword_bred), 4)); } public static void registerFuels() { diff --git a/src/main/java/com/hbm/items/ModItems.java b/src/main/java/com/hbm/items/ModItems.java index a7a014622..13b216771 100644 --- a/src/main/java/com/hbm/items/ModItems.java +++ b/src/main/java/com/hbm/items/ModItems.java @@ -1430,6 +1430,7 @@ public class ModItems { public static Item canteen_13; public static Item canteen_vodka; + public static Item canteen_fab; public static Item defuser; @@ -1578,6 +1579,7 @@ public class ModItems { public static Item gas_mask_m65; public static Item oxy_mask; public static Item hat; + public static Item beta; public static Item t45_helmet; public static Item t45_plate; @@ -1705,6 +1707,10 @@ public class ModItems { public static Item meteorite_sword_machined; public static Item meteorite_sword_treated; public static Item meteorite_sword_etched; + public static Item meteorite_sword_bred; + public static Item meteorite_sword_irradiated; + public static Item meteorite_sword_fused; + public static Item meteorite_sword_baleful; public static Item matchstick; public static Item balefire_and_steel; @@ -3354,8 +3360,9 @@ public class ModItems { twinkie = new ItemLemon(3, 5, false).setUnlocalizedName("twinkie").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":twinkie"); static_sandwich = new ItemLemon(6, 5, false).setUnlocalizedName("static_sandwich").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":static_sandwich"); pudding = new ItemLemon(6, 15, false).setUnlocalizedName("pudding").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":pudding"); - canteen_13 = new ItemCanteen(1 * 60 * 20).setUnlocalizedName("canteen_13").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":canteen_13"); - canteen_vodka = new ItemCanteen(3 * 60 * 20).setUnlocalizedName("canteen_vodka").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":canteen_vodka"); + canteen_13 = new ItemCanteen(1 * 60).setUnlocalizedName("canteen_13").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":canteen_13"); + canteen_vodka = new ItemCanteen(3 * 60).setUnlocalizedName("canteen_vodka").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":canteen_vodka"); + canteen_fab = new ItemCanteen(2 * 60).setUnlocalizedName("canteen_fab").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":canteen_fab"); pancake = new ItemPancake(20, 20, false).setUnlocalizedName("pancake").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":pancake"); nugget = new ItemLemon(200, 200, false).setUnlocalizedName("nugget").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":nugget"); @@ -3654,6 +3661,7 @@ public class ModItems { gas_mask = new ArmorModel(ArmorMaterial.IRON, 7, 0).setUnlocalizedName("gas_mask").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":gas_mask"); gas_mask_m65 = new ArmorModel(ArmorMaterial.IRON, 7, 0).setUnlocalizedName("gas_mask_m65").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":gas_mask_m65"); hat = new ArmorHat(ArmorMaterial.IRON, 7, 0).setUnlocalizedName("nossy_hat").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":hat"); + beta = new ItemDrop().setUnlocalizedName("beta").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":beta"); //oxy_mask = new ArmorModel(ArmorMaterial.IRON, 7, 0).setUnlocalizedName("oxy_mask").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":oxy_mask"); schrabidium_helmet = new ArmorFSB(MainRegistry.aMatSchrab, 7, 0, RefStrings.MODID + ":textures/armor/schrabidium_1.png").setCap(4F).setMod(0.1F) @@ -4007,6 +4015,10 @@ public class ModItems { meteorite_sword_machined = new ItemSwordMeteorite(65F, 0, matMeteorite).setUnlocalizedName("meteorite_sword_machined").setTextureName(RefStrings.MODID + ":meteorite_sword"); meteorite_sword_treated = new ItemSwordMeteorite(80F, 0, matMeteorite).setUnlocalizedName("meteorite_sword_treated").setTextureName(RefStrings.MODID + ":meteorite_sword"); meteorite_sword_etched = new ItemSwordMeteorite(100F, 0, matMeteorite).setUnlocalizedName("meteorite_sword_etched").setTextureName(RefStrings.MODID + ":meteorite_sword"); + meteorite_sword_bred = new ItemSwordMeteorite(125F, 0, matMeteorite).setUnlocalizedName("meteorite_sword_bred").setTextureName(RefStrings.MODID + ":meteorite_sword"); + meteorite_sword_irradiated = new ItemSwordMeteorite(175F, 0, matMeteorite).setUnlocalizedName("meteorite_sword_irradiated").setTextureName(RefStrings.MODID + ":meteorite_sword"); + meteorite_sword_fused = new ItemSwordMeteorite(250F, 0, matMeteorite).setUnlocalizedName("meteorite_sword_fused").setTextureName(RefStrings.MODID + ":meteorite_sword"); + meteorite_sword_baleful = new ItemSwordMeteorite(500F, 0, matMeteorite).setUnlocalizedName("meteorite_sword_baleful").setTextureName(RefStrings.MODID + ":meteorite_sword"); mask_of_infamy = new MaskOfInfamy(ArmorMaterial.IRON, 8, 0).setUnlocalizedName("mask_of_infamy").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":mask_of_infamy"); @@ -5808,6 +5820,10 @@ public class ModItems { GameRegistry.registerItem(meteorite_sword_machined, meteorite_sword_machined.getUnlocalizedName()); GameRegistry.registerItem(meteorite_sword_treated, meteorite_sword_treated.getUnlocalizedName()); GameRegistry.registerItem(meteorite_sword_etched, meteorite_sword_etched.getUnlocalizedName()); + GameRegistry.registerItem(meteorite_sword_bred, meteorite_sword_bred.getUnlocalizedName()); + GameRegistry.registerItem(meteorite_sword_irradiated, meteorite_sword_irradiated.getUnlocalizedName()); + GameRegistry.registerItem(meteorite_sword_fused, meteorite_sword_fused.getUnlocalizedName()); + GameRegistry.registerItem(meteorite_sword_baleful, meteorite_sword_baleful.getUnlocalizedName()); //Multitool GameRegistry.registerItem(multitool_hit, multitool_hit.getUnlocalizedName()); @@ -5870,6 +5886,7 @@ public class ModItems { GameRegistry.registerItem(med_ptsd, med_ptsd.getUnlocalizedName()); GameRegistry.registerItem(canteen_13, canteen_13.getUnlocalizedName()); GameRegistry.registerItem(canteen_vodka, canteen_vodka.getUnlocalizedName()); + GameRegistry.registerItem(canteen_fab, canteen_fab.getUnlocalizedName()); //Energy Drinks GameRegistry.registerItem(can_empty, can_empty.getUnlocalizedName()); @@ -6001,6 +6018,7 @@ public class ModItems { GameRegistry.registerItem(gas_mask_m65, gas_mask_m65.getUnlocalizedName()); //GameRegistry.registerItem(oxy_mask, oxy_mask.getUnlocalizedName()); GameRegistry.registerItem(hat, hat.getUnlocalizedName()); + GameRegistry.registerItem(beta, beta.getUnlocalizedName()); GameRegistry.registerItem(steel_helmet, steel_helmet.getUnlocalizedName()); GameRegistry.registerItem(steel_plate, steel_plate.getUnlocalizedName()); diff --git a/src/main/java/com/hbm/items/armor/ArmorFSB.java b/src/main/java/com/hbm/items/armor/ArmorFSB.java index 9f41edb07..f3b197dfc 100644 --- a/src/main/java/com/hbm/items/armor/ArmorFSB.java +++ b/src/main/java/com/hbm/items/armor/ArmorFSB.java @@ -8,8 +8,6 @@ import java.util.Map.Entry; import org.lwjgl.opengl.GL11; -import com.hbm.interfaces.Untested; -import com.hbm.items.ModItems; import com.hbm.saveddata.RadiationSavedData; import com.hbm.util.I18nUtil; @@ -313,7 +311,7 @@ public class ArmorFSB extends ItemArmor { ArmorFSB chestplate = (ArmorFSB)plate.getItem(); - if(chestplate.damageThreshold >= event.ammount) { + if(chestplate.damageThreshold >= event.ammount && !event.source.isUnblockable()) { event.setCanceled(true); } @@ -343,7 +341,8 @@ public class ArmorFSB extends ItemArmor { if(event.ammount < 100) { - event.ammount -= chestplate.damageThreshold; + if(!event.source.isUnblockable()) + event.ammount -= chestplate.damageThreshold; if(chestplate.damageMod != -1) { event.ammount *= chestplate.damageMod; diff --git a/src/main/java/com/hbm/items/food/ItemCanteen.java b/src/main/java/com/hbm/items/food/ItemCanteen.java index 2052d45cf..faa32064f 100644 --- a/src/main/java/com/hbm/items/food/ItemCanteen.java +++ b/src/main/java/com/hbm/items/food/ItemCanteen.java @@ -26,7 +26,7 @@ public class ItemCanteen extends Item { @Override public void onUpdate(ItemStack stack, World world, Entity entity, int i, boolean b) { - if (stack.getItemDamage() > 0) + if(stack.getItemDamage() > 0 && entity.ticksExisted % 20 == 0) stack.setItemDamage(stack.getItemDamage() - 1); } @@ -41,6 +41,13 @@ public class ItemCanteen extends Item { player.addPotionEffect(new PotionEffect(Potion.confusion.id, 10 * 20, 0)); player.addPotionEffect(new PotionEffect(Potion.damageBoost.id, 30 * 20, 2)); } + if (this == ModItems.canteen_fab) { + player.heal(10F); + player.addPotionEffect(new PotionEffect(Potion.confusion.id, 15 * 20, 0)); + player.addPotionEffect(new PotionEffect(Potion.damageBoost.id, 60 * 20, 2)); + player.addPotionEffect(new PotionEffect(Potion.resistance.id, 60 * 20, 2)); + player.addPotionEffect(new PotionEffect(Potion.moveSpeed.id, 60 * 20, 1)); + } return stack; } @@ -91,6 +98,11 @@ public class ItemCanteen extends Item { else list.add("Smells like disinfectant, tastes like disinfectant."); } + if(this == ModItems.canteen_fab) + { + list.add("Cooldown: 2 minutes"); + list.add("Engages the fab drive"); + } } } diff --git a/src/main/java/com/hbm/items/special/ItemCustomLore.java b/src/main/java/com/hbm/items/special/ItemCustomLore.java index 92943d4b2..875dbf26f 100644 --- a/src/main/java/com/hbm/items/special/ItemCustomLore.java +++ b/src/main/java/com/hbm/items/special/ItemCustomLore.java @@ -413,7 +413,9 @@ public class ItemCustomLore extends Item { this == ModItems.cell_sas3 || this == ModItems.powder_schrabidium || this == ModItems.wire_schrabidium || this == ModItems.circuit_schrabidium || this == ModItems.gun_revolver_schrabidium_ammo || this == ModItems.ingot_saturnite || - this == ModItems.plate_saturnite) + this == ModItems.plate_saturnite || this == ModItems.ingot_schrabidate || + this == ModItems.powder_schrabidate || this == ModItems.ingot_schraranium || + this == ModItems.crystal_schraranium) { return EnumRarity.rare; } diff --git a/src/main/java/com/hbm/items/special/ItemDrop.java b/src/main/java/com/hbm/items/special/ItemDrop.java index ae30b5a60..0d6b0f3b7 100644 --- a/src/main/java/com/hbm/items/special/ItemDrop.java +++ b/src/main/java/com/hbm/items/special/ItemDrop.java @@ -34,6 +34,11 @@ public class ItemDrop extends Item { public boolean onEntityItemUpdate(EntityItem entityItem) { if (entityItem != null) { + if(this == ModItems.beta) { + entityItem.setDead(); + return true; + } + ItemStack stack = entityItem.getEntityItem(); if (stack.getItem() != null && stack.getItem() == ModItems.detonator_deadman) { diff --git a/src/main/java/com/hbm/items/tool/ItemSwordMeteorite.java b/src/main/java/com/hbm/items/tool/ItemSwordMeteorite.java index 8a2e9164e..7ad549757 100644 --- a/src/main/java/com/hbm/items/tool/ItemSwordMeteorite.java +++ b/src/main/java/com/hbm/items/tool/ItemSwordMeteorite.java @@ -60,6 +60,59 @@ public class ItemSwordMeteorite extends ItemSwordAbility { list.add(EnumChatFormatting.ITALIC + "Acids clean the material"); list.add(EnumChatFormatting.ITALIC + "To make this the perfect sword"); } + + if(this == ModItems.meteorite_sword_bred) { + list.add(EnumChatFormatting.ITALIC + "Immense heat and radiation"); + list.add(EnumChatFormatting.ITALIC + "Compress the material"); + } + + if(this == ModItems.meteorite_sword_irradiated) { + list.add(EnumChatFormatting.ITALIC + "The power of the Atom"); + list.add(EnumChatFormatting.ITALIC + "Gives the sword might"); + } + + if(this == ModItems.meteorite_sword_fused) { + list.add(EnumChatFormatting.ITALIC + "This blade has met"); + list.add(EnumChatFormatting.ITALIC + "With the forces of the stars"); + } + + if(this == ModItems.meteorite_sword_baleful) { + list.add(EnumChatFormatting.ITALIC + "This sword has met temperatures"); + list.add(EnumChatFormatting.ITALIC + "Far beyond what normal material can endure"); + } + + /*if(this == ModItems.meteorite_sword_subatomic) { + + }*/ + + /*if(this == ModItems.meteorite_sword_void) { + + }*/ + + /*if(this == ModItems.meteorite_sword_clouded) { + list.add(EnumChatFormatting.ITALIC + "The sword to fell"); + list.add(EnumChatFormatting.ITALIC + "The capital"); + }*/ + + /*if(this == ModItems.meteorite_sword_enchanted) { + list.add(EnumChatFormatting.ITALIC + "The sword to defeat"); + list.add(EnumChatFormatting.ITALIC + "The country"); + }*/ + + /*if(this == ModItems.meteorite_sword_fstbmb) { + list.add(EnumChatFormatting.ITALIC + "The sword to end"); + list.add(EnumChatFormatting.ITALIC + "The world"); + }*/ + + /*if(this == ModItems.meteorite_sword_digama) { + list.add(EnumChatFormatting.ITALIC + "The sword to extinguish"); + list.add(EnumChatFormatting.ITALIC + "The universe"); + }*/ + + //meteorite_sword_duchess + //meteorite_sword_queen + //meteorite_sword_storm + //§k } } diff --git a/src/main/java/com/hbm/lib/RefStrings.java b/src/main/java/com/hbm/lib/RefStrings.java index 028a0c7ac..ab83cbbe1 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 (3726)"; + public static final String VERSION = "1.0.27 BETA (3731)"; //HBM's Beta Naming Convention: //V T (X) //V -> next release version diff --git a/src/main/java/com/hbm/main/ClientProxy.java b/src/main/java/com/hbm/main/ClientProxy.java index 08c48b8ef..bd4723f73 100644 --- a/src/main/java/com/hbm/main/ClientProxy.java +++ b/src/main/java/com/hbm/main/ClientProxy.java @@ -217,6 +217,10 @@ public class ClientProxy extends ServerProxy { MinecraftForgeClient.registerItemRenderer(ModItems.meteorite_sword_machined, new ItemRendererMeteorSword(1.0F, 1.0F, 0.0F)); MinecraftForgeClient.registerItemRenderer(ModItems.meteorite_sword_treated, new ItemRendererMeteorSword(0.5F, 1.0F, 0.5F)); MinecraftForgeClient.registerItemRenderer(ModItems.meteorite_sword_etched, new ItemRendererMeteorSword(1.0F, 1.0F, 0.5F)); + MinecraftForgeClient.registerItemRenderer(ModItems.meteorite_sword_bred, new ItemRendererMeteorSword(0.5F, 0.5F, 0.0F)); + MinecraftForgeClient.registerItemRenderer(ModItems.meteorite_sword_irradiated, new ItemRendererMeteorSword(0.75F, 1.0F, 0.0F)); + MinecraftForgeClient.registerItemRenderer(ModItems.meteorite_sword_fused, new ItemRendererMeteorSword(1.0F, 0.0F, 0.5F)); + MinecraftForgeClient.registerItemRenderer(ModItems.meteorite_sword_baleful, new ItemRendererMeteorSword(0.0F, 1.0F, 0.0F)); //swords and hammers MinecraftForgeClient.registerItemRenderer(ModItems.redstone_sword, new ItemRenderRedstoneSword()); MinecraftForgeClient.registerItemRenderer(ModItems.big_sword, new ItemRenderBigSword()); diff --git a/src/main/java/com/hbm/main/MainRegistry.java b/src/main/java/com/hbm/main/MainRegistry.java index 8a725a919..2d712e450 100644 --- a/src/main/java/com/hbm/main/MainRegistry.java +++ b/src/main/java/com/hbm/main/MainRegistry.java @@ -944,6 +944,7 @@ public class MainRegistry { FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(Items.water_bucket), new ItemStack(Items.bucket), FluidType.WATER, 1000)); FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(Items.lava_bucket), new ItemStack(Items.bucket), FluidType.LAVA, 1000)); FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.bucket_mud), new ItemStack(Items.bucket), FluidType.WATZ, 1000)); + FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.bucket_schrabidic_acid), new ItemStack(Items.bucket), FluidType.SCHRABIDIC, 1000)); FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.rod_water), new ItemStack(ModItems.rod_empty), FluidType.WATER, 1000)); FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.rod_dual_water), new ItemStack(ModItems.rod_dual_empty), FluidType.WATER, 2000)); @@ -973,6 +974,8 @@ public class MainRegistry { FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModBlocks.red_barrel), new ItemStack(ModItems.tank_steel), FluidType.DIESEL, 10000)); FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModBlocks.pink_barrel), new ItemStack(ModItems.tank_steel), FluidType.KEROSENE, 10000)); FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModBlocks.lox_barrel), new ItemStack(ModItems.tank_steel), FluidType.OXYGEN, 10000)); + + FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModBlocks.ore_gneiss_gas), new ItemStack(ModBlocks.stone_gneiss), FluidType.PETROLEUM, 250)); FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.cell_deuterium), new ItemStack(ModItems.cell_empty), FluidType.DEUTERIUM, 1000)); FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.cell_tritium), new ItemStack(ModItems.cell_empty), FluidType.TRITIUM, 1000)); diff --git a/src/main/java/com/hbm/main/ModEventHandler.java b/src/main/java/com/hbm/main/ModEventHandler.java index 7e00b9cf9..2f4d21057 100644 --- a/src/main/java/com/hbm/main/ModEventHandler.java +++ b/src/main/java/com/hbm/main/ModEventHandler.java @@ -122,6 +122,9 @@ public class ModEventHandler if(!player.inventory.hasItem(ModItems.hat)) player.inventory.addItemStackToInventory(new ItemStack(ModItems.hat)); + + if(!player.inventory.hasItem(ModItems.beta)) + player.inventory.addItemStackToInventory(new ItemStack(ModItems.beta)); } } @@ -493,7 +496,7 @@ public class ModEventHandler /// GHOST FIX END /// /// BETA HEALTH START /// - if(player.getDisplayName().equals("Dr_Nostalgia")) { + if(player.inventory.hasItem(ModItems.beta)) { if(player.getFoodStats().getFoodLevel() > 10) { player.heal(player.getFoodStats().getFoodLevel() - 10); diff --git a/src/main/java/com/hbm/render/item/weapon/ItemRenderWeaponQuadro.java b/src/main/java/com/hbm/render/item/weapon/ItemRenderWeaponQuadro.java index dd53f4568..ecfa3056c 100644 --- a/src/main/java/com/hbm/render/item/weapon/ItemRenderWeaponQuadro.java +++ b/src/main/java/com/hbm/render/item/weapon/ItemRenderWeaponQuadro.java @@ -110,7 +110,7 @@ public class ItemRenderWeaponQuadro implements IItemRenderer { Minecraft.getMinecraft().renderEngine.bindTexture(ResourceManager.quadro_tex); ResourceManager.quadro.renderPart("Launcher"); - if(ItemGunBase.getMag(item) > 0 || ItemGunBase.getIsReloading(item)) { + if(ItemGunBase.getMag(item) > 0 || ItemGunBase.getIsReloading(item) && type != ItemRenderType.INVENTORY) { GL11.glPushMatrix(); GL11.glTranslated(0, -1, 0); diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityITER.java b/src/main/java/com/hbm/tileentity/machine/TileEntityITER.java index dab2673a0..85be2a588 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityITER.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityITER.java @@ -182,6 +182,12 @@ public class TileEntityITER extends TileEntityMachineBase implements IConsumer, BreederRecipe out = BreederRecipes.getOutput(slots[1]); + if(slots[1] != null && slots[1].getItem() == ModItems.meteorite_sword_irradiated) + out = new BreederRecipe(ModItems.meteorite_sword_fused, 1); + + if(slots[1] != null && slots[1].getItem() == ModItems.meteorite_sword_fused) + out = new BreederRecipe(ModItems.meteorite_sword_baleful, 4); + if(out == null) { this.progress = 0; return; diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineRadar.java b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineRadar.java index c14deb3d8..dea2920bc 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineRadar.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineRadar.java @@ -3,6 +3,7 @@ package com.hbm.tileentity.machine; import java.util.ArrayList; import java.util.List; +import com.hbm.blocks.ModBlocks; import com.hbm.config.WeaponConfig; import com.hbm.interfaces.IConsumer; import com.hbm.interfaces.Untested; @@ -74,11 +75,14 @@ public class TileEntityMachineRadar extends TileEntityTickingBase implements ICo sendMissileData(); - pingTimer++; - - if(power > 0 && pingTimer >= maxTimer) { - this.worldObj.playSoundEffect(this.xCoord, this.yCoord, this.zCoord, "hbm:block.sonarPing", 5.0F, 1.0F); - pingTimer = 0; + if(worldObj.getBlock(xCoord, yCoord - 1, zCoord) != ModBlocks.muffler) { + + pingTimer++; + + if(power > 0 && pingTimer >= maxTimer) { + this.worldObj.playSoundEffect(this.xCoord, this.yCoord, this.zCoord, "hbm:block.sonarPing", 5.0F, 1.0F); + pingTimer = 0; + } } } } diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineReactorLarge.java b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineReactorLarge.java index d785c2ba9..5c6cab4b6 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineReactorLarge.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineReactorLarge.java @@ -435,6 +435,10 @@ public class TileEntityMachineReactorLarge extends TileEntity } } + //Meteorite sword + if(slots[4] != null && coreHeat > 0 && slots[4].getItem() == ModItems.meteorite_sword_bred) + slots[4] = new ItemStack(ModItems.meteorite_sword_irradiated); + //Load fuel if(slots[4] != null && getFuelContent(slots[4], type) > 0) { diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineReactorSmall.java b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineReactorSmall.java index e29f08d59..dce15876c 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineReactorSmall.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineReactorSmall.java @@ -344,9 +344,15 @@ public class TileEntityMachineReactorSmall extends TileEntity implements ISidedI } if(rods >= rodsMax) + for(int i = 0; i < 12; i++) { - if(slots[i] != null && slots[i].getItem() instanceof ItemFuelRod) - decay(i); + + if(slots[i] != null) { + if(slots[i].getItem() instanceof ItemFuelRod) + decay(i); + else if(slots[i].getItem() == ModItems.meteorite_sword_bred) + slots[i] = new ItemStack(ModItems.meteorite_sword_irradiated); + } } coreHeatMod = 1.0; diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineShredder.java b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineShredder.java index 29c3773f7..13b9dae27 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineShredder.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineShredder.java @@ -277,9 +277,9 @@ public class TileEntityMachineShredder extends TileEntity implements ISidedInven for (int outSlot = 9; outSlot < 27; outSlot++) { - if (slots[outSlot] != null && slots[outSlot].getItem() == outp.getItem() && slots[outSlot].stackSize + outp.stackSize <= outp.getMaxStackSize()) { - - System.out.println(outp.getUnlocalizedName() + " is equal to " + slots[outSlot].getUnlocalizedName()); + if (slots[outSlot] != null && slots[outSlot].getItem() == outp.getItem() && + slots[outSlot].getItemDamage() == outp.getItemDamage() && + slots[outSlot].stackSize + outp.stackSize <= outp.getMaxStackSize()) { slots[outSlot].stackSize += outp.stackSize; slots[inpSlot].stackSize -= 1; diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityMicrowave.java b/src/main/java/com/hbm/tileentity/machine/TileEntityMicrowave.java index 3190ddf68..e9e3e09f1 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityMicrowave.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityMicrowave.java @@ -9,6 +9,7 @@ import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.FurnaceRecipes; import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.NBTTagList; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; @@ -183,5 +184,20 @@ public class TileEntityMicrowave extends TileEntityMachineBase implements IConsu public long getMaxPower() { return maxPower; } + + @Override + public void readFromNBT(NBTTagCompound nbt) { + super.readFromNBT(nbt); + + power = nbt.getLong("power"); + speed = nbt.getInteger("speed"); + } + + @Override + public void writeToNBT(NBTTagCompound nbt) { + super.writeToNBT(nbt); + nbt.setLong("power", power); + nbt.setInteger("speed", speed); + } } diff --git a/src/main/resources/mcmod.info b/src/main/resources/mcmod.info index a168324ab..7a3f1b9fb 100755 --- a/src/main/resources/mcmod.info +++ b/src/main/resources/mcmod.info @@ -3,7 +3,7 @@ "modid": "hbm", "name": "Hbm's Nuclear Tech", "description": "A mod that adds weapons, nuclear themed stuff and machines", - "version":"1.0.27-3726", + "version":"1.0.27-3731", "mcversion": "1.7.10", "url": "", "updateUrl": "",