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

Small fixes, ready for release

Browse Source
This commit is contained in:
HbmMods 2017-05-09 21:41:05 +02:00
parent adbfd2283f
commit 381cf7cb5a
17 changed files with 39 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
assets/hbm/textures/blocks/industrial_generator.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 282 B

After

Width:  |  Height:  |  Size: 332 B

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

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 224 B

After

Width:  |  Height:  |  Size: 225 B

BIN
assets/hbm/textures/models/TestObj.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.4 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

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

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 584 KiB

After

Width:  |  Height:  |  Size: 570 KiB

BIN
assets/hbm/textures/models/textureIGenRotor.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 229 B

4
com/hbm/blocks/ModBlocks.java
View File

@ -923,7 +923,7 @@ public class ModBlocks {
//GameRegistry.registerBlock(machine_rtg_orange, machine_rtg_orange.getUnlocalizedName());
//GameRegistry.registerBlock(machine_rtg_yellow, machine_rtg_yellow.getUnlocalizedName());
//GameRegistry.registerBlock(machine_rtg_green, machine_rtg_green.getUnlocalizedName());
GameRegistry.registerBlock(machine_rtg_cyan, machine_rtg_cyan.getUnlocalizedName());
//GameRegistry.registerBlock(machine_rtg_cyan, machine_rtg_cyan.getUnlocalizedName());
//GameRegistry.registerBlock(machine_rtg_blue, machine_rtg_blue.getUnlocalizedName());
//GameRegistry.registerBlock(machine_rtg_purple, machine_rtg_purple.getUnlocalizedName());
GameRegistry.registerBlock(red_cable, red_cable.getUnlocalizedName());
@ -940,7 +940,7 @@ public class ModBlocks {
GameRegistry.registerBlock(machine_teleporter, machine_teleporter.getUnlocalizedName());
//ReiX Machines
GameRegistry.registerBlock(machine_reix_mainframe, machine_reix_mainframe.getUnlocalizedName());
//GameRegistry.registerBlock(machine_reix_mainframe, machine_reix_mainframe.getUnlocalizedName());
//Industrial Factories
GameRegistry.registerBlock(factory_titanium_hull, factory_titanium_hull.getUnlocalizedName());

2
com/hbm/entity/projectile/EntitySchrab.java
View File

@ -264,7 +264,7 @@ public class EntitySchrab extends Entity implements IProjectile
this.worldObj.createExplosion(this, this.posX, this.posY, this.posZ, 2.5F, true);
ExplosionChaos.burn(this.worldObj, (int)this.posX, (int)this.posY, (int)this.posZ, 10);
ExplosionChaos.flameDeath(this.worldObj, (int)this.posX, (int)this.posY, (int)this.posZ, 20);
ExplosionNukeGeneric.waste(this.worldObj, (int)this.posX, (int)this.posY, (int)this.posZ, 20);
ExplosionNukeGeneric.wasteNoSchrab(this.worldObj, (int)this.posX, (int)this.posY, (int)this.posZ, 20);
ExplosionChaos.poison(this.worldObj, (int)this.posX, (int)this.posY, (int)this.posZ, 20);
}
this.worldObj.spawnEntityInWorld(new EntityLightningBolt(this.worldObj, this.posX, this.posY, this.posZ));

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

@ -1655,7 +1655,7 @@ public class ModItems {
cape_vertice = new ArmorModel(MainRegistry.enumArmorMaterialEmerald, 9, 1).setUnlocalizedName("cape_vertice").setCreativeTab(MainRegistry.tabNuke).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":cape_unknown");
schrabidium_hammer = new WeaponSpecial(MainRegistry.enumToolMaterialHammer).setUnlocalizedName("schrabidium_hammer").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":schrabidium_hammer");
bottle_opener = new WeaponSpecial(MainRegistry.enumToolMaterialBottleOpener).setUnlocalizedName("bottle_opener").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":bottle_opener");
bottle_opener = new WeaponSpecial(MainRegistry.enumToolMaterialBottleOpener).setUnlocalizedName("bottle_opener").setCreativeTab(MainRegistry.tabNuke).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":bottle_opener");
euphemium_stopper = new ItemSyringe().setUnlocalizedName("euphemium_stopper").setMaxStackSize(1).setFull3D().setTextureName(RefStrings.MODID + ":euphemium_stopper");
matchstick = new ItemMatch().setUnlocalizedName("matchstick").setCreativeTab(CreativeTabs.tabTools).setFull3D().setTextureName(RefStrings.MODID + ":matchstick");
crowbar = new ModSword(MainRegistry.enumToolMaterialSteel).setUnlocalizedName("crowbar").setFull3D().setTextureName(RefStrings.MODID + ":crowbar");
@ -2216,7 +2216,7 @@ public class ModItems {
//Missiles
GameRegistry.registerItem(missile_generic, missile_generic.getUnlocalizedName());
GameRegistry.registerItem(missile_anti_ballistic, missile_anti_ballistic.getUnlocalizedName());
//GameRegistry.registerItem(missile_anti_ballistic, missile_anti_ballistic.getUnlocalizedName());
GameRegistry.registerItem(missile_incendiary, missile_incendiary.getUnlocalizedName());
GameRegistry.registerItem(missile_cluster, missile_cluster.getUnlocalizedName());
GameRegistry.registerItem(missile_buster, missile_buster.getUnlocalizedName());
@ -2381,7 +2381,6 @@ public class ModItems {
GameRegistry.registerItem(pipe_rusty, pipe_rusty.getUnlocalizedName());
GameRegistry.registerItem(pipe_lead, pipe_lead.getUnlocalizedName());
GameRegistry.registerItem(reer_graar, reer_graar.getUnlocalizedName());
GameRegistry.registerItem(bottle_opener, bottle_opener.getUnlocalizedName());
//Multitool
GameRegistry.registerItem(multitool_hit, multitool_hit.getUnlocalizedName());
@ -2435,6 +2434,7 @@ public class ModItems {
GameRegistry.registerItem(bottle2_fritz, bottle2_fritz.getUnlocalizedName());
GameRegistry.registerItem(bottle2_korl_special, bottle2_korl_special.getUnlocalizedName());
GameRegistry.registerItem(bottle2_fritz_special, bottle2_fritz_special.getUnlocalizedName());
GameRegistry.registerItem(bottle_opener, bottle_opener.getUnlocalizedName());
//Money
GameRegistry.registerItem(cap_nuka, cap_nuka.getUnlocalizedName());

9
com/hbm/items/gear/ArmorAustralium.java
View File

@ -39,19 +39,22 @@ public class ArmorAustralium extends ItemArmor {
if(rand.nextInt(3) == 0) {
armor.damageItem(1, player);
}
player.addPotionEffect(new PotionEffect(Potion.field_76434_w.id, 10, 2, true));
if(!player.isPotionActive(Potion.field_76444_x.id))
player.addPotionEffect(new PotionEffect(Potion.field_76444_x.id, 80, 2, true));
}
if (armor.getItem() == ModItems.australium_iv) {
if(rand.nextInt(5) == 0) {
armor.damageItem(1, player);
}
player.addPotionEffect(new PotionEffect(Potion.field_76434_w.id, 10, 4, true));
if(!player.isPotionActive(Potion.field_76444_x.id))
player.addPotionEffect(new PotionEffect(Potion.field_76444_x.id, 80, 4, true));
}
if (armor.getItem() == ModItems.australium_v) {
if(rand.nextInt(7) == 0) {
armor.damageItem(1, player);
}
player.addPotionEffect(new PotionEffect(Potion.field_76434_w.id, 10, 3, true));
if(!player.isPotionActive(Potion.field_76444_x.id))
player.addPotionEffect(new PotionEffect(Potion.field_76444_x.id, 80, 3, true));
}
}
}

8
com/hbm/items/special/ItemCustomLore.java
View File

@ -40,7 +40,11 @@ public class ItemCustomLore extends ItemRadioactive {
if(this == ModItems.ingot_neptunium)
{
list.add("That one's my favourite!");
if(MainRegistry.polaroidID == 11) {
list.add("Pretty weird...you know what I mean, right?");
list.add("All of it. The lore, the polaroid, the...");
} else
list.add("That one's my favourite!");
}
if(this == ModItems.pellet_rtg)
@ -389,7 +393,7 @@ public class ItemCustomLore extends ItemRadioactive {
if(this == ModItems.crystal_horn)
{
if(MainRegistry.polaroidID == 11)
list.add("An actual horn");
list.add("An actual horn.");
else
list.add("Not an actual horn.");
}

7
com/hbm/items/tool/ItemRamManipulator.java
View File

@ -4,6 +4,7 @@ import java.util.List;
import com.hbm.interfaces.IBomb;
import com.hbm.lib.Library;
import com.hbm.main.MainRegistry;
import net.minecraft.block.Block;
import net.minecraft.entity.player.EntityPlayer;
@ -18,7 +19,11 @@ public class ItemRamManipulator extends Item {
@Override
public void addInformation(ItemStack itemstack, EntityPlayer player, List list, boolean bool) {
list.add("A broken remote.");
if(MainRegistry.polaroidID == 11)
list.add("A cheating device.");
else
list.add("A broken remote.");
if (itemstack.getTagCompound() == null) {
} else {
list.add("");

2
com/hbm/items/weapon/GunBaleFlare.java
View File

@ -150,7 +150,7 @@ public class GunBaleFlare extends Item {
list.add("These bombs were meant for artillery, but");
list.add("this makeshift launcher works just fine!");
list.add("");
list.add("Ammo: Mini Nukes");
list.add("Ammo: Mk.V AMAT Shell");
list.add("Damage: 1000");
list.add("Creates small nuclear explosion.");
}

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

@ -3,7 +3,7 @@ package com.hbm.lib;
public class RefStrings {
public static final String MODID = "hbm";
public static final String NAME = "Hbm's Nuclear Tech Mod";
public static final String VERSION = "1.0.24 Beta (V-Bromine-Luna), change before release";
public static final String VERSION = "1.0.24";
public static final String CLIENTSIDE = "com.hbm.main.ClientProxy";
public static final String SERVERSIDE = "com.hbm.main.ServerProxy";
}

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

@ -8,5 +8,7 @@ public class SPCLStrings {
String stringQuestion = "41 4d 20 4e 4f 54 20 4f 46 20 55 4e 44 45 52 53 54 41 4e 44 49 4e 47 20 48 4f 57 20 4d 41 4e 45 20 49 53 20 4f 46 20 57 41 56 49 4e 47";
//Hash value for error reports
String stringError = "T1VUT0ZGVUVMT1VUT0ZGVUVMT1VUT0ZGVUVMT1VUT0ZGVUVMT1VUT0ZGVUVMT1VUT0ZGVUVMT1VUT0ZGVUVMT1VUT0ZGVUVMT1VUT0ZGVUVM";
//Hilarious name
String stringCumberbatch = "Bunsenburner Toodlesnoot";
}

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

@ -878,6 +878,8 @@ public class CraftingManager {
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.pipe_rusty, 1), new Object[] { "II", " I", " I", 'I', "ingotIron" }));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.pipe_lead, 1), new Object[] { "II", " I", " I", 'I', "ingotLead" }));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.bottle_opener, 1), new Object[] { "S", "P", 'S', "plateSteel", 'P', "plankWood" }));
GameRegistry.addRecipe(new ItemStack(ModItems.chopper, 1), new Object[] { "BBB", "HTF", "GWW", 'B', ModItems.chopper_blades, 'H', ModItems.chopper_head, 'T', ModItems.chopper_torso, 'F', ModItems.chopper_tail, 'G', ModItems.chopper_gun, 'W', ModItems.chopper_wing });
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.polaroid, 1), new Object[] { " C ", "RPY", " B ", 'B', "dustLapis", 'C', "dustCoal", 'R', "dustAdvanced", 'Y', "dustGold", 'P', Items.paper }));

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

@ -16,14 +16,16 @@ public class RenderIGenerator extends TileEntitySpecialRenderer {
private static final ResourceLocation rotor = new ResourceLocation(/*"/assets/" + */RefStrings.MODID, "models/generator_rotor.obj");
private IModelCustom genModel;
private IModelCustom rotModel;
private ResourceLocation gadgetTexture;
private ResourceLocation genTexture;
private ResourceLocation rotTexture;
public RenderIGenerator()
{
genModel = AdvancedModelLoader.loadModel(body);
rotModel = AdvancedModelLoader.loadModel(rotor);
//gadgetTexture = new ResourceLocation(RefStrings.MODID, "textures/models/TheGadget3_.png");
gadgetTexture = new ResourceLocation(RefStrings.MODID, "textures/models/textureIGen.png");
genTexture = new ResourceLocation(RefStrings.MODID, "textures/models/textureIGen.png");
rotTexture = new ResourceLocation(RefStrings.MODID, "textures/models/textureIGenRotor.png");
}
@Override
@ -50,7 +52,7 @@ public class RenderIGenerator extends TileEntitySpecialRenderer {
GL11.glTranslated(0.5D, 0.0D, 0.0D); break;
}
bindTexture(gadgetTexture);
bindTexture(genTexture);
genModel.renderAll();
@ -86,7 +88,7 @@ public class RenderIGenerator extends TileEntitySpecialRenderer {
i++;
GL11.glRotatef(i, 1F, 0F, 0F);
bindTexture(gadgetTexture);
bindTexture(rotTexture);
rotModel.renderAll();
GL11.glPopMatrix();

3
com/hbm/tileentity/TileEntityNukeCustom.java
View File

@ -234,6 +234,9 @@ public class TileEntityNukeCustom extends TileEntity implements ISidedInventory
if(item == Item.getItemFromBlock(ModBlocks.det_cord)) {
this.tntStrength += 1.5F;
}
if(item == Item.getItemFromBlock(ModBlocks.det_charge)) {
this.tntStrength += 15F;
}
if(item == ModItems.canister_fuel) {
this.tntStrength += 0.3F;
}