somebody once told me the world is gonna roll me, i ain't the sharpest t

ool in the shed
This commit is contained in:
Bob 2020-07-30 00:15:54 +02:00
parent fc73abeed8
commit dfa7b2eacd
6 changed files with 40 additions and 2 deletions

View File

@ -725,6 +725,7 @@ item.coil_gold.name=Goldspule
item.coil_gold_torus.name=Goldene Ringspule
item.coil_magnetized_tungsten.name=4000K Hochtemperaturensupraleitermagnetspule
item.coil_tungsten.name=Heizspirale
item.coin_maskman.name=Maskenmann-Münze
item.coke.name=Koks
item.combine_scrap.name=CMB Schrott
item.component_emitter.name=Emitterkomponente

View File

@ -725,6 +725,7 @@ item.coil_gold.name=Gold Coil
item.coil_gold_torus.name=Golden Ring Coil
item.coil_magnetized_tungsten.name=4000K High Temperature Super Conducting Coil
item.coil_tungsten.name=Heating Coil
item.coin_maskman.name=Maskman Coin
item.coke.name=Coke
item.combine_scrap.name=CMB Scrap Metal
item.component_emitter.name=Emitter Component

View File

@ -43,6 +43,29 @@ public class EntityMaskMan extends EntityMob implements IBossDisplayData {
this.getEntityAttribute(SharedMonsterAttributes.knockbackResistance).setBaseValue(1.0D);
this.getEntityAttribute(SharedMonsterAttributes.maxHealth).setBaseValue(1000.0D);
}
//public static final int dwTargetPlayer = 12;
/*protected void entityInit() {
super.entityInit();
this.getDataWatcher().addObject(dwTargetPlayer, new Integer(0));
}*/
public void onLivingUpdate() {
super.onLivingUpdate();
/*if(worldObj.isRemote) {
} else {
if(this.getAITarget() != null) {
this.getDataWatcher().updateObject(dwTargetPlayer, this.getAITarget().getEntityId());
} else {
this.getDataWatcher().updateObject(dwTargetPlayer, 0);
}
}*/
}
public boolean isAIEnabled() {
return true;

View File

@ -51,7 +51,9 @@ public class EntityAIShootTarget extends EntityAIBase {
EntityBulletBase bullet = new EntityBulletBase(owner.worldObj, BulletConfigSyncingUtil.G20_SHRAPNEL, owner, target, 1.6F, 0);
owner.worldObj.spawnEntityInWorld(bullet);
owner.playSound("hbm:weapon.sawShoot", 1.0F, 2.0F);
owner.playSound("hbm:weapon.calShoot", 1.0F, 1.0F);
}
this.owner.rotationYaw = this.owner.rotationYawHead;
}
}

View File

@ -23,6 +23,11 @@ public class ModelMaskMan extends ModelBase {
EntityMaskMan man = (EntityMaskMan)entity;
//boolean target = entity.worldObj.getEntityByID(man.getDataWatcher().getWatchableObjectInt(man.dwTargetPlayer)) != null;
//if(target)
// GL11.glRotated(-f3, 0, 1, 0);
float f7 = man.limbSwing - man.limbSwingAmount * (1.0F - f5);
float f6 = (man.prevLimbSwingAmount + (man.limbSwingAmount - man.prevLimbSwingAmount) * f5) * 0.5F;
@ -34,7 +39,8 @@ public class ModelMaskMan extends ModelBase {
GL11.glPushMatrix();
GL11.glTranslatef(0.5F, 4F, 0);
GL11.glRotated(f3, 0, 1, 0);
//if(!target)
GL11.glRotated(-f3, 0, 1, 0);
ResourceManager.maskman.renderPart("Head");
GL11.glPopMatrix();

View File

@ -124,6 +124,11 @@ public class RadiationSavedData extends WorldSavedData {
@Override
public void readFromNBT(NBTTagCompound nbt) {
if(!MainRegistry.enableRads) {
return;
}
int count = nbt.getInteger("radCount");
for(int i = 0; i < count; i++) {