xircon/Hbm-s-Nuclear-Tech-GIT
1
0
Fork 0
mirror of https://github.com/HbmMods/Hbm-s-Nuclear-Tech-GIT.git synced 2026-01-25 10:32:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Bottle caps, missiles in water, other small changes

Browse Source
This commit is contained in:
HbmMods 2017-05-07 21:13:57 +02:00
parent a2bf3adbef
commit adbfd2283f
39 changed files with 173 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
assets/hbm/lang/de_DE.lang
View File

@ -1011,6 +1011,13 @@ item.bottle2_fritz.name=Fritz-Kola
item.bottle2_korl_special.name=Das erste Korl
item.bottle2_fritz_special.name=Die erste Fritz-Kola
item.chocolate_milk.name=Schokomilch
item.cap_nuka.name=Nuka-Cola Kronkorken
item.cap_quantum.name=Nuka Cola Quantum Kronkorken
item.cap_korl.name=Korl Kronkorken
item.cap_fritz.name=Fritz-Kola Kronkorken
item.ring_pull.name=Dosenring
item.bottle_opener.name=Hbms eigener selbstgebauter Flaschenöffner
item.blades_aluminium.name=Aluminiumsägeblatt
item.blades_gold.name=Goldenes Sägeblatt

7
assets/hbm/lang/en_US.lang
View File

@ -1011,6 +1011,13 @@ item.bottle2_fritz.name=Fritz Cola
item.bottle2_korl_special.name=The First Korl
item.bottle2_fritz_special.name=The First Fritz Cola
item.chocolate_milk.name=Chocolate Milk
item.cap_nuka.name=Nuka Cola Bottle Cap
item.cap_quantum.name=Nuka Cola Quantum Bottle Cap
item.cap_korl.name=Korl Bottle Cap
item.cap_fritz.name=Fritz Cola Bottle Cap
item.ring_pull.name=Ring Pull
item.bottle_opener.name=Hbm's Own Self-Made Bottle Opener
item.blades_aluminium.name=Aluminium Shredder Blades
item.blades_gold.name=Golden Shredder Blades

BIN
assets/hbm/textures/ABC123.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 9.4 KiB

After

Width:  |  Height:  |  Size: 1.9 KiB

BIN
assets/hbm/textures/items/bottle_opener.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 235 B

BIN
assets/hbm/textures/items/bottle_quantum.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 256 B

After

Width:  |  Height:  |  Size: 260 B

BIN
assets/hbm/textures/items/cap_fritz.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 257 B

BIN
assets/hbm/textures/items/cap_korl.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 300 B

BIN
assets/hbm/textures/items/cap_nuka.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 280 B

BIN
assets/hbm/textures/items/cap_quantum.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 303 B

BIN
assets/hbm/textures/items/cap_template.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 276 B

BIN
assets/hbm/textures/items/ring_pull.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 224 B

BIN
assets/hbm/textures/models/textureIGen.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 688 KiB

After

Width:  |  Height:  |  Size: 584 KiB

15
com/hbm/blocks/bomb/NukeCustom.java
View File

@ -162,6 +162,9 @@ public class NukeCustom extends BlockContainer implements IBomb {
amat += (hydro/2);
schrab += (amat/2);
if(schrab > 300)
schrab = 300;
EntityNukeExplosionPlus entity = new EntityNukeExplosionPlus(world);
entity.posX = x + 0.5;
entity.posY = y + 0.5;
@ -184,6 +187,9 @@ public class NukeCustom extends BlockContainer implements IBomb {
hydro += (nuke/2);
amat += (hydro/2);
if(amat > 350)
amat = 350;
EntityNukeExplosionPlus entity = new EntityNukeExplosionPlus(world);
entity.posX = x + 0.5;
entity.posY = y + 0.5;
@ -231,6 +237,9 @@ public class NukeCustom extends BlockContainer implements IBomb {
nuke += (tnt/2);
hydro += (nuke/2);
if(hydro > 350)
hydro = 350;
EntityNukeExplosionPlus entity = new EntityNukeExplosionPlus(world);
entity.posX = x + 0.5;
entity.posY = y + 0.5;
@ -277,6 +286,9 @@ public class NukeCustom extends BlockContainer implements IBomb {
} else if(nuke > 0) {
nuke += (tnt/2);
if(nuke > 350)
nuke = 350;
EntityNukeExplosionPlus entity = new EntityNukeExplosionPlus(world);
entity.posX = x + 0.5;
entity.posY = y + 0.5;
@ -321,6 +333,9 @@ public class NukeCustom extends BlockContainer implements IBomb {
}
} else if(tnt > 0) {
if(tnt > 100)
tnt = 100;
//world.newExplosion((Entity)null, x + 0.5F, y + 0.5F, z + 0.5F, tnt, field_149933_a.nextInt(5) == 0 ? true : false, true);
ExplosionLarge.explode(world, x, y, z, tnt, true, true, true);
}

2
com/hbm/entity/missile/EntityMissileAntiBallistic.java
View File

@ -179,7 +179,7 @@ public class EntityMissileAntiBallistic extends EntityMissileBase {
this.worldObj.spawnEntityInWorld(new EntityDSmokeFX(this.worldObj, this.posX, this.posY, this.posZ, 0.0, 0.0, 0.0));
if(this.worldObj.getBlock((int)this.posX, (int)this.posY, (int)this.posZ) != Blocks.air)
if(this.worldObj.getBlock((int)this.posX, (int)this.posY, (int)this.posZ) != Blocks.air && this.worldObj.getBlock((int)this.posX, (int)this.posY, (int)this.posZ) != Blocks.water && this.worldObj.getBlock((int)this.posX, (int)this.posY, (int)this.posZ) != Blocks.flowing_water)
{
if(!this.worldObj.isRemote)
{

2
com/hbm/entity/missile/EntityMissileBase.java
View File

@ -225,7 +225,7 @@ public class EntityMissileBase extends EntityThrowable {
break;
}
if(this.worldObj.getBlock((int)this.posX, (int)this.posY, (int)this.posZ) != Blocks.air)
if(this.worldObj.getBlock((int)this.posX, (int)this.posY, (int)this.posZ) != Blocks.air && this.worldObj.getBlock((int)this.posX, (int)this.posY, (int)this.posZ) != Blocks.water && this.worldObj.getBlock((int)this.posX, (int)this.posY, (int)this.posZ) != Blocks.flowing_water)
{
if(!this.worldObj.isRemote)
{

2
com/hbm/entity/missile/EntityMissileBunkerBuster.java
View File

@ -140,7 +140,7 @@ public class EntityMissileBunkerBuster extends EntityMissileBase {
this.worldObj.spawnEntityInWorld(new EntitySmokeFX(this.worldObj, this.posX, this.posY, this.posZ, 0.0, 0.0, 0.0));
if(this.worldObj.getBlock((int)this.posX, (int)this.posY, (int)this.posZ) != Blocks.air)
if(this.worldObj.getBlock((int)this.posX, (int)this.posY, (int)this.posZ) != Blocks.air && this.worldObj.getBlock((int)this.posX, (int)this.posY, (int)this.posZ) != Blocks.water && this.worldObj.getBlock((int)this.posX, (int)this.posY, (int)this.posZ) != Blocks.flowing_water)
{
if(!this.worldObj.isRemote)
{

2
com/hbm/entity/missile/EntityMissileBurst.java
View File

@ -141,7 +141,7 @@ public class EntityMissileBurst extends EntityMissileBase {
this.worldObj.spawnEntityInWorld(new EntitySmokeFX(this.worldObj, this.posX, this.posY, this.posZ, 0.0, 0.0, 0.0));
if(this.worldObj.getBlock((int)this.posX, (int)this.posY, (int)this.posZ) != Blocks.air)
if(this.worldObj.getBlock((int)this.posX, (int)this.posY, (int)this.posZ) != Blocks.air && this.worldObj.getBlock((int)this.posX, (int)this.posY, (int)this.posZ) != Blocks.water && this.worldObj.getBlock((int)this.posX, (int)this.posY, (int)this.posZ) != Blocks.flowing_water)
{
if(!this.worldObj.isRemote)
{

2
com/hbm/entity/missile/EntityMissileBusterStrong.java
View File

@ -141,7 +141,7 @@ public class EntityMissileBusterStrong extends EntityMissileBase {
this.worldObj.spawnEntityInWorld(new EntitySmokeFX(this.worldObj, this.posX, this.posY, this.posZ, 0.0, 0.0, 0.0));
if(this.worldObj.getBlock((int)this.posX, (int)this.posY, (int)this.posZ) != Blocks.air)
if(this.worldObj.getBlock((int)this.posX, (int)this.posY, (int)this.posZ) != Blocks.air && this.worldObj.getBlock((int)this.posX, (int)this.posY, (int)this.posZ) != Blocks.water && this.worldObj.getBlock((int)this.posX, (int)this.posY, (int)this.posZ) != Blocks.flowing_water)
{
if(!this.worldObj.isRemote)
{

2
com/hbm/entity/missile/EntityMissileCluster.java
View File

@ -136,7 +136,7 @@ public class EntityMissileCluster extends EntityMissileBase {
this.worldObj.spawnEntityInWorld(new EntitySmokeFX(this.worldObj, this.posX, this.posY, this.posZ, 0.0, 0.0, 0.0));
if(this.worldObj.getBlock((int)this.posX, (int)this.posY, (int)this.posZ) != Blocks.air)
if(this.worldObj.getBlock((int)this.posX, (int)this.posY, (int)this.posZ) != Blocks.air && this.worldObj.getBlock((int)this.posX, (int)this.posY, (int)this.posZ) != Blocks.water && this.worldObj.getBlock((int)this.posX, (int)this.posY, (int)this.posZ) != Blocks.flowing_water)
{
if(!this.worldObj.isRemote)
{

2
com/hbm/entity/missile/EntityMissileClusterStrong.java
View File

@ -137,7 +137,7 @@ public class EntityMissileClusterStrong extends EntityMissileBase {
this.worldObj.spawnEntityInWorld(new EntitySmokeFX(this.worldObj, this.posX, this.posY, this.posZ, 0.0, 0.0, 0.0));
if(this.worldObj.getBlock((int)this.posX, (int)this.posY, (int)this.posZ) != Blocks.air)
if(this.worldObj.getBlock((int)this.posX, (int)this.posY, (int)this.posZ) != Blocks.air && this.worldObj.getBlock((int)this.posX, (int)this.posY, (int)this.posZ) != Blocks.water && this.worldObj.getBlock((int)this.posX, (int)this.posY, (int)this.posZ) != Blocks.flowing_water)
{
if(!this.worldObj.isRemote)
{

2
com/hbm/entity/missile/EntityMissileDrill.java
View File

@ -141,7 +141,7 @@ public class EntityMissileDrill extends EntityMissileBase {
this.worldObj.spawnEntityInWorld(new EntitySmokeFX(this.worldObj, this.posX, this.posY, this.posZ, 0.0, 0.0, 0.0));
if(this.worldObj.getBlock((int)this.posX, (int)this.posY, (int)this.posZ) != Blocks.air)
if(this.worldObj.getBlock((int)this.posX, (int)this.posY, (int)this.posZ) != Blocks.air && this.worldObj.getBlock((int)this.posX, (int)this.posY, (int)this.posZ) != Blocks.water && this.worldObj.getBlock((int)this.posX, (int)this.posY, (int)this.posZ) != Blocks.flowing_water)
{
if(!this.worldObj.isRemote)
{

2
com/hbm/entity/missile/EntityMissileEndo.java
View File

@ -141,7 +141,7 @@ public class EntityMissileEndo extends EntityMissileBase {
this.worldObj.spawnEntityInWorld(new EntitySmokeFX(this.worldObj, this.posX, this.posY, this.posZ, 0.0, 0.0, 0.0));
if(this.worldObj.getBlock((int)this.posX, (int)this.posY, (int)this.posZ) != Blocks.air)
if(this.worldObj.getBlock((int)this.posX, (int)this.posY, (int)this.posZ) != Blocks.air && this.worldObj.getBlock((int)this.posX, (int)this.posY, (int)this.posZ) != Blocks.water && this.worldObj.getBlock((int)this.posX, (int)this.posY, (int)this.posZ) != Blocks.flowing_water)
{
if(!this.worldObj.isRemote)
{

2
com/hbm/entity/missile/EntityMissileExo.java
View File

@ -141,7 +141,7 @@ public class EntityMissileExo extends EntityMissileBase {
this.worldObj.spawnEntityInWorld(new EntitySmokeFX(this.worldObj, this.posX, this.posY, this.posZ, 0.0, 0.0, 0.0));
if(this.worldObj.getBlock((int)this.posX, (int)this.posY, (int)this.posZ) != Blocks.air)
if(this.worldObj.getBlock((int)this.posX, (int)this.posY, (int)this.posZ) != Blocks.air && this.worldObj.getBlock((int)this.posX, (int)this.posY, (int)this.posZ) != Blocks.water && this.worldObj.getBlock((int)this.posX, (int)this.posY, (int)this.posZ) != Blocks.flowing_water)
{
if(!this.worldObj.isRemote)
{

2
com/hbm/entity/missile/EntityMissileGeneric.java
View File

@ -140,7 +140,7 @@ public class EntityMissileGeneric extends EntityMissileBase {
this.worldObj.spawnEntityInWorld(new EntitySmokeFX(this.worldObj, this.posX, this.posY, this.posZ, 0.0, 0.0, 0.0));
if(this.worldObj.getBlock((int)this.posX, (int)this.posY, (int)this.posZ) != Blocks.air)
if(this.worldObj.getBlock((int)this.posX, (int)this.posY, (int)this.posZ) != Blocks.air && this.worldObj.getBlock((int)this.posX, (int)this.posY, (int)this.posZ) != Blocks.water && this.worldObj.getBlock((int)this.posX, (int)this.posY, (int)this.posZ) != Blocks.flowing_water)
{
if(!this.worldObj.isRemote)
{

2
com/hbm/entity/missile/EntityMissileIncendiary.java
View File

@ -143,7 +143,7 @@ public class EntityMissileIncendiary extends EntityMissileBase {
this.worldObj.spawnEntityInWorld(new EntitySmokeFX(this.worldObj, this.posX, this.posY, this.posZ, 0.0, 0.0, 0.0));
if(this.worldObj.getBlock((int)this.posX, (int)this.posY, (int)this.posZ) != Blocks.air)
if(this.worldObj.getBlock((int)this.posX, (int)this.posY, (int)this.posZ) != Blocks.air && this.worldObj.getBlock((int)this.posX, (int)this.posY, (int)this.posZ) != Blocks.water && this.worldObj.getBlock((int)this.posX, (int)this.posY, (int)this.posZ) != Blocks.flowing_water)
{
if(!this.worldObj.isRemote)
{

2
com/hbm/entity/missile/EntityMissileIncendiaryStrong.java
View File

@ -143,7 +143,7 @@ public class EntityMissileIncendiaryStrong extends EntityMissileBase {
this.worldObj.spawnEntityInWorld(new EntitySmokeFX(this.worldObj, this.posX, this.posY, this.posZ, 0.0, 0.0, 0.0));
if(this.worldObj.getBlock((int)this.posX, (int)this.posY, (int)this.posZ) != Blocks.air)
if(this.worldObj.getBlock((int)this.posX, (int)this.posY, (int)this.posZ) != Blocks.air && this.worldObj.getBlock((int)this.posX, (int)this.posY, (int)this.posZ) != Blocks.water && this.worldObj.getBlock((int)this.posX, (int)this.posY, (int)this.posZ) != Blocks.flowing_water)
{
if(!this.worldObj.isRemote)
{

2
com/hbm/entity/missile/EntityMissileInferno.java
View File

@ -143,7 +143,7 @@ public class EntityMissileInferno extends EntityMissileBase {
this.worldObj.spawnEntityInWorld(new EntitySmokeFX(this.worldObj, this.posX, this.posY, this.posZ, 0.0, 0.0, 0.0));
if(this.worldObj.getBlock((int)this.posX, (int)this.posY, (int)this.posZ) != Blocks.air)
if(this.worldObj.getBlock((int)this.posX, (int)this.posY, (int)this.posZ) != Blocks.air && this.worldObj.getBlock((int)this.posX, (int)this.posY, (int)this.posZ) != Blocks.water && this.worldObj.getBlock((int)this.posX, (int)this.posY, (int)this.posZ) != Blocks.flowing_water)
{
if(!this.worldObj.isRemote)
{

2
com/hbm/entity/missile/EntityMissileMirv.java
View File

@ -140,7 +140,7 @@ public class EntityMissileMirv extends EntityMissileBase {
this.worldObj.spawnEntityInWorld(new EntitySmokeFX(this.worldObj, this.posX, this.posY, this.posZ, 0.0, 0.0, 0.0));
if(this.worldObj.getBlock((int)this.posX, (int)this.posY, (int)this.posZ) != Blocks.air)
if(this.worldObj.getBlock((int)this.posX, (int)this.posY, (int)this.posZ) != Blocks.air && this.worldObj.getBlock((int)this.posX, (int)this.posY, (int)this.posZ) != Blocks.water && this.worldObj.getBlock((int)this.posX, (int)this.posY, (int)this.posZ) != Blocks.flowing_water)
{
if(!this.worldObj.isRemote)
{

2
com/hbm/entity/missile/EntityMissileNuclear.java
View File

@ -143,7 +143,7 @@ public class EntityMissileNuclear extends EntityMissileBase {
this.worldObj.spawnEntityInWorld(new EntitySmokeFX(this.worldObj, this.posX, this.posY, this.posZ, 0.0, 0.0, 0.0));
if(this.worldObj.getBlock((int)this.posX, (int)this.posY, (int)this.posZ) != Blocks.air)
if(this.worldObj.getBlock((int)this.posX, (int)this.posY, (int)this.posZ) != Blocks.air && this.worldObj.getBlock((int)this.posX, (int)this.posY, (int)this.posZ) != Blocks.water && this.worldObj.getBlock((int)this.posX, (int)this.posY, (int)this.posZ) != Blocks.flowing_water)
{
if(!this.worldObj.isRemote)
{

2
com/hbm/entity/missile/EntityMissileRain.java
View File

@ -137,7 +137,7 @@ public class EntityMissileRain extends EntityMissileBase {
this.worldObj.spawnEntityInWorld(new EntitySmokeFX(this.worldObj, this.posX, this.posY, this.posZ, 0.0, 0.0, 0.0));
if(this.worldObj.getBlock((int)this.posX, (int)this.posY, (int)this.posZ) != Blocks.air)
if(this.worldObj.getBlock((int)this.posX, (int)this.posY, (int)this.posZ) != Blocks.air && this.worldObj.getBlock((int)this.posX, (int)this.posY, (int)this.posZ) != Blocks.water && this.worldObj.getBlock((int)this.posX, (int)this.posY, (int)this.posZ) != Blocks.flowing_water)
{
if(!this.worldObj.isRemote)
{

2
com/hbm/entity/missile/EntityMissileStrong.java
View File

@ -141,7 +141,7 @@ public class EntityMissileStrong extends EntityMissileBase {
this.worldObj.spawnEntityInWorld(new EntitySmokeFX(this.worldObj, this.posX, this.posY, this.posZ, 0.0, 0.0, 0.0));
if(this.worldObj.getBlock((int)this.posX, (int)this.posY, (int)this.posZ) != Blocks.air)
if(this.worldObj.getBlock((int)this.posX, (int)this.posY, (int)this.posZ) != Blocks.air && this.worldObj.getBlock((int)this.posX, (int)this.posY, (int)this.posZ) != Blocks.water && this.worldObj.getBlock((int)this.posX, (int)this.posY, (int)this.posZ) != Blocks.flowing_water)
{
if(!this.worldObj.isRemote)
{

7
com/hbm/entity/projectile/EntityBaleflare.java
View File

@ -3,6 +3,7 @@ package com.hbm.entity.projectile;
import java.util.List;
import com.hbm.entity.logic.EntityNukeExplosionAdvanced;
import com.hbm.entity.particle.EntitySSmokeFX;
import com.hbm.explosion.ExplosionParticle;
import com.hbm.explosion.ExplosionParticleB;
import com.hbm.items.ModItems;
@ -471,6 +472,12 @@ public class EntityBaleflare extends Entity implements IProjectile {
this.setPosition(this.posX, this.posY, this.posZ);
this.func_145775_I();
}
if(!this.inGround)
if(!worldObj.isRemote) {
worldObj.spawnEntityInWorld(new EntitySSmokeFX(worldObj, this.posX, this.posY - 0.5, this.posZ, 0.0, 0.0, 0.0));
worldObj.spawnEntityInWorld(new EntitySSmokeFX(worldObj, this.posX - this.motionX, this.posY - 0.5 - this.motionY, this.posZ - this.motionZ, 0.0, 0.0, 0.0));
}
}
/**

17
com/hbm/gui/MachineRecipes.java
View File

@ -100,6 +100,16 @@ public class MachineRecipes {
return new ItemStack(ModItems.nugget_euphemium, 2, 34);
}
if (item == ModItems.rod_quad_euphemium && item2 == ModItems.powder_tennessine
|| item == ModItems.powder_tennessine && item2 == ModItems.rod_quad_euphemium) {
return new ItemStack(ModItems.nugget_euphemium, 2, 34);
}
if (item == ModItems.rod_quad_euphemium && item2 == ModItems.powder_cerium
|| item == ModItems.powder_cerium && item2 == ModItems.rod_quad_euphemium) {
return new ItemStack(ModItems.nugget_euphemium, 2, 34);
}
if (item == ModItems.oil_canola && item2 == ModItems.canister_empty
|| item == ModItems.canister_empty && item2 == ModItems.oil_canola) {
return new ItemStack(ModItems.canister_canola);
@ -124,9 +134,6 @@ public class MachineRecipes {
new ItemStack(ModItems.cell_empty, 1) };
ItemStack[] test = new ItemStack[] { new ItemStack(Items.apple, 3), new ItemStack(Items.leather, 1),
new ItemStack(Items.sugar, 3), new ItemStack(Items.blaze_powder, 2) };
ItemStack[] euphemium = new ItemStack[] { new ItemStack(ModItems.nugget_euphemium, 1),
new ItemStack(ModItems.nugget_euphemium, 1), new ItemStack(ModItems.nugget_euphemium, 1),
new ItemStack(ModItems.rod_quad_empty, 1) };
ItemStack[] schrabidium = new ItemStack[] { new ItemStack(ModItems.ingot_schrabidium, 1),
new ItemStack(ModItems.sulfur, 1), new ItemStack(ModItems.sulfur, 1),
new ItemStack(ModItems.cell_empty, 1) };
@ -186,10 +193,6 @@ public class MachineRecipes {
}
}
if (item == ModItems.rod_quad_euphemium) {
return euphemium;
}
if (item == ModItems.cell_sas3) {
return schrabidium;
}

20
com/hbm/items/ModItems.java
View File

@ -427,6 +427,11 @@ public class ModItems {
public static Item bottle2_korl_special;
public static Item bottle2_fritz_special;
public static Item chocolate_milk;
public static Item cap_nuka;
public static Item cap_quantum;
public static Item cap_korl;
public static Item cap_fritz;
public static Item ring_pull;
public static Item rod_empty;
public static Item rod_uranium;
@ -773,6 +778,7 @@ public class ModItems {
public static Item mask_of_infamy;
public static Item schrabidium_hammer;
public static Item bottle_opener;
public static Item crowbar;
@ -1237,6 +1243,11 @@ public class ModItems {
bottle2_korl_special = new ItemEnergy().setUnlocalizedName("bottle2_korl_special").setContainerItem(ModItems.bottle2_empty).setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":bottle2_korl");
bottle2_fritz_special = new ItemEnergy().setUnlocalizedName("bottle2_fritz_special").setContainerItem(ModItems.bottle2_empty).setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":bottle2_fritz");
chocolate_milk = new ItemEnergy().setUnlocalizedName("chocolate_milk").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":chocolate_milk");
cap_nuka = new Item().setUnlocalizedName("cap_nuka").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":cap_nuka");
cap_quantum = new Item().setUnlocalizedName("cap_quantum").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":cap_quantum");
cap_korl = new Item().setUnlocalizedName("cap_korl").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":cap_korl");
cap_fritz = new Item().setUnlocalizedName("cap_fritz").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":cap_fritz");
ring_pull = new Item().setUnlocalizedName("ring_pull").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":ring_pull");
rod_empty = new Item().setUnlocalizedName("rod_empty").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":rod_empty");
rod_uranium = new ItemCustomLore().setUnlocalizedName("rod_uranium").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_uranium");
@ -1644,6 +1655,7 @@ public class ModItems {
cape_vertice = new ArmorModel(MainRegistry.enumArmorMaterialEmerald, 9, 1).setUnlocalizedName("cape_vertice").setCreativeTab(MainRegistry.tabNuke).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":cape_unknown");
schrabidium_hammer = new WeaponSpecial(MainRegistry.enumToolMaterialHammer).setUnlocalizedName("schrabidium_hammer").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":schrabidium_hammer");
bottle_opener = new WeaponSpecial(MainRegistry.enumToolMaterialBottleOpener).setUnlocalizedName("bottle_opener").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":bottle_opener");
euphemium_stopper = new ItemSyringe().setUnlocalizedName("euphemium_stopper").setMaxStackSize(1).setFull3D().setTextureName(RefStrings.MODID + ":euphemium_stopper");
matchstick = new ItemMatch().setUnlocalizedName("matchstick").setCreativeTab(CreativeTabs.tabTools).setFull3D().setTextureName(RefStrings.MODID + ":matchstick");
crowbar = new ModSword(MainRegistry.enumToolMaterialSteel).setUnlocalizedName("crowbar").setFull3D().setTextureName(RefStrings.MODID + ":crowbar");
@ -2369,6 +2381,7 @@ public class ModItems {
GameRegistry.registerItem(pipe_rusty, pipe_rusty.getUnlocalizedName());
GameRegistry.registerItem(pipe_lead, pipe_lead.getUnlocalizedName());
GameRegistry.registerItem(reer_graar, reer_graar.getUnlocalizedName());
GameRegistry.registerItem(bottle_opener, bottle_opener.getUnlocalizedName());
//Multitool
GameRegistry.registerItem(multitool_hit, multitool_hit.getUnlocalizedName());
@ -2423,6 +2436,13 @@ public class ModItems {
GameRegistry.registerItem(bottle2_korl_special, bottle2_korl_special.getUnlocalizedName());
GameRegistry.registerItem(bottle2_fritz_special, bottle2_fritz_special.getUnlocalizedName());
//Money
GameRegistry.registerItem(cap_nuka, cap_nuka.getUnlocalizedName());
GameRegistry.registerItem(cap_quantum, cap_quantum.getUnlocalizedName());
GameRegistry.registerItem(cap_korl, cap_korl.getUnlocalizedName());
GameRegistry.registerItem(cap_fritz, cap_fritz.getUnlocalizedName());
GameRegistry.registerItem(ring_pull, ring_pull.getUnlocalizedName());
//Chaos
GameRegistry.registerItem(chocolate_milk, chocolate_milk.getUnlocalizedName());

31
com/hbm/items/food/ItemEnergy.java
View File

@ -116,6 +116,7 @@ public class ItemEnergy extends Item {
if (!p_77654_3_.capabilities.isCreativeMode && this != ModItems.chocolate_milk)
{
if(this == ModItems.can_creature || this == ModItems.can_mrsugar || this == ModItems.can_overcharge || this == ModItems.can_redbomb || this == ModItems.can_smart) {
p_77654_3_.inventory.addItemStackToInventory(new ItemStack(ModItems.ring_pull));
if (p_77654_1_.stackSize <= 0)
{
return new ItemStack(ModItems.can_empty);
@ -124,7 +125,8 @@ public class ItemEnergy extends Item {
p_77654_3_.inventory.addItemStackToInventory(new ItemStack(ModItems.can_empty));
}
if(this == ModItems.bottle_cherry || this == ModItems.bottle_nuka || this == ModItems.bottle_quantum) {
if(this == ModItems.bottle_cherry || this == ModItems.bottle_nuka) {
p_77654_3_.inventory.addItemStackToInventory(new ItemStack(ModItems.cap_nuka));
if (p_77654_1_.stackSize <= 0)
{
return new ItemStack(ModItems.bottle_empty);
@ -133,7 +135,28 @@ public class ItemEnergy extends Item {
p_77654_3_.inventory.addItemStackToInventory(new ItemStack(ModItems.bottle_empty));
}
if(this == ModItems.bottle2_korl || this == ModItems.bottle2_fritz || this == ModItems.bottle2_korl_special || this == ModItems.bottle2_fritz_special) {
if(this == ModItems.bottle_quantum) {
p_77654_3_.inventory.addItemStackToInventory(new ItemStack(ModItems.cap_quantum));
if (p_77654_1_.stackSize <= 0)
{
return new ItemStack(ModItems.bottle_empty);
}
p_77654_3_.inventory.addItemStackToInventory(new ItemStack(ModItems.bottle_empty));
}
if(this == ModItems.bottle2_korl || this == ModItems.bottle2_korl_special) {
p_77654_3_.inventory.addItemStackToInventory(new ItemStack(ModItems.cap_korl));
if (p_77654_1_.stackSize <= 0)
{
return new ItemStack(ModItems.bottle2_empty);
}
p_77654_3_.inventory.addItemStackToInventory(new ItemStack(ModItems.bottle2_empty));
}
if(this == ModItems.bottle2_fritz || this == ModItems.bottle2_fritz_special) {
p_77654_3_.inventory.addItemStackToInventory(new ItemStack(ModItems.cap_fritz));
if (p_77654_1_.stackSize <= 0)
{
return new ItemStack(ModItems.bottle2_empty);
@ -158,6 +181,10 @@ public class ItemEnergy extends Item {
public ItemStack onItemRightClick(ItemStack p_77659_1_, World p_77659_2_, EntityPlayer p_77659_3_)
{
if(!(this == ModItems.can_creature || this == ModItems.can_mrsugar || this == ModItems.can_overcharge || this == ModItems.can_redbomb || this == ModItems.can_smart))
if(!p_77659_3_.inventory.hasItem(ModItems.bottle_opener))
return p_77659_1_;
p_77659_3_.setItemInUse(p_77659_1_, this.getMaxItemUseDuration(p_77659_1_));
return p_77659_1_;
}

2
com/hbm/items/food/ItemNugget.java
View File

@ -18,7 +18,7 @@ public class ItemNugget extends ItemFood {
public void addInformation(ItemStack itemstack, EntityPlayer player, List list, boolean bool) {
if (this == ModItems.gun_moist_nugget) {
list.add("A Moisn-Na...no wait, it's");
list.add("A Mosin-Na...no wait, it's");
list.add("just a moist nugget.");
}
}

30
com/hbm/items/gear/WeaponSpecial.java
View File

@ -1,6 +1,7 @@
package com.hbm.items.gear;
import java.util.List;
import java.util.Random;
import com.google.common.collect.Multimap;
import com.hbm.items.ModItems;
@ -12,9 +13,13 @@ import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.EnumRarity;
import net.minecraft.item.ItemStack;
import net.minecraft.item.ItemSword;
import net.minecraft.potion.Potion;
import net.minecraft.potion.PotionEffect;
import net.minecraft.world.World;
public class WeaponSpecial extends ItemSword {
Random rand = new Random();
public WeaponSpecial(ToolMaterial p_i45356_1_) {
super(p_i45356_1_);
@ -36,7 +41,7 @@ public class WeaponSpecial extends ItemSword {
public boolean hitEntity(ItemStack stack, EntityLivingBase entity, EntityLivingBase entityPlayer)
{
World world = entity.worldObj;
if(this == ModItems.schrabidium_hammer) {
if (!world.isRemote)
{
@ -44,6 +49,22 @@ public class WeaponSpecial extends ItemSword {
}
world.playSoundAtEntity(entity, "random.anvil_land", 3.0F, 0.1F);
}
if(this == ModItems.bottle_opener) {
if (!world.isRemote)
{
int i = rand.nextInt(7);
if(i == 0)
entity.addPotionEffect(new PotionEffect(Potion.blindness.id, 5 * 60 * 20, 0));
if(i == 1)
entity.addPotionEffect(new PotionEffect(Potion.moveSlowdown.id, 5 * 60 * 20, 2));
if(i == 2)
entity.addPotionEffect(new PotionEffect(Potion.digSlowdown.id, 5 * 60 * 20, 2));
if(i == 3)
entity.addPotionEffect(new PotionEffect(Potion.confusion.id, 1 * 60 * 20, 0));
}
world.playSoundAtEntity(entity, "random.anvil_land", 3.0F, 1.F);
}
if(this == ModItems.ullapool_caber) {
if (!world.isRemote)
@ -63,9 +84,6 @@ public class WeaponSpecial extends ItemSword {
if(this == ModItems.schrabidium_hammer) {
multimap.put(SharedMonsterAttributes.movementSpeed.getAttributeUnlocalizedName(), new AttributeModifier(field_111210_e, "Weapon modifier", (double)-0.5, 1));
}
if(this == ModItems.ullapool_caber) {
multimap.put(SharedMonsterAttributes.attackDamage.getAttributeUnlocalizedName(), new AttributeModifier(field_111210_e, "Weapon modifier", (double) 7, 0));
}
return multimap;
}
@ -80,6 +98,10 @@ public class WeaponSpecial extends ItemSword {
list.add("High-yield Scottish face removal.");
list.add("A sober person would throw it...");
}
if(this == ModItems.bottle_opener) {
list.add("My very own bottle opener.");
list.add("Use with caution!");
}
}
}

31
com/hbm/items/special/ItemCustomLore.java
View File

@ -4,6 +4,7 @@ import java.util.List;
import com.hbm.items.ModItems;
import com.hbm.lib.ModDamageSource;
import com.hbm.main.MainRegistry;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLivingBase;
@ -44,12 +45,18 @@ public class ItemCustomLore extends ItemRadioactive {
if(this == ModItems.pellet_rtg)
{
list.add("RTG fuel pellet for infinite energy! (almost)");
if(MainRegistry.polaroidID == 11)
list.add("Contains ~100% Pu238 oxide.");
else
list.add("RTG fuel pellet for infinite energy! (almost)");
}
if(this == ModItems.pellet_rtg_weak)
{
list.add("Cheaper and weaker pellet, now with more U238!");
if(MainRegistry.polaroidID == 11)
list.add("Meh.");
else
list.add("Cheaper and weaker pellet, now with more U238!");
}
if(this == ModItems.pellet_cluster)
@ -341,12 +348,15 @@ public class ItemCustomLore extends ItemRadioactive {
if(this == ModItems.dust)
{
list.add("I hate dust!");
if(MainRegistry.polaroidID == 11)
list.add("Another one bites the dust!");
else
list.add("I hate dust!");
}
if(this == ModItems.ingot_combine_steel)
{
list.add("\"I mean, it's a verb for crying out loud.");
/*list.add("\"I mean, it's a verb for crying out loud.");
list.add("The aliens aren't verbs. They're nouns!\"");
list.add("\"Actually, I think it's also the name");
list.add("of some kind of farm equipment, like a");
@ -357,7 +367,8 @@ public class ItemCustomLore extends ItemRadioactive {
list.add("oh yea, it can also mean 'the most advanced");
list.add("form of life in the known universe'.\"");
list.add("\"So?\"");
list.add("\"'So?' C'mon man, they're ALIENS!\"");
list.add("\"'So?' C'mon man, they're ALIENS!\"");*/
list.add("*insert Freeman's Mind reference here*");
}
if(this == ModItems.gun_super_shotgun)
@ -377,12 +388,18 @@ public class ItemCustomLore extends ItemRadioactive {
if(this == ModItems.crystal_horn)
{
list.add("Not an actual horn.");
if(MainRegistry.polaroidID == 11)
list.add("An actual horn");
else
list.add("Not an actual horn.");
}
if(this == ModItems.crystal_charred)
{
list.add("High quality silicate, slightly burned.");
if(MainRegistry.polaroidID == 11)
list.add("Also a real horn. Weird, right?");
else
list.add("High quality silicate, slightly burned.");
}
}

9
com/hbm/main/MainRegistry.java
View File

@ -199,6 +199,8 @@ public class MainRegistry
public static ToolMaterial enumToolMaterialPipeRusty = EnumHelper.addToolMaterial("PIPERUSTY", 1, 350, 1.5F, 4.5F, 25);
public static ToolMaterial enumToolMaterialPipeLead = EnumHelper.addToolMaterial("PIPELEAD", 1, 250, 1.5F, 5.5F, 25);
public static ToolMaterial enumToolMaterialBottleOpener = EnumHelper.addToolMaterial("OPENER", 1, 250, 1.5F, 0.5F, 200);
public static ToolMaterial enumToolMaterialMultitool = EnumHelper.addToolMaterial("MULTITOOL", 3, 5000, 25F, 5.5F, 25);
//Armor Materials
@ -315,6 +317,7 @@ public class MainRegistry
enumToolMaterialSteel.setRepairItem(new ItemStack(ModItems.ingot_steel));
enumToolMaterialAlloy.setRepairItem(new ItemStack(ModItems.ingot_advanced_alloy));
enumToolMaterialCmb.setRepairItem(new ItemStack(ModItems.ingot_combine_steel));
enumToolMaterialBottleOpener.setRepairItem(new ItemStack(ModItems.plate_steel));
NetworkRegistry.INSTANCE.registerGuiHandler(instance, new GUIHandler());
GameRegistry.registerTileEntity(TileEntityTestBombAdvanced.class, "tilentity_testbombadvanced");
@ -565,6 +568,12 @@ public class MainRegistry
OreDictionary.registerOre("oreFluorite", ModBlocks.ore_fluorite);
OreDictionary.registerOre("oreLead", ModBlocks.ore_lead);
OreDictionary.registerOre("oreBeryllium", ModBlocks.ore_beryllium);
OreDictionary.registerOre("oreAustralium", ModBlocks.ore_australium);
OreDictionary.registerOre("oreWeidanium", ModBlocks.ore_weidanium);
OreDictionary.registerOre("oreReiium", ModBlocks.ore_reiium);
OreDictionary.registerOre("oreUnobtainium", ModBlocks.ore_unobtainium);
OreDictionary.registerOre("oreDaffergon", ModBlocks.ore_daffergon);
OreDictionary.registerOre("oreVerticium", ModBlocks.ore_verticium);
OreDictionary.registerOre("oreUranium", ModBlocks.ore_nether_uranium);
OreDictionary.registerOre("orePlutonium", ModBlocks.ore_nether_plutonium);