mirror of
https://github.com/HbmMods/Hbm-s-Nuclear-Tech-GIT.git
synced 2026-01-25 10:32:49 +00:00
Merge branch 'master' of https://github.com/HbmMods/Hbm-s-Nuclear-Tech-GIT
# Conflicts: # assets/hbm/lang/de_DE.lang # assets/hbm/lang/en_US.lang # assets/hbm/textures/armor/hazmat_paa_1.png # assets/hbm/textures/armor/paa_1.png # com/hbm/blocks/BlockCrate.java # com/hbm/blocks/ModBlocks.java # com/hbm/explosion/ExplosionNukeGeneric.java # com/hbm/handler/FuelHandler.java # com/hbm/items/GunMP.java # com/hbm/items/GunRevolver.java # com/hbm/items/ItemStarterKit.java # com/hbm/items/ModArmor.java # com/hbm/items/ModItems.java # com/hbm/lib/Library.java # com/hbm/lib/RefStrings.java # com/hbm/main/ClientProxy.java # com/hbm/main/CraftingManager.java # com/hbm/main/MainRegistry.java # com/hbm/main/ModEventHandlerClient.java # com/hbm/sound/MovingSoundPlayerLoop.java # com/hbm/sound/MovingSoundXVL1456.java
This commit is contained in:
HbmMods
commit
5525318475
@ -707,10 +707,13 @@ item.hazmat_paa_helmet.name=PaA-Kampfschutzanzug Helm
|
||||
item.hazmat_paa_plate.name=PaA-Kampfschutzanzug Brustplatte
|
||||
item.hazmat_paa_legs.name=PaA-Kampfschutzanzug Hose
|
||||
item.hazmat_paa_boots.name=PaA-Kampfschutzanzug Stiefel
|
||||
<<<<<<< HEAD
|
||||
|
||||
item.paa_plate.name=PaA-Brustschutzplatte
|
||||
item.paa_legs.name=PaA-Beinverstärkungsschienen
|
||||
item.paa_boots.name=PaA-"olle Latschen"
|
||||
=======
|
||||
>>>>>>> 540fb3d256a0f4ae6a8b1db586f8e9cfd6ed7372
|
||||
|
||||
item.goggles.name=Schutzbrille
|
||||
item.gas_mask.name=Gasmaske
|
||||
@ -864,6 +867,10 @@ item.blades_advanced_alloy.name=Fortgeschrittenes Sägeblatt
|
||||
item.blades_combine_steel.name=CMB-Sägeblatt
|
||||
item.blades_schrabidium.name=Schrabidiumsägeblatt
|
||||
|
||||
<<<<<<< HEAD
|
||||
item.letter.name=Eilbrief
|
||||
|
||||
item.chopper.name=Jagdschrauber
|
||||
item.chopper.name=Jagdschrauber
|
||||
=======
|
||||
item.letter.name=Eilbrief
|
||||
>>>>>>> 540fb3d256a0f4ae6a8b1db586f8e9cfd6ed7372
|
||||
|
||||
@ -17,7 +17,10 @@ death.attack.tau=%1$s was riddeled by %2$s using negatively charged tauons.
|
||||
death.attack.tauBlast=%1$s charged the XVL1456 for too long and was blown into pieces.
|
||||
death.attack.chopperBullet=%1$s was rekt by %2$s.
|
||||
death.attack.cmb=%1$s was fizzeled by %2$s.
|
||||
<<<<<<< HEAD
|
||||
death.attack.subAtomic=%1$s's atoms have been destroyed by %2$s.
|
||||
=======
|
||||
>>>>>>> 540fb3d256a0f4ae6a8b1db586f8e9cfd6ed7372
|
||||
death.attack.subAtomic2=%1$s was QPU-misaligned because %2$s tampered with his de facto speed.
|
||||
death.attack.subAtomic3=%1$s's divergence dropped below 1% because of %2$s.
|
||||
death.attack.subAtomic4=%1$s was divided by zero by %2$s.
|
||||
@ -707,10 +710,13 @@ item.hazmat_paa_helmet.name=PaA Battle Hazmat Suit Helmet
|
||||
item.hazmat_paa_plate.name=PaA Battle Hazmat Suit Chestplate
|
||||
item.hazmat_paa_legs.name=PaA Battle Hazmat Suit Leggings
|
||||
item.hazmat_paa_boots.name=PaA Battle Hazmat Suit Boots
|
||||
<<<<<<< HEAD
|
||||
|
||||
item.paa_plate.name=PaA Chest Protection Plate
|
||||
item.paa_legs.name=PaA Leg Reinforcements
|
||||
item.paa_boots.name=PaA "good ol' shoes"
|
||||
=======
|
||||
>>>>>>> 540fb3d256a0f4ae6a8b1db586f8e9cfd6ed7372
|
||||
|
||||
item.goggles.name=Protection Goggles
|
||||
item.gas_mask.name=Gas Mask
|
||||
@ -864,6 +870,10 @@ item.blades_advanced_alloy.name=Advanced Shredder Blades
|
||||
item.blades_combine_steel.name=CMB Shredder Blades
|
||||
item.blades_schrabidium.name=Schrabidium Shredder Blades
|
||||
|
||||
<<<<<<< HEAD
|
||||
item.letter.name=Express Mail
|
||||
|
||||
item.chopper.name=Hunter Chopper
|
||||
item.chopper.name=Hunter Chopper
|
||||
=======
|
||||
item.letter.name=Express Mail
|
||||
>>>>>>> 540fb3d256a0f4ae6a8b1db586f8e9cfd6ed7372
|
||||
|
||||
@ -50,7 +50,11 @@ public class BlockCrate extends BlockFalling {
|
||||
Random rand = new Random();
|
||||
List<Item> list = new ArrayList<Item>();
|
||||
|
||||
<<<<<<< HEAD
|
||||
switch(rand.nextInt(32)) {
|
||||
=======
|
||||
switch(rand.nextInt(29)) {
|
||||
>>>>>>> 540fb3d256a0f4ae6a8b1db586f8e9cfd6ed7372
|
||||
case 0:
|
||||
list.add(ModItems.clip_revolver_iron);
|
||||
list.add(ModItems.clip_revolver_iron);
|
||||
@ -173,6 +177,7 @@ public class BlockCrate extends BlockFalling {
|
||||
list.add(ModItems.clip_fatman);
|
||||
list.add(ModItems.clip_rpg);
|
||||
break;
|
||||
<<<<<<< HEAD
|
||||
case 29:
|
||||
list.add(ModItems.grenade_generic);
|
||||
list.add(ModItems.grenade_generic);
|
||||
@ -187,6 +192,8 @@ public class BlockCrate extends BlockFalling {
|
||||
list.add(ModItems.grenade_mk2);
|
||||
list.add(ModItems.grenade_mk2);
|
||||
break;
|
||||
=======
|
||||
>>>>>>> 540fb3d256a0f4ae6a8b1db586f8e9cfd6ed7372
|
||||
}
|
||||
|
||||
for(Item stack : list) {
|
||||
|
||||
@ -9,7 +9,10 @@ import com.hbm.main.MainRegistry;
|
||||
|
||||
import cpw.mods.fml.common.registry.GameRegistry;
|
||||
import net.minecraft.block.Block;
|
||||
<<<<<<< HEAD
|
||||
import net.minecraft.block.Block.SoundType;
|
||||
=======
|
||||
>>>>>>> 540fb3d256a0f4ae6a8b1db586f8e9cfd6ed7372
|
||||
import net.minecraft.block.BlockFalling;
|
||||
import net.minecraft.block.material.MapColor;
|
||||
import net.minecraft.block.material.Material;
|
||||
@ -355,9 +358,15 @@ public class ModBlocks {
|
||||
block_lead = new BlockGeneric(Material.iron).setBlockName("block_lead").setCreativeTab(MainRegistry.tabBlock).setStepSound(Block.soundTypeMetal).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":block_lead");
|
||||
block_trinitite = new BlockOre(Material.iron).setBlockName("block_trinitite").setCreativeTab(MainRegistry.tabBlock).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":block_trinitite");
|
||||
block_waste = new BlockOre(Material.iron).setBlockName("block_waste").setCreativeTab(MainRegistry.tabBlock).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":block_waste");
|
||||
<<<<<<< HEAD
|
||||
block_scrap = new BlockFalling(Material.sand).setBlockName("block_scrap").setCreativeTab(MainRegistry.tabBlock).setHardness(2.5F).setResistance(5.0F).setStepSound(Block.soundTypeGravel).setBlockTextureName(RefStrings.MODID + ":block_scrap");
|
||||
block_beryllium = new BlockGeneric(Material.iron).setBlockName("block_beryllium").setCreativeTab(MainRegistry.tabBlock).setStepSound(Block.soundTypeMetal).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":block_beryllium");
|
||||
block_schrabidium = new BlockGeneric(Material.iron).setBlockName("block_schrabidium").setCreativeTab(MainRegistry.tabBlock).setStepSound(Block.soundTypeMetal).setHardness(5.0F).setResistance(600.0F).setBlockTextureName(RefStrings.MODID + ":block_schrabidium");
|
||||
=======
|
||||
block_scrap = new BlockFalling(Material.sand).setBlockName("block_scrap").setCreativeTab(MainRegistry.tabBlock).setHardness(2.5F).setResistance(5.0F).setBlockTextureName(RefStrings.MODID + ":block_scrap");
|
||||
block_beryllium = new BlockGeneric(Material.iron).setBlockName("block_beryllium").setCreativeTab(MainRegistry.tabBlock).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":block_beryllium");
|
||||
block_schrabidium = new BlockGeneric(Material.iron).setBlockName("block_schrabidium").setCreativeTab(MainRegistry.tabBlock).setHardness(5.0F).setResistance(600.0F).setBlockTextureName(RefStrings.MODID + ":block_schrabidium");
|
||||
>>>>>>> 540fb3d256a0f4ae6a8b1db586f8e9cfd6ed7372
|
||||
block_advanced_alloy = new BlockGeneric(Material.iron).setBlockName("block_advanced_alloy").setCreativeTab(MainRegistry.tabBlock).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":block_advanced_alloy");
|
||||
block_magnetized_tungsten = new BlockGeneric(Material.iron).setBlockName("block_magnetized_tungsten").setCreativeTab(MainRegistry.tabBlock).setStepSound(Block.soundTypeMetal).setHardness(5.0F).setResistance(35.0F).setBlockTextureName(RefStrings.MODID + ":block_magnetized_tungsten");
|
||||
block_combine_steel = new BlockGeneric(Material.iron).setBlockName("block_combine_steel").setCreativeTab(MainRegistry.tabBlock).setStepSound(Block.soundTypeMetal).setHardness(5.0F).setResistance(600.0F).setBlockTextureName(RefStrings.MODID + ":block_combine_steel");
|
||||
|
||||
@ -170,6 +170,7 @@ public class ExplosionNukeGeneric {
|
||||
|
||||
public static void destruction(World world, int x, int y, int z) {
|
||||
int rand;
|
||||
<<<<<<< HEAD
|
||||
if (!world.isRemote) {
|
||||
if (world.getBlock(x, y, z) != Blocks.bedrock && world.getBlock(x, y, z) != ModBlocks.reinforced_brick
|
||||
&& world.getBlock(x, y, z) != ModBlocks.reinforced_glass
|
||||
@ -199,6 +200,32 @@ public class ExplosionNukeGeneric {
|
||||
world.setBlock(x, y, z, ModBlocks.gravel_obsidian, 0, 3);
|
||||
} else {
|
||||
world.setBlock(x, y, z, Blocks.air, 0, 3);
|
||||
=======
|
||||
if(!world.isRemote)
|
||||
{
|
||||
if(world.getBlock(x, y, z) != Blocks.bedrock && world.getBlock(x, y, z) != ModBlocks.reinforced_brick && world.getBlock(x, y, z) != ModBlocks.reinforced_glass && world.getBlock(x, y, z) != ModBlocks.reinforced_light && world.getBlock(x, y, z) != ModBlocks.reinforced_sand && world.getBlock(x, y, z) != ModBlocks.reinforced_lamp_off && world.getBlock(x, y, z) != ModBlocks.reinforced_lamp_on && world.getBlock(x, y, z) != ModBlocks.cmb_brick && world.getBlock(x, y, z) != ModBlocks.cmb_brick_reinforced && !(world.getBlock(x, y, z) instanceof DecoBlockAlt))
|
||||
{
|
||||
if(world.getBlock(x, y, z) == ModBlocks.brick_concrete)
|
||||
{
|
||||
rand = field_149933_a.nextInt(8);
|
||||
if(rand == 0)
|
||||
{
|
||||
world.setBlock(x, y, z, Blocks.gravel, 0, 3);
|
||||
}
|
||||
}else if(world.getBlock(x, y, z) == ModBlocks.brick_light)
|
||||
{
|
||||
rand = field_149933_a.nextInt(2);
|
||||
if(rand == 0)
|
||||
{
|
||||
world.setBlock(x, y, z, ModBlocks.waste_planks, 0, 3);
|
||||
}
|
||||
}else if(world.getBlock(x, y, z) == ModBlocks.brick_obsidian)
|
||||
{
|
||||
rand = field_149933_a.nextInt(20);
|
||||
if(rand == 0)
|
||||
{
|
||||
world.setBlock(x, y, z, Blocks.obsidian, 0, 3);
|
||||
>>>>>>> 540fb3d256a0f4ae6a8b1db586f8e9cfd6ed7372
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -15,6 +15,7 @@ public class FuelHandler implements IFuelHandler {
|
||||
int i = 200;
|
||||
|
||||
if(fuel.getItem().equals(ModItems.canister_fuel))
|
||||
<<<<<<< HEAD
|
||||
return i * 16;
|
||||
if(fuel.getItem().equals(ModItems.powder_coal))
|
||||
return i * 8;
|
||||
@ -26,6 +27,17 @@ public class FuelHandler implements IFuelHandler {
|
||||
return i * 32;
|
||||
if(fuel.getItem().equals(Item.getItemFromBlock(ModBlocks.block_scrap)))
|
||||
return i * 20;
|
||||
=======
|
||||
return 3200;
|
||||
if(fuel.getItem().equals(ModItems.powder_coal))
|
||||
return 1600;
|
||||
if(fuel.getItem().equals(ModItems.scrap))
|
||||
return 800;
|
||||
if(fuel.getItem().equals(ModItems.dust))
|
||||
return 400;
|
||||
if(fuel.getItem().equals(ModItems.powder_fire))
|
||||
return 6400;
|
||||
>>>>>>> 540fb3d256a0f4ae6a8b1db586f8e9cfd6ed7372
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
@ -85,6 +85,10 @@ public class GunMP extends Item {
|
||||
list.add("user's? The victim's? Both?");
|
||||
list.add("");
|
||||
list.add("Ammo: Small Propellantless Machine Gun Round");
|
||||
<<<<<<< HEAD
|
||||
list.add("Damage: 100 - 150");
|
||||
=======
|
||||
list.add("Damage: 35 - 45");
|
||||
>>>>>>> 540fb3d256a0f4ae6a8b1db586f8e9cfd6ed7372
|
||||
}
|
||||
}
|
||||
|
||||
@ -65,6 +65,7 @@ public class GunRevolver extends Item {
|
||||
|
||||
@Override
|
||||
public EnumRarity getRarity(ItemStack p_77613_1_) {
|
||||
<<<<<<< HEAD
|
||||
|
||||
if (this == ModItems.gun_revolver_schrabidium) {
|
||||
return EnumRarity.rare;
|
||||
@ -187,6 +188,142 @@ public class GunRevolver extends Item {
|
||||
public int getItemEnchantability() {
|
||||
return 1;
|
||||
}
|
||||
=======
|
||||
|
||||
if(this == ModItems.gun_revolver_schrabidium)
|
||||
{
|
||||
return EnumRarity.rare;
|
||||
}
|
||||
|
||||
if(this == ModItems.gun_revolver_cursed)
|
||||
{
|
||||
return EnumRarity.uncommon;
|
||||
}
|
||||
|
||||
return EnumRarity.common;
|
||||
}
|
||||
|
||||
/**
|
||||
* called when the player releases the use item button. Args: itemstack, world, entityplayer, itemInUseCount
|
||||
*/
|
||||
@Override
|
||||
public void onPlayerStoppedUsing(ItemStack p_77615_1_, World p_77615_2_, EntityPlayer p_77615_3_, int p_77615_4_)
|
||||
{
|
||||
int j = this.getMaxItemUseDuration(p_77615_1_) - p_77615_4_;
|
||||
|
||||
ArrowLooseEvent event = new ArrowLooseEvent(p_77615_3_, p_77615_1_, j);
|
||||
MinecraftForge.EVENT_BUS.post(event);
|
||||
j = event.charge;
|
||||
|
||||
boolean flag = p_77615_3_.capabilities.isCreativeMode || EnchantmentHelper.getEnchantmentLevel(Enchantment.infinity.effectId, p_77615_1_) > 0;
|
||||
|
||||
|
||||
if (flag || p_77615_3_.inventory.hasItem(ammo))
|
||||
{
|
||||
float f = j / 20.0F;
|
||||
f = (f * f + f * 2.0F) / 3.0F;
|
||||
|
||||
if (j < 10.0D)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
if (j > 10.0F)
|
||||
{
|
||||
f = 10.0F;
|
||||
}
|
||||
|
||||
EntityBullet entityarrow = new EntityBullet(p_77615_2_, p_77615_3_, 3.0F, dmgMin, dmgMax, instakill, rad);
|
||||
entityarrow.setDamage(dmgMin + rand.nextInt(dmgMax - dmgMin));
|
||||
|
||||
p_77615_1_.damageItem(1, p_77615_3_);
|
||||
if(this == ModItems.gun_revolver || this == ModItems.gun_revolver_iron || this == ModItems.gun_revolver_gold || this == ModItems.gun_revolver_lead)
|
||||
{
|
||||
//p_77615_2_.playSoundAtEntity(p_77615_3_, "random.explode", 1.0F, 3.0F);
|
||||
p_77615_2_.playSoundAtEntity(p_77615_3_, "hbm:weapon.revolverShoot", 1.0F, 1.0F);
|
||||
}
|
||||
if(this == ModItems.gun_revolver_cursed)
|
||||
{
|
||||
//p_77615_2_.playSoundAtEntity(p_77615_3_, "random.explode", 3.0F, 1.5F);
|
||||
p_77615_2_.playSoundAtEntity(p_77615_3_, "hbm:weapon.heavyShoot", 3.0F, 1.0F);
|
||||
}
|
||||
if(this == ModItems.gun_revolver_schrabidium)
|
||||
{
|
||||
//p_77615_2_.playSoundAtEntity(p_77615_3_, "random.explode", 1.0F, 3.0F);
|
||||
p_77615_2_.playSoundAtEntity(p_77615_3_, "hbm:weapon.schrabidiumShoot", 1.0F, 1.0F);
|
||||
}
|
||||
|
||||
if (flag)
|
||||
{
|
||||
entityarrow.canBePickedUp = 2;
|
||||
}
|
||||
else
|
||||
{
|
||||
p_77615_3_.inventory.consumeInventoryItem(ammo);
|
||||
}
|
||||
|
||||
if (!p_77615_2_.isRemote)
|
||||
{
|
||||
p_77615_2_.spawnEntityInWorld(entityarrow);
|
||||
|
||||
if(this == ModItems.gun_revolver_cursed && rand.nextInt(3) == 0)
|
||||
{
|
||||
p_77615_3_.addPotionEffect(new PotionEffect(Potion.wither.id, 5 * 20, 0));
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public ItemStack onEaten(ItemStack p_77654_1_, World p_77654_2_, EntityPlayer p_77654_3_)
|
||||
{
|
||||
return p_77654_1_;
|
||||
}
|
||||
|
||||
/**
|
||||
* How long it takes to use or consume an item
|
||||
*/
|
||||
@Override
|
||||
public int getMaxItemUseDuration(ItemStack p_77626_1_)
|
||||
{
|
||||
return 72000;
|
||||
}
|
||||
|
||||
/**
|
||||
* returns the action that specifies what animation to play when the items is being used
|
||||
*/
|
||||
@Override
|
||||
public EnumAction getItemUseAction(ItemStack p_77661_1_)
|
||||
{
|
||||
return EnumAction.bow;
|
||||
}
|
||||
|
||||
/**
|
||||
* Called whenever this item is equipped and the right mouse button is pressed. Args: itemStack, world, entityPlayer
|
||||
*/
|
||||
@Override
|
||||
public ItemStack onItemRightClick(ItemStack p_77659_1_, World p_77659_2_, EntityPlayer p_77659_3_)
|
||||
{
|
||||
ArrowNockEvent event = new ArrowNockEvent(p_77659_3_, p_77659_1_);
|
||||
MinecraftForge.EVENT_BUS.post(event);
|
||||
|
||||
if (p_77659_3_.capabilities.isCreativeMode || p_77659_3_.inventory.hasItem(ammo))
|
||||
{
|
||||
p_77659_3_.setItemInUse(p_77659_1_, this.getMaxItemUseDuration(p_77659_1_));
|
||||
}
|
||||
|
||||
return p_77659_1_;
|
||||
}
|
||||
|
||||
/**
|
||||
* Return the enchantability factor of the item, most of the time is based on material.
|
||||
*/
|
||||
@Override
|
||||
public int getItemEnchantability()
|
||||
{
|
||||
return 1;
|
||||
}
|
||||
>>>>>>> 540fb3d256a0f4ae6a8b1db586f8e9cfd6ed7372
|
||||
|
||||
@Override
|
||||
public void addInformation(ItemStack itemstack, EntityPlayer player, List list, boolean bool) {
|
||||
|
||||
@ -345,7 +345,11 @@ public class ItemStarterKit extends Item {
|
||||
player.inventory.addItemStackToInventory(new ItemStack(ModItems.watch, 1));
|
||||
}
|
||||
|
||||
<<<<<<< HEAD
|
||||
if(this == ModItems.letter && world.isRemote)
|
||||
=======
|
||||
if(this == ModItems.letter && !world.isRemote)
|
||||
>>>>>>> 540fb3d256a0f4ae6a8b1db586f8e9cfd6ed7372
|
||||
{
|
||||
if(player.getUniqueID().toString().equals(Library.a20)) {
|
||||
player.addChatMessage(new ChatComponentText("Error: null reference @ com.hbm.items.ItemStarterKit.class, please report this to the modder!"));
|
||||
|
||||
@ -38,12 +38,15 @@ public class ModArmor extends ItemArmor {
|
||||
if(stack.getItem().equals(ModItems.cmb_legs)) {
|
||||
return (RefStrings.MODID + ":textures/armor/cmb_2.png");
|
||||
}
|
||||
<<<<<<< HEAD
|
||||
if(stack.getItem().equals(ModItems.paa_plate) || stack.getItem().equals(ModItems.paa_boots)) {
|
||||
return (RefStrings.MODID + ":textures/armor/paa_1.png");
|
||||
}
|
||||
if(stack.getItem().equals(ModItems.paa_legs)) {
|
||||
return (RefStrings.MODID + ":textures/armor/paa_2.png");
|
||||
}
|
||||
=======
|
||||
>>>>>>> 540fb3d256a0f4ae6a8b1db586f8e9cfd6ed7372
|
||||
|
||||
else return null;
|
||||
}
|
||||
|
||||
@ -539,9 +539,12 @@ public class ModItems {
|
||||
public static Item cmb_plate;
|
||||
public static Item cmb_legs;
|
||||
public static Item cmb_boots;
|
||||
<<<<<<< HEAD
|
||||
public static Item paa_plate;
|
||||
public static Item paa_legs;
|
||||
public static Item paa_boots;
|
||||
=======
|
||||
>>>>>>> 540fb3d256a0f4ae6a8b1db586f8e9cfd6ed7372
|
||||
|
||||
public static Item schrabidium_sword;
|
||||
public static Item schrabidium_pickaxe;
|
||||
@ -1213,9 +1216,12 @@ public class ModItems {
|
||||
cmb_plate = new ModArmor(MainRegistry.enumArmorMaterialCmb, 7, 1).setUnlocalizedName("cmb_plate").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":cmb_plate");
|
||||
cmb_legs = new ModArmor(MainRegistry.enumArmorMaterialCmb, 7, 2).setUnlocalizedName("cmb_legs").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":cmb_legs");
|
||||
cmb_boots = new ModArmor(MainRegistry.enumArmorMaterialCmb, 7, 3).setUnlocalizedName("cmb_boots").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":cmb_boots");
|
||||
<<<<<<< HEAD
|
||||
paa_plate = new ModArmor(MainRegistry.enumArmorMaterialPaa, 7, 1).setUnlocalizedName("paa_plate").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":paa_plate");
|
||||
paa_legs = new ModArmor(MainRegistry.enumArmorMaterialPaa, 7, 2).setUnlocalizedName("paa_legs").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":paa_legs");
|
||||
paa_boots = new ModArmor(MainRegistry.enumArmorMaterialPaa, 7, 3).setUnlocalizedName("paa_boots").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":paa_boots");
|
||||
=======
|
||||
>>>>>>> 540fb3d256a0f4ae6a8b1db586f8e9cfd6ed7372
|
||||
|
||||
schrabidium_sword = new SwordSchrabidium(MainRegistry.enumToolMaterialSchrabidium).setUnlocalizedName("schrabidium_sword").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":schrabidium_sword");
|
||||
schrabidium_pickaxe = new PickaxeSchrabidium(MainRegistry.enumToolMaterialSchrabidium).setUnlocalizedName("schrabidium_pickaxe").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":schrabidium_pickaxe");
|
||||
@ -1921,9 +1927,12 @@ public class ModItems {
|
||||
GameRegistry.registerItem(cmb_plate, cmb_plate.getUnlocalizedName());
|
||||
GameRegistry.registerItem(cmb_legs, cmb_legs.getUnlocalizedName());
|
||||
GameRegistry.registerItem(cmb_boots, cmb_boots.getUnlocalizedName());
|
||||
<<<<<<< HEAD
|
||||
GameRegistry.registerItem(paa_plate, paa_plate.getUnlocalizedName());
|
||||
GameRegistry.registerItem(paa_legs, paa_legs.getUnlocalizedName());
|
||||
GameRegistry.registerItem(paa_boots, paa_boots.getUnlocalizedName());
|
||||
=======
|
||||
>>>>>>> 540fb3d256a0f4ae6a8b1db586f8e9cfd6ed7372
|
||||
GameRegistry.registerItem(schrabidium_helmet, schrabidium_helmet.getUnlocalizedName());
|
||||
GameRegistry.registerItem(schrabidium_plate, schrabidium_plate.getUnlocalizedName());
|
||||
GameRegistry.registerItem(schrabidium_legs, schrabidium_legs.getUnlocalizedName());
|
||||
|
||||
@ -29,12 +29,92 @@ import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
public class Library {
|
||||
<<<<<<< HEAD
|
||||
|
||||
public static List<String> book1 = new ArrayList<String>();
|
||||
public static List<String> book2 = new ArrayList<String>();
|
||||
public static List<String> book3 = new ArrayList<String>();
|
||||
public static List<String> book4 = new ArrayList<String>();
|
||||
public static List<String> book5 = new ArrayList<String>();
|
||||
=======
|
||||
|
||||
public static String book11 = "Resources\nHbm's Nuclear Tech Mod features eleven different ores and 13 materials which are used to craft machines and bombs. Most of them can be obtained from ores or various machines. This book will provide information about all of them.";
|
||||
public static String book12 = "Uranium\nUranium is a rather rare ore found deep underground. Smelting the ore will give you a raw uranium ingot which can later be processed into fissile material that can be used for energy production or nuclear weapons.";
|
||||
public static String book13 = "Titanium\nTitanium is a material mainly used for crafting machines and bomb hulls. You can get it from smelting titanium ore.";
|
||||
public static String book14 = "Steel\nSteel is a commonly used material for building bombs, machines and decorative elements. It can be obtained by combining a lump of coal and an iron ingot in the alloy furnace.";
|
||||
public static String book15 = "Sulfur\nSulfur is a powder which will directly drop from it's ore. Sulfur is used for extracting deuterium with the deuterium extractor, crafting gunpowder or Schrabidiumtrisulfite.";
|
||||
public static String book16 = "Niter\nNiter also drops directly from the ore, it's only uses are for crafting det cords and gunpowder.";
|
||||
public static String book17 = "Industrial Grade Copper\nIndustrial Grade Copper (mainly just referred to as Copper) is an importand ingot used for crafting electronic components and creating Minecraft Grade Copper. It can be obtained by simply smelting copper ore.";
|
||||
public static String book18 = "Minecraft Grade Copper\nMinecraft Grade Copper (aka Red Copper) can be created by combining copper ingots and redstone in the alloy furnace. It is used for crafting advanced electronics and batteries.";
|
||||
public static String book19 = "Tungsten\nTungsten can be used to make neutron reflectors by combining it in the alloy furnace with coal. It is also needed for heating coils, which are importand for storing uranium and plutonium hexafluorite.";
|
||||
public static String book110 = "Aluminium\nAluminium is a commonly found metal that is used for crafting hulls and machines. Basic circuits are also made out of aluminium wires.";
|
||||
public static String book111 = "Fuorite\nFluorite is a powder which can be found in form of ores. It is used to make uranium and plutonium hexafluorite, gasses which can be enriched in a gas centrifuge.";
|
||||
public static String book112 = "Beryllium\nBeryllium is an ingot which can be simply obtained from it's ore. Beryllium is used for Schrabidium fuel and plutonium cores.";
|
||||
public static String book113 = "Lead\nLead is a very common ore that can be smelted into an ingot. It can be used to craft breeding reactors, RTG-Units and if combined with copper in the alloy furnace, it can be processed into neutron reflectors.";
|
||||
public static String book114 = "Schrabidium\nSchrabidium is a very odd element only found near nuclear testing sites. It has violent behaviours if used the right way, making it perfect for bombs. If a big ammount is hit by neutrons, it will create other elements.";
|
||||
public static String book115 = "Advanced Alloy\nThe advanced alloy is a very durable and useful material, only used for the best factories which can handle four operations at once. It is composed of Minecraft grade copper and steel, combined by an alloy furnace.";
|
||||
public static String book116 = "Fuel\nFuel is obtained by combining an empty canister and a piece of coal in the alloy furnace. It is used for crafting explosive barrels and missiles.";
|
||||
|
||||
public static String book21 = "Machines\nAs an essential part of technic mods, Hbm's Nuclear Tech Mod also features many machines. They are either used to smelt or refine items or to store hazardous materials or even generate electricity.";
|
||||
public static String book22 = "Alloy Furnace\nThe alloy furnace is the most importand machine as it is used to create alloys like red copper or neutron reflectors. It uses different kinds of fuel such as coal, netherrack, lava or even redstone.";
|
||||
public static String book23 = "Gas Centrifuge\nThe gas centrifuge is a requirement for any advanced nuclear tech as it can be used to enrich uranium and plutonium. It uses the same fuel as the alloy furnace. It can process uranium and plutonium hexafluorite.";
|
||||
public static String book24 = "Hexafluorite Tanks\nThese tanks can store uranium or plutonium hexafluorite. By placing a filled cell into the upper-left slot, the gas will be transfered into the tank. Placing empty cells into the upper-right slot will drain the tank's content.";
|
||||
public static String book25 = "Breeding Reactor\nThe breeding reactor is used to breed uranium into plutonium. By filling the lower slot with a radioactive rod it will supply it with power, the rod which shall be breeded goes into the upper slot.";
|
||||
public static String book26 = "Nuclear Powered Furnace\nThis furnace works like the regular furnace, but uses fissile material as fuel instead. Each smelting process only takes arround 1.5 seconds.";
|
||||
public static String book27 = "RTG-Furnace\nThe RGT-Furnace also works like a normal furnace, but uses three plutonium 238 pellets as fuel. Those pellets never deplete, making this furnace last forever. Smelting an item takes 2.5 seconds.";
|
||||
public static String book28 = "Coal Generator\nThe coal generator can generate electricity by burning coal. It needs a constant water supply for successfully providing energy, it can use water buckets or cells. You can transport it's energy either with wires or batteries.";
|
||||
public static String book29 = "Nuclear Reactor\nThe nuclear reactor uses special fuel cells to generate energy. It needs water to do so and coolant to prevent it from overheating.";
|
||||
public static String book210 = "Coated Wire\nThis wire is made from red copper and can transfer electricity. It can take energy from various generators and transport it to machines.";
|
||||
public static String book211 = "Energy Storage Block\nThis battery block will collect electricity from wires. Applying a redstone signal will prevent it from getting more energy and make it release it's electricity again.";
|
||||
public static String book212 = "Electric Furnace\nThe electric furnace works like a normal furnace, but uses electricity instead of fuel items. It can be powered either with wires or with battery items.";
|
||||
public static String book213 = "Deuterium Extractor\nThis machine needs electricity, water, sulfur and empty cells to extract deuterium from the water. Water will deplete much faster than sulfur.";
|
||||
public static String book214 = "Factories\nFactories are big 3x3x3 furnaces on steroids. Depending on what type you use, it can smelt 2 or 4 items at the same time, while having nine additional in and output slots!";
|
||||
public static String book215 = "Large Nuclear Reactor\nThese big machines work like regular nuclear reactors, but can store much more energy, water, coolant and up to 30 slots of fuel! Be sure to protect it with a concrete shell, or else it will emit deadly doses of radiation.";
|
||||
public static String book216 = "Fusion Reactor\nHarness the mighty power of the sun with this high-tech machinery! It will not present any danger as it can not explode or radiate, unlike other reactors. It needs deuterium, tritium, a fuse and four energy cores to start the fusion process.";
|
||||
public static String book217 = "Schrabidium Transmutator\nThis new innovaion turns regular impure uranium into schrabidium! It needs almost 500MHE and a neutral redcoil capacitor to work. The capacitors can be discharged, but it is very dangerous to do so.";
|
||||
|
||||
public static String book31 = "Bombs\nThis mod also features many different bombs, some of them work like regular TNT, others are nukes and need additional items to ignite.";
|
||||
public static String book32 = "The Gadget\nThe Gadget was the first functional nuclear explosive ever built. It needs four special propellants, a plutonium core and a cable drum. It's crater has a radius up to 150 meters.";
|
||||
public static String book33 = "Little Boy\nLittle Boy is a gun-type nuke which uses a tungsten-carbide neutron reflector, two different uranium 235 elements, a propellant and it's igniter. It has an explosion radius of 120.";
|
||||
public static String book34 = "Fat Man\nFat Man is very similar to the Gadged in terms of it's inner parts, even though it uses alternate versions of these items. It's explosion radius is 175 meters.";
|
||||
public static String book35 = "Ivy Mike\nIvy Mike is a hydrogen bomb which needs Fat Man's parts to work. Additionally, you can add an uranium tank, deuterium and a cooler to increase the radius by a lot. Radius with Fat Man parts: 175 meters, radius with additional items: 250 meters.";
|
||||
public static String book36 = "Tsar Bomba\nThe Tsar Bomba was the strongest bomb ever built and is a hydrogen bomb much like Ivy Mike. It needs Fat Man's parts to work and with the fusion core, the explosion radius reaches an astounding 500 meters.";
|
||||
public static String book37 = "The Prototype\nThe Prototype was the first (and strongest) Schrabidium-powered bomb. It was made from a pimped makeshift nuclear reactor using liquid Schrabidiumtrisulfide. Like any other Schrabidium bomb, the Prototype's crater is 100% spherical,";
|
||||
public static String book38 = "leaving no blocks untouched, besides Bedrock on Y: 0. It needs four quad rods of regular uranium, four quad rods filled with lead, two quad rods of neptunium and four Schrabidiumtrisulfide cells in order to explode. It has a crater radius of only";
|
||||
public static String book39 = "150 meters, but because it's shape, it can destroy a whopping 14 million blocks, the seven million blocks of the bottom half are ten times more than the ammount of blocks the Gadget will destroy below it's Y axis.";
|
||||
public static String book310 = "F.L.E.I.J.A.\nF.L.E.I.J.A. (pronounced <20>oFre-ja<6A>r) is a high-tech Schrabidium bomb which consists of two special impulse igniters, three Schrabidium propellants and six magnetized F.L.E.I.J.A. uranium 235 cores. It has a range of 50 meters.";
|
||||
public static String book311 = "Multi Purpose Bomb\nThe multi purpose bomb is a small customizable explosive which requires four blocks of TNT to work. It has a base explosion value which can be modified with different items. You can either use two of a kind (the small box will show";
|
||||
public static String book312 = "you what kind of explosion it will create), only one item (with half the radius/effect of the modifier) or two different items (two different items or one single are part of scambled mode, indicated by a question mark. It will have two different effects.)";
|
||||
public static String book313 = "Modifying items:\nBase Value: 8\nGunpowder: +1\nTNT: +4\nExplosive Pellets: +50 bomblets\nFire Powder: +10 fire radius\nPoison Powder: +15 poison radius\nGas Cartridge: +15 gas radius";
|
||||
public static String book314 = "Flame War in a Box\nEverything explodes, everything is on fire. Enough desription.";
|
||||
public static String book315 = "Levitation Bomb\nThis bomb uses a Schrabidium powered modified thermal distribution unit to lift the surrounding area 50 meters up. It will mess with entities caught in it's radius, making them...weird.";
|
||||
public static String book316 = "Endothermic Bomb\nThis bomb contains an ice-filled thermal distribution unit and will freeze blocks and entities close to it. Entities will get a slowness effect and freeze to a big ice cube.";
|
||||
public static String book317 = "Exothermic Bomb\nThe exothermic bomb needs a thermal distribution unit filled with lava in order to burn and/or melt nearby blocks. Living creatures will get a slowness and weakness effect.";
|
||||
public static String book318 = "Det Cord\nThe det cord is a TNT like block with a much smaller explosion radius. It will explode right after ignition. It can be triggered by redstone or other explosions and is ideal to trigger far away TNT chrages.";
|
||||
public static String book319 = "Explosive Barrel\nThis is a red barrel filled with fuel. It will explode if it catches fire, explodes or gets shot with a revolver. It will blow up in a big firey explosion, great for demolishing houses or forests.";
|
||||
public static String book320 = "Radioactive Barrel\nA yellow barrel filled to the top with nuclear waste. It has a much bigger explosion radius than it's non-nuclear counterpart, and can only be triggered by explosions. It will give creatures bad effects when they stay to close.";
|
||||
|
||||
public static String book41 = "Missiles\nThere are four different tiers and four major groups of missiles. They need a launch pad to work and will fly to a maked target where they will explode. Most missiles are easily recognizable by their shape and color.";
|
||||
public static String book42 = "HE Missiles\nHE missiles (often just referred to as generic missiles) are the simplest type of missiles. They will fly in an arc shape and explode on impact. There are three different HE missiles, one for each of the first three tiers.";
|
||||
public static String book43 = "Incendiary Missiles\nIncendiary missiles work just like generic missiles, with the slight difference that the explosion will spawn fire. The higher the tier, the more fire the impact will create. There are three different tiers of incendiary missiles.";
|
||||
public static String book44 = "Cluster Missiles\nCluster missiles will fly the same arc shape as all the other missiles do, with the exception that it will explode just before impact, releasing hundrets of small bomblets. They are avalible in three different sizes (tiers)";
|
||||
public static String book45 = "Bunker Busters\nA bunker buster behaves much like a normal missile, except that it's explosion goes further down, digging holes and revealing underground structures or destroying bunkers. They also come in three different sizes.";
|
||||
public static String book46 = "Endothermic Missile\nA tier 3 missile which works exactly like an endothermic bomb, but has double the effect radius.";
|
||||
public static String book47 = "Exothermic Missile\nAnother tier 3 missile with an exothermic warhead and double the radius of it's stationary counterpart.";
|
||||
public static String book48 = "Nuclear Missile\nIt's basically a small nuke mounted on a missile. It has an explosion radius of 100 meters, making it the smallest nuke (next to the waffle of mass destruction, the nuclear creeper and the MIRV.)";
|
||||
public static String book49 = "Nuclear MIRV Missile\nThe nuclear MIRV is the most destructive intercontinental ballistic missile ever created. It combines a cluster bomb with the destructive force of a nuke, splitting into eight small warheads just before impact.";
|
||||
|
||||
public static String book51 = "Misc\nNext to nuclear technology and weapons of mass destruction, this mod also offers some gimmicks, handguns, different armor sets, randomly generated dungeons and more! (Please, do not touch any objects you don't know. You will probably explode and die.)";
|
||||
public static String book52 = "Revolvers\nLike in the good old Western films, you can shoot with your own revolver! There are four different tiers of revolvers, dealing about 5 - infinite damage, depending on the tier. Note: A revolver can not hurt mobs like the ender dragon!";
|
||||
public static String book53 = "RPG\nTo use the RPG, charge it like a bow and release the charge when it reached it's maximum. The rocket will cause a small explosion about half the size of a creeper's explosion.";
|
||||
public static String book54 = "Nuke Launcher\nThe M42 Nuclear Catapult \"Fat Man\" is the perfect christmas present for every small child! It shoots small tactical nuclear warheads causing chaos and destrucion. (What did you expect?)";
|
||||
public static String book55 = "Grenades\nA grenade is a very easy-to-use type of explosive. Simply throw it like a snowball and watch the explosion. Remember: Never, NEVER throw a Schrabidium Grenade.";
|
||||
public static String book56 = "Syringes\nDon't do drugs! (except in Minecraft) Need some health? Take a Stimpak. You demand damage resistance? Inject a Med-X. Want to go nuts? Take AWESOME (only one dose per hour will help) Warning: Hitting enemies with syinges will give them the effect!";
|
||||
public static String book57 = "Mobile Stealth Device\nThis useful machine will make you invisibile, even without the annoying particles! Just remember that the effect will wear off in 30 seconds, so don't rely too much on it.";
|
||||
public static String book58 = "Food\nSurprisingly enough, this mod offers a great variety of different food. Be sure not to eat anything, you may explode/combust/die of radiation poisoning/starve to death/experience a rare case of waffles taking over the world.";
|
||||
|
||||
public static String book61;
|
||||
>>>>>>> 540fb3d256a0f4ae6a8b1db586f8e9cfd6ed7372
|
||||
|
||||
public static String HbMinecraft = "192af5d7-ed0f-48d8-bd89-9d41af8524f8";
|
||||
public static String LPkukin = "937c9804-e11f-4ad2-a5b1-42e62ac73077";
|
||||
|
||||
@ -3,7 +3,11 @@ package com.hbm.lib;
|
||||
public class RefStrings {
|
||||
public static final String MODID = "hbm";
|
||||
public static final String NAME = "Hbm's Nuclear Tech Mod";
|
||||
<<<<<<< HEAD
|
||||
public static final String VERSION = "1.0.23";
|
||||
=======
|
||||
public static final String VERSION = "1.0.22";
|
||||
>>>>>>> 540fb3d256a0f4ae6a8b1db586f8e9cfd6ed7372
|
||||
public static final String CLIENTSIDE = "com.hbm.main.ClientProxy";
|
||||
public static final String SERVERSIDE = "com.hbm.main.ServerProxy";
|
||||
}
|
||||
|
||||
@ -10,7 +10,10 @@ import com.hbm.entity.EntityBullet;
|
||||
import com.hbm.entity.EntityChopperMine;
|
||||
import com.hbm.entity.EntityCloudFleija;
|
||||
import com.hbm.entity.EntityCombineBall;
|
||||
<<<<<<< HEAD
|
||||
import com.hbm.entity.EntityFalloutRain;
|
||||
=======
|
||||
>>>>>>> 540fb3d256a0f4ae6a8b1db586f8e9cfd6ed7372
|
||||
import com.hbm.entity.EntityGrenadeASchrab;
|
||||
import com.hbm.entity.EntityGrenadeCluster;
|
||||
import com.hbm.entity.EntityGrenadeElectric;
|
||||
@ -238,7 +241,10 @@ public class ClientProxy extends ServerProxy
|
||||
RenderingRegistry.registerEntityRenderingHandler(EntityNukeCloudBig.class, new RenderBigNuke());
|
||||
RenderingRegistry.registerEntityRenderingHandler(EntityCloudFleija.class, new RenderCloudFleija());
|
||||
RenderingRegistry.registerEntityRenderingHandler(EntityNukeCloudNoShroom.class, new RenderNoCloud());
|
||||
<<<<<<< HEAD
|
||||
RenderingRegistry.registerEntityRenderingHandler(EntityFalloutRain.class, new RenderFallout());
|
||||
=======
|
||||
>>>>>>> 540fb3d256a0f4ae6a8b1db586f8e9cfd6ed7372
|
||||
|
||||
ClientRegistry.bindTileEntitySpecialRenderer(TileEntityDecoTapeRecorder.class, new RenderTapeRecorder());
|
||||
ClientRegistry.bindTileEntitySpecialRenderer(TileEntityDecoSteelPoles.class, new RenderSteelPoles());
|
||||
|
||||
@ -462,10 +462,17 @@ public class CraftingManager {
|
||||
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.fwatz_computer), 1), new Object[] { "DTD", "TMT", "DTD", 'D', "dustDiamond", 'T', "dustMagnetizedTungsten", 'M', ModBlocks.block_meteor }));
|
||||
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.fwatz_core), 1), new Object[] { "CMC", "MAM", "CMC", 'C', ModItems.circuit_schrabidium, 'M', ModBlocks.fwatz_computer, 'A', ModBlocks.fwatz_conductor }));
|
||||
|
||||
<<<<<<< HEAD
|
||||
GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.brick_light), 4), new Object[] { "FBF", "BFB", "FBF", 'F', Blocks.fence, 'B', Blocks.brick_block });
|
||||
GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.brick_concrete), 4), new Object[] { "FBF", "BFB", "FBF", 'F', Blocks.iron_bars, 'B', Blocks.stone });
|
||||
GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.brick_obsidian), 4), new Object[] { "FBF", "BFB", "FBF", 'F', Blocks.iron_bars, 'B', Blocks.obsidian });
|
||||
GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.cmb_brick), 4), new Object[] { "PPP", "PIP", "PPP", 'P', ModItems.plate_combine_steel, 'I', ModItems.ingot_combine_steel });
|
||||
=======
|
||||
GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.brick_light), 8), new Object[] { "FBF", "BFB", "FBF", 'F', Blocks.fence, 'B', Blocks.brick_block });
|
||||
GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.brick_concrete), 8), new Object[] { "FBF", "BFB", "FBF", 'F', Blocks.iron_bars, 'B', Blocks.stone });
|
||||
GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.brick_obsidian), 8), new Object[] { "FBF", "BFB", "FBF", 'F', Blocks.iron_bars, 'B', Blocks.obsidian });
|
||||
GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.cmb_brick), 8), new Object[] { "PPP", "PIP", "PPP", 'P', ModItems.plate_combine_steel, 'I', ModItems.ingot_combine_steel });
|
||||
>>>>>>> 540fb3d256a0f4ae6a8b1db586f8e9cfd6ed7372
|
||||
GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.cmb_brick_reinforced), 8), new Object[] { "TBT", "BCB", "TBT", 'T', ModBlocks.block_magnetized_tungsten, 'B', ModBlocks.brick_concrete, 'C', ModBlocks.cmb_brick });
|
||||
|
||||
GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.reinforced_brick), 8), new Object[] { "FBF", "BFB", "FBF", 'F', Blocks.iron_bars, 'B', ModBlocks.brick_concrete });
|
||||
@ -744,8 +751,11 @@ public class CraftingManager {
|
||||
GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.powder_magnetized_tungsten, 1), new Object[] { "dustTungsten", "nuggetSchrabidium" }));
|
||||
GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.powder_red_copper, 2), new Object[] { "dustRedstone", "dustCopper" }));
|
||||
GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.powder_steel, 2), new Object[] { "dustIron", "dustCoal" }));
|
||||
<<<<<<< HEAD
|
||||
|
||||
GameRegistry.addRecipe(new ItemStack(ModItems.chopper, 1), new Object[] { "BBB", "HTF", "GWW", 'B', ModItems.chopper_blades, 'H', ModItems.chopper_head, 'T', ModItems.chopper_torso, 'F', ModItems.chopper_tail, 'G', ModItems.chopper_gun, 'W', ModItems.chopper_wing });
|
||||
=======
|
||||
>>>>>>> 540fb3d256a0f4ae6a8b1db586f8e9cfd6ed7372
|
||||
}
|
||||
|
||||
public static void AddSmeltingRec()
|
||||
@ -783,7 +793,10 @@ public class CraftingManager {
|
||||
GameRegistry.addSmelting(ModItems.powder_lithium, new ItemStack(ModItems.lithium), 1.0F);
|
||||
|
||||
GameRegistry.addSmelting(ModItems.combine_scrap, new ItemStack(ModItems.ingot_combine_steel), 1.0F);
|
||||
<<<<<<< HEAD
|
||||
GameRegistry.addSmelting(ModItems.tank_waste, new ItemStack(ModItems.tank_waste), 0.0F);
|
||||
=======
|
||||
>>>>>>> 540fb3d256a0f4ae6a8b1db586f8e9cfd6ed7372
|
||||
|
||||
GameRegistry.addSmelting(Items.bone, new ItemStack(Items.slime_ball, 3), 0.0F);
|
||||
GameRegistry.addSmelting(new ItemStack(Items.dye, 1, 15), new ItemStack(Items.slime_ball, 1), 0.0F);
|
||||
|
||||
@ -29,7 +29,10 @@ import com.hbm.entity.EntityBullet;
|
||||
import com.hbm.entity.EntityChopperMine;
|
||||
import com.hbm.entity.EntityCloudFleija;
|
||||
import com.hbm.entity.EntityCombineBall;
|
||||
<<<<<<< HEAD
|
||||
import com.hbm.entity.EntityFalloutRain;
|
||||
=======
|
||||
>>>>>>> 540fb3d256a0f4ae6a8b1db586f8e9cfd6ed7372
|
||||
import com.hbm.entity.EntityGrenadeASchrab;
|
||||
import com.hbm.entity.EntityGrenadeCluster;
|
||||
import com.hbm.entity.EntityGrenadeElectric;
|
||||
@ -175,7 +178,11 @@ public class MainRegistry
|
||||
public static ArmorMaterial enumArmorMaterialT45 = EnumHelper.addArmorMaterial("T45", 1000, new int[] {2, 5, 4, 1}, 0);
|
||||
public static ArmorMaterial enumArmorMaterialSteel = EnumHelper.addArmorMaterial("STEEL", 20, new int[] {2, 6, 5, 2}, 5);
|
||||
public static ArmorMaterial enumArmorMaterialTitanium = EnumHelper.addArmorMaterial("TITANIUM", 25, new int[] {3, 8, 6, 3}, 9);
|
||||
<<<<<<< HEAD
|
||||
public static ArmorMaterial enumArmorMaterialAlloy = EnumHelper.addArmorMaterial("ALLOY", 40, new int[] {3, 8, 6, 3}, 12);
|
||||
=======
|
||||
public static ArmorMaterial enumArmorMaterialAlloy = EnumHelper.addArmorMaterial("ALLOY", 50, new int[] {3, 8, 6, 3}, 12);
|
||||
>>>>>>> 540fb3d256a0f4ae6a8b1db586f8e9cfd6ed7372
|
||||
public static ArmorMaterial enumArmorMaterialPaa = EnumHelper.addArmorMaterial("PAA", 75, new int[] {3, 8, 6, 3}, 25);
|
||||
public static ArmorMaterial enumArmorMaterialCmb = EnumHelper.addArmorMaterial("CMB", 60, new int[] {3, 8, 6, 3}, 50);
|
||||
|
||||
@ -370,8 +377,12 @@ public class MainRegistry
|
||||
EntityRegistry.registerModEntity(EntityGrenadeZOMG.class, "entity_grenade_zomg", 49, this, 500, 1, true);
|
||||
EntityRegistry.registerModEntity(EntityGrenadeASchrab.class, "entity_grenade_aschrab", 50, this, 500, 1, true);
|
||||
EntityRegistry.registerModEntity(EntityNukeCloudNoShroom.class, "entity_nuke_cloud_no", 51, this, 1000, 1, true);
|
||||
<<<<<<< HEAD
|
||||
EntityRegistry.registerModEntity(EntityFalloutRain.class, "entity_fallout", 52, this, 1000, 1, true);
|
||||
|
||||
=======
|
||||
|
||||
>>>>>>> 540fb3d256a0f4ae6a8b1db586f8e9cfd6ed7372
|
||||
EntityRegistry.registerGlobalEntityID(EntityNuclearCreeper.class, "entity_mob_nuclear_creeper", EntityRegistry.findGlobalUniqueEntityId(), 0x204131, 0x75CE00);
|
||||
EntityRegistry.registerGlobalEntityID(EntityHunterChopper.class, "entity_mob_hunter_chopper", EntityRegistry.findGlobalUniqueEntityId(), 0x000020, 0x2D2D72);
|
||||
}
|
||||
@ -525,6 +536,7 @@ public class MainRegistry
|
||||
recipes.overridePreSetRecipe(new ItemStack(Items.quartz), new ItemStack(ModItems.powder_quartz));
|
||||
recipes.overridePreSetRecipe(new ItemStack(Blocks.quartz_ore), new ItemStack(ModItems.powder_quartz, 2));
|
||||
recipes.overridePreSetRecipe(new ItemStack(ModBlocks.ore_nether_fire), new ItemStack(ModItems.powder_fire, 6));
|
||||
<<<<<<< HEAD
|
||||
recipes.overridePreSetRecipe(new ItemStack(ModBlocks.brick_light), new ItemStack(Items.clay_ball, 4));
|
||||
recipes.overridePreSetRecipe(new ItemStack(ModBlocks.brick_concrete), new ItemStack(Blocks.gravel, 1));
|
||||
recipes.overridePreSetRecipe(new ItemStack(ModBlocks.brick_obsidian), new ItemStack(ModBlocks.gravel_obsidian, 1));
|
||||
@ -557,6 +569,8 @@ public class MainRegistry
|
||||
recipes.overridePreSetRecipe(new ItemStack(Blocks.stained_hardened_clay, 1, 14), new ItemStack(Items.clay_ball, 4));
|
||||
recipes.overridePreSetRecipe(new ItemStack(Blocks.stained_hardened_clay, 1, 15), new ItemStack(Items.clay_ball, 4));
|
||||
recipes.overridePreSetRecipe(new ItemStack(Blocks.tnt), new ItemStack(Items.gunpowder, 5));
|
||||
=======
|
||||
>>>>>>> 540fb3d256a0f4ae6a8b1db586f8e9cfd6ed7372
|
||||
|
||||
recipes.PrintRecipes();
|
||||
}
|
||||
|
||||
@ -1,8 +1,11 @@
|
||||
package com.hbm.main;
|
||||
|
||||
<<<<<<< HEAD
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
=======
|
||||
>>>>>>> 540fb3d256a0f4ae6a8b1db586f8e9cfd6ed7372
|
||||
import com.hbm.entity.EntityChopperMine;
|
||||
import com.hbm.entity.EntityHunterChopper;
|
||||
import com.hbm.lib.Library;
|
||||
@ -22,7 +25,10 @@ import net.minecraft.entity.Entity;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
import net.minecraftforge.client.event.sound.PlaySoundEvent17;
|
||||
<<<<<<< HEAD
|
||||
import net.minecraftforge.event.entity.EntityJoinWorldEvent;
|
||||
=======
|
||||
>>>>>>> 540fb3d256a0f4ae6a8b1db586f8e9cfd6ed7372
|
||||
|
||||
public class ModEventHandlerClient {
|
||||
|
||||
@ -32,11 +38,14 @@ public class ModEventHandlerClient {
|
||||
|
||||
WorldClient wc = Minecraft.getMinecraft().theWorld;
|
||||
|
||||
<<<<<<< HEAD
|
||||
//Alright, alright, I give the fuck up, you've wasted my time enough with this bullshit. You win.
|
||||
//A winner is you.
|
||||
//Conglaturations.
|
||||
//Fuck you.
|
||||
|
||||
=======
|
||||
>>>>>>> 540fb3d256a0f4ae6a8b1db586f8e9cfd6ed7372
|
||||
if(r.toString().equals("hbm:misc.nullTau") && Library.getClosestPlayerForSound(wc, e.sound.getXPosF(), e.sound.getYPosF(), e.sound.getZPosF(), 2) != null)
|
||||
{
|
||||
EntityPlayer ent = Library.getClosestPlayerForSound(wc, e.sound.getXPosF(), e.sound.getYPosF(), e.sound.getZPosF(), 2);
|
||||
|
||||
@ -9,9 +9,14 @@ import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
|
||||
public abstract class MovingSoundPlayerLoop extends MovingSound {
|
||||
<<<<<<< HEAD
|
||||
|
||||
public static List<MovingSoundPlayerLoop> globalSoundList = new ArrayList<MovingSoundPlayerLoop>();
|
||||
public List<Entity> playerForSound = new ArrayList<Entity>();
|
||||
=======
|
||||
|
||||
public static List<MovingSoundPlayerLoop> globalSoundList = new ArrayList<MovingSoundPlayerLoop>();
|
||||
>>>>>>> 540fb3d256a0f4ae6a8b1db586f8e9cfd6ed7372
|
||||
public Entity player;
|
||||
public enum EnumHbmSound { soundTauLoop, soundChopperLoop, soundCrashingLoop, soundMineLoop };
|
||||
public EnumHbmSound type;
|
||||
@ -41,7 +46,10 @@ public abstract class MovingSoundPlayerLoop extends MovingSound {
|
||||
}
|
||||
|
||||
public void stop() {
|
||||
<<<<<<< HEAD
|
||||
|
||||
=======
|
||||
>>>>>>> 540fb3d256a0f4ae6a8b1db586f8e9cfd6ed7372
|
||||
this.donePlaying = true;
|
||||
this.repeat = false;
|
||||
while(MovingSoundPlayerLoop.getSoundByPlayer(player, type) != null)
|
||||
|
||||
@ -26,7 +26,11 @@ public class MovingSoundXVL1456 extends MovingSoundPlayerLoop {
|
||||
i = ((EntityPlayer)this.player).getItemInUse();
|
||||
}
|
||||
|
||||
<<<<<<< HEAD
|
||||
//this.setPitch(this.getPitch() + 0.1F);
|
||||
=======
|
||||
this.setPitch(this.getPitch() + 0.1F);
|
||||
>>>>>>> 540fb3d256a0f4ae6a8b1db586f8e9cfd6ed7372
|
||||
|
||||
if(i == null || (i != null && i.getItem() != ModItems.gun_xvl1456) || !((EntityPlayer)this.player).isSneaking() || ((EntityPlayer)this.player).getItemInUseDuration() <= 0)
|
||||
this.stop();
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user