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

Made everything ready for release

Browse Source
This commit is contained in:
HbmMods 2016-01-23 18:56:43 +01:00
parent 8357d03ebd
commit 3b98716d69
12 changed files with 233 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -216,6 +216,7 @@ item.centrifuge_tower.name=Zentrifugenturm
item.reactor_core.name=Brutreaktorkern
item.pellet_rtg.name=Plutonium 238 Pellet
item.rtg_unit.name=RTG Einheit
item.hazmat_cloth.name=Strahlenschutzanzugsstoff
item.cell_empty.name=Leere Zelle
item.cell_uf6.name=Uranhexafluorit-Zelle
@ -224,6 +225,10 @@ item.cell_antimatter.name=Antimaterienzelle
item.cell_deuterium.name=Deuteriumzelle
item.cell_sas3.name=Schrabidiumtrisulfat-Zelle
item.canister_empty.name=Leerer Kanister
item.canister_fuel.name=Treibstoffkanister
item.canister_napalm.name=Napalm B
item.rod_empty.name=Leerer Brennstab
item.rod_uranium.name=Uranbrennstab
item.rod_u235.name=U235-Brennstab
@ -303,6 +308,8 @@ item.multi_kit.name=Mehrzweckbomben Kit
item.grenade_kit.name=Granaten Kit
item.nuke_electric_kit.name=Kit des Elektronikingenieurs
item.prototype_kit.name=Prototyp Kit
item.missile_kit.name=Raketen Kit
item.t45_kit.name=T45-Powerrüstungskit
tile.waste_earth.name=Totes Gras
tile.waste_trinitite.name=Trinititerz
@ -365,6 +372,7 @@ item.bomb_waffle.name=Massenvernichtungswaffel
item.schnitzel_vegan.name=Veganes Schnitzel
item.apple_schrabidium.name=Schrabidiumapfel
item.cotton_candy.name=Radioaktive Zuckerwatte
item.tem_flakes.name=Tem Flakes
tile.frozen_grass.name=Gefrorenes Gras
tile.frozen_dirt.name=Gefrorene Erde
@ -483,4 +491,28 @@ item.t45_legs.name=T45-Powerrüstungsbeinschutz
item.t45_boots.name=T45-Powerrüstungsstiefel
tile.mush.name=Leuchtender Pilz
tile.waste_mycelium.name=Leuchtende Myzel
tile.waste_mycelium.name=Leuchtende Myzel
item.warhead_generic_small.name=Kleiner Sprengkopf
item.warhead_generic_medium.name=Mittlerer Sprengkopf
item.warhead_generic_large.name=Großer Sprengkopf
item.warhead_incendiary_small.name=Kleiner Brandsprengkopf
item.warhead_incendiary_medium.name=Mittlerer Brandsprengkopf
item.warhead_incendiary_large.name=Großer Brandsprengkopf
item.warhead_cluster_small.name=Kleiner Kasettensprengkopf
item.warhead_cluster_medium.name=Mittlerer Kasettensprengkopf
item.warhead_cluster_large.name=Großer Kasettensprengkopf
item.warhead_buster_small.name=Kleiner bunkerbrechender Sprengkopf
item.warhead_buster_medium.name=Mittlerer bunkerbrechender Sprengkopf
item.warhead_buster_large.name=Großer bunkerbrechender Sprengkopf
item.warhead_nuclear.name=Atomsprengkopf
item.warhead_mirvlet.name=MIRV
item.warhead_mirv.name=Achtfacher MIRV-Sprengkopf
item.warhead_thermo_endo.name=Endothermischer Sprengkopf
item.warhead_thermo_exo.name=Exothermischer Sprengkopf
item.fuel_tank_small.name=Kleiner Triebstofftank
item.fuel_tank_medium.name=Mittlerer Triebstofftank
item.fuel_tank_large.name=Großer Triebstofftank
item.thruster_small.name=Kleines Raketentriebwerk
item.thruster_medium.name=Mittleres Raketentriebwerk
item.thruster_large.name=Großes Raketentriebwerk

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

@ -216,6 +216,7 @@ item.centrifuge_tower.name=Centrifuge Tower
item.reactor_core.name=Breeding Reactor Core
item.pellet_rtg.name=Plutonium 238 Fuel Pellet
item.rtg_unit.name=RTG Unit
item.hazmat_cloth.name=Hazmat Cloth
item.cell_empty.name=Empty Cell
item.cell_uf6.name=Uranium Hexafluorite Cell
@ -224,6 +225,10 @@ item.cell_antimatter.name=Antimatter Cell
item.cell_deuterium.name=Deuterium Cell
item.cell_sas3.name=Schrabidiumtrisulfide Cell
item.canister_empty.name=Empty Canister
item.canister_fuel.name=Fuel Canister
item.canister_napalm.name=Napalm B
item.rod_empty.name=Emty Rod
item.rod_uranium.name=Uranium Rod
item.rod_u235.name=U235 Rod
@ -303,6 +308,9 @@ item.multi_kit.name=Multi Purpose Bomb Kit
item.grenade_kit.name=Grenade Kit
item.nuke_electric_kit.name=Electronic Engineer's Kit
item.prototype_kit.name=Prototype Kit
item.missile_kit.name=Missile Kit
item.t45_kit.name=T45 Power Armor Kit
tile.waste_earth.name=Dead Grass
tile.waste_trinitite.name=Trinitite Ore
@ -365,6 +373,7 @@ item.bomb_waffle.name=Waffle of Mass Destruction
item.schnitzel_vegan.name=Vegan Schnitzel
item.apple_schrabidium.name=Schrabidium Apple
item.cotton_candy.name=Radioactive Cotton Candy
item.tem_flakes.name=Tem Flakes
tile.frozen_grass.name=Frozen Grass
tile.frozen_dirt.name=Frozen Dirt
@ -483,4 +492,28 @@ item.t45_legs.name=T45 Power Armor Leggings
item.t45_boots.name=T45 Power Armor Boots
tile.mush.name=Glowing Mushroom
tile.waste_mycelium.name=Glowing Mycelium
tile.waste_mycelium.name=Glowing Mycelium
item.warhead_generic_small.name=Small Warhead
item.warhead_generic_medium.name=Medium Warhead
item.warhead_generic_large.name=Large Warhead
item.warhead_incendiary_small.name=Small Incendiary Warhead
item.warhead_incendiary_medium.name=Medium Incendiary Warhead
item.warhead_incendiary_large.name=Large Incendiary Warhead
item.warhead_cluster_small.name=Small Cluster Warhead
item.warhead_cluster_medium.name=Medium Cluster Warhead
item.warhead_cluster_large.name=Large Cluster Warhead
item.warhead_buster_small.name=Small Bunker Buster Warhead
item.warhead_buster_medium.name=Medium Bunker Buster Warhead
item.warhead_buster_large.name=Large Bunker Buster Warhead
item.warhead_nuclear.name=Nuclear Warhead
item.warhead_mirvlet.name=MIRV
item.warhead_mirv.name=Eightfold MIRV Warhead
item.warhead_thermo_endo.name=Endothermic Warhead
item.warhead_thermo_exo.name=Exothermic Warhead
item.fuel_tank_small.name=Small Fuel Tank
item.fuel_tank_medium.name=Medium Fuel Tank
item.fuel_tank_large.name=Large Fuel Tank
item.thruster_small.name=Small Thruster
item.thruster_medium.name=Medium Thruster
item.thruster_large.name=Large Thruster

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

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 275 B

After

Width:  |  Height:  |  Size: 284 B

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 305 B

16
com/hbm/blocks/TestEventTester.java
View File

@ -18,14 +18,15 @@ import net.minecraft.util.Vec3;
import net.minecraft.world.World;
public class TestEventTester extends Block {
protected TestEventTester(Material p_i45394_1_) {
super(p_i45394_1_);
}
public float explosionSize = 1000F;
private Map field_77288_k = new HashMap();
protected static Random itemRand = new Random();
public World worldObj;
protected TestEventTester(Material p_i45394_1_) {
super(p_i45394_1_);
}
@Override
public void onNeighborBlockChange(World p_149695_1_, int x, int y, int z, Block p_149695_5_)
@ -33,8 +34,11 @@ public class TestEventTester extends Block {
this.worldObj = p_149695_1_;
if (p_149695_1_.isBlockIndirectlyGettingPowered(x, y, z))
{
ExplosionChaos.frag(p_149695_1_, x, y + 2, z, 10, false, null);/*mirv(this.worldObj, x, y + 20, z);*/
//Thelaser thread is too dangerous to use right now
//ThreadLaser laser = new ThreadLaser(p_149695_1_, x, y, z, "north");
//laser.start();
ExplosionChaos.frag(p_149695_1_, x, y + 2, z, 10, false, null);
//mirv(this.worldObj, x, y + 20, z);
//killEvent(p_149695_1_, x, y, z);
/*EntityNuclearCreeper e = new EntityNuclearCreeper(p_149695_1_);
e.posX = x;

8
com/hbm/blocks/TileEntityYellowBarrel.java
View File

@ -74,14 +74,6 @@ public class TileEntityYellowBarrel extends TileEntity {
if(!worldObj.isRemote)
worldObj.spawnEntityInWorld(creep);
entity.setDead();
} else if(entity instanceof EntityCow) {
EntityMooshroom creep = new EntityMooshroom(worldObj);
creep.setLocationAndAngles(entity.posX, entity.posY, entity.posZ, entity.rotationYaw, entity.rotationPitch);
//creep.setRotationYawHead(((EntityCow)entity).rotationYawHead);
if(!entity.isDead)
if(!worldObj.isRemote)
worldObj.spawnEntityInWorld(creep);
entity.setDead();
} else if(entity instanceof EntityLivingBase && !(entity instanceof EntityNuclearCreeper) && !(entity instanceof EntityMooshroom))
{
((EntityLivingBase) entity).addPotionEffect(new PotionEffect(Potion.poison.getId(), 2 * 60 * 20, 2));

6
com/hbm/entity/EntityNuclearCreeper.java
View File

@ -22,6 +22,8 @@ import net.minecraft.entity.effect.EntityLightningBolt;
import net.minecraft.entity.monster.EntityCreeper;
import net.minecraft.entity.monster.EntityMob;
import net.minecraft.entity.monster.EntitySkeleton;
import net.minecraft.entity.passive.EntityCow;
import net.minecraft.entity.passive.EntityMooshroom;
import net.minecraft.entity.passive.EntityOcelot;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.projectile.EntityArrow;
@ -231,10 +233,10 @@ public class EntityNuclearCreeper extends EntityMob {
{
if(entity instanceof EntityPlayer && Library.checkForHazmat((EntityPlayer)entity))
{
Library.damageSuit(((EntityPlayer)entity), 0);
/*Library.damageSuit(((EntityPlayer)entity), 0);
Library.damageSuit(((EntityPlayer)entity), 1);
Library.damageSuit(((EntityPlayer)entity), 2);
Library.damageSuit(((EntityPlayer)entity), 3);
Library.damageSuit(((EntityPlayer)entity), 3);*/
} else if(entity instanceof EntityCreeper) {
EntityNuclearCreeper creep = new EntityNuclearCreeper(this.worldObj);

14
com/hbm/items/ItemBattery.java
View File

@ -20,7 +20,14 @@ public class ItemBattery extends Item {
{
list.add("Energy stored: " + ((this.getMaxDamage() - this.getDamage(itemstack)) * 100) + " HE");
} else {
list.add("Charge: " + ((this.getMaxDamage() - this.getDamage(itemstack)) * 100) / this.getMaxDamage() + "%");
if(this.getDamage(itemstack) != 0)
{
int charge = ((this.getMaxDamage() - this.getDamage(itemstack)) * 100) / this.getMaxDamage();
charge++;
list.add("Charge: " + charge + "%");
} else {
list.add("Charge: 100%");
}
}
}
@ -31,6 +38,11 @@ public class ItemBattery extends Item {
{
return EnumRarity.rare;
}
if(this == ModItems.fusion_core)
{
return EnumRarity.uncommon;
}
return EnumRarity.common;
}

54
com/hbm/items/ItemTemFlakes.java Normal file
View File

@ -0,0 +1,54 @@
package com.hbm.items;
import java.util.List;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
import net.minecraft.item.ItemFood;
import net.minecraft.item.ItemStack;
import net.minecraft.world.World;
public class ItemTemFlakes extends ItemFood {
public ItemTemFlakes(int p_i45339_1_, float p_i45339_2_, boolean p_i45339_3_) {
super(p_i45339_1_, p_i45339_2_, p_i45339_3_);
this.setHasSubtypes(true);
this.setAlwaysEdible();
}
@Override
protected void onFoodEaten(ItemStack p_77849_1_, World p_77849_2_, EntityPlayer p_77849_3_)
{
p_77849_3_.heal(2F);
}
@Override
@SideOnly(Side.CLIENT)
public void getSubItems(Item p_150895_1_, CreativeTabs p_150895_2_, List p_150895_3_)
{
p_150895_3_.add(new ItemStack(p_150895_1_, 1, 0));
p_150895_3_.add(new ItemStack(p_150895_1_, 1, 1));
p_150895_3_.add(new ItemStack(p_150895_1_, 1, 2));
}
@Override
public void addInformation(ItemStack itemstack, EntityPlayer player, List list, boolean bool)
{
if(itemstack.getItemDamage() == 0)
{
list.add("Heals 2HP DISCOUNT FOOD OF TEM!!!");
}
if(itemstack.getItemDamage() == 1)
{
list.add("Heals 2HP food of tem");
}
if(itemstack.getItemDamage() == 2)
{
list.add("Heals food of tem (expensiv)");
}
}
}

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

@ -306,6 +306,7 @@ public class ModItems {
public static Item schnitzel_vegan;
public static Item cotton_candy;
public static Item apple_schrabidium;
public static Item tem_flakes;
public static Item flame_pony;
public static Item flame_conspiracy;
@ -689,6 +690,7 @@ public class ModItems {
schnitzel_vegan = new ItemSchnitzelVegan(0, true).setUnlocalizedName("schnitzel_vegan").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":schnitzel_vegan");
cotton_candy = new ItemCottonCandy(5, false).setUnlocalizedName("cotton_candy").setCreativeTab(MainRegistry.tabNuke).setFull3D().setTextureName(RefStrings.MODID + ":cotton_candy");
apple_schrabidium = new ItemAppleSchrabidium(20, 100, false).setUnlocalizedName("apple_schrabidium").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":apple_schrabidium");
tem_flakes = new ItemTemFlakes(0, 0, false).setUnlocalizedName("tem_flakes").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":tem_flakes");
flame_pony = new ItemCustomLore().setUnlocalizedName("flame_pony").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":flame_pony");
flame_conspiracy = new ItemCustomLore().setUnlocalizedName("flame_conspiracy").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":flame_conspiracy");
@ -781,7 +783,7 @@ public class ModItems {
hazmat_plate = new ArmorHazmat(MainRegistry.enumArmorMaterialHazmat, 9, 1).setUnlocalizedName("hazmat_plate").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":hazmat_plate");
hazmat_legs = new ArmorHazmat(MainRegistry.enumArmorMaterialHazmat, 9, 2).setUnlocalizedName("hazmat_legs").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":hazmat_legs");
hazmat_boots = new ArmorHazmat(MainRegistry.enumArmorMaterialHazmat, 9, 3).setUnlocalizedName("hazmat_boots").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":hazmat_boots");
}
}
private static void registerItem() {
//Weapons
@ -1127,6 +1129,7 @@ public class ModItems {
GameRegistry.registerItem(schnitzel_vegan, schnitzel_vegan.getUnlocalizedName());
GameRegistry.registerItem(cotton_candy, cotton_candy.getUnlocalizedName());
GameRegistry.registerItem(apple_schrabidium, apple_schrabidium.getUnlocalizedName());
GameRegistry.registerItem(tem_flakes, tem_flakes.getUnlocalizedName());
//The Gadget
GameRegistry.registerItem(gadget_explosive, gadget_explosive.getUnlocalizedName());

10
com/hbm/main/CraftingManager.java
View File

@ -387,7 +387,10 @@ public class CraftingManager {
GameRegistry.addRecipe(new ItemStack(ModItems.apple_schrabidium, 1, 0), new Object[] { "SSS", "SAS", "SSS", 'S', ModItems.nugget_schrabidium, 'A', Items.apple });
GameRegistry.addRecipe(new ItemStack(ModItems.apple_schrabidium, 1, 1), new Object[] { "SSS", "SAS", "SSS", 'S', ModItems.ingot_schrabidium, 'A', Items.apple });
GameRegistry.addRecipe(new ItemStack(ModItems.apple_schrabidium, 1, 2), new Object[] { "SSS", "SAS", "SSS", 'S', Item.getItemFromBlock(ModBlocks.block_schrabidium), 'A', Items.apple });
GameRegistry.addShapelessRecipe(new ItemStack(ModItems.tem_flakes, 1, 0), new Object[] { Items.gold_nugget, Items.paper });
GameRegistry.addShapelessRecipe(new ItemStack(ModItems.tem_flakes, 1, 1), new Object[] { Items.gold_nugget, Items.gold_nugget, Items.gold_nugget, Items.paper });
GameRegistry.addShapelessRecipe(new ItemStack(ModItems.tem_flakes, 1, 2), new Object[] { Items.gold_ingot, Items.gold_ingot, Items.gold_nugget, Items.gold_nugget, Items.paper });
GameRegistry.addRecipe(new ItemStack(ModItems.syringe_empty, 6), new Object[] { "P", "C", "B", 'B', Item.getItemFromBlock(Blocks.iron_bars), 'C', ModItems.cell_empty, 'P', ModItems.plate_iron });
GameRegistry.addRecipe(new ItemStack(ModItems.syringe_antidote, 6), new Object[] { "SSS", "PMP", "SSS", 'S', ModItems.syringe_empty, 'P', Items.pumpkin_seeds, 'M', Items.milk_bucket });
GameRegistry.addRecipe(new ItemStack(ModItems.syringe_antidote, 6), new Object[] { "SPS", "SMS", "SPS", 'S', ModItems.syringe_empty, 'P', Items.pumpkin_seeds, 'M', Items.milk_bucket });
@ -407,6 +410,9 @@ public class CraftingManager {
GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.nuke_fleija), 1), new Object[] { "DGD", "CHF", "DGD", 'G', ModItems.wire_gold, 'C', ModItems.circuit_gold, 'H', ModItems.hull_small_aluminium, 'F', ModItems.fins_quad_titanium, 'D', new ItemStack(Items.dye, 1, 15) });
GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.nuke_prototype), 1), new Object[] { "GCG", "HRH", "GCG", 'G', ModItems.wire_gold, 'C', ModItems.ingot_euphemium, 'H', ModItems.hull_small_steel, 'R', ModItems.dysfunctional_reactor });
GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.launch_pad), 1), new Object[] { "PPP", "ICI", "CBC", 'P', ModItems.plate_steel, 'I', ModItems.ingot_steel, 'C', ModItems.circuit_gold, 'B', Item.getItemFromBlock(ModBlocks.machine_battery) });
GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.book_guide), 1), new Object[] { "IBI", "LBL", "IBI", 'B', Items.book, 'I', new ItemStack(Items.dye, 1, 0), 'L', new ItemStack(Items.dye, 1, 4) });
GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.bomb_multi), 1), new Object[] { "AAD", "CHF", "AAD", 'A', ModItems.wire_aluminium, 'C', ModItems.circuit_aluminium, 'H', ModItems.hull_small_aluminium, 'F', ModItems.fins_quad_titanium, 'D', new ItemStack(Items.dye, 1, 15) });
GameRegistry.addShapelessRecipe(new ItemStack(ModItems.pellet_cluster, 8), new Object[] { ModItems.plate_iron, Item.getItemFromBlock(Blocks.tnt), ModItems.plate_steel });
GameRegistry.addShapelessRecipe(new ItemStack(ModItems.powder_fire, 4), new Object[] { Items.blaze_powder, ModItems.sulfur, Items.redstone });
@ -495,7 +501,7 @@ public class CraftingManager {
GameRegistry.addRecipe(new ItemStack(ModItems.apple_euphemium, 1), new Object[] { "EEE", "EAE", "EEE", 'E', ModItems.nugget_euphemium, 'A', Items.apple });
GameRegistry.addRecipe(new ItemStack(ModItems.mask_of_infamy, 1), new Object[] { "III", "III", " I ", 'I', ModItems.plate_iron });
GameRegistry.addRecipe(new ItemStack(ModItems.designator, 9), new Object[] { "#", '#', ModItems.plate_iron });
GameRegistry.addRecipe(new ItemStack(ModItems.designator, 1), new Object[] { " A", "#B#", "#B#", '#', ModItems.plate_iron, 'A', ModItems.plate_steel, 'B', ModItems.circuit_red_copper });
}
public static void AddSmeltingRec()

73
com/hbm/threads/ThreadLaser.java Normal file
View File

@ -0,0 +1,73 @@
package com.hbm.threads;
import cpw.mods.fml.common.FMLCommonHandler;
import net.minecraft.init.Blocks;
import net.minecraft.world.World;
import net.minecraftforge.common.MinecraftForge;
public class ThreadLaser implements Runnable {
public Thread thread;
public boolean running = false;
public int x;
public int y;
public int z;
public World world;
public String direction;
public int age;
public ThreadLaser(World world, int x, int y, int z, String direction) {
thread = new Thread(this);
this.x = x;
this.y = y;
this.z = z;
this.world = world;
this.direction = direction;
//MinecraftForge.EVENT_BUS.register(this);
//FMLCommonHandler.instance().bus().register(this);
}
public void start() {
running = true;
if(running)
{
thread.start();
}
}
public void stop() {
running = false;
thread.stop();
}
@Override
public void run() {
while(running)
{
if(direction == "north")
{
for(int i = -1; i < 2; i++)
{
for(int j = -1; j < 2; j++)
{
world.setBlock(x, y + i, z + j, Blocks.air);
}
}
x += 1;
}
if(!(world.checkChunksExist(x - 1, y - 1, z - 1, x + 1, y + 1, z + 1)))
stop();
try {
age++;
thread.sleep(2000);
} catch (InterruptedException e) {
e.printStackTrace();
}
}
}
}