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

Little fixes, changed IGen texture

Browse Source
This commit is contained in:
HbmMods 2017-05-04 20:42:27 +02:00
parent 6770e62957
commit a2bf3adbef
14 changed files with 1424 additions and 1461 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -29,8 +29,10 @@ death.attack.electrified=%1$s wurde von %2$s elektrisiert.
death.attack.flamethrower=%1$s wurde von %2$s gegrillt.
death.attack.plasma=%1$s wurde von %2$s eingeäschert.
death.attack.ice=%1$s wurde von %2$s in ein Eis am Stiel verwandelt.
death.attack.cheater=%1$s starb als dreckiger Cheater. Spiel fair, oder verpiss dich!
death.attack.cheater=%1$s's Innereien wurden zu Hafer. (???)
death.attack.laser=%1$s wurde von %2$s in Asche verwandet.
death.attack.rubble=%1$s wurde von Schutt zerquetscht.
death.attack.shrapnel=%1$s wurde von einem Schrapnell zerfetzt.
item.redstone_sword.name=Redstoneschwert
item.big_sword.name=Großes Schwert
@ -685,7 +687,7 @@ item.gun_mp.name=Maschinengewehr des Pazifisten
item.gun_zomg.name=Singularitätsbetriebener Paarvernichtungsstrahl "ZOMG Kanone"
item.gun_emp.name=EMP-Strahler
item.gun_super_shotgun.name=Super Shotgun
item.gun_moist_nugget.name=Moisn-Nagant
item.gun_moist_nugget.name=Mosin-Nagant
item.gun_revolver_inverted.name=Umgedrehter Revolver
item.gun_jack.name=Jackhammer
item.gun_spark.name=Die Zündkerze
@ -824,7 +826,7 @@ tile.yellow_barrel.name=Radioaktives Fass
item.designator.name=Kurzdistanz Zielmarkierer
item.designator_range.name=Weitstrecken-Zielmarkierer
item.missile_generic.name=HE Rakete
item.missile_anti_ballistic.name=Flugabwehrrakete
item.missile_anti_ballistic.name=Flugabwehrrakete (WIP)
item.missile_incendiary.name=Brandrakete
item.missile_cluster.name=Streurakete
item.missile_buster.name=Bunkerbrechende Rakete

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

@ -29,8 +29,10 @@ death.attack.electrified=%1$s was electrified by %2$s.
death.attack.flamethrower=%1$s was cremated by %2$s.
death.attack.plasma=%1$s was immolated by %2$s.
death.attack.ice=%1$s was turned into a popsicle by %2$s.
death.attack.cheater=%1$s died as a dirty cheater. Play fair, or piss off.
death.attack.cheater=%1$s's intestines turned into oats. (???)
death.attack.laser=%1$s was turned into ash by %2$s.
death.attack.rubble=%1$s was squashed by debris.
death.attack.shrapnel=%1$s was ragged by a shrapnel.
item.redstone_sword.name=Redstone Sword
item.big_sword.name=Great Sword
@ -685,7 +687,7 @@ item.gun_mp.name=Pacifist's Machine Gun
item.gun_zomg.name=Singularity Powered Annihilation Ray "ZOMG Cannon"
item.gun_emp.name=EMP Ray
item.gun_super_shotgun.name=Super Shotgun
item.gun_moist_nugget.name=Moisn-Nagant
item.gun_moist_nugget.name=Mosin-Nagant
item.gun_revolver_inverted.name=Flipped Revolver
item.gun_jack.name=Jackhammer
item.gun_spark.name=Spark Plug
@ -824,7 +826,7 @@ tile.yellow_barrel.name=Radioactive Barrel
item.designator.name=Short Range Target Designator
item.designator_range.name=Long Range Target Designator
item.missile_generic.name=High Explosive Missile
item.missile_anti_ballistic.name=Anti Ballistic Missile
item.missile_anti_ballistic.name=Anti Ballistic Missile (WIP)
item.missile_incendiary.name=Incendiary Missile
item.missile_cluster.name=Cluster Missile
item.missile_buster.name=Bunker Buster

2837
assets/hbm/models/generator_body.obj
View File

File diff suppressed because it is too large Load Diff

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 279 B

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 688 KiB

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

@ -25,6 +25,8 @@ public class EntityMissileAntiBallistic extends EntityMissileBase {
@Override
public void onUpdate()
{
System.out.println(phase);
this.baseHeight = 35;
this.posX += this.motionX;

3
com/hbm/entity/projectile/EntityRubble.java
View File

@ -3,6 +3,7 @@ package com.hbm.entity.projectile;
import com.hbm.entity.effect.EntityCloudFleija;
import com.hbm.entity.logic.EntityNukeExplosionAdvanced;
import com.hbm.explosion.ExplosionChaos;
import com.hbm.lib.ModDamageSource;
import com.hbm.main.MainRegistry;
import net.minecraft.block.material.Material;
@ -43,7 +44,7 @@ public class EntityRubble extends EntityThrowable {
{
byte b0 = 15;
p_70184_1_.entityHit.attackEntityFrom(DamageSource.causeThrownDamage(this, this.getThrower()), b0);
p_70184_1_.entityHit.attackEntityFrom(ModDamageSource.rubble, b0);
}
if(this.ticksExisted > 5) {

3
com/hbm/entity/projectile/EntityShrapnel.java
View File

@ -4,6 +4,7 @@ import com.hbm.entity.effect.EntityCloudFleija;
import com.hbm.entity.logic.EntityNukeExplosionAdvanced;
import com.hbm.entity.particle.EntitySSmokeFX;
import com.hbm.explosion.ExplosionChaos;
import com.hbm.lib.ModDamageSource;
import com.hbm.main.MainRegistry;
import net.minecraft.block.material.Material;
@ -54,7 +55,7 @@ public class EntityShrapnel extends EntityThrowable {
{
byte b0 = 15;
p_70184_1_.entityHit.attackEntityFrom(DamageSource.causeThrownDamage(this, this.getThrower()), b0);
p_70184_1_.entityHit.attackEntityFrom(ModDamageSource.shrapnel, b0);
}
if(this.ticksExisted > 5) {

3
com/hbm/explosion/ExplosionChaos.java
View File

@ -8,6 +8,7 @@ import com.hbm.blocks.ModBlocks;
import com.hbm.entity.grenade.EntityGrenadeTau;
import com.hbm.entity.grenade.EntityGrenadeZOMG;
import com.hbm.entity.missile.EntityMIRV;
import com.hbm.entity.missile.EntityMissileAntiBallistic;
import com.hbm.entity.missile.EntityMissileBase;
import com.hbm.entity.projectile.EntityBullet;
import com.hbm.entity.projectile.EntityMiniNuke;
@ -738,7 +739,7 @@ public class ExplosionChaos {
d6 /= d9;
d7 /= d9;
double d10 = world.getBlockDensity(vec3, entity.boundingBox);
if (entity instanceof EntityMissileBase) {
if (entity instanceof EntityMissileBase && !(entity instanceof EntityMissileAntiBallistic)) {
return entity;
}
}

12
com/hbm/items/special/ItemAntiCheat.java
View File

@ -20,10 +20,18 @@ public class ItemAntiCheat extends ItemCustomLore {
if(stack.getItemDamage() != 34) {
if(entity instanceof EntityPlayer) {
EntityPlayer player = (EntityPlayer)entity;
for(ItemStack s : player.inventory.mainInventory) {
player.inventory.consumeInventoryItem(ModItems.ingot_euphemium);
player.inventory.consumeInventoryItem(ModItems.nugget_euphemium);
}
}
entity.attackEntityFrom(ModDamageSource.cheater, Float.POSITIVE_INFINITY);
if(!world.isRemote)
ExplosionChaos.antiCheat(world, (int)entity.posX, (int)entity.posY, (int)entity.posZ, 20);
//if(!world.isRemote)
// ExplosionChaos.antiCheat(world, (int)entity.posX, (int)entity.posY, (int)entity.posZ, 20);
}
}

2
com/hbm/lib/ModDamageSource.java
View File

@ -27,6 +27,8 @@ public class ModDamageSource extends DamageSource {
public static DamageSource suicide = (new DamageSource("suicide")).setProjectile();
public static DamageSource teleporter = (new DamageSource("teleporter")).setDamageIsAbsolute();
public static DamageSource cheater = (new DamageSource("cheater")).setDamageIsAbsolute().setDamageBypassesArmor().setDamageAllowedInCreativeMode();
public static DamageSource rubble = (new DamageSource("rubble")).setProjectile();
public static DamageSource shrapnel = (new DamageSource("shrapnel")).setProjectile();
public ModDamageSource(String p_i1566_1_) {
super(p_i1566_1_);

3
com/hbm/render/tileentity/RenderIGenerator.java
View File

@ -22,7 +22,8 @@ public class RenderIGenerator extends TileEntitySpecialRenderer {
{
genModel = AdvancedModelLoader.loadModel(body);
rotModel = AdvancedModelLoader.loadModel(rotor);
gadgetTexture = new ResourceLocation(RefStrings.MODID, "textures/models/TheGadget3_.png");
//gadgetTexture = new ResourceLocation(RefStrings.MODID, "textures/models/TheGadget3_.png");
gadgetTexture = new ResourceLocation(RefStrings.MODID, "textures/models/textureIGen.png");
}
@Override

2
com/hbm/tileentity/TileEntityIGenerator.java
View File

@ -38,7 +38,7 @@ public class TileEntityIGenerator extends TileEntity implements ISidedInventory,
public int fuel;
public int burn;
public int soundCycle = 0;
public static final int maxPower = 10000;
public static final int maxPower = 100000;
public static final int maxTorque = 2500;
public static final int maxHeat = 7500;
public static final int maxWater = 10000;

2
com/hbm/tileentity/TileEntityReiXMainframe.java
View File

@ -67,7 +67,7 @@ public class TileEntityReiXMainframe extends TileEntity implements ISidedInvento
@Override
public String getInventoryName() {
return this.hasCustomInventoryName() ? this.customName : "container.machineCMB";
return this.hasCustomInventoryName() ? this.customName : "container.machineReiX";
}
@Override