Skip to content

Commit

Permalink
finished bobmazon, fixed fallout crash, improved textures
Browse files Browse the repository at this point in the history
  • Loading branch information
HbmMods committed Apr 17, 2019
1 parent 5b78dfb commit a4997d8
Show file tree
Hide file tree
Showing 41 changed files with 476 additions and 150 deletions.
16 changes: 11 additions & 5 deletions assets/hbm/lang/de_DE.lang
Original file line number Diff line number Diff line change
Expand Up @@ -34,15 +34,15 @@ achievement.fiend.desc=Sei gemein.
achievement.fiend2=Unhold 2: Noch unholdiger
achievement.fiend2.desc=Sei gemeiner.
achievement.metalworks=Metallurgie
achievement.metalworks.desc=Bobmazon Level 1
achievement.metalworks.desc=Bobmazon Level 1 (Hochofen)
achievement.assembly=Fertigung
achievement.assembly.desc=Bobmazon Level 2
achievement.assembly.desc=Bobmazon Level 2 (Fertigungsmaschine)
achievement.chemistry=Chemie
achievement.chemistry.desc=Bobmazon Level 3
achievement.chemistry.desc=Bobmazon Level 3 (Betonziegel)
achievement.oil=Petroleum
achievement.oil.desc=Bobmazon Level 4
achievement.oil.desc=Bobmazon Level 4 (Elektrischer Boiler)
achievement.nuclear=Atomwissenschaft
achievement.nuclear.desc=Bobmazon Level 5
achievement.nuclear.desc=Bobmazon Level 5 (Urankernbrennstoff)

potion.hbm_taint=Verdorben
potion.hbm_mutation=Verdorbenes Herz
Expand Down Expand Up @@ -179,6 +179,7 @@ death.attack.blackhole=%1$s wurde spaghettifiziert.
death.attack.blender=%1$s wurde in kleine, mundgerechte Stücke geschnitten.
death.attack.meteorite=%1$s wurde von einem fallenden Stein aus dem Weltall erschlagen.
death.attack.boxcar=%1$s wurde von einem fallenden Güterwagon zermatscht. Autsch!
death.attack.boat=%1$s wurde von Schiff getroffen.
death.attack.broadcast=%1$s wurde das Gehirn geschmolzen.
death.attack.ams=%1$s wurde in tödlichen Teilchen gebadet, die von der Menschheit erst benannt werden müssen.
death.attack.amsCore=%1$s wurde vom Feuer einer Singularität verdampft.
Expand Down Expand Up @@ -536,6 +537,11 @@ item.assembly_template.name=Fertigungsvorlage:
item.chemistry_template.name=Chemievorlage:
item.siren_track.name=Sirenentrack

item.bobmazon_materials.name=Bobmazon: Ressourcen
item.bobmazon_machines.name=Bobmazon: Blöcke und Maschinen
item.bobmazon_weapons.name=Bobmazon: Waffen und Sprengstoffe
item.bobmazon_tools.name=Bobmazon: Werkzeuge

item.fuse.name=Sicherung
item.arc_electrode.name=Graphitelektrode
item.arc_electrode_burnt.name=Geschmolzene Elektrode
Expand Down
16 changes: 11 additions & 5 deletions assets/hbm/lang/en_US.lang
Original file line number Diff line number Diff line change
Expand Up @@ -34,15 +34,15 @@ achievement.fiend.desc=Be mean.
achievement.fiend2=Delinquent 2: Delinquent Harder
achievement.fiend2.desc=Be meaner.
achievement.metalworks=Metalworks
achievement.metalworks.desc=Bobmazon Level 1
achievement.metalworks.desc=Bobmazon Level 1 (Blast Furnace)
achievement.assembly=Fabrication
achievement.assembly.desc=Bobmazon Level 2
achievement.assembly.desc=Bobmazon Level 2 (Assembly Machine)
achievement.chemistry=Chemistry
achievement.chemistry.desc=Bobmazon Level 3
achievement.chemistry.desc=Bobmazon Level 3 (Concrete Bricks)
achievement.oil=Petroleum
achievement.oil.desc=Bobmazon Level 4
achievement.oil.desc=Bobmazon Level 4 (Electric Boiler)
achievement.nuclear=Atomic Science
achievement.nuclear.desc=Bobmazon Level 5
achievement.nuclear.desc=Bobmazon Level 5 (Uranium Fuel)

potion.hbm_taint=Tainted
potion.hbm_mutation=Tainted Heart
Expand Down Expand Up @@ -179,6 +179,7 @@ death.attack.blackhole=%1$s was spaghettified.
death.attack.blender=%1$s was chopped in small, bite-sized pieces.
death.attack.meteorite=%1$s was hit by a falling rock from outer space.
death.attack.boxcar=%1$s was smushed by a falling boxcar. Oh well.
death.attack.boat=%1$s was hit by a boat.
death.attack.broadcast=%1$s got their brain melted.
death.attack.ams=%1$s was bathed in deadly particles that have yet to be named by human science.
death.attack.amsCore=%1$s was vaporized in the fire of a singularity.
Expand Down Expand Up @@ -536,6 +537,11 @@ item.assembly_template.name=Assembly Template:
item.chemistry_template.name=Chemistry Template:
item.siren_track.name=Siren Track

item.bobmazon_materials.name=Bobmazon: Materials
item.bobmazon_machines.name=Bobmazon: Blocks and Machines
item.bobmazon_weapons.name=Bobmazon: Weapons and Explosives
item.bobmazon_tools.name=Bobmazon: Tools

item.fuse.name=Fuse
item.arc_electrode.name=Graphite Electrode
item.arc_electrode_burnt.name=Molten Electrode
Expand Down
Binary file modified assets/hbm/textures/blocks/battery_dineutronium_front.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/hbm/textures/blocks/battery_dineutronium_side.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/hbm/textures/blocks/battery_dineutronium_top.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/hbm/textures/blocks/battery_front_alt.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/hbm/textures/blocks/battery_lithium_front.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/hbm/textures/blocks/battery_lithium_side.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/hbm/textures/blocks/battery_lithium_top.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/hbm/textures/blocks/battery_schrabidium_front.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/hbm/textures/blocks/battery_schrabidium_side.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/hbm/textures/blocks/battery_schrabidium_top.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/hbm/textures/blocks/battery_side_alt.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/hbm/textures/blocks/battery_top.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/hbm/textures/blocks/crate_iron_side.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/hbm/textures/blocks/crate_iron_top.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/hbm/textures/blocks/crate_steel_side.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/hbm/textures/blocks/crate_steel_top.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/hbm/textures/blocks/machine_transformer.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/hbm/textures/blocks/machine_transformer_iron.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/hbm/textures/blocks/machine_transformer_top.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/hbm/textures/blocks/machine_transformer_top_iron.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/hbm/textures/models/ModelRedBarrel.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/hbm/textures/models/ModelYellowBarrel.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/hbm/textures/models/bobmazon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 9 additions & 1 deletion com/hbm/entity/effect/EntityFalloutRain.java
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,12 @@ public void onUpdate() {

Vec3 vec = Vec3.createVectorHelper(radProgress * 0.5, 0, 0);
double circum = radProgress * 2 * Math.PI * 2;

///
if(circum == 0)
circum = 1;
///

double part = 360D / circum;

vec.rotateAroundY((float) (part * revProgress));
Expand Down Expand Up @@ -222,6 +228,8 @@ public void setScale(int i) {

public int getScale() {

return this.dataWatcher.getWatchableObjectInt(16);
int scale = this.dataWatcher.getWatchableObjectInt(16);

return scale == 0 ? 1 : scale;
}
}
73 changes: 73 additions & 0 deletions com/hbm/entity/missile/EntityBobmazon.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,73 @@
package com.hbm.entity.missile;

import com.hbm.blocks.ModBlocks;
import com.hbm.entity.particle.EntityGasFlameFX;
import com.hbm.explosion.ExplosionLarge;
import com.hbm.packet.AuxParticlePacket;
import com.hbm.packet.PacketDispatcher;

import cpw.mods.fml.common.network.NetworkRegistry.TargetPoint;
import net.minecraft.block.material.Material;
import net.minecraft.entity.Entity;
import net.minecraft.entity.item.EntityItem;
import net.minecraft.init.Blocks;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.world.World;

public class EntityBobmazon extends Entity {

public ItemStack payload;

public EntityBobmazon(World p_i1582_1_) {
super(p_i1582_1_);
this.ignoreFrustumCheck = true;
this.setSize(1F, 3F);
}

@Override
protected void entityInit() {
this.dataWatcher.addObject(16, Integer.valueOf(0));
}

@Override
public void onUpdate() {

motionY = -0.5;
motionX = 0;
motionZ = 0;

this.lastTickPosX = this.prevPosX = this.posX;
this.lastTickPosY = this.prevPosY = this.posY;
this.lastTickPosZ = this.prevPosZ = this.posZ;

for(int i = 0; i < 4; i++) {

if(!this.worldObj.isRemote && i % 2 == 0)
PacketDispatcher.wrapper.sendToAllAround(new AuxParticlePacket(posX, posY + 1, posZ, 2), new TargetPoint(worldObj.provider.dimensionId, posX, posY + 1, posZ, 300));

if(worldObj.getBlock((int)(posX - 0.5), (int)(posY + 1), (int)(posZ - 0.5)).getMaterial() != Material.air && !worldObj.isRemote && dataWatcher.getWatchableObjectInt(16) != 1) {
this.setDead();
ExplosionLarge.spawnParticles(worldObj, posX, posY, posZ, 50);

this.worldObj.playSoundEffect(this.posX, this.posY, this.posZ, "hbm:entity.oldExplosion", 10.0F, 0.5F + this.rand.nextFloat() * 0.1F);

if(payload != null)
worldObj.spawnEntityInWorld(new EntityItem(worldObj, posX, posY, posZ, payload));

break;
}

this.posX += this.motionX;
this.posY += this.motionY;
this.posZ += this.motionZ;
}
}

@Override
protected void readEntityFromNBT(NBTTagCompound nbt) { }

@Override
protected void writeEntityToNBT(NBTTagCompound nbt) { }

}
4 changes: 4 additions & 0 deletions com/hbm/entity/projectile/EntityBulletBase.java
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
import java.lang.reflect.Field;
import java.util.List;

import com.hbm.blocks.ModBlocks;
import com.hbm.blocks.generic.RedBarrel;
import com.hbm.calc.VectorUtil;
import com.hbm.entity.effect.EntityCloudFleijaRainbow;
import com.hbm.entity.effect.EntityEMPBlast;
Expand Down Expand Up @@ -441,6 +443,8 @@ private void onBlockImpact(int bX, int bY, int bZ) {
worldObj.getBlock(bX, bY, bZ) == Blocks.stained_glass_pane)
worldObj.func_147480_a(bX, bY, bZ, false);

if(worldObj.getBlock(bX, bY, bZ) == ModBlocks.red_barrel)
((RedBarrel) ModBlocks.red_barrel).explode(worldObj, bX, bY, bZ);
}
}

Expand Down
Loading

1 comment on commit a4997d8

@RagexPrince683
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

what you did here screwed my max fps... ples fix

Please sign in to comment.