diff --git a/Factory1.png b/Factory1.png new file mode 100644 index 000000000..c61802a14 Binary files /dev/null and b/Factory1.png differ diff --git a/Factory2.png b/Factory2.png new file mode 100644 index 000000000..4c7d8b43e Binary files /dev/null and b/Factory2.png differ diff --git a/Factory3.png b/Factory3.png new file mode 100644 index 000000000..c61802a14 Binary files /dev/null and b/Factory3.png differ diff --git a/Fusion1.png b/Fusion1.png new file mode 100644 index 000000000..6f528ffbc Binary files /dev/null and b/Fusion1.png differ diff --git a/Fusion2.png b/Fusion2.png new file mode 100644 index 000000000..2f8fd88ed Binary files /dev/null and b/Fusion2.png differ diff --git a/Fusion3.png b/Fusion3.png new file mode 100644 index 000000000..e513765a9 Binary files /dev/null and b/Fusion3.png differ diff --git a/Fusion4.png b/Fusion4.png new file mode 100644 index 000000000..2f8fd88ed Binary files /dev/null and b/Fusion4.png differ diff --git a/Fusion5.png b/Fusion5.png new file mode 100644 index 000000000..6f528ffbc Binary files /dev/null and b/Fusion5.png differ diff --git a/Info.txt b/Info.txt new file mode 100644 index 000000000..544d49e72 --- /dev/null +++ b/Info.txt @@ -0,0 +1,2 @@ +The included images are schematics for all multiblock structures, layer by layer. If a block is seperated by a black line, it is interchangeable, such as the electricity ports of factories which are opitonal, the inner tungsten blanked of the fusion reactor which can be removed completely and the concrete arround the nuclear reactor (leaving out these potions will have it's downsites, such as less energy, missing ports or radiation) +The advanced factory can be built like the basic one, but with it's own parts. \ No newline at end of file diff --git a/Reachtor1.png b/Reachtor1.png new file mode 100644 index 000000000..e28e7e15d Binary files /dev/null and b/Reachtor1.png differ diff --git a/Reachtor2.png b/Reachtor2.png new file mode 100644 index 000000000..b3cdd7005 Binary files /dev/null and b/Reachtor2.png differ diff --git a/Reachtor3.png b/Reachtor3.png new file mode 100644 index 000000000..13656df24 Binary files /dev/null and b/Reachtor3.png differ diff --git a/Reachtor4.png b/Reachtor4.png new file mode 100644 index 000000000..b3cdd7005 Binary files /dev/null and b/Reachtor4.png differ diff --git a/Reachtor5.png b/Reachtor5.png new file mode 100644 index 000000000..e28e7e15d Binary files /dev/null and b/Reachtor5.png differ diff --git a/assets/hbm/lang/de_DE.lang b/assets/hbm/lang/de_DE.lang index 73a1c7a4c..f5cd94926 100644 --- a/assets/hbm/lang/de_DE.lang +++ b/assets/hbm/lang/de_DE.lang @@ -106,11 +106,13 @@ tile.book_guide.name=Hbm's Nuclear Tech Mod Handbuch tile.factory_titanium_hull.name=Einfache Fabrikshülle tile.factory_titanium_furnace.name=Einfache Fabrikzugriffsluke +tile.factory_titanium_conductor.name=Einfacher Fabriksstromanschluss tile.factory_titanium_core.name=Einfache Fabrikkernkomponente item.factory_core_titanium.name=Einfacher Fabrikenergiecluster container.factoryTitanium=Einfache Fabrik tile.factory_advanced_hull.name=Fortgeschrittene Fabrikshülle tile.factory_advanced_furnace.name=Fortgeschrittene Fabrikzugriffsluke +tile.factory_advanced_conductor.name=Fortgeschrittener Fabriksstromanschluss tile.factory_advanced_core.name=Fortgeschrittene Fabrikkernkomponente item.factory_core_advanced.name=Fortgeschrittener Fabrikenergiecluster container.factoryAdvanced=Fortgeschrittene Fabrik @@ -118,7 +120,7 @@ container.factoryAdvanced=Fortgeschrittene Fabrik tile.reactor_element.name=Reaktorkammer tile.reactor_control.name=Steuerstäbe tile.reactor_hatch.name=Kraftwerkszugriffsluke -tile.reactor_conductor.name=Stromanschluss +tile.reactor_conductor.name=Reaktorstromanschluss tile.reactor_computer.name=Reaktorsteuerung container.reactorMultiblock=Großer Atomreaktor @@ -389,6 +391,7 @@ item.grenade_flare.name=Blendgranate item.grenade_electric.name=Blitzbombe item.grenade_poison.name=Giftgranate item.grenade_gas.name=Gasgranate +item.grenade_plasma.name=Plasmagranate item.grenade_schrabidium.name=Schrabidiumgranate item.grenade_nuke.name=Mark VI Bohrgranate item.grenade_nuclear.name=Nuka-Granate @@ -618,4 +621,9 @@ item.alloy_shovel.name=Legierungsschaufel item.alloy_hoe.name=Legierungsfeldhacke tile.red_cable.name=Rotes Kupferkabel -tile.block_meteor.name=Meteoritenblock \ No newline at end of file +tile.block_meteor.name=Meteoritenblock + +item.cape_radiation.name=Cape (Radioaktiv) +item.cape_gasmask.name=Cape (Gasmaske) +item.cape_schrabidium.name=Cape (Schrabidisch) +item.cape_hbm.name=Hbms Cape \ No newline at end of file diff --git a/assets/hbm/lang/en_US.lang b/assets/hbm/lang/en_US.lang index 6727a5e8d..f258c35f4 100644 --- a/assets/hbm/lang/en_US.lang +++ b/assets/hbm/lang/en_US.lang @@ -106,11 +106,13 @@ tile.book_guide.name=Hbm's Nuclear Tech Mod Manual tile.factory_titanium_hull.name=Basic Factory Casing tile.factory_titanium_furnace.name=Basic Factory Access Hatch +tile.factory_titanium_conductor.name=Basic Factory Electricity Port tile.factory_titanium_core.name=Basic Factory Core Component item.factory_core_titanium.name=Basic Factory Energy Cluster container.factoryTitanium=Basic Factory tile.factory_advanced_hull.name=Advanced Factory Casing tile.factory_advanced_furnace.name=Advanced Factory Access Hatch +tile.factory_advanced_conductor.name=Advanced Factory Electricity Port tile.factory_advanced_core.name=Advanced Factory Core Component item.factory_core_advanced.name=Advanced Factory Energy Cluster container.factoryAdvanced=Advanced Factory @@ -390,6 +392,7 @@ item.grenade_flare.name=Flare Grenade item.grenade_electric.name=Lightning Bomb item.grenade_poison.name=Poison Grenade item.grenade_gas.name=Gas Grenade +item.grenade_plasma.name=Plasma Grenade item.grenade_schrabidium.name=Schrabidium Grenade item.grenade_nuke.name=Mark VI Drill Grenade item.grenade_nuclear.name=Nuka Grenade @@ -619,4 +622,9 @@ item.alloy_shovel.name=Advanced Alloy Shovel item.alloy_hoe.name=Advanced Alloy Hoe tile.red_cable.name=Red Copper Cable -tile.block_meteor.name=Meteor Block \ No newline at end of file +tile.block_meteor.name=Meteor Block + +item.cape_radiation.name=Cape (Radiation) +item.cape_gasmask.name=Cape (Gas Mask) +item.cape_schrabidium.name=Cape (Schrabidic) +item.cape_hbm.name=Hbm's Cape \ No newline at end of file diff --git a/assets/hbm/textures/items/cape_gasmask.png b/assets/hbm/textures/items/cape_gasmask.png new file mode 100644 index 000000000..e80702f1c Binary files /dev/null and b/assets/hbm/textures/items/cape_gasmask.png differ diff --git a/assets/hbm/textures/items/cape_radiation.png b/assets/hbm/textures/items/cape_radiation.png new file mode 100644 index 000000000..1a272b1eb Binary files /dev/null and b/assets/hbm/textures/items/cape_radiation.png differ diff --git a/assets/hbm/textures/items/cape_schrabidium.png b/assets/hbm/textures/items/cape_schrabidium.png new file mode 100644 index 000000000..6cafe4881 Binary files /dev/null and b/assets/hbm/textures/items/cape_schrabidium.png differ diff --git a/assets/hbm/textures/items/cape_test.png b/assets/hbm/textures/items/cape_test.png new file mode 100644 index 000000000..2b6391001 Binary files /dev/null and b/assets/hbm/textures/items/cape_test.png differ diff --git a/assets/hbm/textures/items/cape_unknown.png b/assets/hbm/textures/items/cape_unknown.png new file mode 100644 index 000000000..86035c3c4 Binary files /dev/null and b/assets/hbm/textures/items/cape_unknown.png differ diff --git a/assets/hbm/textures/items/grenade_plasma.png b/assets/hbm/textures/items/grenade_plasma.png new file mode 100644 index 000000000..26b215610 Binary files /dev/null and b/assets/hbm/textures/items/grenade_plasma.png differ diff --git a/assets/hbm/textures/models/CapeGasMask.png b/assets/hbm/textures/models/CapeGasMask.png new file mode 100644 index 000000000..6b7d44edc Binary files /dev/null and b/assets/hbm/textures/models/CapeGasMask.png differ diff --git a/assets/hbm/textures/models/CapeHbm.png b/assets/hbm/textures/models/CapeHbm.png new file mode 100644 index 000000000..a53d49dc1 Binary files /dev/null and b/assets/hbm/textures/models/CapeHbm.png differ diff --git a/assets/hbm/textures/models/CapeLPkukin.png b/assets/hbm/textures/models/CapeLPkukin.png new file mode 100644 index 000000000..12b448622 Binary files /dev/null and b/assets/hbm/textures/models/CapeLPkukin.png differ diff --git a/assets/hbm/textures/models/CapeRadiation.png b/assets/hbm/textures/models/CapeRadiation.png new file mode 100644 index 000000000..2673f2639 Binary files /dev/null and b/assets/hbm/textures/models/CapeRadiation.png differ diff --git a/assets/hbm/textures/models/CapeSchrabidium.png b/assets/hbm/textures/models/CapeSchrabidium.png new file mode 100644 index 000000000..d785a2608 Binary files /dev/null and b/assets/hbm/textures/models/CapeSchrabidium.png differ diff --git a/assets/hbm/textures/models/CapeTemplate.png b/assets/hbm/textures/models/CapeTemplate.png new file mode 100644 index 000000000..28b80b568 Binary files /dev/null and b/assets/hbm/textures/models/CapeTemplate.png differ diff --git a/assets/hbm/textures/models/CapeUnknown.png b/assets/hbm/textures/models/CapeUnknown.png new file mode 100644 index 000000000..94efc81c2 Binary files /dev/null and b/assets/hbm/textures/models/CapeUnknown.png differ diff --git a/assets/hbm/textures/models/TestCape.png b/assets/hbm/textures/models/TestCape.png new file mode 100644 index 000000000..672c05b30 Binary files /dev/null and b/assets/hbm/textures/models/TestCape.png differ diff --git a/com/hbm/blocks/ModBlocks.java b/com/hbm/blocks/ModBlocks.java index fd69f0976..0140faa45 100644 --- a/com/hbm/blocks/ModBlocks.java +++ b/com/hbm/blocks/ModBlocks.java @@ -1,5 +1,6 @@ package com.hbm.blocks; +import com.hbm.items.ItemPlasmaBlock; import com.hbm.items.ItemPrototypeBlock; import com.hbm.items.ItemSchrabidiumBlock; import com.hbm.lib.RefStrings; @@ -570,7 +571,7 @@ public class ModBlocks { GameRegistry.registerBlock(fusion_heater, fusion_heater.getUnlocalizedName()); GameRegistry.registerBlock(fusion_hatch, fusion_hatch.getUnlocalizedName()); GameRegistry.registerBlock(fusion_core, fusion_core.getUnlocalizedName()); - GameRegistry.registerBlock(plasma, plasma.getUnlocalizedName()); + GameRegistry.registerBlock(plasma, ItemPlasmaBlock.class, plasma.getUnlocalizedName()); //Launch Pads GameRegistry.registerBlock(launch_pad, launch_pad.getUnlocalizedName()); diff --git a/com/hbm/blocks/TestEventTester.java b/com/hbm/blocks/TestEventTester.java index fcc9a5b3f..e79986cf9 100644 --- a/com/hbm/blocks/TestEventTester.java +++ b/com/hbm/blocks/TestEventTester.java @@ -106,7 +106,9 @@ public class TestEventTester extends Block { //ExplosionChaos.anvil(par1World, par2, par3 + 2, par4, 1); //return true; - return false; + System.out.println(par5EntityPlayer.getCommandSenderName()); + System.out.println(par5EntityPlayer.getUniqueID()); + return true; } /*public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int i, float a, float b, float c) diff --git a/com/hbm/blocks/TileEntityCoreAdvanced.java b/com/hbm/blocks/TileEntityCoreAdvanced.java index e01078e48..cf6593642 100644 --- a/com/hbm/blocks/TileEntityCoreAdvanced.java +++ b/com/hbm/blocks/TileEntityCoreAdvanced.java @@ -179,7 +179,7 @@ public class TileEntityCoreAdvanced extends TileEntity implements ISidedInventor world.getBlock(this.xCoord, this.yCoord - 1, this.zCoord - 1) == ModBlocks.factory_advanced_hull && world.getBlock(this.xCoord + 1, this.yCoord - 1, this.zCoord - 1) == ModBlocks.factory_advanced_hull && world.getBlock(this.xCoord - 1, this.yCoord - 1, this.zCoord) == ModBlocks.factory_advanced_hull && - world.getBlock(this.xCoord, this.yCoord - 1, this.zCoord) == ModBlocks.factory_advanced_conductor && + (world.getBlock(this.xCoord, this.yCoord - 1, this.zCoord) == ModBlocks.factory_advanced_conductor || world.getBlock(this.xCoord, this.yCoord - 1, this.zCoord) == ModBlocks.factory_advanced_hull) && world.getBlock(this.xCoord + 1, this.yCoord - 1, this.zCoord) == ModBlocks.factory_advanced_hull && world.getBlock(this.xCoord - 1, this.yCoord - 1, this.zCoord + 1) == ModBlocks.factory_advanced_hull && world.getBlock(this.xCoord, this.yCoord - 1, this.zCoord + 1) == ModBlocks.factory_advanced_hull && @@ -196,7 +196,7 @@ public class TileEntityCoreAdvanced extends TileEntity implements ISidedInventor world.getBlock(this.xCoord, this.yCoord + 1, this.zCoord - 1) == ModBlocks.factory_advanced_hull && world.getBlock(this.xCoord + 1, this.yCoord + 1, this.zCoord - 1) == ModBlocks.factory_advanced_hull && world.getBlock(this.xCoord - 1, this.yCoord + 1, this.zCoord) == ModBlocks.factory_advanced_hull && - world.getBlock(this.xCoord, this.yCoord + 1, this.zCoord) == ModBlocks.factory_advanced_conductor && + (world.getBlock(this.xCoord, this.yCoord + 1, this.zCoord) == ModBlocks.factory_advanced_conductor || world.getBlock(this.xCoord, this.yCoord + 1, this.zCoord) == ModBlocks.factory_advanced_hull) && world.getBlock(this.xCoord + 1, this.yCoord + 1, this.zCoord) == ModBlocks.factory_advanced_hull && world.getBlock(this.xCoord - 1, this.yCoord + 1, this.zCoord + 1) == ModBlocks.factory_advanced_hull && world.getBlock(this.xCoord, this.yCoord + 1, this.zCoord + 1) == ModBlocks.factory_advanced_hull && diff --git a/com/hbm/blocks/TileEntityCoreTitanium.java b/com/hbm/blocks/TileEntityCoreTitanium.java index 4aa8142f1..c391eaa5a 100644 --- a/com/hbm/blocks/TileEntityCoreTitanium.java +++ b/com/hbm/blocks/TileEntityCoreTitanium.java @@ -180,7 +180,7 @@ public class TileEntityCoreTitanium extends TileEntity implements ISidedInventor world.getBlock(this.xCoord, this.yCoord - 1, this.zCoord - 1) == ModBlocks.factory_titanium_hull && world.getBlock(this.xCoord + 1, this.yCoord - 1, this.zCoord - 1) == ModBlocks.factory_titanium_hull && world.getBlock(this.xCoord - 1, this.yCoord - 1, this.zCoord) == ModBlocks.factory_titanium_hull && - world.getBlock(this.xCoord, this.yCoord - 1, this.zCoord) == ModBlocks.factory_titanium_conductor && + (world.getBlock(this.xCoord, this.yCoord - 1, this.zCoord) == ModBlocks.factory_titanium_conductor || world.getBlock(this.xCoord, this.yCoord - 1, this.zCoord) == ModBlocks.factory_titanium_hull) && world.getBlock(this.xCoord + 1, this.yCoord - 1, this.zCoord) == ModBlocks.factory_titanium_hull && world.getBlock(this.xCoord - 1, this.yCoord - 1, this.zCoord + 1) == ModBlocks.factory_titanium_hull && world.getBlock(this.xCoord, this.yCoord - 1, this.zCoord + 1) == ModBlocks.factory_titanium_hull && @@ -197,7 +197,7 @@ public class TileEntityCoreTitanium extends TileEntity implements ISidedInventor world.getBlock(this.xCoord, this.yCoord + 1, this.zCoord - 1) == ModBlocks.factory_titanium_hull && world.getBlock(this.xCoord + 1, this.yCoord + 1, this.zCoord - 1) == ModBlocks.factory_titanium_hull && world.getBlock(this.xCoord - 1, this.yCoord + 1, this.zCoord) == ModBlocks.factory_titanium_hull && - world.getBlock(this.xCoord, this.yCoord + 1, this.zCoord) == ModBlocks.factory_titanium_conductor && + (world.getBlock(this.xCoord, this.yCoord + 1, this.zCoord) == ModBlocks.factory_titanium_conductor || world.getBlock(this.xCoord, this.yCoord + 1, this.zCoord) == ModBlocks.factory_titanium_hull) && world.getBlock(this.xCoord + 1, this.yCoord + 1, this.zCoord) == ModBlocks.factory_titanium_hull && world.getBlock(this.xCoord - 1, this.yCoord + 1, this.zCoord + 1) == ModBlocks.factory_titanium_hull && world.getBlock(this.xCoord, this.yCoord + 1, this.zCoord + 1) == ModBlocks.factory_titanium_hull && diff --git a/com/hbm/blocks/TileEntityMachineCentrifuge.java b/com/hbm/blocks/TileEntityMachineCentrifuge.java index 0211d12ce..a931d1f67 100644 --- a/com/hbm/blocks/TileEntityMachineCentrifuge.java +++ b/com/hbm/blocks/TileEntityMachineCentrifuge.java @@ -280,34 +280,6 @@ public class TileEntityMachineCentrifuge extends TileEntity implements ISidedInv { slots[5].stackSize += itemStack[3].stackSize; } - /* - if(slots[2] == null && slots[3] == null && slots[4] == null && slots[5] == null) - { - if(itemStack[0] != null) - { - slots[2] = itemStack[0].copy(); - } - - if(itemStack[1] != null) - { - slots[3] = itemStack[1].copy(); - } - - if(itemStack[2] != null) - { - slots[4] = itemStack[2].copy(); - } - - if(itemStack[3] != null) - { - slots[5] = itemStack[3].copy(); - } - }else if(slots[2].isItemEqual(itemStack[0]) && slots[3].isItemEqual(itemStack[1]) && slots[4].isItemEqual(itemStack[2]) && slots[5].isItemEqual(itemStack[3])) { - slots[2].stackSize += itemStack[0].stackSize; - slots[3].stackSize += itemStack[1].stackSize; - slots[4].stackSize += itemStack[2].stackSize; - slots[5].stackSize += itemStack[3].stackSize; - }*/ for(int i = 0; i < 1; i++) { @@ -386,7 +358,7 @@ public class TileEntityMachineCentrifuge extends TileEntity implements ISidedInv { dualCookTime++; - if(this.dualCookTime == TileEntityMachineCentrifuge.processingSpeed) + if(this.dualCookTime >= TileEntityMachineCentrifuge.processingSpeed) { this.dualCookTime = 0; this.processItem(); diff --git a/com/hbm/entity/EntityGrenadePlasma.java b/com/hbm/entity/EntityGrenadePlasma.java new file mode 100644 index 000000000..85c618110 --- /dev/null +++ b/com/hbm/entity/EntityGrenadePlasma.java @@ -0,0 +1,56 @@ +package com.hbm.entity; + +import com.hbm.explosion.ExplosionChaos; +import com.hbm.explosion.ExplosionNukeGeneric; + +import net.minecraft.entity.Entity; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.monster.EntityBlaze; +import net.minecraft.entity.projectile.EntityThrowable; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.DamageSource; +import net.minecraft.util.MovingObjectPosition; +import net.minecraft.world.World; + +public class EntityGrenadePlasma extends EntityThrowable +{ + private static final String __OBFID = "CL_00001722"; + + public EntityGrenadePlasma(World p_i1773_1_) + { + super(p_i1773_1_); + } + + public EntityGrenadePlasma(World p_i1774_1_, EntityLivingBase p_i1774_2_) + { + super(p_i1774_1_, p_i1774_2_); + } + + public EntityGrenadePlasma(World p_i1775_1_, double p_i1775_2_, double p_i1775_4_, double p_i1775_6_) + { + super(p_i1775_1_, p_i1775_2_, p_i1775_4_, p_i1775_6_); + } + + @Override + protected void onImpact(MovingObjectPosition p_70184_1_) + { + if (p_70184_1_.entityHit != null) + { + byte b0 = 0; + + if (p_70184_1_.entityHit instanceof EntityBlaze) + { + b0 = 3; + } + + p_70184_1_.entityHit.attackEntityFrom(DamageSource.causeThrownDamage(this, this.getThrower()), b0); + } + + if (!this.worldObj.isRemote) + { + this.setDead(); + this.worldObj.createExplosion(this, this.posX, this.posY, this.posZ, 2.0F, true); + ExplosionChaos.plasma(this.worldObj, (int)this.posX, (int)this.posY, (int)this.posZ, 7 ); + } + } +} diff --git a/com/hbm/explosion/ExplosionChaos.java b/com/hbm/explosion/ExplosionChaos.java index 02504f5c3..2bb90863b 100644 --- a/com/hbm/explosion/ExplosionChaos.java +++ b/com/hbm/explosion/ExplosionChaos.java @@ -732,4 +732,30 @@ public class ExplosionChaos { world.spawnEntityInWorld(mirv8); } + public static void plasma(World world, int x, int y, int z, int radius) + { + int r = radius; + int r2 = r*r; + int r22 = r2/2; + for (int xx = -r; xx < r; xx++) + { + int X = xx+x; + int XX = xx*xx; + for (int yy = -r; yy < r; yy++) + { + int Y = yy+y; + int YY = XX+yy*yy; + for (int zz = -r; zz < r; zz++) + { + int Z = zz+z; + int ZZ = YY+zz*zz; + if (ZZ 32.0F) + { + f5 = 32.0F; + } + + float f6 = (float)(d3 * d1 + d0 * d2) * 100.0F; + float f7 = (float)(d3 * d2 - d0 * d1) * 100.0F; + + if (f6 < 0.0F) + { + f6 = 0.0F; + } + + float f8 = player.prevCameraYaw + (player.cameraYaw - player.prevCameraYaw) * par7; + f5 += MathHelper.sin((player.prevDistanceWalkedModified + (player.distanceWalkedModified - player.prevDistanceWalkedModified) * par7) * 6.0F) * 32.0F * f8; + + if (player.isSneaking()) + { + f5 += 25.0F; + } + + GL11.glRotatef(6.0F + f6 / 2.0F + f5, 1.0F, 0.0F, 0.0F); + GL11.glRotatef(f7 / 2.0F, 0.0F, 0.0F, 1.0F); + GL11.glRotatef(-f7 / 2.0F, 0.0F, 1.0F, 0.0F); + GL11.glRotatef(180.0F, 0.0F, 1.0F, 0.0F); + this.bipedCloak.render(par7); + GL11.glPopMatrix(); + } + } +}