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

mostly render stuff, some model reworks

Browse Source
This commit is contained in:
Bob 2020-10-11 21:28:43 +02:00
parent 851e39d723
commit 651b37b33f
35 changed files with 9647 additions and 9921 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/assets/hbm/lang/de_DE.lang
View File

@ -672,6 +672,7 @@ item.chainsaw.name=Kettensäge
item.chemistry_template.name=Chemievorlage:
item.chernobylsign.name=Tschernobyl-Warnschild-Streitaxt
item.chlorine_pinwheel.name=Chlorgas-Konverter
item.chlorophyte_pickaxe.name=Grünalgenspitzhacke
item.chocolate_milk.name=Schokomilch
item.chopper.name=Jagdschrauber
item.chopper_blades.name=Jagdschrauber Rotorblätter
@ -1196,6 +1197,7 @@ item.med_schiziphrenia.name=Schizophrenie-Medikament
item.memespoon.name=§eLuftschlag
item.memory.name=item.null.name
item.mese_gavel.name=Mese-Richterhammer
item.mese_pickaxe.name=Mesespitzhacke
item.meteor_remote.name=Meteoritenkontroller
item.mike_cooling_unit.name=Deuteriumkühleinheit
item.mike_core.name=Mit Uran ummantelter Deuteriumtank
@ -2437,5 +2439,6 @@ tool.ability.silktouch=Behutsamkeit
tool.ability.smelter=Auto-Ofen
weapon.ability.radiation=Radioaktive Schneide
weapon.ability.phosphorus=Phosphorspitze
weapon.ability.stun=Betäubend
weapon.ability.vampire=Vampir

3
src/main/java/assets/hbm/lang/en_US.lang
View File

@ -672,6 +672,7 @@ item.chainsaw.name=Chainsaw
item.chemistry_template.name=Chemistry Template:
item.chernobylsign.name=Chernobyl Warning Sign Battle Axe
item.chlorine_pinwheel.name=Chlorine Pinwheel
item.chlorophyte_pickaxe.name=Chlorophyte Pickaxe
item.chocolate_milk.name=Chocolate Milk
item.chopper.name=Hunter Chopper
item.chopper_blades.name=Hunter Chopper Rotor Blades
@ -1196,6 +1197,7 @@ item.med_schiziphrenia.name=Schizophrenia Medication
item.memespoon.name=§eMarket Gardener
item.memory.name=item.null.name
item.mese_gavel.name=Mese Gavel
item.mese_pickaxe.name=Mese Pickaxe
item.meteor_remote.name=Meteorite Remote
item.mike_cooling_unit.name=Deuterium Cooling Unit
item.mike_core.name=Uranium Coated Deuterium Tank
@ -2437,5 +2439,6 @@ tool.ability.silktouch=Silk Touch
tool.ability.smelter=Auto-Smelter
weapon.ability.radiation=Radioactive Blade
weapon.ability.phosphorus=Phosphorus Tip
weapon.ability.stun=Stunning
weapon.ability.vampire=Vampire

8481
src/main/java/assets/hbm/models/boxcar.obj
View File

File diff suppressed because it is too large Load Diff

1902
src/main/java/assets/hbm/models/duchessgambit.obj
View File

File diff suppressed because it is too large Load Diff

8495
src/main/java/assets/hbm/models/missile_parts/mp_w_15_boxcar.obj
View File

File diff suppressed because it is too large Load Diff

BIN
src/main/java/assets/hbm/textures/models/boxcar.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 15 KiB

After

Width:  |  Height:  |  Size: 38 KiB

BIN
src/main/java/assets/hbm/textures/models/boxcar_base.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.8 KiB

BIN
src/main/java/assets/hbm/textures/models/boxcar_painted.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.7 KiB

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

@ -1189,8 +1189,8 @@ public class ModBlocks {
struct_launcher_core = new BlockStruct(Material.iron).setBlockName("struct_launcher_core").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.missileTab).setBlockTextureName(RefStrings.MODID + ":struct_launcher_core");
struct_launcher_core_large = new BlockStruct(Material.iron).setBlockName("struct_launcher_core_large").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.missileTab).setBlockTextureName(RefStrings.MODID + ":struct_launcher_core_large");
struct_soyuz_core = new BlockSoyuzStruct(Material.iron).setBlockName("struct_soyuz_core").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.missileTab).setBlockTextureName(RefStrings.MODID + ":struct_soyuz_core");
struct_iter_core = new BlockITERStruct(Material.iron).setBlockName("struct_iter_core").setLightLevel(1F).setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.missileTab).setBlockTextureName(RefStrings.MODID + ":struct_iter_core");
struct_plasma_core = new BlockPlasmaStruct(Material.iron).setBlockName("struct_plasma_core").setLightLevel(1F).setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.missileTab).setBlockTextureName(RefStrings.MODID + ":struct_plasma_core");
struct_iter_core = new BlockITERStruct(Material.iron).setBlockName("struct_iter_core").setLightLevel(1F).setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":struct_iter_core");
struct_plasma_core = new BlockPlasmaStruct(Material.iron).setBlockName("struct_plasma_core").setLightLevel(1F).setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":struct_plasma_core");
factory_titanium_hull = new BlockGeneric(Material.iron).setBlockName("factory_titanium_hull").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":factory_titanium_hull");
factory_titanium_furnace = new FactoryHatch(Material.iron).setBlockName("factory_titanium_furnace").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":factory_titanium_furnace");

55
src/main/java/com/hbm/blocks/generic/DecoBlock.java
View File

@ -67,7 +67,7 @@ public class DecoBlock extends BlockContainer {
@Override
public Item getItemDropped(int p_149650_1_, Random p_149650_2_, int p_149650_3_)
{
if(this == ModBlocks.boxcar || this == ModBlocks.bomber)
if(this == ModBlocks.bomber)
return null;
return Item.getItemFromBlock(this);
}
@ -219,57 +219,4 @@ public class DecoBlock extends BlockContainer {
return AxisAlignedBB.getBoundingBox(x + this.minX, y + this.minY, z + this.minZ, x + this.maxX, y + this.maxY, z + this.maxZ);
}
@Override
public void breakBlock(World world, int x, int y, int z, Block b, int i) {
if (b == ModBlocks.boxcar) {
List<ItemStack> list = new ArrayList<ItemStack>();
list.add(new ItemStack(ModItems.ingot_steel, 5 + rand.nextInt(16)));
list.add(new ItemStack(ModItems.plate_steel, 15 + rand.nextInt(31)));
list.add(new ItemStack(Items.iron_ingot, 5 + rand.nextInt(11)));
list.add(new ItemStack(ModBlocks.block_steel, 1 + rand.nextInt(3)));
list.add(new ItemStack(ModBlocks.crate, 1 + rand.nextInt(6)));
for (int i1 = 0; i1 < list.size(); ++i1) {
ItemStack itemstack = list.get(i1).copy();
if (itemstack != null) {
float f = this.rand.nextFloat() * 0.8F + 0.1F;
float f1 = this.rand.nextFloat() * 0.8F + 0.1F;
float f2 = this.rand.nextFloat() * 0.8F + 0.1F;
while (itemstack.stackSize > 0) {
int j1 = this.rand.nextInt(21) + 10;
if (j1 > itemstack.stackSize) {
j1 = itemstack.stackSize;
}
itemstack.stackSize -= j1;
EntityItem entityitem = new EntityItem(world, x + f, y + f1,
z + f2,
new ItemStack(itemstack.getItem(), j1, itemstack.getItemDamage()));
if (itemstack.hasTagCompound()) {
entityitem.getEntityItem()
.setTagCompound((NBTTagCompound) itemstack.getTagCompound().copy());
}
float f3 = 0.05F;
entityitem.motionX = (float) this.rand.nextGaussian() * f3;
entityitem.motionY = (float) this.rand.nextGaussian() * f3 + 0.2F;
entityitem.motionZ = (float) this.rand.nextGaussian() * f3;
world.spawnEntityInWorld(entityitem);
}
}
}
world.func_147453_f(x, y, z, b);
}
super.breakBlock(world, x, y, z, b, i);
}
}

31
src/main/java/com/hbm/handler/WeaponAbility.java
View File

@ -1,6 +1,7 @@
package com.hbm.handler;
import com.hbm.items.tool.IItemAbility;
import com.hbm.potion.HbmPotion;
import com.hbm.util.ContaminationUtil;
import net.minecraft.client.resources.I18n;
@ -103,5 +104,35 @@ public abstract class WeaponAbility {
return I18n.format(getName()) + " (" + duration + ")";
}
}
public static class PhosphorusAbility extends WeaponAbility {
int duration;
public PhosphorusAbility(int duration) {
this.duration = duration;
}
@Override
public void onHit(World world, EntityPlayer player, Entity victim, IItemAbility tool) {
if(victim instanceof EntityLivingBase) {
EntityLivingBase living = (EntityLivingBase) victim;
living.addPotionEffect(new PotionEffect(HbmPotion.phosphorus.id, duration * 20, 4));
}
}
@Override
public String getName() {
return "weapon.ability.phosphorus";
}
@Override
public String getFullName() {
return I18n.format(getName()) + " (" + duration + ")";
}
}
}

1
src/main/java/com/hbm/handler/guncfg/GunEnergyFactory.java
View File

@ -10,7 +10,6 @@ import com.hbm.handler.BulletConfiguration;
import com.hbm.handler.GunConfiguration;
import com.hbm.interfaces.IBulletImpactBehavior;
import com.hbm.items.ModItems;
import com.hbm.main.MainRegistry;
import com.hbm.packet.AuxParticlePacketNT;
import com.hbm.packet.PacketDispatcher;
import com.hbm.potion.HbmPotion;

6
src/main/java/com/hbm/inventory/MagicRecipes.java
View File

@ -72,6 +72,12 @@ public class MagicRecipes {
new ComparableStack(ModBlocks.gravel_diamond),
new ComparableStack(ModBlocks.gravel_diamond),
new ComparableStack(ModItems.lead_gavel)));
recipes.add(new MagicRecipe(new ItemStack(ModItems.mese_gavel),
new ComparableStack(ModItems.shimmer_handle),
new ComparableStack(ModItems.powder_dineutronium),
new ComparableStack(ModItems.blades_desh),
new ComparableStack(ModItems.diamond_gavel)));
}
public static List<MagicRecipe> getRecipes() {

1
src/main/java/com/hbm/inventory/ShredderRecipes.java
View File

@ -145,6 +145,7 @@ public class ShredderRecipes {
ShredderRecipes.setRecipe(ModBlocks.meteor_pillar, new ItemStack(ModItems.powder_meteorite, 1));
ShredderRecipes.setRecipe(ModBlocks.ore_rare, new ItemStack(ModItems.powder_desh_mix, 1));
ShredderRecipes.setRecipe(Blocks.diamond_ore, new ItemStack(ModBlocks.gravel_diamond, 2));
ShredderRecipes.setRecipe(ModBlocks.boxcar, new ItemStack(ModItems.powder_steel, 32));
ShredderRecipes.setRecipe(ModItems.ingot_schraranium, new ItemStack(ModItems.nugget_schrabidium, 2));
ShredderRecipes.setRecipe(ModItems.crystal_iron, new ItemStack(ModItems.powder_iron, 3));

43
src/main/java/com/hbm/items/ModItems.java
View File

@ -30,6 +30,7 @@ import net.minecraft.item.ItemStack;
import net.minecraft.potion.Potion;
import net.minecraft.potion.PotionEffect;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.common.util.EnumHelper;
import net.minecraftforge.fluids.FluidContainerRegistry;
import net.minecraftforge.fluids.FluidStack;
@ -2656,8 +2657,8 @@ public class ModItems {
rod_dual_lead = new Item().setUnlocalizedName("rod_dual_lead").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_dual_empty).setTextureName(RefStrings.MODID + ":rod_dual_lead");
rod_dual_schrabidium = new ItemRadioactive(15F, false, true).setUnlocalizedName("rod_dual_schrabidium").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_dual_empty).setTextureName(RefStrings.MODID + ":rod_dual_schrabidium");
rod_dual_solinium = new ItemRadioactive(15F, false, true).setUnlocalizedName("rod_dual_solinium").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_dual_empty).setTextureName(RefStrings.MODID + ":rod_dual_solinium");
rod_dual_balefire = new ItemRadioactive(3000F).setUnlocalizedName("rod_dual_balefire").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_dual_balefire");
rod_dual_balefire_blazing = new ItemRadioactive(5000F, true).setUnlocalizedName("rod_dual_balefire_blazing").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_dual_balefire_blazing");
rod_dual_balefire = new ItemRadioactive(3000F).setUnlocalizedName("rod_dual_balefire").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_dual_empty).setTextureName(RefStrings.MODID + ":rod_dual_balefire");
rod_dual_balefire_blazing = new ItemRadioactive(5000F, true).setUnlocalizedName("rod_dual_balefire_blazing").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_dual_empty).setTextureName(RefStrings.MODID + ":rod_dual_balefire_blazing");
rod_quad_empty = new Item().setUnlocalizedName("rod_quad_empty").setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":rod_quad_empty");
rod_quad_th232 = new ItemCustomLore().setUnlocalizedName("rod_quad_th232").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_quad_empty).setTextureName(RefStrings.MODID + ":rod_quad_th232");
@ -2674,8 +2675,8 @@ public class ModItems {
rod_quad_lead = new Item().setUnlocalizedName("rod_quad_lead").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_quad_empty).setTextureName(RefStrings.MODID + ":rod_quad_lead");
rod_quad_schrabidium = new ItemRadioactive(30F, false, true).setUnlocalizedName("rod_quad_schrabidium").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_quad_empty).setTextureName(RefStrings.MODID + ":rod_quad_schrabidium");
rod_quad_solinium = new ItemRadioactive(30F, false, true).setUnlocalizedName("rod_quad_solinium").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_quad_empty).setTextureName(RefStrings.MODID + ":rod_quad_solinium");
rod_quad_balefire = new ItemRadioactive(6000F).setUnlocalizedName("rod_quad_balefire").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_quad_balefire");
rod_quad_balefire_blazing = new ItemRadioactive(10000F, true).setUnlocalizedName("rod_quad_balefire_blazing").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_quad_balefire_blazing");
rod_quad_balefire = new ItemRadioactive(6000F).setUnlocalizedName("rod_quad_balefire").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_quad_empty).setTextureName(RefStrings.MODID + ":rod_quad_balefire");
rod_quad_balefire_blazing = new ItemRadioactive(10000F, true).setUnlocalizedName("rod_quad_balefire_blazing").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_quad_empty).setTextureName(RefStrings.MODID + ":rod_quad_balefire_blazing");
rod_thorium_fuel = new ItemFuelRod(0.5F, false, 100000, 10).setUnlocalizedName("rod_thorium_fuel").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_empty).setTextureName(RefStrings.MODID + ":rod_thorium_fuel");
rod_dual_thorium_fuel = new ItemFuelRod(1.5F, false, 100000, 20).setUnlocalizedName("rod_dual_thorium_fuel").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_dual_empty).setTextureName(RefStrings.MODID + ":rod_dual_thorium_fuel");
@ -3246,7 +3247,7 @@ public class ModItems {
med_ptsd = new ItemLemon(0, 0, false).setUnlocalizedName("med_ptsd").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":med_ptsd_new");
med_schizophrenia = new ItemLemon(0, 0, false).setUnlocalizedName("med_schizophrenia").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":med_schizophrenia_new");
loops = new ItemLemon(4, 5, false).setUnlocalizedName("loops").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":loops");
loop_stew = new ItemLemon(10, 10, false).setUnlocalizedName("loop_stew").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":loop_stew");
loop_stew = new ItemLemon(10, 10, false).setUnlocalizedName("loop_stew").setMaxStackSize(1).setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":loop_stew");
fooditem = new ItemLemon(2, 5, false).setUnlocalizedName("fooditem").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":fooditem");
twinkie = new ItemLemon(3, 5, false).setUnlocalizedName("twinkie").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":twinkie");
static_sandwich = new ItemLemon(6, 5, false).setUnlocalizedName("static_sandwich").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":static_sandwich");
@ -3792,14 +3793,29 @@ public class ModItems {
.addBreakAbility(new ToolAbility.HammerAbility(3))
.addBreakAbility(new ToolAbility.HammerAbility(4))
.addBreakAbility(new ToolAbility.RecursionAbility(9)).setUnlocalizedName("drax_mk3").setTextureName(RefStrings.MODID + ":drax_mk3");
chlorophyte_pickaxe = new ItemToolAbility(20F, -0.05, MainRegistry.tMatElec, EnumToolType.MINER)
.addBreakAbility(new ToolAbility.MercuryAbility()).setUnlocalizedName("chlorophyte_pickaxe").setTextureName(RefStrings.MODID + ":chlorophyte_pickaxe");
mese_pickaxe = new ItemToolAbilityPower(20F, -0.05, MainRegistry.tMatElec, EnumToolType.MINER, 2500000000L, 500000, 10000)
ToolMaterial matChlorophyte = EnumHelper.addToolMaterial("HBM_CHLOROPHYTE", 4, 0, 50F, 0.0F, 200).setRepairItem(new ItemStack(ModItems.powder_chlorophyte));
chlorophyte_pickaxe = new ItemToolAbility(20F, 0, matChlorophyte, EnumToolType.MINER)
.addBreakAbility(new ToolAbility.HammerAbility(2))
.addBreakAbility(new ToolAbility.LuckAbility(4))
.addBreakAbility(new ToolAbility.CentrifugeAbility())
.addBreakAbility(new ToolAbility.MercuryAbility())
.addHitAbility(new WeaponAbility.StunAbility(10))
.addHitAbility(new WeaponAbility.VampireAbility(5F)).setUnlocalizedName("chlorophyte_pickaxe").setTextureName(RefStrings.MODID + ":chlorophyte_pickaxe");
ToolMaterial matMese = EnumHelper.addToolMaterial("HBM_MESE", 4, 0, 50F, 0.0F, 200).setRepairItem(new ItemStack(ModItems.plate_paa));
mese_pickaxe = new ItemToolAbility(35F, 0, matMese, EnumToolType.MINER)
.addBreakAbility(new ToolAbility.HammerAbility(3))
.addBreakAbility(new ToolAbility.RecursionAbility(5))
.addBreakAbility(new ToolAbility.CrystallizerAbility())
.addBreakAbility(new ToolAbility.SilkAbility())
.addBreakAbility(new ToolAbility.LuckAbility(9))
.addBreakAbility(new ToolAbility.ExplosionAbility(2.5F))
.addBreakAbility(new ToolAbility.ExplosionAbility(5F))
.addBreakAbility(new ToolAbility.ExplosionAbility(7.5F))
.addBreakAbility(new ToolAbility.ExplosionAbility(10F))
.setUnlocalizedName("mese_pickaxe").setTextureName(RefStrings.MODID + ":mese_pickaxe");
.addBreakAbility(new ToolAbility.ExplosionAbility(15F))
.addHitAbility(new WeaponAbility.StunAbility(10))
.addHitAbility(new WeaponAbility.PhosphorusAbility(60)) .setUnlocalizedName("mese_pickaxe").setTextureName(RefStrings.MODID + ":mese_pickaxe");
mask_of_infamy = new MaskOfInfamy(ArmorMaterial.IRON, 8, 0).setUnlocalizedName("mask_of_infamy").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":mask_of_infamy");
@ -3846,7 +3862,12 @@ public class ModItems {
wood_gavel = new WeaponSpecial(ToolMaterial.WOOD).setUnlocalizedName("wood_gavel").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":wood_gavel");
lead_gavel = new WeaponSpecial(MainRegistry.tMatSteel).setUnlocalizedName("lead_gavel").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":lead_gavel");
diamond_gavel = new WeaponSpecial(ToolMaterial.EMERALD).setUnlocalizedName("diamond_gavel").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":diamond_gavel");
mese_gavel = new WeaponSpecial(ToolMaterial.GOLD).setUnlocalizedName("mese_gavel").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":mese_gavel");
ToolMaterial matMeseGavel = EnumHelper.addToolMaterial("HBM_MESEGAVEL", 4, 0, 50F, 0.0F, 200).setRepairItem(new ItemStack(ModItems.plate_paa));
mese_gavel = new ItemSwordAbility(250, 1.5, matMeseGavel)
.addHitAbility(new WeaponAbility.PhosphorusAbility(60))
.addHitAbility(new WeaponAbility.RadiationAbility(500))
.addHitAbility(new WeaponAbility.StunAbility(10))
.addHitAbility(new WeaponAbility.VampireAbility(50)).setUnlocalizedName("mese_gavel").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":mese_gavel");
multitool_hit = new ItemMultitoolPassive().setUnlocalizedName("multitool_hit").setCreativeTab(null).setTextureName(RefStrings.MODID + ":multitool_fist");
multitool_dig = new ItemMultitoolTool(4.0F, MainRegistry.enumToolMaterialMultitool, ItemMultitoolTool.getAllBlocks()).setFull3D().setUnlocalizedName("multitool_dig").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":multitool_claw");

5
src/main/java/com/hbm/items/tool/ItemSwordAbility.java
View File

@ -6,6 +6,7 @@ import java.util.List;
import com.google.common.collect.HashMultimap;
import com.google.common.collect.Multimap;
import com.hbm.handler.WeaponAbility;
import com.hbm.items.ModItems;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@ -59,6 +60,10 @@ public class ItemSwordAbility extends ItemSword implements IItemAbility {
if(!attacker.worldObj.isRemote && !this.hitAbility.isEmpty() && attacker instanceof EntityPlayer && canOperate(stack)) {
//hacky hacky hack
if(this == ModItems.mese_gavel)
attacker.worldObj.playSoundAtEntity(victim, "hbm:weapon.whack", 3.0F, 1.F);
for(WeaponAbility ability : this.hitAbility) {
ability.onHit(attacker.worldObj, (EntityPlayer) attacker, victim, this);
}

1
src/main/java/com/hbm/items/tool/WeaponSpecial.java
View File

@ -16,7 +16,6 @@ import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.SharedMonsterAttributes;
import net.minecraft.entity.ai.attributes.AttributeModifier;
import net.minecraft.entity.passive.EntityHorse;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.init.Blocks;
import net.minecraft.item.EnumRarity;

6
src/main/java/com/hbm/lib/HbmWorldGen.java
View File

@ -556,9 +556,9 @@ public class HbmWorldGen implements IWorldGenerator {
z = j + rand.nextInt(65) - 32;
y = world.getHeightValue(x, z);
if(world.getBlock(x, y, z).canPlaceTorchOnTop(world, x, y, z)) {
world.setBlock(x, y + 1, z, Blocks.skull, 1, 2);
TileEntitySkull skull = (TileEntitySkull)world.getTileEntity(x, y + 1, z);
if(world.getBlock(x, y - 1, z).canPlaceTorchOnTop(world, x, y - 1, z)) {
world.setBlock(x, y, z, Blocks.skull, 1, 2);
TileEntitySkull skull = (TileEntitySkull)world.getTileEntity(x, y, z);
if(skull != null)
skull.func_145903_a(rand.nextInt(16));

2
src/main/java/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.27 BETA (3640)";
public static final String VERSION = "1.0.27 BETA (3654)";
//HBM's Beta Naming Convention:
//V T (X)
//V -> next release version

8
src/main/java/com/hbm/main/CraftingManager.java
View File

@ -1263,6 +1263,9 @@ public class CraftingManager {
GameRegistry.addRecipe(new ItemStack(ModItems.drax_mk2, 1), new Object[] { "SCS", "IDI", "FEF", 'S', ModItems.ingot_starmetal, 'C', ModItems.crystal_trixite, 'I', ModItems.ingot_saturnite, 'D', ModItems.drax, 'F', ItemBattery.getFullBattery(ModItems.fusion_core), 'E', ModItems.circuit_targeting_tier5 });
GameRegistry.addRecipe(new ItemStack(ModItems.drax_mk3, 1), new Object[] { "ECE", "CDC", "SBS", 'E', ModBlocks.block_euphemium_cluster, 'C', ModItems.crystal_schrabidium, 'D', ModItems.drax_mk2, 'S', ModItems.circuit_targeting_tier6, 'B', ItemBattery.getFullBattery(ModItems.battery_spark) });
GameRegistry.addRecipe(new ItemStack(ModItems.chlorophyte_pickaxe, 1), new Object[] { " SD", "APS", "FA ", 'S', ModItems.blades_steel, 'D', ModItems.powder_chlorophyte, 'A', ModItems.ingot_fiberglass, 'P', ModItems.steel_pickaxe, 'F', ModItems.bolt_dura_steel });
GameRegistry.addRecipe(new ItemStack(ModItems.mese_pickaxe, 1), new Object[] { " SD", "APS", "FA ", 'S', ModItems.blades_desh, 'D', ModItems.powder_dineutronium, 'A', ModItems.plate_paa, 'P', ModItems.chlorophyte_pickaxe, 'F', ModItems.shimmer_handle });
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.jetpack_boost, 1), new Object[] { "PTP", "SLS", "W W", 'P', "plateSteel", 'T', ModItems.tank_steel, 'S', ModItems.pipes_steel, 'L', Items.leather, 'W', ModItems.thruster_small }));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.jetpack_fly, 1), new Object[] { "PTP", "SLS", "W W", 'P', "plateSteel", 'T', ModItems.cap_aluminium, 'S', ModItems.pipes_steel, 'L', ModItems.jetpack_boost, 'W', ModItems.thruster_small }));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.jetpack_break, 1), new Object[] { "PTP", "SLS", "P P", 'P', "plateSteel", 'T', ModItems.cap_aluminium, 'S', ModItems.coil_tungsten, 'L', ModItems.jetpack_boost }));
@ -1568,7 +1571,8 @@ public class CraftingManager {
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.mp_fuselage_10_kerosene_metal, 1), new Object[] { "ICI", "CTC", "ICI", 'C', "plateSteel", 'I', "plateIron", 'T', ModItems.mp_fuselage_10_kerosene }));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.mp_fuselage_10_long_kerosene_metal, 1), new Object[] { "ICI", "CTC", "ICI", 'C', "plateSteel", 'I', "plateIron", 'T', ModItems.mp_fuselage_10_long_kerosene }));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.mp_fuselage_15_kerosene_metal, 1), new Object[] { "ICI", "CTC", "ICI", 'C', "plateSteel", 'I', "plateIron", 'T', ModItems.mp_fuselage_15_kerosene }));
GameRegistry.addRecipe(new ItemStack(ModItems.mp_warhead_15_boxcar, 1), new Object[] { "SNS", "CBC", "SFS", 'S', ModItems.ingot_starmetal, 'N', ModBlocks.det_nuke, 'C', ModItems.circuit_targeting_tier4, 'B', ModBlocks.boxcar, 'F', ModItems.tritium_deuterium_cake });
GameRegistry.addRecipe(new ItemStack(ModItems.mp_chip_1, 1), new Object[] { "P", "C", "S", 'P', ModItems.plate_polymer, 'C', ModItems.circuit_targeting_tier1, 'S', ModBlocks.steel_scaffold });
GameRegistry.addRecipe(new ItemStack(ModItems.mp_chip_2, 1), new Object[] { "P", "C", "S", 'P', ModItems.plate_polymer, 'C', ModItems.circuit_targeting_tier2, 'S', ModBlocks.steel_scaffold });
GameRegistry.addRecipe(new ItemStack(ModItems.mp_chip_3, 1), new Object[] { "P", "C", "S", 'P', ModItems.plate_polymer, 'C', ModItems.circuit_targeting_tier3, 'S', ModBlocks.steel_scaffold });
@ -1624,7 +1628,7 @@ public class CraftingManager {
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.barrel_iron, 1), new Object[] { "IPI", "I I", "IPI", 'I', "plateIron", 'P', "ingotIron" }));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.barrel_steel, 1), new Object[] { "IPI", "I I", "IPI", 'I', "plateSteel", 'P', "ingotSteel" }));
GameRegistry.addRecipe(new ItemStack(ModBlocks.barrel_antimatter, 1), new Object[] { "IPI", "IPI", "IPI", 'I', ModItems.plate_saturnite, 'P', ModItems.coil_advanced_torus });
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.tesla, 1), new Object[] { "CCC", " I ", "PTP", 'C', ModItems.coil_copper, 'I', "ingotIron", 'P', "ingotPolymer", 'T', ModBlocks.machine_transformer }));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.tesla, 1), new Object[] { "CCC", "PIP", "WTW", 'C', ModItems.coil_copper, 'I', "ingotIron", 'P', "ingotPolymer", 'T', ModBlocks.machine_transformer, 'W', "plankWood" }));
GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.cladding_paint, 1), new Object[] { "dustLead", Items.clay_ball, Items.glass_bottle }));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.cladding_rubber, 1), new Object[] { "RCR", "CDC", "RCR", 'R', ModItems.plate_polymer, 'C', "dustCoal", 'D', ModItems.ducttape }));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.cladding_lead, 1), new Object[] { "DPD", "PRP", "DPD", 'R', ModItems.cladding_rubber, 'P', "plateLead", 'D', ModItems.ducttape }));

4
src/main/java/com/hbm/main/ModEventHandlerClient.java
View File

@ -46,13 +46,10 @@ import net.minecraft.client.entity.AbstractClientPlayer;
import net.minecraft.client.multiplayer.WorldClient;
import net.minecraft.client.renderer.OpenGlHelper;
import net.minecraft.client.renderer.RenderHelper;
import net.minecraft.client.renderer.Tessellator;
import net.minecraft.client.renderer.entity.Render;
import net.minecraft.client.renderer.entity.RenderPlayer;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.AxisAlignedBB;
import net.minecraft.util.EnumChatFormatting;
import net.minecraft.util.IIcon;
import net.minecraft.util.ResourceLocation;
@ -60,7 +57,6 @@ import net.minecraft.util.Vec3;
import net.minecraftforge.client.event.MouseEvent;
import net.minecraftforge.client.event.RenderGameOverlayEvent;
import net.minecraftforge.client.event.RenderGameOverlayEvent.ElementType;
import net.minecraftforge.client.event.RenderLivingEvent;
import net.minecraftforge.client.event.RenderPlayerEvent;
import net.minecraftforge.client.event.RenderWorldLastEvent;
import net.minecraftforge.client.event.TextureStitchEvent;

19
src/main/java/com/hbm/main/ResourceManager.java
View File

@ -167,14 +167,23 @@ public class ResourceManager {
public static final IModelCustom shredder_blade = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/shredder_blade.obj"));
//Bombs
public static final IModelCustom bomb_gadget = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/TheGadget3.obj"));
public static final IModelCustom bomb_boy = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/LilBoy1.obj"));
public static final IModelCustom bomb_man = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/FatMan.obj"));
public static final IModelCustom bomb_mike = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/IvyMike.obj"));
public static final IModelCustom bomb_tsar = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/TsarBomba.obj"));
public static final IModelCustom bomb_prototype = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/Prototype.obj"));
public static final IModelCustom bomb_fleija = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/Fleija.obj"));
public static final IModelCustom bomb_solinium = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/bombs/ufp.obj"));
public static final IModelCustom n2 = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/bombs/n2.obj"));
public static final IModelCustom bomb_multi = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/BombGeneric.obj"));
public static final IModelCustom n45_globe = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/bombs/n45_globe.obj"));
public static final IModelCustom n45_knob = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/bombs/n45_knob.obj"));
public static final IModelCustom n45_rod = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/bombs/n45_rod.obj"));
public static final IModelCustom n45_stand = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/bombs/n45_stand.obj"));
public static final IModelCustom n45_chain = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/bombs/n45_chain.obj"));
public static final IModelCustom fstbmb = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/bombs/fstbmb.obj"));
public static final IModelCustom dud = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/BalefireCrashed.obj"));
//Cel-Prime
public static final IModelCustom cp_tower = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/cel_prime_tower.obj"));
@ -388,14 +397,24 @@ public class ResourceManager {
public static final ResourceLocation forcefield_top_tex = new ResourceLocation(RefStrings.MODID, "textures/models/forcefield_top.png");
//Bombs
public static final ResourceLocation bomb_gadget_tex = new ResourceLocation(RefStrings.MODID, "textures/models/TheGadget3_tex.png");
public static final ResourceLocation bomb_boy_tex = new ResourceLocation(RefStrings.MODID, "textures/models/lilboy.png");
public static final ResourceLocation bomb_man_tex = new ResourceLocation(RefStrings.MODID, "textures/models/FatMan.png");
public static final ResourceLocation bomb_mike_tex = new ResourceLocation(RefStrings.MODID, "textures/models/IvyMike.png");
public static final ResourceLocation bomb_tsar_tex = new ResourceLocation(RefStrings.MODID, "textures/models/TsarBomba.png");
public static final ResourceLocation bomb_prototype_tex = new ResourceLocation(RefStrings.MODID, "textures/models/Prototype.png");
public static final ResourceLocation bomb_fleija_tex = new ResourceLocation(RefStrings.MODID, "textures/models/Fleija.png");
public static final ResourceLocation bomb_solinium_tex = new ResourceLocation(RefStrings.MODID, "textures/models/bombs/ufp.png");
public static final ResourceLocation n2_tex = new ResourceLocation(RefStrings.MODID, "textures/models/bombs/n2.png");
public static final ResourceLocation bomb_custom_tex = new ResourceLocation(RefStrings.MODID, "textures/models/CustomNuke.png");
public static final ResourceLocation bomb_multi_tex = new ResourceLocation(RefStrings.MODID, "textures/models/BombGeneric.png");
public static final ResourceLocation n45_globe_tex = new ResourceLocation(RefStrings.MODID, "textures/models/bombs/n45_globe.png");
public static final ResourceLocation n45_knob_tex = new ResourceLocation(RefStrings.MODID, "textures/models/bombs/n45_knob.png");
public static final ResourceLocation n45_rod_tex = new ResourceLocation(RefStrings.MODID, "textures/models/bombs/n45_rod.png");
public static final ResourceLocation n45_stand_tex = new ResourceLocation(RefStrings.MODID, "textures/models/n45_stand.png");
public static final ResourceLocation n45_chain_tex = new ResourceLocation(RefStrings.MODID, "textures/models/bombs/n45_chain.png");
public static final ResourceLocation fstbmb_tex = new ResourceLocation(RefStrings.MODID, "textures/models/bombs/fstbmb.png");
public static final ResourceLocation dud_tex = new ResourceLocation(RefStrings.MODID, "textures/models/BalefireCrashed.png");
//Satellites
public static final ResourceLocation sat_base_tex = new ResourceLocation(RefStrings.MODID, "textures/models/sat_base.png");

1
src/main/java/com/hbm/render/item/ItemRenderBase.java
View File

@ -29,6 +29,7 @@ public abstract class ItemRenderBase implements IItemRenderer {
public void renderItem(ItemRenderType type, ItemStack item, Object... data) {
GL11.glPushMatrix();
GL11.glEnable(GL11.GL_CULL_FACE);
if(type == ItemRenderType.INVENTORY) {
RenderHelper.enableGUIStandardItemLighting();
GL11.glTranslated(8, 10, 0);

268
src/main/java/com/hbm/render/item/ItemRenderLibrary.java
View File

@ -20,17 +20,15 @@ public class ItemRenderLibrary {
renderers.put(Item.getItemFromBlock(ModBlocks.obj_tester), new ItemRenderBase() {
public void renderInventory() {
GL11.glTranslated(0, -4, 0);
GL11.glScaled(2, 2, 2);
}
public void renderCommon() {
GL11.glShadeModel(GL11.GL_SMOOTH);
bindTexture(ResourceManager.soyuz_module_dome_tex);
ResourceManager.soyuz_module.renderPart("Dome");
bindTexture(ResourceManager.soyuz_module_lander_tex);
ResourceManager.soyuz_module.renderPart("Capsule");
bindTexture(ResourceManager.soyuz_module_propulsion_tex);
ResourceManager.soyuz_module.renderPart("Propulsion");
bindTexture(ResourceManager.soyuz_module_solar_tex);
ResourceManager.soyuz_module.renderPart("Solar");
bindTexture(ResourceManager.soyuz_module_dome_tex); ResourceManager.soyuz_module.renderPart("Dome");
bindTexture(ResourceManager.soyuz_module_lander_tex); ResourceManager.soyuz_module.renderPart("Capsule");
bindTexture(ResourceManager.soyuz_module_propulsion_tex); ResourceManager.soyuz_module.renderPart("Propulsion");
bindTexture(ResourceManager.soyuz_module_solar_tex); ResourceManager.soyuz_module.renderPart("Solar");
GL11.glShadeModel(GL11.GL_FLAT);
}});
@ -383,8 +381,258 @@ public class ItemRenderLibrary {
public void renderCommon() {
GL11.glScaled(0.5, 0.5, 0.5);
GL11.glTranslatef(0, 0, 14);
bindTexture(ResourceManager.iter_microwave);
ResourceManager.iter.renderPart("Microwave");
GL11.glShadeModel(GL11.GL_SMOOTH);
bindTexture(ResourceManager.iter_microwave); ResourceManager.iter.renderPart("Microwave");
GL11.glShadeModel(GL11.GL_FLAT);
}});
renderers.put(Item.getItemFromBlock(ModBlocks.tesla), new ItemRenderBase() {
public void renderInventory() {
GL11.glTranslated(0, -3, 0);
GL11.glScaled(6, 6, 6);
}
public void renderCommon() {
GL11.glDisable(GL11.GL_CULL_FACE);
bindTexture(ResourceManager.tesla_tex); ResourceManager.tesla.renderAll();
GL11.glEnable(GL11.GL_CULL_FACE);
}});
renderers.put(Item.getItemFromBlock(ModBlocks.boxcar), new ItemRenderBase() {
public void renderInventory() {
GL11.glRotated(90, 0, 1, 0);
GL11.glTranslated(0, -1, 0);
GL11.glScaled(4, 4, 4);
}
public void renderCommon() {
GL11.glScaled(0.5, 0.5, 0.5);
bindTexture(ResourceManager.boxcar_tex); ResourceManager.boxcar.renderAll();
}});
renderers.put(Item.getItemFromBlock(ModBlocks.boat), new ItemRenderBase() {
public void renderInventory() {
GL11.glRotated(-90, 0, 1, 0);
GL11.glTranslated(0, 1, 0);
GL11.glScaled(1.75, 1.75, 1.75);
}
public void renderCommon() {
GL11.glScaled(0.5, 0.5, 0.5);
GL11.glTranslatef(0, 0, -3);
bindTexture(ResourceManager.duchessgambit_tex); ResourceManager.duchessgambit.renderAll();
}});
renderers.put(Item.getItemFromBlock(ModBlocks.bomber), new ItemRenderBase() {
public void renderInventory() {
GL11.glTranslated(0, 1, 0);
GL11.glScaled(2.25, 2.25, 2.25);
}
public void renderCommon() {
GL11.glRotated(-90, 0, 1, 0);
GL11.glScaled(2, 2, 2);
GL11.glTranslatef(0, 0, -0.25F);
bindTexture(ResourceManager.dornier_0_tex); ResourceManager.dornier.renderAll();
}});
renderers.put(Item.getItemFromBlock(ModBlocks.nuke_gadget), new ItemRenderBase() {
public void renderInventory() {
GL11.glTranslated(0, -3, 0);
GL11.glScaled(5, 5, 5);
}
public void renderCommon() {
GL11.glTranslated(0.25, 0, 0);
bindTexture(ResourceManager.bomb_gadget_tex);
ResourceManager.bomb_gadget.renderAll();
}});
renderers.put(Item.getItemFromBlock(ModBlocks.nuke_boy), new ItemRenderBase() {
public void renderInventory() {
GL11.glScaled(5, 5, 5);
}
public void renderCommon() {
GL11.glTranslated(-1, 0, 0);
bindTexture(ResourceManager.bomb_boy_tex);
ResourceManager.bomb_boy.renderAll();
}});
renderers.put(Item.getItemFromBlock(ModBlocks.nuke_man), new ItemRenderBase() {
public void renderInventory() {
GL11.glTranslated(0, -2, 0);
GL11.glScaled(5.5, 5.5, 5.5);
}
public void renderCommon() {
GL11.glRotated(180, 0, 1, 0);
GL11.glTranslated(-0.75, 0, 0);
GL11.glDisable(GL11.GL_CULL_FACE);
bindTexture(ResourceManager.bomb_man_tex);
ResourceManager.bomb_man.renderAll();
GL11.glEnable(GL11.GL_CULL_FACE);
}});
renderers.put(Item.getItemFromBlock(ModBlocks.nuke_mike), new ItemRenderBase() {
public void renderInventory() {
GL11.glTranslated(0, -5, 0);
GL11.glScaled(2.5, 2.5, 2.5);
}
public void renderCommon() {
GL11.glRotated(90, 0, 1, 0);
bindTexture(ResourceManager.bomb_mike_tex);
ResourceManager.bomb_mike.renderAll();
}});
renderers.put(Item.getItemFromBlock(ModBlocks.nuke_tsar), new ItemRenderBase() {
public void renderInventory() {
GL11.glScaled(2.25, 2.25, 2.25);
}
public void renderCommon() {
GL11.glTranslated(1.5, 0, 0);
bindTexture(ResourceManager.bomb_tsar_tex);
ResourceManager.bomb_tsar.renderAll();
}});
renderers.put(Item.getItemFromBlock(ModBlocks.nuke_prototype), new ItemRenderBase() {
public void renderInventory() {
GL11.glScaled(2.25, 2.25, 2.25);
}
public void renderCommon() {
GL11.glRotated(90, 0, 1, 0);
bindTexture(ResourceManager.bomb_prototype_tex);
ResourceManager.bomb_prototype.renderAll();
}});
renderers.put(Item.getItemFromBlock(ModBlocks.nuke_fleija), new ItemRenderBase() {
public void renderInventory() {
GL11.glTranslated(0, -2, 0);
GL11.glScaled(4.5, 4.5, 4.5);
}
public void renderCommon() {
GL11.glScaled(2, 2, 2);
GL11.glRotated(90, 0, 1, 0);
bindTexture(ResourceManager.bomb_fleija_tex);
ResourceManager.bomb_fleija.renderAll();
}});
renderers.put(Item.getItemFromBlock(ModBlocks.nuke_solinium), new ItemRenderBase() {
public void renderInventory() {
GL11.glScaled(4, 4, 4);
}
public void renderCommon() {
GL11.glTranslated(0.5, 0, 0);
GL11.glRotated(90, 0, 1, 0);
GL11.glDisable(GL11.GL_CULL_FACE);
bindTexture(ResourceManager.bomb_solinium_tex);
ResourceManager.bomb_solinium.renderAll();
GL11.glEnable(GL11.GL_CULL_FACE);
}});
renderers.put(Item.getItemFromBlock(ModBlocks.nuke_n2), new ItemRenderBase() {
public void renderInventory() {
GL11.glTranslated(0, -4, 0);
GL11.glScaled(3, 3, 3);
}
public void renderCommon() {
GL11.glRotated(90, 0, 1, 0);
bindTexture(ResourceManager.n2_tex);
ResourceManager.n2.renderAll();
}});
renderers.put(Item.getItemFromBlock(ModBlocks.nuke_fstbmb), new ItemRenderBase() {
public void renderInventory() {
GL11.glScaled(2.25, 2.25, 2.25);
}
public void renderCommon() {
GL11.glTranslated(1, 0, 0);
GL11.glRotated(90, 0, 1, 0);
GL11.glShadeModel(GL11.GL_SMOOTH);
bindTexture(ResourceManager.fstbmb_tex);
ResourceManager.fstbmb.renderPart("Body");
ResourceManager.fstbmb.renderPart("Balefire");
GL11.glShadeModel(GL11.GL_FLAT);
}});
renderers.put(Item.getItemFromBlock(ModBlocks.nuke_custom), new ItemRenderBase() {
public void renderInventory() {
GL11.glScaled(5, 5, 5);
}
public void renderCommon() {
GL11.glTranslated(-1, 0, 0);
bindTexture(ResourceManager.bomb_custom_tex);
ResourceManager.bomb_boy.renderAll();
}});
renderers.put(Item.getItemFromBlock(ModBlocks.crashed_balefire), new ItemRenderBase() {
public void renderInventory() {
GL11.glTranslated(0, 3, 0);
GL11.glScaled(2, 2, 2);
}
public void renderCommon() {
GL11.glRotated(90, 0, 1, 0);
GL11.glDisable(GL11.GL_CULL_FACE);
bindTexture(ResourceManager.dud_tex);
ResourceManager.dud.renderAll();
GL11.glEnable(GL11.GL_CULL_FACE);
}});
renderers.put(Item.getItemFromBlock(ModBlocks.bomb_multi), new ItemRenderBase() {
public void renderInventory() {
GL11.glTranslated(0, -1, 0);
GL11.glScaled(4, 4, 4);
}
public void renderCommon() {
GL11.glTranslated(0.75, 0, 0);
GL11.glScaled(3, 3, 3);
GL11.glTranslated(0, 0.5, 0);
GL11.glRotatef(180, 1F, 0F, 0F);
GL11.glRotatef(90, 0F, 1F, 0F);
GL11.glDisable(GL11.GL_CULL_FACE);
bindTexture(ResourceManager.bomb_multi_tex);
ResourceManager.bomb_multi.renderAll();
GL11.glEnable(GL11.GL_CULL_FACE);
}});
renderers.put(Item.getItemFromBlock(ModBlocks.mine_ap), new ItemRenderBase() {
public void renderInventory() {
GL11.glScaled(8, 8, 8);
}
public void renderCommon() {
GL11.glScaled(6, 6, 6);
GL11.glRotatef(22.5F, 0F, 1F, 0F);
GL11.glDisable(GL11.GL_CULL_FACE);
bindTexture(ResourceManager.mine_ap_tex);
ResourceManager.mine_ap.renderAll();
GL11.glEnable(GL11.GL_CULL_FACE);
}});
renderers.put(Item.getItemFromBlock(ModBlocks.mine_he), new ItemRenderBase() {
public void renderInventory() {
GL11.glScaled(6, 6, 6);
}
public void renderCommon() {
GL11.glScaled(4, 4, 4);
bindTexture(ResourceManager.mine_he_tex);
ResourceManager.mine_he.renderAll();
}});
renderers.put(Item.getItemFromBlock(ModBlocks.mine_shrap), new ItemRenderBase() {
public void renderInventory() {
GL11.glScaled(6, 6, 6);
}
public void renderCommon() {
GL11.glScaled(4, 4, 4);
bindTexture(ResourceManager.mine_shrap_tex);
ResourceManager.mine_he.renderAll();
}});
renderers.put(Item.getItemFromBlock(ModBlocks.mine_fat), new ItemRenderBase() {
public void renderInventory() {
GL11.glTranslated(0, -1, 0);
GL11.glScaled(7, 7, 7);
}
public void renderCommon() {
GL11.glTranslated(0.25, 0, 0);
GL11.glRotated(90, 0, 1, 0);
GL11.glDisable(GL11.GL_CULL_FACE);
bindTexture(ResourceManager.mine_fat_tex);
ResourceManager.mine_fat.renderAll();
GL11.glEnable(GL11.GL_CULL_FACE);
}});
}

21
src/main/java/com/hbm/render/tileentity/RenderBombMulti.java
View File

@ -2,25 +2,12 @@ package com.hbm.render.tileentity;
import org.lwjgl.opengl.GL11;
import com.hbm.lib.RefStrings;
import com.hbm.main.ResourceManager;
import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.ResourceLocation;
import net.minecraftforge.client.model.AdvancedModelLoader;
import net.minecraftforge.client.model.IModelCustom;
public class RenderBombMulti extends TileEntitySpecialRenderer {
private static final ResourceLocation bombModel = new ResourceLocation(RefStrings.MODID, "models/BombGeneric.obj");
private IModelCustom bombModelC;
private ResourceLocation bombTexture;
public RenderBombMulti()
{
bombModelC = AdvancedModelLoader.loadModel(bombModel);
bombTexture = new ResourceLocation(RefStrings.MODID, "textures/models/BombGeneric.png");
}
@Override
public void renderTileEntityAt(TileEntity tileEntity, double x, double y, double z, float f)
@ -43,8 +30,10 @@ public class RenderBombMulti extends TileEntitySpecialRenderer {
GL11.glRotatef(180, 0F, 1F, 0F); break;
}
bindTexture(bombTexture);
bombModelC.renderAll();
bindTexture(ResourceManager.bomb_multi_tex);
ResourceManager.bomb_multi.renderAll();
GL11.glEnable(GL11.GL_CULL_FACE);
GL11.glPopMatrix();
}

22
src/main/java/com/hbm/render/tileentity/RenderCrashedBomb.java
View File

@ -2,33 +2,20 @@ package com.hbm.render.tileentity;
import org.lwjgl.opengl.GL11;
import com.hbm.lib.RefStrings;
import com.hbm.main.ResourceManager;
import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.ResourceLocation;
import net.minecraftforge.client.model.AdvancedModelLoader;
import net.minecraftforge.client.model.IModelCustom;
public class RenderCrashedBomb extends TileEntitySpecialRenderer {
private static final ResourceLocation objTesterModelRL = new ResourceLocation(/*"/assets/" + */RefStrings.MODID, "models/BalefireCrashed.obj");
private IModelCustom manModel;
private ResourceLocation manTexture;
public RenderCrashedBomb()
{
manModel = AdvancedModelLoader.loadModel(objTesterModelRL);
manTexture = new ResourceLocation(RefStrings.MODID, "textures/models/BalefireCrashed.png");
}
@Override
public void renderTileEntityAt(TileEntity tileEntity, double x, double y, double z, float f)
{
GL11.glPushMatrix();
GL11.glTranslated(x + 0.5D, y, z + 0.5D);
GL11.glDisable(GL11.GL_CULL_FACE);
GL11.glEnable(GL11.GL_LIGHTING);
GL11.glDisable(GL11.GL_CULL_FACE);
switch(tileEntity.getBlockMetadata())
{
case 5:
@ -41,10 +28,11 @@ public class RenderCrashedBomb extends TileEntitySpecialRenderer {
GL11.glRotatef(0, 0F, 1F, 0F); break;
}
bindTexture(manTexture);
manModel.renderAll();
bindTexture(ResourceManager.dud_tex);
ResourceManager.dud.renderAll();
GL11.glEnable(GL11.GL_CULL_FACE);
GL11.glPopMatrix();
}
}

20
src/main/java/com/hbm/render/tileentity/RenderDecoBlock.java
View File

@ -200,13 +200,25 @@ public class RenderDecoBlock extends TileEntitySpecialRenderer {
GL11.glPopMatrix();
if(tileentity.getWorldObj().getBlock(tileentity.xCoord, tileentity.yCoord, tileentity.zCoord) == ModBlocks.boxcar) {
GL11.glTranslatef(0, 0, -1.5F);
GL11.glRotated(90, 1, 0, 0);
GL11.glDisable(GL11.GL_CULL_FACE);
GL11.glRotatef(180, 0F, 0F, 1F);
GL11.glTranslatef(0, -1.5F, 0);
switch(tileentity.getBlockMetadata()) {
case 4: GL11.glRotatef(0, 0F, 1F, 0F); break;
case 2: GL11.glRotatef(270, 0F, 1F, 0F); break;
case 5: GL11.glRotatef(180, 0F, 1F, 0F); break;
case 3: GL11.glRotatef(90, 0F, 1F, 0F); break;
default:
GL11.glRotatef(180, 0F, 0F, 1F);
GL11.glRotated(90, 1, 0, 0);
GL11.glTranslatef(0, -1.5F, 0);
break;
}
GL11.glEnable(GL11.GL_CULL_FACE);
bindTexture(ResourceManager.boxcar_tex);
ResourceManager.boxcar.renderAll();
GL11.glEnable(GL11.GL_CULL_FACE);
}
if(tileentity.getWorldObj().getBlock(tileentity.xCoord, tileentity.yCoord, tileentity.zCoord) == ModBlocks.boat) {

19
src/main/java/com/hbm/render/tileentity/RenderNukeBoy.java
View File

@ -2,25 +2,12 @@ package com.hbm.render.tileentity;
import org.lwjgl.opengl.GL11;
import com.hbm.lib.RefStrings;
import com.hbm.main.ResourceManager;
import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.ResourceLocation;
import net.minecraftforge.client.model.AdvancedModelLoader;
import net.minecraftforge.client.model.IModelCustom;
public class RenderNukeBoy extends TileEntitySpecialRenderer {
private static final ResourceLocation objTesterModelRL = new ResourceLocation(/*"/assets/" + */RefStrings.MODID, "models/LilBoy1.obj");
private IModelCustom boyModel;
private ResourceLocation boyTexture;
public RenderNukeBoy()
{
boyModel = AdvancedModelLoader.loadModel(objTesterModelRL);
boyTexture = new ResourceLocation(RefStrings.MODID, "textures/models/lilboy.png");
}
@Override
public void renderTileEntityAt(TileEntity tileEntity, double x, double y, double z, float f)
@ -45,8 +32,8 @@ public class RenderNukeBoy extends TileEntitySpecialRenderer {
GL11.glTranslated(-2.0D, 0.0D, 0.0D); break;
}
bindTexture(boyTexture);
boyModel.renderAll();
bindTexture(ResourceManager.bomb_boy_tex);
ResourceManager.bomb_boy.renderAll();
GL11.glPopMatrix();
}

21
src/main/java/com/hbm/render/tileentity/RenderNukeCustom.java
View File

@ -2,25 +2,12 @@ package com.hbm.render.tileentity;
import org.lwjgl.opengl.GL11;
import com.hbm.lib.RefStrings;
import com.hbm.main.ResourceManager;
import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.ResourceLocation;
import net.minecraftforge.client.model.AdvancedModelLoader;
import net.minecraftforge.client.model.IModelCustom;
public class RenderNukeCustom extends TileEntitySpecialRenderer {
private static final ResourceLocation objTesterModelRL = new ResourceLocation(/*"/assets/" + */RefStrings.MODID, "models/LilBoy1.obj");
private IModelCustom boyModel;
private ResourceLocation boyTexture;
public RenderNukeCustom()
{
boyModel = AdvancedModelLoader.loadModel(objTesterModelRL);
boyTexture = new ResourceLocation(RefStrings.MODID, "textures/models/CustomNuke.png");
}
@Override
public void renderTileEntityAt(TileEntity tileEntity, double x, double y, double z, float f)
@ -45,10 +32,10 @@ public class RenderNukeCustom extends TileEntitySpecialRenderer {
GL11.glTranslated(-2.0D, 0.0D, 0.0D); break;
}
bindTexture(boyTexture);
boyModel.renderAll();
bindTexture(ResourceManager.bomb_custom_tex);
ResourceManager.bomb_boy.renderAll();
GL11.glEnable(GL11.GL_LIGHTING);
GL11.glEnable(GL11.GL_CULL_FACE);
GL11.glPopMatrix();
}

21
src/main/java/com/hbm/render/tileentity/RenderNukeFleija.java
View File

@ -2,27 +2,12 @@ package com.hbm.render.tileentity;
import org.lwjgl.opengl.GL11;
import com.hbm.lib.RefStrings;
import com.hbm.main.ResourceManager;
import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.ResourceLocation;
import net.minecraftforge.client.model.AdvancedModelLoader;
import net.minecraftforge.client.model.IModelCustom;
public class RenderNukeFleija extends TileEntitySpecialRenderer {
private static final ResourceLocation objTesterModelRL = new ResourceLocation(/*"/assets/" + */RefStrings.MODID, "models/Fleija.obj");
//private static final ResourceLocation objTesterModelRL = new ResourceLocation(/*"/assets/" + */RefStrings.MODID, "models/Prototype.obj");
private IModelCustom manModel;
private ResourceLocation manTexture;
public RenderNukeFleija()
{
manModel = AdvancedModelLoader.loadModel(objTesterModelRL);
manTexture = new ResourceLocation(RefStrings.MODID, "textures/models/Fleija.png");
//manTexture = new ResourceLocation(RefStrings.MODID, "textures/models/Prototype.png");
}
@Override
public void renderTileEntityAt(TileEntity tileEntity, double x, double y, double z, float f)
@ -42,8 +27,8 @@ public class RenderNukeFleija extends TileEntitySpecialRenderer {
GL11.glRotatef(0, 0F, 1F, 0F); break;
}
bindTexture(manTexture);
manModel.renderAll();
bindTexture(ResourceManager.bomb_fleija_tex);
ResourceManager.bomb_fleija.renderAll();
GL11.glPopMatrix();
}

21
src/main/java/com/hbm/render/tileentity/RenderNukeGadget.java
View File

@ -2,26 +2,13 @@ package com.hbm.render.tileentity;
import org.lwjgl.opengl.GL11;
import com.hbm.lib.RefStrings;
import com.hbm.main.ResourceManager;
import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.ResourceLocation;
import net.minecraftforge.client.model.AdvancedModelLoader;
import net.minecraftforge.client.model.IModelCustom;
public class RenderNukeGadget extends TileEntitySpecialRenderer {
private static final ResourceLocation objTesterModelRL = new ResourceLocation(/*"/assets/" + */RefStrings.MODID, "models/TheGadget3.obj");
private IModelCustom gadgetModel;
private ResourceLocation gadgetTexture;
public RenderNukeGadget()
{
gadgetModel = AdvancedModelLoader.loadModel(objTesterModelRL);
gadgetTexture = new ResourceLocation(RefStrings.MODID, "textures/models/TheGadget3_tex.png");
}
@Override
public void renderTileEntityAt(TileEntity tileEntity, double x, double y, double z, float f)
{
@ -41,8 +28,10 @@ public class RenderNukeGadget extends TileEntitySpecialRenderer {
GL11.glRotatef(0, 0F, 1F, 0F); break;
}
bindTexture(gadgetTexture);
gadgetModel.renderAll();
bindTexture(ResourceManager.bomb_gadget_tex);
ResourceManager.bomb_gadget.renderAll();
GL11.glEnable(GL11.GL_CULL_FACE);
GL11.glPopMatrix();
}

21
src/main/java/com/hbm/render/tileentity/RenderNukeMan.java
View File

@ -2,25 +2,12 @@ package com.hbm.render.tileentity;
import org.lwjgl.opengl.GL11;
import com.hbm.lib.RefStrings;
import com.hbm.main.ResourceManager;
import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.ResourceLocation;
import net.minecraftforge.client.model.AdvancedModelLoader;
import net.minecraftforge.client.model.IModelCustom;
public class RenderNukeMan extends TileEntitySpecialRenderer {
private static final ResourceLocation objTesterModelRL = new ResourceLocation(/*"/assets/" + */RefStrings.MODID, "models/FatMan.obj");
private IModelCustom manModel;
private ResourceLocation manTexture;
public RenderNukeMan()
{
manModel = AdvancedModelLoader.loadModel(objTesterModelRL);
manTexture = new ResourceLocation(RefStrings.MODID, "textures/models/FatMan.png");
}
@Override
public void renderTileEntityAt(TileEntity tileEntity, double x, double y, double z, float f)
@ -41,10 +28,10 @@ public class RenderNukeMan extends TileEntitySpecialRenderer {
GL11.glRotatef(0, 0F, 1F, 0F); break;
}
bindTexture(manTexture);
manModel.renderAll();
bindTexture(ResourceManager.bomb_man_tex);
ResourceManager.bomb_man.renderAll();
GL11.glEnable(GL11.GL_LIGHTING);
GL11.glEnable(GL11.GL_CULL_FACE);
GL11.glPopMatrix();
}

21
src/main/java/com/hbm/render/tileentity/RenderNukeMike.java
View File

@ -2,25 +2,12 @@ package com.hbm.render.tileentity;
import org.lwjgl.opengl.GL11;
import com.hbm.lib.RefStrings;
import com.hbm.main.ResourceManager;
import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.ResourceLocation;
import net.minecraftforge.client.model.AdvancedModelLoader;
import net.minecraftforge.client.model.IModelCustom;
public class RenderNukeMike extends TileEntitySpecialRenderer {
private static final ResourceLocation objTesterModelRL = new ResourceLocation(/*"/assets/" + */RefStrings.MODID, "models/IvyMike.obj");
private IModelCustom mikeModel;
private ResourceLocation mikeTexture;
public RenderNukeMike()
{
mikeModel = AdvancedModelLoader.loadModel(objTesterModelRL);
mikeTexture = new ResourceLocation(RefStrings.MODID, "textures/models/IvyMike.png");
}
@Override
public void renderTileEntityAt(TileEntity tileEntity, double x, double y, double z, float f)
@ -41,8 +28,10 @@ public class RenderNukeMike extends TileEntitySpecialRenderer {
GL11.glRotatef(0, 0F, 1F, 0F); break;
}
bindTexture(mikeTexture);
mikeModel.renderAll();
bindTexture(ResourceManager.bomb_mike_tex);
ResourceManager.bomb_mike.renderAll();
GL11.glEnable(GL11.GL_CULL_FACE);
GL11.glPopMatrix();
}

21
src/main/java/com/hbm/render/tileentity/RenderNukePrototype.java
View File

@ -2,25 +2,12 @@ package com.hbm.render.tileentity;
import org.lwjgl.opengl.GL11;
import com.hbm.lib.RefStrings;
import com.hbm.main.ResourceManager;
import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.ResourceLocation;
import net.minecraftforge.client.model.AdvancedModelLoader;
import net.minecraftforge.client.model.IModelCustom;
public class RenderNukePrototype extends TileEntitySpecialRenderer {
private static final ResourceLocation objTesterModelRL = new ResourceLocation(/*"/assets/" + */RefStrings.MODID, "models/Prototype.obj");
private IModelCustom tsarModel;
private ResourceLocation tsarTexture;
public RenderNukePrototype()
{
tsarModel = AdvancedModelLoader.loadModel(objTesterModelRL);
tsarTexture = new ResourceLocation(RefStrings.MODID, "textures/models/Prototype.png");
}
@Override
public void renderTileEntityAt(TileEntity tileEntity, double x, double y, double z, float f)
@ -41,8 +28,10 @@ public class RenderNukePrototype extends TileEntitySpecialRenderer {
GL11.glRotatef(0, 0F, 1F, 0F); break;
}
bindTexture(tsarTexture);
tsarModel.renderAll();
bindTexture(ResourceManager.bomb_prototype_tex);
ResourceManager.bomb_prototype.renderAll();
GL11.glEnable(GL11.GL_CULL_FACE);
GL11.glPopMatrix();
}

21
src/main/java/com/hbm/render/tileentity/RenderNukeTsar.java
View File

@ -2,25 +2,12 @@ package com.hbm.render.tileentity;
import org.lwjgl.opengl.GL11;
import com.hbm.lib.RefStrings;
import com.hbm.main.ResourceManager;
import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.ResourceLocation;
import net.minecraftforge.client.model.AdvancedModelLoader;
import net.minecraftforge.client.model.IModelCustom;
public class RenderNukeTsar extends TileEntitySpecialRenderer {
private static final ResourceLocation objTesterModelRL = new ResourceLocation(/*"/assets/" + */RefStrings.MODID, "models/TsarBomba.obj");
private IModelCustom tsarModel;
private ResourceLocation tsarTexture;
public RenderNukeTsar()
{
tsarModel = AdvancedModelLoader.loadModel(objTesterModelRL);
tsarTexture = new ResourceLocation(RefStrings.MODID, "textures/models/TsarBomba.png");
}
@Override
public void renderTileEntityAt(TileEntity tileEntity, double x, double y, double z, float f)
@ -41,8 +28,10 @@ public class RenderNukeTsar extends TileEntitySpecialRenderer {
GL11.glRotatef(0, 0F, 1F, 0F); break;
}
bindTexture(tsarTexture);
tsarModel.renderAll();
bindTexture(ResourceManager.bomb_tsar_tex);
ResourceManager.bomb_tsar.renderAll();
GL11.glEnable(GL11.GL_CULL_FACE);
GL11.glPopMatrix();
}