diff --git a/src/main/java/assets/hbm/lang/de_DE.lang b/src/main/java/assets/hbm/lang/de_DE.lang index fd9357177..22ca5dd53 100644 --- a/src/main/java/assets/hbm/lang/de_DE.lang +++ b/src/main/java/assets/hbm/lang/de_DE.lang @@ -1195,6 +1195,7 @@ item.med_ptsd.name=PTBS-Medikament item.med_schiziphrenia.name=Schizophrenie-Medikament item.memespoon.name=§eLuftschlag item.memory.name=item.null.name +item.mese_gavel.name=Mese-Richterhammer item.meteor_remote.name=Meteoritenkontroller item.mike_cooling_unit.name=Deuteriumkühleinheit item.mike_core.name=Mit Uran ummantelter Deuteriumtank @@ -1428,7 +1429,6 @@ item.part_carbon.name=Kohlenstoffstaubkiste item.part_copper.name=Kupferstaubkiste item.part_lithium.name=Lithiumstaubkiste item.part_plutonium.name=Plutoniumstaubkiste -item.pch.name=Horse Nut Hammer item.pedestal_steel.name=Stahlsockel item.pellet_advanced.name=Fortgeschrittenes Watzaufwertugspellet item.pellet_antimatter.name=Antimateriencluster diff --git a/src/main/java/assets/hbm/lang/en_US.lang b/src/main/java/assets/hbm/lang/en_US.lang index 5447c263d..a78c3d14e 100644 --- a/src/main/java/assets/hbm/lang/en_US.lang +++ b/src/main/java/assets/hbm/lang/en_US.lang @@ -1195,6 +1195,7 @@ item.med_ptsd.name=PTSD Medication item.med_schiziphrenia.name=Schizophrenia Medication item.memespoon.name=§eMarket Gardener item.memory.name=item.null.name +item.mese_gavel.name=Mese Gavel item.meteor_remote.name=Meteorite Remote item.mike_cooling_unit.name=Deuterium Cooling Unit item.mike_core.name=Uranium Coated Deuterium Tank @@ -1428,7 +1429,6 @@ item.part_carbon.name=Box of Carbon Dust item.part_copper.name=Box of Copper Dust item.part_lithium.name=Box of Lithium Dust item.part_plutonium.name=Box of Plutonium Dust -item.pch.name=Horse Nut Hammer item.pedestal_steel.name=Steel Pedestal item.pellet_advanced.name=Advanced Watz Performance Improver item.pellet_antimatter.name=Antimatter Cluster diff --git a/src/main/java/assets/hbm/textures/items/assembly_template_secret.png b/src/main/java/assets/hbm/textures/items/assembly_template_secret.png new file mode 100644 index 000000000..05f3775b2 Binary files /dev/null and b/src/main/java/assets/hbm/textures/items/assembly_template_secret.png differ diff --git a/src/main/java/assets/hbm/textures/items/chemistry_template_secret.png b/src/main/java/assets/hbm/textures/items/chemistry_template_secret.png new file mode 100644 index 000000000..b27c9d086 Binary files /dev/null and b/src/main/java/assets/hbm/textures/items/chemistry_template_secret.png differ diff --git a/src/main/java/assets/hbm/textures/items/chlorophyte_pickaxe.png b/src/main/java/assets/hbm/textures/items/chlorophyte_pickaxe.png new file mode 100644 index 000000000..a49eaf41b Binary files /dev/null and b/src/main/java/assets/hbm/textures/items/chlorophyte_pickaxe.png differ diff --git a/src/main/java/assets/hbm/textures/items/mese_gavel.png b/src/main/java/assets/hbm/textures/items/mese_gavel.png new file mode 100644 index 000000000..9e9daf3dd Binary files /dev/null and b/src/main/java/assets/hbm/textures/items/mese_gavel.png differ diff --git a/src/main/java/assets/hbm/textures/items/mese_pickaxe.png b/src/main/java/assets/hbm/textures/items/mese_pickaxe.png new file mode 100644 index 000000000..6d4cfbe5d Binary files /dev/null and b/src/main/java/assets/hbm/textures/items/mese_pickaxe.png differ diff --git a/src/main/java/assets/hbm/textures/items/pch.png b/src/main/java/assets/hbm/textures/items/pch.png deleted file mode 100644 index ab9769b10..000000000 Binary files a/src/main/java/assets/hbm/textures/items/pch.png and /dev/null differ diff --git a/src/main/java/assets/hbm/textures/items/stamp_steel_circuit.png b/src/main/java/assets/hbm/textures/items/stamp_steel_circuit.png index f4c5b7f32..d95fe00df 100644 Binary files a/src/main/java/assets/hbm/textures/items/stamp_steel_circuit.png and b/src/main/java/assets/hbm/textures/items/stamp_steel_circuit.png differ diff --git a/src/main/java/assets/hbm/textures/items/stamp_steel_flat.png b/src/main/java/assets/hbm/textures/items/stamp_steel_flat.png index c55a85339..5c39c684f 100644 Binary files a/src/main/java/assets/hbm/textures/items/stamp_steel_flat.png and b/src/main/java/assets/hbm/textures/items/stamp_steel_flat.png differ diff --git a/src/main/java/assets/hbm/textures/items/stamp_steel_plate.png b/src/main/java/assets/hbm/textures/items/stamp_steel_plate.png index b93c0ff10..71ae06f63 100644 Binary files a/src/main/java/assets/hbm/textures/items/stamp_steel_plate.png and b/src/main/java/assets/hbm/textures/items/stamp_steel_plate.png differ diff --git a/src/main/java/assets/hbm/textures/items/stamp_steel_wire.png b/src/main/java/assets/hbm/textures/items/stamp_steel_wire.png index 5f2df8a2d..1d5728a73 100644 Binary files a/src/main/java/assets/hbm/textures/items/stamp_steel_wire.png and b/src/main/java/assets/hbm/textures/items/stamp_steel_wire.png differ diff --git a/src/main/java/assets/hbm/textures/models/capes/CapeDoctor17.png b/src/main/java/assets/hbm/textures/models/capes/CapeDoctor17.png new file mode 100644 index 000000000..faea11df4 Binary files /dev/null and b/src/main/java/assets/hbm/textures/models/capes/CapeDoctor17.png differ diff --git a/src/main/java/assets/hbm/textures/models/weapons/gavel_mese.png b/src/main/java/assets/hbm/textures/models/weapons/gavel_mese.png new file mode 100644 index 000000000..7346cd171 Binary files /dev/null and b/src/main/java/assets/hbm/textures/models/weapons/gavel_mese.png differ diff --git a/src/main/java/com/hbm/blocks/machine/MachineITER.java b/src/main/java/com/hbm/blocks/machine/MachineITER.java index 899555f85..3b721adce 100644 --- a/src/main/java/com/hbm/blocks/machine/MachineITER.java +++ b/src/main/java/com/hbm/blocks/machine/MachineITER.java @@ -1,5 +1,7 @@ package com.hbm.blocks.machine; +import java.util.Random; + import com.hbm.blocks.BlockDummyable; import com.hbm.blocks.ModBlocks; import com.hbm.main.MainRegistry; @@ -40,6 +42,11 @@ public class MachineITER extends BlockDummyable { return null; } + @Override + public Item getItemDropped(int i, Random rand, int j) { + return null; + } + @Override public int[] getDimensions() { //because we'll implement our own gnarly behavior here diff --git a/src/main/java/com/hbm/blocks/machine/MachinePlasmaHeater.java b/src/main/java/com/hbm/blocks/machine/MachinePlasmaHeater.java index aa52d6311..49d3c568d 100644 --- a/src/main/java/com/hbm/blocks/machine/MachinePlasmaHeater.java +++ b/src/main/java/com/hbm/blocks/machine/MachinePlasmaHeater.java @@ -1,5 +1,7 @@ package com.hbm.blocks.machine; +import java.util.Random; + import com.hbm.blocks.BlockDummyable; import com.hbm.blocks.ModBlocks; import com.hbm.handler.MultiblockHandlerXR; @@ -12,6 +14,7 @@ import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; @@ -36,6 +39,11 @@ public class MachinePlasmaHeater extends BlockDummyable { return null; } + + @Override + public Item getItemDropped(int i, Random rand, int j) { + return null; + } @Override public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float hitX, float hitY, float hitZ) { diff --git a/src/main/java/com/hbm/inventory/gui/GUIIGenerator.java b/src/main/java/com/hbm/inventory/gui/GUIIGenerator.java index f59f84d9a..783cc93ad 100644 --- a/src/main/java/com/hbm/inventory/gui/GUIIGenerator.java +++ b/src/main/java/com/hbm/inventory/gui/GUIIGenerator.java @@ -36,7 +36,7 @@ public class GUIIGenerator extends GuiInfoContainer { String name = this.diFurnace.hasCustomInventoryName() ? this.diFurnace.getInventoryName() : I18n.format(this.diFurnace.getInventoryName()); this.fontRendererObj.drawString(name, this.xSize / 2 - this.fontRendererObj.getStringWidth(name) / 2, 6, 4210752); - this.fontRendererObj.drawString(I18n.format("container.inventory"), 8, this.ySize - 96 + 2, 4210752); + this.fontRendererObj.drawString(I18n.format("container.inventory"), 14, this.ySize - 96 + 2, 4210752); } @Override diff --git a/src/main/java/com/hbm/items/ModItems.java b/src/main/java/com/hbm/items/ModItems.java index 946de743c..13fa576a5 100644 --- a/src/main/java/com/hbm/items/ModItems.java +++ b/src/main/java/com/hbm/items/ModItems.java @@ -1648,10 +1648,10 @@ public class ModItems { public static Item shimmer_sledge; public static Item shimmer_axe; public static Item bottle_opener; - public static Item pch; public static Item wood_gavel; public static Item lead_gavel; public static Item diamond_gavel; + public static Item mese_gavel; public static Item crowbar; @@ -3833,10 +3833,10 @@ public class ModItems { wrench = new WeaponSpecial(MainRegistry.tMatSteel).setUnlocalizedName("wrench").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":wrench"); wrench_flipped = new WeaponSpecial(MainRegistry.tMatElec).setUnlocalizedName("wrench_flipped").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":wrench_flipped"); memespoon = new WeaponSpecial(MainRegistry.tMatSteel).setUnlocalizedName("memespoon").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":memespoon"); - pch = new WeaponSpecial(MainRegistry.tMatHammmer).setUnlocalizedName("pch").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":pch"); wood_gavel = new WeaponSpecial(ToolMaterial.WOOD).setUnlocalizedName("wood_gavel").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":wood_gavel"); lead_gavel = new WeaponSpecial(MainRegistry.tMatSteel).setUnlocalizedName("lead_gavel").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":lead_gavel"); diamond_gavel = new WeaponSpecial(ToolMaterial.EMERALD).setUnlocalizedName("diamond_gavel").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":diamond_gavel"); + mese_gavel = new WeaponSpecial(ToolMaterial.GOLD).setUnlocalizedName("mese_gavel").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":mese_gavel"); multitool_hit = new ItemMultitoolPassive().setUnlocalizedName("multitool_hit").setCreativeTab(null).setTextureName(RefStrings.MODID + ":multitool_fist"); multitool_dig = new ItemMultitoolTool(4.0F, MainRegistry.enumToolMaterialMultitool, ItemMultitoolTool.getAllBlocks()).setFull3D().setUnlocalizedName("multitool_dig").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":multitool_claw"); @@ -5471,10 +5471,10 @@ public class ModItems { GameRegistry.registerItem(schrabidium_hammer, schrabidium_hammer.getUnlocalizedName()); GameRegistry.registerItem(shimmer_sledge, shimmer_sledge.getUnlocalizedName()); GameRegistry.registerItem(shimmer_axe, shimmer_axe.getUnlocalizedName()); - GameRegistry.registerItem(pch, pch.getUnlocalizedName()); GameRegistry.registerItem(wood_gavel, wood_gavel.getUnlocalizedName()); GameRegistry.registerItem(lead_gavel, lead_gavel.getUnlocalizedName()); GameRegistry.registerItem(diamond_gavel, diamond_gavel.getUnlocalizedName()); + GameRegistry.registerItem(mese_gavel, mese_gavel.getUnlocalizedName()); GameRegistry.registerItem(schrabidium_pickaxe, schrabidium_pickaxe.getUnlocalizedName()); GameRegistry.registerItem(schrabidium_axe, schrabidium_axe.getUnlocalizedName()); GameRegistry.registerItem(schrabidium_shovel, schrabidium_shovel.getUnlocalizedName()); diff --git a/src/main/java/com/hbm/items/special/ItemSyringe.java b/src/main/java/com/hbm/items/special/ItemSyringe.java index 96216c69d..228237db9 100644 --- a/src/main/java/com/hbm/items/special/ItemSyringe.java +++ b/src/main/java/com/hbm/items/special/ItemSyringe.java @@ -21,6 +21,8 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; +import net.minecraft.util.ChatComponentText; +import net.minecraft.util.DamageSource; import net.minecraft.world.World; public class ItemSyringe extends Item { diff --git a/src/main/java/com/hbm/items/tool/WeaponSpecial.java b/src/main/java/com/hbm/items/tool/WeaponSpecial.java index 9c5a72848..9efc477e4 100644 --- a/src/main/java/com/hbm/items/tool/WeaponSpecial.java +++ b/src/main/java/com/hbm/items/tool/WeaponSpecial.java @@ -65,37 +65,6 @@ public class WeaponSpecial extends ItemSword { world.playSoundAtEntity(entity, "hbm:weapon.bonk", 3.0F, 1.0F); } - if(this == ModItems.pch) { - - world.playSoundAtEntity(entity, "hbm:weapon.bodysplat", 10.0F, 1.0F); - - if(entity instanceof EntityHorse) { - - for(int i = 0; i < 10; i++) { - EntityHorse horse = (EntityHorse) ((EntityHorse) entity).createChild((EntityHorse)entity); - horse.setPositionAndRotation(entity.posX, entity.posY, entity.posZ, entity.rotationYaw, entity.rotationPitch); - horse.setGrowingAge(-24000); - world.spawnEntityInWorld(horse); - } - - return false; - } - - if (!world.isRemote) - { - entity.addPotionEffect(new PotionEffect(HbmPotion.bang.id, 20, 0)); - } - - Vec3 vec = entityPlayer.getLookVec(); - double dX = vec.xCoord * 10; - double dY = vec.yCoord * 10; - double dZ = vec.zCoord * 10; - - entity.motionX += dX; - entity.motionY += dY; - entity.motionZ += dZ; - } - if(this == ModItems.bottle_opener) { if (!world.isRemote) { @@ -289,9 +258,6 @@ public class WeaponSpecial extends ItemSword { list.add("Even though it says \"+1000000000"); list.add("damage\", it's actually \"onehit anything\""); } - if(this == ModItems.pch) { - list.add("How am I not locked up yet?"); - } if(this == ModItems.ullapool_caber) { list.add("High-yield Scottish face removal."); list.add("A sober person would throw it..."); diff --git a/src/main/java/com/hbm/lib/Library.java b/src/main/java/com/hbm/lib/Library.java index 1f0059490..44a9f7aeb 100644 --- a/src/main/java/com/hbm/lib/Library.java +++ b/src/main/java/com/hbm/lib/Library.java @@ -71,6 +71,7 @@ public class Library { public static String Schrabby = "3a4a1944-5154-4e67-b80a-b6561e8630b7"; public static String SweatySwiggs = "5544aa30-b305-4362-b2c1-67349bb499d5"; public static String Drillgon = "41ebd03f-7a12-42f3-b037-0caa4d6f235b"; + public static String Doctor17 = "e4ab1199-1c22-4f82-a516-c3238bc2d0d1"; public static Set contributors = Sets.newHashSet(new String[] { "06ab7c03-55ce-43f8-9d3c-2850e3c652de", //mustang_rudolf diff --git a/src/main/java/com/hbm/main/ClientProxy.java b/src/main/java/com/hbm/main/ClientProxy.java index d018be287..97283ab33 100644 --- a/src/main/java/com/hbm/main/ClientProxy.java +++ b/src/main/java/com/hbm/main/ClientProxy.java @@ -202,10 +202,10 @@ public class ClientProxy extends ServerProxy { MinecraftForgeClient.registerItemRenderer(ModItems.stopsign, new ItemRenderShim()); MinecraftForgeClient.registerItemRenderer(ModItems.sopsign, new ItemRenderShim()); MinecraftForgeClient.registerItemRenderer(ModItems.chernobylsign, new ItemRenderShim()); - MinecraftForgeClient.registerItemRenderer(ModItems.pch, new ItemRenderShim()); MinecraftForgeClient.registerItemRenderer(ModItems.wood_gavel, new ItemRenderGavel()); MinecraftForgeClient.registerItemRenderer(ModItems.lead_gavel, new ItemRenderGavel()); MinecraftForgeClient.registerItemRenderer(ModItems.diamond_gavel, new ItemRenderGavel()); + MinecraftForgeClient.registerItemRenderer(ModItems.mese_gavel, new ItemRenderGavel()); //guns MinecraftForgeClient.registerItemRenderer(ModItems.gun_rpg, new ItemRenderRpg()); MinecraftForgeClient.registerItemRenderer(ModItems.gun_karl, new ItemRenderRpg()); diff --git a/src/main/java/com/hbm/main/CraftingManager.java b/src/main/java/com/hbm/main/CraftingManager.java index 76ea014c8..79fddf783 100644 --- a/src/main/java/com/hbm/main/CraftingManager.java +++ b/src/main/java/com/hbm/main/CraftingManager.java @@ -549,7 +549,6 @@ public class CraftingManager { GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.shimmer_handle, 1), new Object[] { "GP", "GP", "GP", 'G', "plateGold", 'P', "ingotPolymer" })); GameRegistry.addRecipe(new ItemStack(ModItems.shimmer_sledge, 1), new Object[] { "H", "G", "G", 'G', ModItems.shimmer_handle, 'H', ModItems.shimmer_head }); GameRegistry.addRecipe(new ItemStack(ModItems.shimmer_axe, 1), new Object[] { "H", "G", "G", 'G', ModItems.shimmer_handle, 'H', ModItems.shimmer_axe_head }); - GameRegistry.addRecipe(new ItemStack(ModItems.pch, 1), new Object[] { "CDC", "CBC", "CHC", 'C', ModItems.canned_jizz, 'D', ModItems.ducttape, 'B', ModItems.fluid_barrel_empty, 'H', ModItems.schrabidium_hammer }); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.definitelyfood, 1), new Object[] { "DDD", "SDS", "DDD", 'D', Blocks.dirt, 'S', "plateSteel" })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.blade_tungsten, 2), new Object[] { "IP", "TP", "TI", 'P', "plateTitanium", 'T', "ingotTitanium", 'I', "ingotTungsten" })); GameRegistry.addRecipe(new ItemStack(ModItems.turbine_tungsten, 1), new Object[] { "BBB", "BSB", "BBB", 'B', ModItems.blade_tungsten, 'S', ModItems.ingot_dura_steel }); @@ -1020,9 +1019,9 @@ public class CraftingManager { GameRegistry.addRecipe(new ItemStack(ModItems.apple_schrabidium, 1, 0), new Object[] { "SSS", "SAS", "SSS", 'S', ModItems.nugget_schrabidium, 'A', Items.apple }); GameRegistry.addRecipe(new ItemStack(ModItems.apple_schrabidium, 1, 1), new Object[] { "SSS", "SAS", "SSS", 'S', ModItems.ingot_schrabidium, 'A', Items.apple }); GameRegistry.addRecipe(new ItemStack(ModItems.apple_schrabidium, 1, 2), new Object[] { "SSS", "SAS", "SSS", 'S', Item.getItemFromBlock(ModBlocks.block_schrabidium), 'A', Items.apple }); - GameRegistry.addRecipe(new ItemStack(ModItems.apple_lead, 1, 0), new Object[] { "SSS", "SAS", "SSS", 'S', ModItems.nugget_lead, 'A', Items.apple }); - GameRegistry.addRecipe(new ItemStack(ModItems.apple_lead, 1, 1), new Object[] { "SSS", "SAS", "SSS", 'S', ModItems.ingot_lead, 'A', Items.apple }); - GameRegistry.addRecipe(new ItemStack(ModItems.apple_lead, 1, 2), new Object[] { "SSS", "SAS", "SSS", 'S', ModBlocks.block_lead, 'A', Items.apple }); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.apple_lead, 1, 0), new Object[] { "SSS", "SAS", "SSS", 'S', "nuggetLead", 'A', Items.apple })); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.apple_lead, 1, 1), new Object[] { "SSS", "SAS", "SSS", 'S', "ingotLead", 'A', Items.apple })); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.apple_lead, 1, 2), new Object[] { "SSS", "SAS", "SSS", 'S', "blockLead", 'A', Items.apple })); GameRegistry.addShapelessRecipe(new ItemStack(ModItems.tem_flakes, 1, 0), new Object[] { Items.gold_nugget, Items.paper }); GameRegistry.addShapelessRecipe(new ItemStack(ModItems.tem_flakes, 1, 1), new Object[] { Items.gold_nugget, Items.gold_nugget, Items.gold_nugget, Items.paper }); GameRegistry.addShapelessRecipe(new ItemStack(ModItems.tem_flakes, 1, 2), new Object[] { Items.gold_ingot, Items.gold_ingot, Items.gold_nugget, Items.gold_nugget, Items.paper }); @@ -1169,15 +1168,36 @@ public class CraftingManager { GameRegistry.addRecipe(new ShapedOreRecipe(ItemBattery.getEmptyBattery(ModItems.battery_steam), new Object[] { "PMP", "ISI", "PCP", 'P', "plateCopper", 'M', ModItems.motor, 'C', ModItems.coil_tungsten, 'S', new ItemStack(ModItems.fluid_tank_full, 1, FluidType.WATER.getID()), 'I', ModItems.plate_polymer })); GameRegistry.addRecipe(new ShapedOreRecipe(ItemBattery.getEmptyBattery(ModItems.battery_steam_large), new Object[] { "MPM", "ISI", "CPC", 'P', ModItems.board_copper, 'M', ModItems.motor, 'C', ModItems.coil_tungsten, 'S', new ItemStack(ModItems.fluid_barrel_full, 1, FluidType.WATER.getID()), 'I', "ingotPolymer" })); - GameRegistry.addRecipe(new ItemStack(ModItems.schrabidium_helmet, 1), new Object[] { "EEE", "ESE", 'E', ModItems.ingot_schrabidium, 'S', ModItems.starmetal_helmet }); - GameRegistry.addRecipe(new ItemStack(ModItems.schrabidium_plate, 1), new Object[] { "ESE", "EEE", "EEE", 'E', ModItems.ingot_schrabidium, 'S', ModItems.starmetal_plate }); - GameRegistry.addRecipe(new ItemStack(ModItems.schrabidium_legs, 1), new Object[] { "EEE", "ESE", "E E", 'E', ModItems.ingot_schrabidium, 'S', ModItems.starmetal_legs }); - GameRegistry.addRecipe(new ItemStack(ModItems.schrabidium_boots, 1), new Object[] { "E E", "ESE", 'E', ModItems.ingot_schrabidium, 'S', ModItems.starmetal_boots }); - GameRegistry.addRecipe(new ItemStack(ModItems.schrabidium_sword, 1), new Object[] { "I", "W", "S", 'I', ModBlocks.block_schrabidium, 'W', ModItems.desh_sword, 'S', ModItems.ingot_polymer }); - GameRegistry.addRecipe(new ItemStack(ModItems.schrabidium_pickaxe, 1), new Object[] { "SWS", " P ", " P ", 'S', ModItems.blades_schrabidium, 'W', ModItems.desh_pickaxe, 'P', ModItems.ingot_polymer }); - GameRegistry.addRecipe(new ItemStack(ModItems.schrabidium_axe, 1), new Object[] { "SW", "SP", " P", 'S', ModItems.blades_schrabidium, 'W', ModItems.desh_axe, 'P', ModItems.ingot_polymer }); - GameRegistry.addRecipe(new ItemStack(ModItems.schrabidium_shovel, 1), new Object[] { "S", "W", "P", 'S', ModItems.blades_schrabidium, 'W', ModItems.desh_shovel, 'P', ModItems.ingot_polymer }); - GameRegistry.addRecipe(new ItemStack(ModItems.schrabidium_hoe, 1), new Object[] { "IW", " S", " S", 'I', ModItems.ingot_schrabidium, 'W', ModItems.desh_hoe, 'S', ModItems.ingot_polymer }); + if(GeneralConfig.enableBabyMode) { + GameRegistry.addRecipe(new ItemStack(ModItems.starmetal_helmet, 1), new Object[] { "EEE", "E E", 'E', ModItems.ingot_starmetal }); + GameRegistry.addRecipe(new ItemStack(ModItems.starmetal_plate, 1), new Object[] { "E E", "EEE", "EEE", 'E', ModItems.ingot_starmetal }); + GameRegistry.addRecipe(new ItemStack(ModItems.starmetal_legs, 1), new Object[] { "EEE", "E E", "E E", 'E', ModItems.ingot_starmetal }); + GameRegistry.addRecipe(new ItemStack(ModItems.starmetal_boots, 1), new Object[] { "E E", "E E", 'E', ModItems.ingot_starmetal }); + GameRegistry.addRecipe(new ItemStack(ModItems.schrabidium_helmet, 1), new Object[] { "EEE", "E E", 'E', ModItems.ingot_schrabidium }); + GameRegistry.addRecipe(new ItemStack(ModItems.schrabidium_plate, 1), new Object[] { "E E", "EEE", "EEE", 'E', ModItems.ingot_schrabidium }); + GameRegistry.addRecipe(new ItemStack(ModItems.schrabidium_legs, 1), new Object[] { "EEE", "E E", "E E", 'E', ModItems.ingot_schrabidium }); + GameRegistry.addRecipe(new ItemStack(ModItems.schrabidium_boots, 1), new Object[] { "E E", "E E", 'E', ModItems.ingot_schrabidium }); + GameRegistry.addRecipe(new ItemStack(ModItems.schrabidium_sword, 1), new Object[] { "I", "I", "S", 'I', ModItems.ingot_schrabidium, 'S', Items.stick }); + GameRegistry.addRecipe(new ItemStack(ModItems.schrabidium_pickaxe, 1), new Object[] { "III", " S ", " S ", 'I', ModItems.ingot_schrabidium, 'S', Items.stick }); + GameRegistry.addRecipe(new ItemStack(ModItems.schrabidium_axe, 1), new Object[] { "II", "IS", " S", 'I', ModItems.ingot_schrabidium, 'S', Items.stick }); + GameRegistry.addRecipe(new ItemStack(ModItems.schrabidium_shovel, 1), new Object[] { "I", "S", "S", 'I', ModItems.ingot_schrabidium, 'S', Items.stick }); + GameRegistry.addRecipe(new ItemStack(ModItems.schrabidium_hoe, 1), new Object[] { "II", " S", " S", 'I', ModItems.ingot_schrabidium, 'S', Items.stick }); + } else { + GameRegistry.addRecipe(new ItemStack(ModItems.starmetal_helmet, 1), new Object[] { "EEE", "ECE", 'E', ModItems.ingot_starmetal, 'C', ModItems.cobalt_helmet }); + GameRegistry.addRecipe(new ItemStack(ModItems.starmetal_plate, 1), new Object[] { "ECE", "EEE", "EEE", 'E', ModItems.ingot_starmetal, 'C', ModItems.cobalt_plate }); + GameRegistry.addRecipe(new ItemStack(ModItems.starmetal_legs, 1), new Object[] { "EEE", "ECE", "E E", 'E', ModItems.ingot_starmetal, 'C', ModItems.cobalt_legs }); + GameRegistry.addRecipe(new ItemStack(ModItems.starmetal_boots, 1), new Object[] { "E E", "ECE", 'E', ModItems.ingot_starmetal, 'C', ModItems.cobalt_boots }); + GameRegistry.addRecipe(new ItemStack(ModItems.schrabidium_helmet, 1), new Object[] { "EEE", "ESE", " P ", 'E', ModItems.ingot_schrabidium, 'S', ModItems.starmetal_helmet, 'P', ModItems.pellet_charged }); + GameRegistry.addRecipe(new ItemStack(ModItems.schrabidium_plate, 1), new Object[] { "ESE", "EPE", "EEE", 'E', ModItems.ingot_schrabidium, 'S', ModItems.starmetal_plate, 'P', ModItems.pellet_charged }); + GameRegistry.addRecipe(new ItemStack(ModItems.schrabidium_legs, 1), new Object[] { "EEE", "ESE", "EPE", 'E', ModItems.ingot_schrabidium, 'S', ModItems.starmetal_legs, 'P', ModItems.pellet_charged }); + GameRegistry.addRecipe(new ItemStack(ModItems.schrabidium_boots, 1), new Object[] { "EPE", "ESE", 'E', ModItems.ingot_schrabidium, 'S', ModItems.starmetal_boots, 'P', ModItems.pellet_charged }); + GameRegistry.addRecipe(new ItemStack(ModItems.schrabidium_sword, 1), new Object[] { "I", "W", "S", 'I', ModBlocks.block_schrabidium, 'W', ModItems.desh_sword, 'S', ModItems.ingot_polymer }); + GameRegistry.addRecipe(new ItemStack(ModItems.schrabidium_pickaxe, 1), new Object[] { "SWS", " P ", " P ", 'S', ModItems.blades_schrabidium, 'W', ModItems.desh_pickaxe, 'P', ModItems.ingot_polymer }); + GameRegistry.addRecipe(new ItemStack(ModItems.schrabidium_axe, 1), new Object[] { "SW", "SP", " P", 'S', ModItems.blades_schrabidium, 'W', ModItems.desh_axe, 'P', ModItems.ingot_polymer }); + GameRegistry.addRecipe(new ItemStack(ModItems.schrabidium_shovel, 1), new Object[] { "S", "W", "P", 'S', ModItems.blades_schrabidium, 'W', ModItems.desh_shovel, 'P', ModItems.ingot_polymer }); + GameRegistry.addRecipe(new ItemStack(ModItems.schrabidium_hoe, 1), new Object[] { "IW", " S", " S", 'I', ModItems.ingot_schrabidium, 'W', ModItems.desh_hoe, 'S', ModItems.ingot_polymer }); + } + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.steel_helmet, 1), new Object[] { "EEE", "E E", 'E', "ingotSteel" })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.steel_plate, 1), new Object[] { "E E", "EEE", "EEE", 'E', "ingotSteel" })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.steel_legs, 1), new Object[] { "EEE", "E E", "E E", 'E', "ingotSteel" })); @@ -1238,10 +1258,6 @@ public class CraftingManager { GameRegistry.addRecipe(new ItemStack(ModItems.cobalt_plate, 1), new Object[] { "E E", "EEE", "EEE", 'E', ModItems.ingot_cobalt }); GameRegistry.addRecipe(new ItemStack(ModItems.cobalt_legs, 1), new Object[] { "EEE", "E E", "E E", 'E', ModItems.ingot_cobalt }); GameRegistry.addRecipe(new ItemStack(ModItems.cobalt_boots, 1), new Object[] { "E E", "E E", 'E', ModItems.ingot_cobalt }); - GameRegistry.addRecipe(new ItemStack(ModItems.starmetal_helmet, 1), new Object[] { "EEE", "ECE", 'E', ModItems.ingot_starmetal, 'C', ModItems.cobalt_helmet }); - GameRegistry.addRecipe(new ItemStack(ModItems.starmetal_plate, 1), new Object[] { "ECE", "EEE", "EEE", 'E', ModItems.ingot_starmetal, 'C', ModItems.cobalt_plate }); - GameRegistry.addRecipe(new ItemStack(ModItems.starmetal_legs, 1), new Object[] { "EEE", "ECE", "E E", 'E', ModItems.ingot_starmetal, 'C', ModItems.cobalt_legs }); - GameRegistry.addRecipe(new ItemStack(ModItems.starmetal_boots, 1), new Object[] { "E E", "ECE", 'E', ModItems.ingot_starmetal, 'C', ModItems.cobalt_boots }); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.drax, 1), new Object[] { "BCF", "DDM", "BCC", 'B', ModItems.blades_advanced_alloy, 'C', "ingotCobalt", 'F', ItemBattery.getFullBattery(ModItems.fusion_core), 'D', "ingotDesh", 'M', ModItems.motor })); GameRegistry.addRecipe(new ItemStack(ModItems.drax_mk2, 1), new Object[] { "SCS", "IDI", "FEF", 'S', ModItems.ingot_starmetal, 'C', ModItems.crystal_trixite, 'I', ModItems.ingot_saturnite, 'D', ModItems.drax, 'F', ItemBattery.getFullBattery(ModItems.fusion_core), 'E', ModItems.circuit_targeting_tier5 }); diff --git a/src/main/java/com/hbm/main/ModEventHandler.java b/src/main/java/com/hbm/main/ModEventHandler.java index 080cfe9e4..3b0ad7a9d 100644 --- a/src/main/java/com/hbm/main/ModEventHandler.java +++ b/src/main/java/com/hbm/main/ModEventHandler.java @@ -243,6 +243,9 @@ public class ModEventHandler //effect for radiation EntityLivingBase entity = (EntityLivingBase) e; + + if(entity instanceof EntityPlayer && ((EntityPlayer)entity).capabilities.isCreativeMode) + continue; if(event.world.getTotalWorldTime() % 20 == 0) { @@ -307,9 +310,6 @@ public class ModEventHandler if(eRad > 2500) entity.getEntityData().setFloat("hfr_radiation", 2500); - if(entity instanceof EntityPlayer && ((EntityPlayer)entity).capabilities.isCreativeMode) - continue; - if(eRad >= 1000) { if(entity.attackEntityFrom(ModDamageSource.radiation, entity.getMaxHealth() * 100)) { entity.getEntityData().setFloat("hfr_radiation", 0); @@ -475,6 +475,17 @@ public class ModEventHandler EntityPlayer player = event.player; if(!player.worldObj.isRemote && event.phase == TickEvent.Phase.START) { + + /// GHOST FIX START /// + + if(!Float.isFinite(player.getHealth()) || !Float.isFinite(player.getAbsorptionAmount())) { + player.addChatComponentMessage(new ChatComponentText("Your health has been restored!")); + player.worldObj.playSoundAtEntity(player, "hbm:item.syringe", 1.0F, 1.0F); + player.setHealth(player.getMaxHealth()); + player.setAbsorptionAmount(0); + } + + /// GHOST FIX END /// /// FSB ARMOR START /// ItemStack helmet = player.inventory.armorInventory[3]; diff --git a/src/main/java/com/hbm/main/ModEventHandlerClient.java b/src/main/java/com/hbm/main/ModEventHandlerClient.java index a31a0c5ad..6bab0fef1 100644 --- a/src/main/java/com/hbm/main/ModEventHandlerClient.java +++ b/src/main/java/com/hbm/main/ModEventHandlerClient.java @@ -46,10 +46,13 @@ import net.minecraft.client.entity.AbstractClientPlayer; import net.minecraft.client.multiplayer.WorldClient; import net.minecraft.client.renderer.OpenGlHelper; import net.minecraft.client.renderer.RenderHelper; +import net.minecraft.client.renderer.Tessellator; +import net.minecraft.client.renderer.entity.Render; import net.minecraft.client.renderer.entity.RenderPlayer; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.IIcon; import net.minecraft.util.ResourceLocation; @@ -57,6 +60,7 @@ import net.minecraft.util.Vec3; import net.minecraftforge.client.event.MouseEvent; import net.minecraftforge.client.event.RenderGameOverlayEvent; import net.minecraftforge.client.event.RenderGameOverlayEvent.ElementType; +import net.minecraftforge.client.event.RenderLivingEvent; import net.minecraftforge.client.event.RenderPlayerEvent; import net.minecraftforge.client.event.RenderWorldLastEvent; import net.minecraftforge.client.event.TextureStitchEvent; @@ -165,6 +169,16 @@ public class ModEventHandlerClient { renderer.modelArmorChestplate.aimedBow = true; } } + + /*@SubscribeEvent + public void renderThermalSight(RenderLivingEvent.Pre event) { + + AxisAlignedBB aabb = event.entity.boundingBox; + + GL11.glPushMatrix(); + Render.renderAABB(aabb); + GL11.glPopMatrix(); + }*/ @SubscribeEvent public void clickHandler(MouseEvent event) { diff --git a/src/main/java/com/hbm/main/ResourceManager.java b/src/main/java/com/hbm/main/ResourceManager.java index 9a06e07b4..8f6fa648b 100644 --- a/src/main/java/com/hbm/main/ResourceManager.java +++ b/src/main/java/com/hbm/main/ResourceManager.java @@ -420,6 +420,7 @@ public class ResourceManager { public static final ResourceLocation gavel_wood = new ResourceLocation(RefStrings.MODID, "textures/models/weapons/gavel_wood.png"); public static final ResourceLocation gavel_lead = new ResourceLocation(RefStrings.MODID, "textures/models/weapons/gavel_lead.png"); public static final ResourceLocation gavel_diamond = new ResourceLocation(RefStrings.MODID, "textures/models/weapons/gavel_diamond.png"); + public static final ResourceLocation gavel_mese = new ResourceLocation(RefStrings.MODID, "textures/models/weapons/gavel_mese.png"); public static final ResourceLocation brimstone_tex = new ResourceLocation(RefStrings.MODID, "textures/models/brimstone.png"); public static final ResourceLocation hk69_tex = new ResourceLocation(RefStrings.MODID, "textures/models/weapons/hk69.png"); diff --git a/src/main/java/com/hbm/render/item/weapon/ItemRenderGavel.java b/src/main/java/com/hbm/render/item/weapon/ItemRenderGavel.java index cc10e859d..eeefd0d95 100644 --- a/src/main/java/com/hbm/render/item/weapon/ItemRenderGavel.java +++ b/src/main/java/com/hbm/render/item/weapon/ItemRenderGavel.java @@ -42,6 +42,8 @@ public class ItemRenderGavel implements IItemRenderer { Minecraft.getMinecraft().renderEngine.bindTexture(ResourceManager.gavel_lead); if(item.getItem() == ModItems.diamond_gavel) Minecraft.getMinecraft().renderEngine.bindTexture(ResourceManager.gavel_diamond); + if(item.getItem() == ModItems.mese_gavel) + Minecraft.getMinecraft().renderEngine.bindTexture(ResourceManager.gavel_mese); switch(type) { case EQUIPPED_FIRST_PERSON: @@ -55,6 +57,9 @@ public class ItemRenderGavel implements IItemRenderer { GL11.glRotated(45, 0, 0, 1); GL11.glRotated(90, 0, 1, 0); + if(item.getItem() == ModItems.mese_gavel) + GL11.glScaled(2, 2, 2); + break; case ENTITY: @@ -66,6 +71,11 @@ public class ItemRenderGavel implements IItemRenderer { GL11.glTranslated(1.375, 0, 0); GL11.glRotated(90, 0, 1, 0); + if(item.getItem() == ModItems.mese_gavel) { + GL11.glScaled(2, 2, 2); + GL11.glTranslated(0, 0.25, 0); + } + break; default: break; diff --git a/src/main/java/com/hbm/render/item/weapon/ItemRenderShim.java b/src/main/java/com/hbm/render/item/weapon/ItemRenderShim.java index 039f14f5e..ee047b381 100644 --- a/src/main/java/com/hbm/render/item/weapon/ItemRenderShim.java +++ b/src/main/java/com/hbm/render/item/weapon/ItemRenderShim.java @@ -50,8 +50,6 @@ public class ItemRenderShim implements IItemRenderer { Minecraft.getMinecraft().renderEngine.bindTexture(ResourceManager.sopsign_tex); if(item.getItem() == ModItems.chernobylsign) Minecraft.getMinecraft().renderEngine.bindTexture(ResourceManager.chernobylsign_tex); - if(item.getItem() == ModItems.pch) - Minecraft.getMinecraft().renderEngine.bindTexture(ResourceManager.pch_tex); if(item.getItem() == ModItems.shimmer_sledge || item.getItem() == ModItems.shimmer_axe) { GL11.glRotatef(-135.0F, 0.0F, 0.0F, 1.0F); @@ -67,11 +65,6 @@ public class ItemRenderShim implements IItemRenderer { GL11.glRotatef(90F, 0.0F, 1.0F, 0.0F); } - if(item.getItem() == ModItems.pch) { - GL11.glRotatef(45.0F, 0.0F, 0.0F, 1.0F); - GL11.glTranslatef(0.7F, 0.0F, 0.0F); - } - if(item.getItem() == ModItems.shimmer_sledge) ResourceManager.shimmer_sledge.renderAll(); if(item.getItem() == ModItems.shimmer_axe) @@ -79,12 +72,6 @@ public class ItemRenderShim implements IItemRenderer { if(item.getItem() == ModItems.stopsign || item.getItem() == ModItems.sopsign || item.getItem() == ModItems.chernobylsign) ResourceManager.stopsign.renderAll(); - if(item.getItem() == ModItems.pch) { - GL11.glShadeModel(GL11.GL_SMOOTH); - ResourceManager.pch.renderAll(); - GL11.glShadeModel(GL11.GL_FLAT); - } - default: break; } GL11.glPopMatrix(); diff --git a/src/main/java/com/hbm/render/util/RenderAccessoryUtility.java b/src/main/java/com/hbm/render/util/RenderAccessoryUtility.java index 1c2e69626..6d44fe229 100644 --- a/src/main/java/com/hbm/render/util/RenderAccessoryUtility.java +++ b/src/main/java/com/hbm/render/util/RenderAccessoryUtility.java @@ -28,6 +28,7 @@ public class RenderAccessoryUtility { private static ResourceLocation test = new ResourceLocation(RefStrings.MODID + ":textures/models/capes/CapeTest.png"); private static ResourceLocation schrabby = new ResourceLocation(RefStrings.MODID + ":textures/models/capes/CapeSchrabbyAlt.png"); private static ResourceLocation swiggs = new ResourceLocation(RefStrings.MODID + ":textures/models/capes/CapeSweatySwiggs.png"); + private static ResourceLocation doctor17 = new ResourceLocation(RefStrings.MODID + ":textures/models/capes/CapeDoctor17.png"); private static ResourceLocation wiki = new ResourceLocation(RefStrings.MODID + ":textures/models/capes/CapeWiki.png"); public static ResourceLocation getCloakFromPlayer(EntityPlayer player) { @@ -92,6 +93,9 @@ public class RenderAccessoryUtility { if(uuid.equals(Library.SweatySwiggs)) { return swiggs; } + if(uuid.equals(Library.Doctor17)) { + return doctor17; + } if(Library.contributors.contains(uuid)) { return wiki; } diff --git a/src/main/java/com/hbm/util/ContaminationUtil.java b/src/main/java/com/hbm/util/ContaminationUtil.java index 51c9087f5..4883d1872 100644 --- a/src/main/java/com/hbm/util/ContaminationUtil.java +++ b/src/main/java/com/hbm/util/ContaminationUtil.java @@ -39,6 +39,9 @@ public class ContaminationUtil { if(!(e instanceof EntityLivingBase)) return; + if(e instanceof EntityPlayer && ((EntityPlayer)e).capabilities.isCreativeMode) + return; + EntityLivingBase entity = (EntityLivingBase)e; f *= calculateRadiationMod(entity); @@ -52,6 +55,9 @@ public class ContaminationUtil { if(!(e instanceof EntityLivingBase)) return; + if(e instanceof EntityPlayer && ((EntityPlayer)e).capabilities.isCreativeMode) + return; + if(((EntityLivingBase)e).isPotionActive(HbmPotion.mutation)) return;