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

More battery blocks, FFGEUA stops transmitting to full machines, B93

Browse Source
This commit is contained in:
HbmMods 2018-04-28 12:14:38 +02:00
parent d009832cf6
commit bd5050bc1b
21 changed files with 594 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
assets/hbm/textures/blocks/battery_dineutronium_front.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 532 B

BIN
assets/hbm/textures/blocks/battery_dineutronium_side.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 579 B

BIN
assets/hbm/textures/blocks/battery_lithium_front.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 594 B

BIN
assets/hbm/textures/blocks/battery_lithium_side.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 584 B

BIN
assets/hbm/textures/blocks/battery_schrabidium_front.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 566 B

BIN
assets/hbm/textures/blocks/battery_schrabidium_side.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 560 B

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 321 B

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.8 KiB

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

@ -267,6 +267,9 @@ public class ModBlocks {
public static final int guiID_machine_deuterium = 20;
public static Block machine_battery;
public static Block machine_lithium_battery;
public static Block machine_schrabidium_battery;
public static Block machine_dineutronium_battery;
public static final int guiID_machine_battery = 21;
public static Block machine_coal_off;
@ -685,7 +688,10 @@ public class ModBlocks {
//machine_deuterium = new MachineDeuterium(Material.iron).setBlockName("machine_deuterium").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.tabBlock);
machine_battery = new MachineBattery(Material.iron).setBlockName("machine_battery").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.tabBlock);
machine_battery = new MachineBattery(Material.iron, 1000000).setBlockName("machine_battery").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.tabBlock);
machine_lithium_battery = new MachineBattery(Material.iron, 15000000).setBlockName("machine_lithium_battery").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.tabBlock);
machine_schrabidium_battery = new MachineBattery(Material.iron, 500000000).setBlockName("machine_schrabidium_battery").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.tabBlock);
machine_dineutronium_battery = new MachineBattery(Material.iron, 150000000000L).setBlockName("machine_dineutronium_battery").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.tabBlock);
machine_coal_off = new MachineCoal(false).setBlockName("machine_coal_off").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.tabBlock);
machine_coal_on = new MachineCoal(true).setBlockName("machine_coal_on").setHardness(5.0F).setLightLevel(1.0F).setResistance(10.0F);
@ -1110,6 +1116,9 @@ public class ModBlocks {
GameRegistry.registerBlock(gas_duct_solid, gas_duct_solid.getUnlocalizedName());
GameRegistry.registerBlock(fluid_duct, fluid_duct.getUnlocalizedName());
GameRegistry.registerBlock(machine_battery, machine_battery.getUnlocalizedName());
GameRegistry.registerBlock(machine_lithium_battery, machine_lithium_battery.getUnlocalizedName());
GameRegistry.registerBlock(machine_schrabidium_battery, machine_schrabidium_battery.getUnlocalizedName());
GameRegistry.registerBlock(machine_dineutronium_battery, machine_dineutronium_battery.getUnlocalizedName());
GameRegistry.registerBlock(machine_transformer, machine_transformer.getUnlocalizedName());
GameRegistry.registerBlock(machine_converter_he_rf, machine_converter_he_rf.getUnlocalizedName());
GameRegistry.registerBlock(machine_converter_rf_he, machine_converter_rf_he.getUnlocalizedName());

26
com/hbm/blocks/machine/MachineBattery.java
View File

@ -31,19 +31,35 @@ public class MachineBattery extends BlockContainer {
private final Random field_149933_a = new Random();
private Random rand;
private static boolean keepInventory;
private long maxPower;
@SideOnly(Side.CLIENT)
private IIcon iconFront;
public MachineBattery(Material p_i45386_1_) {
public MachineBattery(Material p_i45386_1_, long maxPower) {
super(p_i45386_1_);
this.maxPower = maxPower;
}
@Override
@SideOnly(Side.CLIENT)
public void registerBlockIcons(IIconRegister iconRegister) {
this.iconFront = iconRegister.registerIcon(RefStrings.MODID + ":battery_front_alt");
this.blockIcon = iconRegister.registerIcon(RefStrings.MODID + ":battery_side_alt");
if(this == ModBlocks.machine_battery) {
this.iconFront = iconRegister.registerIcon(RefStrings.MODID + ":battery_front_alt");
this.blockIcon = iconRegister.registerIcon(RefStrings.MODID + ":battery_side_alt");
}
if(this == ModBlocks.machine_lithium_battery) {
this.iconFront = iconRegister.registerIcon(RefStrings.MODID + ":battery_lithium_front");
this.blockIcon = iconRegister.registerIcon(RefStrings.MODID + ":battery_lithium_side");
}
if(this == ModBlocks.machine_schrabidium_battery) {
this.iconFront = iconRegister.registerIcon(RefStrings.MODID + ":battery_schrabidium_front");
this.blockIcon = iconRegister.registerIcon(RefStrings.MODID + ":battery_schrabidium_side");
}
if(this == ModBlocks.machine_dineutronium_battery) {
this.iconFront = iconRegister.registerIcon(RefStrings.MODID + ":battery_dineutronium_front");
this.blockIcon = iconRegister.registerIcon(RefStrings.MODID + ":battery_dineutronium_side");
}
}
@Override
@ -55,7 +71,7 @@ public class MachineBattery extends BlockContainer {
@Override
public Item getItemDropped(int p_149650_1_, Random p_149650_2_, int p_149650_3_)
{
return Item.getItemFromBlock(ModBlocks.machine_battery);
return Item.getItemFromBlock(this);
}
@Override
@ -124,7 +140,7 @@ public class MachineBattery extends BlockContainer {
@Override
public TileEntity createNewTileEntity(World p_149915_1_, int p_149915_2_) {
return new TileEntityMachineBattery();
return new TileEntityMachineBattery(maxPower);
}
@Override

7
com/hbm/inventory/gui/GUIMachineBattery.java
View File

@ -30,6 +30,11 @@ public class GUIMachineBattery extends GuiInfoContainer {
super.drawScreen(mouseX, mouseY, f);
this.drawElectricityInfo(this, mouseX, mouseY, guiLeft + 62, guiTop + 69 - 52, 52, 52, diFurnace.power, diFurnace.maxPower);
String[] text = new String[] { "Only stores power by default.",
"Apply redstone signal to set it to",
"output mode." };
this.drawCustomInfoStat(mouseX, mouseY, guiLeft - 16, guiTop + 36, 16, 16, guiLeft - 8, guiTop + 36 + 16, text);
}
@Override
@ -51,5 +56,7 @@ public class GUIMachineBattery extends GuiInfoContainer {
int i = (int)diFurnace.getPowerRemainingScaled(52);
drawTexturedModalRect(guiLeft + 62, guiTop + 69 - i, 176, 52 - i, 52, i);
}
this.drawInfoPanel(guiLeft - 16, guiTop + 36, 16, 16, 2);
}
}

20
com/hbm/inventory/gui/GUIMachineRadar.java
View File

@ -49,21 +49,21 @@ public class GUIMachineRadar extends GuiInfoContainer {
if(m[2] == 0)
text = new String[] { "Tier 1 Missile", m[0] + " / " + m[1], "Alt.: " + m[3] };
if(m[2] == 1)
else if(m[2] == 1)
text = new String[] { "Tier 2 Missile", m[0] + " / " + m[1], "Alt.: " + m[3] };
if(m[2] == 2)
else if(m[2] == 2)
text = new String[] { "Tier 3 Missile", m[0] + " / " + m[1], "Alt.: " + m[3] };
if(m[2] == 3)
else if(m[2] == 3)
text = new String[] { "Tier 4 Missile", m[0] + " / " + m[1], "Alt.: " + m[3] };
if(m[2] == 4)
else if(m[2] == 4)
text = new String[] { "Anti Ballistic Missile", m[0] + " / " + m[1], "Alt.: " + m[3] };
if(m[2] == 5)
text = new String[] { "Airborne Entity", m[0] + " / " + m[1], "Alt.: " + m[3] };
if(m[2] == 6)
else if(m[2] == 5)
text = new String[] { "Player", m[0] + " / " + m[1], "Alt.: " + m[3] };
/*else if(m[2] == 6)
text = new String[] { "Stinger Missile", m[0] + " / " + m[1], "Alt.: " + m[3] };
if(m[2] == 7)
text = new String[] { "Sky Stinger Missile", m[0] + " / " + m[1], "Alt.: " + m[3] };
if(m[2] == 8)
else if(m[2] == 7)
text = new String[] { "Sky Stinger Missile", m[0] + " / " + m[1], "Alt.: " + m[3] };*/
else
text = new String[] { "Unknown Force", m[0] + " / " + m[1], "Alt.: " + m[3] };
this.func_146283_a(Arrays.asList(text), x, z);

10
com/hbm/inventory/gui/GUIMachineTeleporter.java
View File

@ -33,12 +33,12 @@ public class GUIMachineTeleporter extends GuiContainer {
this.fontRendererObj.drawString(name, this.xSize / 2 - this.fontRendererObj.getStringWidth(name) / 2, 6,
4210752);
this.fontRendererObj.drawString("Power: " + diFurnace.power + "HE/" + TileEntityMachineTeleporter.maxPower + "HE", 10, 20,
4210752);
this.fontRendererObj.drawString("Mode: " + (diFurnace.mode ? "Send" : "Receive"), 10, 29, 4210752);
13882323);
this.fontRendererObj.drawString("Mode: " + (diFurnace.mode ? "Send" : "Receive"), 10, 29, 13882323);
if (diFurnace.mode) {
this.fontRendererObj.drawString("Destination X: " + diFurnace.targetX, 10, 38, 4210752);
this.fontRendererObj.drawString("Destination Y: " + diFurnace.targetY, 10, 47, 4210752);
this.fontRendererObj.drawString("Destination Z: " + diFurnace.targetZ, 10, 56, 4210752);
this.fontRendererObj.drawString("Destination X: " + diFurnace.targetX, 10, 38, 13882323);
this.fontRendererObj.drawString("Destination Y: " + diFurnace.targetY, 10, 47, 13882323);
this.fontRendererObj.drawString("Destination Z: " + diFurnace.targetZ, 10, 56, 13882323);
}
}

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

@ -717,6 +717,7 @@ public class ModItems {
public static Item gun_bolt_action_ammo;
public static Item gun_b92;
public static Item gun_b92_ammo;
public static Item gun_b93;
public static Item gun_xvl1456;
public static Item gun_xvl1456_ammo;
public static Item gun_osipr;
@ -1856,6 +1857,7 @@ public class ModItems {
gun_bolt_action_green = new GunBoltAction().setUnlocalizedName("gun_bolt_action_green").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":gun_bolt_action_green");
gun_b92_ammo = new GunB92Cell().setUnlocalizedName("gun_b92_ammo").setMaxStackSize(1).setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":gun_b92_ammo_alt");
gun_b92 = new GunB92().setUnlocalizedName("gun_b92").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":gun_b92");
gun_b93 = new GunB92().setUnlocalizedName("gun_b93").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":gun_b93");
gun_xvl1456_ammo = new Item().setUnlocalizedName("gun_xvl1456_ammo").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":gun_xvl1456_ammo");
gun_xvl1456 = new GunXVL1456().setUnlocalizedName("gun_xvl1456").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":gun_xvl1456");
gun_osipr_ammo = new Item().setUnlocalizedName("gun_osipr_ammo").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":gun_osipr_ammo");
@ -3138,6 +3140,7 @@ public class ModItems {
GameRegistry.registerItem(gun_revolver_nightmare2, gun_revolver_nightmare2.getUnlocalizedName());
GameRegistry.registerItem(gun_revolver_pip, gun_revolver_pip.getUnlocalizedName());
GameRegistry.registerItem(gun_b92, gun_b92.getUnlocalizedName());
GameRegistry.registerItem(gun_b93, gun_b93.getUnlocalizedName());
GameRegistry.registerItem(gun_rpg, gun_rpg.getUnlocalizedName());
GameRegistry.registerItem(gun_stinger, gun_stinger.getUnlocalizedName());
GameRegistry.registerItem(gun_fatman, gun_fatman.getUnlocalizedName());

37
com/hbm/lib/Library.java
View File

@ -1082,21 +1082,40 @@ public class Library {
int size = that.getList().size();
if(size > 0)
{
long part = that.getSPower() / size;
for(IConsumer consume : that.getList())
{
///EXPERIMENTAL START///
List<IConsumer> requestList = new ArrayList();
for(IConsumer consume : that.getList()) {
if(consume.getPower() < consume.getMaxPower())
requestList.add(consume);
}
if(requestList.size() > 0) {
///EXPERIMENTAL END///
long part = that.getSPower() / size;
for(IConsumer consume : requestList)
{
if(consume.getMaxPower() - consume.getPower() >= part)
if(consume.getPower() < consume.getMaxPower())
{
that.setSPower(that.getSPower()-part);
consume.setPower(consume.getPower() + part);
} else {
that.setSPower(that.getSPower() - (consume.getMaxPower() - consume.getPower()));
consume.setPower(consume.getMaxPower());
if(consume.getMaxPower() - consume.getPower() >= part)
{
that.setSPower(that.getSPower()-part);
consume.setPower(consume.getPower() + part);
} else {
that.setSPower(that.getSPower() - (consume.getMaxPower() - consume.getPower()));
consume.setPower(consume.getMaxPower());
}
}
}
//
}
//
}
that.clearList();
}

1
com/hbm/main/ClientProxy.java
View File

@ -200,6 +200,7 @@ public class ClientProxy extends ServerProxy
MinecraftForgeClient.registerItemRenderer(ModItems.gun_bolt_action_green, new ItemRenderGunAnim());
MinecraftForgeClient.registerItemRenderer(ModItems.gun_lever_action_sonata, new ItemRenderGunAnim());
MinecraftForgeClient.registerItemRenderer(ModItems.gun_b92, new ItemRenderGunAnim());
MinecraftForgeClient.registerItemRenderer(ModItems.gun_b93, new ItemRenderGunAnim());
MinecraftForgeClient.registerItemRenderer(ModItems.multitool_dig, new ItemRenderMultitool());
MinecraftForgeClient.registerItemRenderer(ModItems.multitool_silk, new ItemRenderMultitool());

17
com/hbm/render/item/ItemRenderGunAnim.java
View File

@ -9,6 +9,7 @@ import com.hbm.items.weapon.GunLeverAction;
import com.hbm.items.weapon.GunLeverActionS;
import com.hbm.lib.RefStrings;
import com.hbm.render.model.ModelB92;
import com.hbm.render.model.ModelB93;
import com.hbm.render.model.ModelBoltAction;
import com.hbm.render.model.ModelDash;
import com.hbm.render.model.ModelDefabricator;
@ -35,11 +36,13 @@ public class ItemRenderGunAnim implements IItemRenderer {
protected ModelLeverAction leveraction;
protected ModelBoltAction boltaction;
protected ModelB92 b92;
protected ModelB93 b93;
public ItemRenderGunAnim() {
leveraction = new ModelLeverAction();
boltaction = new ModelBoltAction();
b92 = new ModelB92();
b93 = new ModelB93();
}
@Override
@ -76,6 +79,8 @@ public class ItemRenderGunAnim implements IItemRenderer {
Minecraft.getMinecraft().renderEngine.bindTexture(new ResourceLocation(RefStrings.MODID +":textures/models/ModelBoltActionGreen.png"));
if(item.getItem() == ModItems.gun_b92)
Minecraft.getMinecraft().renderEngine.bindTexture(new ResourceLocation(RefStrings.MODID +":textures/models/ModelB92SM.png"));
if(item.getItem() == ModItems.gun_b93)
Minecraft.getMinecraft().renderEngine.bindTexture(new ResourceLocation(RefStrings.MODID +":textures/models/ModelB93.png"));
GL11.glRotatef(-135.0F, 0.0F, 0.0F, 1.0F);
GL11.glTranslatef(-0.5F, 0.0F, -0.2F);
@ -110,6 +115,12 @@ public class ItemRenderGunAnim implements IItemRenderer {
GL11.glRotatef(GunB92.getRotationFromAnim(item) * -90, 0.0F, 0.0F, 1.0F);
GL11.glTranslatef(off * -0.5F, off * -0.5F, 0.0F);
}
if(item.getItem() == ModItems.gun_b93 && GunB92.getRotationFromAnim(item) > 0) {
float off = GunB92.getRotationFromAnim(item) * 2;
GL11.glRotatef(GunB92.getRotationFromAnim(item) * -90, 0.0F, 0.0F, 1.0F);
GL11.glTranslatef(off * -0.5F, off * -0.5F, 0.0F);
}
if(item.getItem() == ModItems.gun_lever_action || item.getItem() == ModItems.gun_lever_action_dark)
leveraction.renderAnim((Entity)data[1], 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F, GunLeverAction.getRotationFromAnim(item));
@ -119,6 +130,8 @@ public class ItemRenderGunAnim implements IItemRenderer {
boltaction.renderAnim((Entity)data[1], 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F, GunBoltAction.getLevRotationFromAnim(item), GunBoltAction.getTransFromAnim(item));
if(item.getItem() == ModItems.gun_b92)
b92.renderAnim((Entity)data[1], 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F, GunB92.getTransFromAnim(item));
if(item.getItem() == ModItems.gun_b93)
b93.renderAnim((Entity)data[1], 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F, GunB92.getTransFromAnim(item));
GL11.glPopMatrix();
break;
@ -136,6 +149,8 @@ public class ItemRenderGunAnim implements IItemRenderer {
Minecraft.getMinecraft().renderEngine.bindTexture(new ResourceLocation(RefStrings.MODID +":textures/models/ModelBoltActionGreen.png"));
if(item.getItem() == ModItems.gun_b92)
Minecraft.getMinecraft().renderEngine.bindTexture(new ResourceLocation(RefStrings.MODID +":textures/models/ModelB92SM.png"));
if(item.getItem() == ModItems.gun_b93)
Minecraft.getMinecraft().renderEngine.bindTexture(new ResourceLocation(RefStrings.MODID +":textures/models/ModelB93.png"));
GL11.glRotatef(-200.0F, 0.0F, 0.0F, 1.0F);
GL11.glRotatef(75.0F, 0.0F, 1.0F, 0.0F);
@ -159,6 +174,8 @@ public class ItemRenderGunAnim implements IItemRenderer {
boltaction.renderAnim((Entity)data[1], 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F, GunBoltAction.getLevRotationFromAnim(item), GunBoltAction.getTransFromAnim(item));
if(item.getItem() == ModItems.gun_b92)
b92.renderAnim((Entity)data[1], 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F, GunB92.getTransFromAnim(item));
if(item.getItem() == ModItems.gun_b93)
b93.renderAnim((Entity)data[1], 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F, GunB92.getTransFromAnim(item));
GL11.glPopMatrix();
default: break;
}

480
com/hbm/render/model/ModelB93.java Normal file
View File

@ -0,0 +1,480 @@
// Date: 26.04.2018 22:13:08
// Template version 1.1
// Java generated by Techne
// Keep in mind that you still need to fill in some blanks
// - ZeuX
package com.hbm.render.model;
import net.minecraft.client.model.ModelBase;
import net.minecraft.client.model.ModelRenderer;
import net.minecraft.entity.Entity;
public class ModelB93 extends ModelBase {
// fields
ModelRenderer Muzzle1;
ModelRenderer Barrel1;
ModelRenderer Barrel2;
ModelRenderer Grip;
ModelRenderer Front1;
ModelRenderer Front2;
ModelRenderer Body;
ModelRenderer Top;
ModelRenderer GripBottom;
ModelRenderer Handle;
ModelRenderer HandleBack;
ModelRenderer Frame1;
ModelRenderer Frame2;
ModelRenderer Frame3;
ModelRenderer Trigger;
ModelRenderer BackPlate1;
ModelRenderer Back;
ModelRenderer BackPlate2;
ModelRenderer Pump1;
ModelRenderer Pump2;
ModelRenderer BodyPlate;
ModelRenderer Muz1;
ModelRenderer Muz2;
ModelRenderer Muz3;
ModelRenderer Damp1;
ModelRenderer Damp2;
ModelRenderer Damp3;
ModelRenderer DampFront;
ModelRenderer EmitterRod;
ModelRenderer EmitterCrystal;
ModelRenderer EmitterClamp1;
ModelRenderer EmitterClamp2;
ModelRenderer EmitterClamp3;
ModelRenderer EmitterClamp4;
ModelRenderer EmitterClamp5;
ModelRenderer EmitterClamp6;
ModelRenderer EmitterClamp7;
ModelRenderer EmitterClamp8;
ModelRenderer PowBox;
ModelRenderer PowPanel;
ModelRenderer Nix1;
ModelRenderer Nix2;
ModelRenderer Nix3;
ModelRenderer Nix11;
ModelRenderer Nix21;
ModelRenderer Nix31;
ModelRenderer Nix12;
ModelRenderer Nix22;
ModelRenderer Nix32;
ModelRenderer Pylon;
ModelRenderer Wire1;
ModelRenderer Wire2;
ModelRenderer Wire3;
ModelRenderer PowPylon;
public ModelB93() {
textureWidth = 128;
textureHeight = 64;
Muzzle1 = new ModelRenderer(this, 22, 36);
Muzzle1.addBox(0F, 0F, 0F, 2, 3, 2);
Muzzle1.setRotationPoint(-24F, 0.5F, -1F);
Muzzle1.setTextureSize(64, 32);
Muzzle1.mirror = true;
setRotation(Muzzle1, 0F, 0F, 0F);
Barrel1 = new ModelRenderer(this, 0, 0);
Barrel1.addBox(0F, 0F, 0F, 24, 2, 3);
Barrel1.setRotationPoint(-24F, 1F, -1.5F);
Barrel1.setTextureSize(64, 32);
Barrel1.mirror = true;
setRotation(Barrel1, 0F, 0F, 0F);
Barrel2 = new ModelRenderer(this, 0, 5);
Barrel2.addBox(0F, 0F, 0F, 22, 1, 2);
Barrel2.setRotationPoint(-22F, 0.5F, -1F);
Barrel2.setTextureSize(64, 32);
Barrel2.mirror = true;
setRotation(Barrel2, 0F, 0F, 0F);
Grip = new ModelRenderer(this, 0, 8);
Grip.addBox(0F, 0F, 0F, 20, 3, 4);
Grip.setRotationPoint(-20F, 3F, -2F);
Grip.setTextureSize(64, 32);
Grip.mirror = true;
setRotation(Grip, 0F, 0F, 0F);
Front1 = new ModelRenderer(this, 10, 36);
Front1.addBox(0F, 0F, 0F, 2, 4, 4);
Front1.setRotationPoint(-22F, 0.5F, -2F);
Front1.setTextureSize(64, 32);
Front1.mirror = true;
setRotation(Front1, 0F, 0F, 0F);
Front2 = new ModelRenderer(this, 0, 36);
Front2.addBox(0F, 0F, 0F, 2, 6, 3);
Front2.setRotationPoint(-22F, 0F, -1.5F);
Front2.setTextureSize(64, 32);
Front2.mirror = true;
setRotation(Front2, 0F, 0F, 0F);
Body = new ModelRenderer(this, 0, 15);
Body.addBox(0F, 0F, 0F, 15, 7, 4);
Body.setRotationPoint(0F, 0.5F, -2F);
Body.setTextureSize(64, 32);
Body.mirror = true;
setRotation(Body, 0F, 0F, 0F);
Top = new ModelRenderer(this, 28, 60);
Top.addBox(0F, 0F, 0F, 15, 1, 3);
Top.setRotationPoint(0F, 0F, -1.5F);
Top.setTextureSize(64, 32);
Top.mirror = true;
setRotation(Top, 0F, 0F, 0F);
GripBottom = new ModelRenderer(this, 24, 43);
GripBottom.addBox(0F, 0F, 0F, 18, 1, 2);
GripBottom.setRotationPoint(-18F, 5.5F, -1F);
GripBottom.setTextureSize(64, 32);
GripBottom.mirror = true;
setRotation(GripBottom, 0F, 0F, 0F);
Handle = new ModelRenderer(this, 0, 45);
Handle.addBox(0F, 0F, 0F, 6, 15, 4);
Handle.setRotationPoint(6F, 7F, -2F);
Handle.setTextureSize(64, 32);
Handle.mirror = true;
setRotation(Handle, 0F, 0F, -0.2268928F);
HandleBack = new ModelRenderer(this, 20, 46);
HandleBack.addBox(5.5F, 0F, 0F, 1, 15, 3);
HandleBack.setRotationPoint(6F, 7F, -1.5F);
HandleBack.setTextureSize(64, 32);
HandleBack.mirror = true;
setRotation(HandleBack, 0F, 0F, -0.2268928F);
Frame1 = new ModelRenderer(this, 28, 57);
Frame1.addBox(0F, 0F, 0F, 7, 1, 2);
Frame1.setRotationPoint(0.5F, 11F, -1F);
Frame1.setTextureSize(64, 32);
Frame1.mirror = true;
setRotation(Frame1, 0F, 0F, 0F);
Frame2 = new ModelRenderer(this, 28, 51);
Frame2.addBox(0F, 0F, 0F, 2, 4, 2);
Frame2.setRotationPoint(-2F, 6.5F, -1F);
Frame2.setTextureSize(64, 32);
Frame2.mirror = true;
setRotation(Frame2, 0F, 0F, 0F);
Frame3 = new ModelRenderer(this, 46, 57);
Frame3.addBox(0F, -1F, 0F, 3, 1, 2);
Frame3.setRotationPoint(-2F, 10.5F, -1F);
Frame3.setTextureSize(64, 32);
Frame3.mirror = true;
setRotation(Frame3, 0F, 0F, 0.5235988F);
Trigger = new ModelRenderer(this, 36, 53);
Trigger.addBox(0F, 0F, 0F, 2, 3, 1);
Trigger.setRotationPoint(4F, 7F, -0.5F);
Trigger.setTextureSize(64, 32);
Trigger.mirror = true;
setRotation(Trigger, 0F, 0F, 0.1919862F);
BackPlate1 = new ModelRenderer(this, 56, 53);
BackPlate1.addBox(-1F, 0F, 0F, 1, 4, 3);
BackPlate1.setRotationPoint(15F, 0F, -1.5F);
BackPlate1.setTextureSize(64, 32);
BackPlate1.mirror = true;
setRotation(BackPlate1, 0F, 0F, -0.5235988F);
Back = new ModelRenderer(this, 42, 49);
Back.addBox(0F, 0F, 0F, 2, 4, 4);
Back.setRotationPoint(15F, 3.5F, -2F);
Back.setTextureSize(64, 32);
Back.mirror = true;
setRotation(Back, 0F, 0F, 0F);
BackPlate2 = new ModelRenderer(this, 48, 5);
BackPlate2.addBox(-2F, 0F, 0F, 2, 4, 4);
BackPlate2.setRotationPoint(15F, 0.5F, -2F);
BackPlate2.setTextureSize(64, 32);
BackPlate2.mirror = true;
setRotation(BackPlate2, 0F, 0F, -0.4886922F);
Pump1 = new ModelRenderer(this, 46, 29);
Pump1.addBox(0F, 0F, 0F, 7, 2, 2);
Pump1.setRotationPoint(10F, 1F, -1F);
Pump1.setTextureSize(64, 32);
Pump1.mirror = true;
setRotation(Pump1, 0F, 0F, 0F);
Pump2 = new ModelRenderer(this, 44, 33);
Pump2.addBox(0F, 0F, 0F, 3, 3, 7);
Pump2.setRotationPoint(17F, 0.5F, -3.5F);
Pump2.setTextureSize(64, 32);
Pump2.mirror = true;
setRotation(Pump2, 0F, 0F, 0F);
BodyPlate = new ModelRenderer(this, 0, 26);
BodyPlate.addBox(0F, 0F, 0F, 14, 5, 5);
BodyPlate.setRotationPoint(1.5F, 2F, -2.5F);
BodyPlate.setTextureSize(64, 32);
BodyPlate.mirror = true;
setRotation(BodyPlate, 0F, 0F, 0F);
Muz1 = new ModelRenderer(this, 90, 3);
Muz1.addBox(0F, 0F, 0F, 2, 5, 3);
Muz1.setRotationPoint(-26F, -0.5F, -1.5F);
Muz1.setTextureSize(64, 32);
Muz1.mirror = true;
setRotation(Muz1, 0F, 0F, 0F);
Muz2 = new ModelRenderer(this, 64, 2);
Muz2.addBox(0F, 0F, 0F, 2, 3, 5);
Muz2.setRotationPoint(-26F, 0.5F, -2.5F);
Muz2.setTextureSize(64, 32);
Muz2.mirror = true;
setRotation(Muz2, 0F, 0F, 0F);
Muz3 = new ModelRenderer(this, 78, 3);
Muz3.addBox(0F, 0F, 0F, 2, 4, 4);
Muz3.setRotationPoint(-26F, 0F, -2F);
Muz3.setTextureSize(64, 32);
Muz3.mirror = true;
setRotation(Muz3, 0F, 0F, 0F);
Damp1 = new ModelRenderer(this, 64, 53);
Damp1.addBox(0F, 0F, 0F, 24, 7, 4);
Damp1.setRotationPoint(-50F, -1.5F, -2F);
Damp1.setTextureSize(64, 32);
Damp1.mirror = true;
setRotation(Damp1, 0F, 0F, 0F);
Damp2 = new ModelRenderer(this, 64, 42);
Damp2.addBox(0F, 0F, 0F, 24, 4, 7);
Damp2.setRotationPoint(-50F, 0F, -3.5F);
Damp2.setTextureSize(64, 32);
Damp2.mirror = true;
setRotation(Damp2, 0F, 0F, 0F);
Damp3 = new ModelRenderer(this, 64, 30);
Damp3.addBox(0F, 0F, 0F, 24, 6, 6);
Damp3.setRotationPoint(-50F, -1F, -3F);
Damp3.setTextureSize(64, 32);
Damp3.mirror = true;
setRotation(Damp3, 0F, 0F, 0F);
DampFront = new ModelRenderer(this, 64, 22);
DampFront.addBox(0F, 0F, 0F, 2, 4, 4);
DampFront.setRotationPoint(-51.1F, 0F, -2F);
DampFront.setTextureSize(64, 32);
DampFront.mirror = true;
setRotation(DampFront, 0F, 0F, 0F);
EmitterRod = new ModelRenderer(this, 64, 18);
EmitterRod.addBox(0F, 0F, 0F, 4, 2, 2);
EmitterRod.setRotationPoint(-55F, 1F, -1F);
EmitterRod.setTextureSize(64, 32);
EmitterRod.mirror = true;
setRotation(EmitterRod, 0F, 0F, 0F);
EmitterCrystal = new ModelRenderer(this, 76, 24);
EmitterCrystal.addBox(0F, -1.5F, -1.5F, 3, 3, 3);
EmitterCrystal.setRotationPoint(-57F, 2F, 0F);
EmitterCrystal.setTextureSize(64, 32);
EmitterCrystal.mirror = true;
setRotation(EmitterCrystal, 0.7853982F, 0F, 0F);
EmitterClamp1 = new ModelRenderer(this, 88, 27);
EmitterClamp1.addBox(-5F, 0F, 0F, 5, 2, 1);
EmitterClamp1.setRotationPoint(-50F, 1F, -0.5F);
EmitterClamp1.setTextureSize(64, 32);
EmitterClamp1.mirror = true;
setRotation(EmitterClamp1, 0F, 0F, 1.047198F);
EmitterClamp2 = new ModelRenderer(this, 88, 24);
EmitterClamp2.addBox(-5F, -2F, 0F, 5, 2, 1);
EmitterClamp2.setRotationPoint(-50F, 3F, -0.5F);
EmitterClamp2.setTextureSize(64, 32);
EmitterClamp2.mirror = true;
setRotation(EmitterClamp2, 0F, 0F, -1.047198F);
EmitterClamp3 = new ModelRenderer(this, 100, 27);
EmitterClamp3.addBox(-5F, 0F, 0F, 5, 1, 2);
EmitterClamp3.setRotationPoint(-50F, 1.5F, -1F);
EmitterClamp3.setTextureSize(64, 32);
EmitterClamp3.mirror = true;
setRotation(EmitterClamp3, 0F, -1.047198F, 0F);
EmitterClamp4 = new ModelRenderer(this, 100, 24);
EmitterClamp4.addBox(-5F, 0F, -2F, 5, 1, 2);
EmitterClamp4.setRotationPoint(-50F, 1.5F, 1F);
EmitterClamp4.setTextureSize(64, 32);
EmitterClamp4.mirror = true;
setRotation(EmitterClamp4, 0F, 1.047198F, 0F);
EmitterClamp5 = new ModelRenderer(this, 76, 22);
EmitterClamp5.addBox(-6F, 0F, 0F, 7, 1, 1);
EmitterClamp5.setRotationPoint(-53F, -4F, -0.5F);
EmitterClamp5.setTextureSize(64, 32);
EmitterClamp5.mirror = true;
setRotation(EmitterClamp5, 0F, 0F, -0.5235988F);
EmitterClamp6 = new ModelRenderer(this, 76, 20);
EmitterClamp6.addBox(-6F, -1F, 0F, 7, 1, 1);
EmitterClamp6.setRotationPoint(-53F, 8F, -0.5F);
EmitterClamp6.setTextureSize(64, 32);
EmitterClamp6.mirror = true;
setRotation(EmitterClamp6, 0F, 0F, 0.5235988F);
EmitterClamp7 = new ModelRenderer(this, 92, 22);
EmitterClamp7.addBox(-6F, 0F, 0F, 7, 1, 1);
EmitterClamp7.setRotationPoint(-53F, 1.5F, -6F);
EmitterClamp7.setTextureSize(64, 32);
EmitterClamp7.mirror = true;
setRotation(EmitterClamp7, 0F, 0.5235988F, 0F);
EmitterClamp8 = new ModelRenderer(this, 92, 20);
EmitterClamp8.addBox(-6F, 0F, -1F, 7, 1, 1);
EmitterClamp8.setRotationPoint(-53F, 1.5F, 6F);
EmitterClamp8.setTextureSize(64, 32);
EmitterClamp8.mirror = true;
setRotation(EmitterClamp8, 0F, -0.5235988F, 0F);
PowBox = new ModelRenderer(this, 76, 11);
PowBox.addBox(0F, 0F, 0F, 10, 5, 4);
PowBox.setRotationPoint(4F, 2F, 2.5F);
PowBox.setTextureSize(64, 32);
PowBox.mirror = true;
setRotation(PowBox, 0F, 0F, 0F);
PowPanel = new ModelRenderer(this, 44, 24);
PowPanel.addBox(0F, 0F, 0F, 9, 4, 1);
PowPanel.setRotationPoint(4.5F, 2.5F, 6F);
PowPanel.setTextureSize(64, 32);
PowPanel.mirror = true;
setRotation(PowPanel, 0F, 0F, 0F);
Nix1 = new ModelRenderer(this, 56, 17);
Nix1.addBox(0F, 0F, 0F, 2, 5, 2);
Nix1.setRotationPoint(11F, -3F, 4F);
Nix1.setTextureSize(64, 32);
Nix1.mirror = true;
setRotation(Nix1, 0F, 0F, 0F);
Nix2 = new ModelRenderer(this, 48, 17);
Nix2.addBox(0F, 0F, 0F, 2, 5, 2);
Nix2.setRotationPoint(8F, -3F, 4F);
Nix2.setTextureSize(64, 32);
Nix2.mirror = true;
setRotation(Nix2, 0F, 0F, 0F);
Nix3 = new ModelRenderer(this, 40, 17);
Nix3.addBox(0F, 0F, 0F, 2, 5, 2);
Nix3.setRotationPoint(5F, -3F, 4F);
Nix3.setTextureSize(64, 32);
Nix3.mirror = true;
setRotation(Nix3, 0F, 0F, 0F);
Nix11 = new ModelRenderer(this, 72, 15);
Nix11.addBox(0F, 0F, 0F, 1, 2, 1);
Nix11.setRotationPoint(11.5F, -5F, 4.5F);
Nix11.setTextureSize(64, 32);
Nix11.mirror = true;
setRotation(Nix11, 0F, 0F, 0F);
Nix21 = new ModelRenderer(this, 68, 15);
Nix21.addBox(0F, 0F, 0F, 1, 2, 1);
Nix21.setRotationPoint(8.5F, -5F, 4.5F);
Nix21.setTextureSize(64, 32);
Nix21.mirror = true;
setRotation(Nix21, 0F, 0F, 0F);
Nix31 = new ModelRenderer(this, 64, 15);
Nix31.addBox(0F, 0F, 0F, 1, 2, 1);
Nix31.setRotationPoint(5.5F, -5F, 4.5F);
Nix31.setTextureSize(64, 32);
Nix31.mirror = true;
setRotation(Nix31, 0F, 0F, 0F);
Nix12 = new ModelRenderer(this, 72, 10);
Nix12.addBox(0F, 0F, 0F, 1, 4, 1);
Nix12.setRotationPoint(11.5F, -1.5F, 4.5F);
Nix12.setTextureSize(64, 32);
Nix12.mirror = true;
setRotation(Nix12, 0F, 0F, 0F);
Nix22 = new ModelRenderer(this, 68, 10);
Nix22.addBox(0F, 0F, 0F, 1, 4, 1);
Nix22.setRotationPoint(8.5F, -1.5F, 4.5F);
Nix22.setTextureSize(64, 32);
Nix22.mirror = true;
setRotation(Nix22, 0F, 0F, 0F);
Nix32 = new ModelRenderer(this, 64, 10);
Nix32.addBox(0F, 0F, 0F, 1, 4, 1);
Nix32.setRotationPoint(5.5F, -1.5F, 4.5F);
Nix32.setTextureSize(64, 32);
Nix32.mirror = true;
setRotation(Nix32, 0F, 0F, 0F);
Pylon = new ModelRenderer(this, 114, 24);
Pylon.addBox(0F, 0F, 0F, 2, 2, 4);
Pylon.setRotationPoint(-35F, 1F, 3.5F);
Pylon.setTextureSize(64, 32);
Pylon.mirror = true;
setRotation(Pylon, 0F, 0F, 0F);
Wire1 = new ModelRenderer(this, 82, 0);
Wire1.addBox(0F, 0F, 0F, 20, 0, 3);
Wire1.setRotationPoint(-24F, 7F, 4F);
Wire1.setTextureSize(64, 32);
Wire1.mirror = true;
setRotation(Wire1, 0F, 0F, 0F);
Wire2 = new ModelRenderer(this, 104, 3);
Wire2.addBox(0F, 0F, 0F, 9, 0, 3);
Wire2.setRotationPoint(-4F, 7F, 4F);
Wire2.setTextureSize(64, 32);
Wire2.mirror = true;
setRotation(Wire2, 0F, 0F, -0.4363323F);
Wire3 = new ModelRenderer(this, 100, 6);
Wire3.addBox(-11F, 0F, 0F, 11, 0, 3);
Wire3.setRotationPoint(-24F, 7F, 4F);
Wire3.setTextureSize(64, 32);
Wire3.mirror = true;
setRotation(Wire3, 0F, 0F, 0.4363323F);
PowPylon = new ModelRenderer(this, 108, 17);
PowPylon.addBox(0F, 0F, 0F, 2, 2, 5);
PowPylon.setRotationPoint(2.5F, 3F, 2.5F);
PowPylon.setTextureSize(64, 32);
PowPylon.mirror = true;
setRotation(PowPylon, 0F, 0F, 0F);
}
public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) {
super.render(entity, f, f1, f2, f3, f4, f5);
setRotationAngles(f, f1, f2, f3, f4, f5, entity);
Muzzle1.render(f5);
Barrel1.render(f5);
Barrel2.render(f5);
Grip.render(f5);
Front1.render(f5);
Front2.render(f5);
Body.render(f5);
Top.render(f5);
GripBottom.render(f5);
Handle.render(f5);
HandleBack.render(f5);
Frame1.render(f5);
Frame2.render(f5);
Frame3.render(f5);
Trigger.render(f5);
BackPlate1.render(f5);
Back.render(f5);
BackPlate2.render(f5);
Pump1.render(f5);
Pump2.render(f5);
BodyPlate.render(f5);
Muz1.render(f5);
Muz2.render(f5);
Muz3.render(f5);
Damp1.render(f5);
Damp2.render(f5);
Damp3.render(f5);
DampFront.render(f5);
EmitterRod.render(f5);
EmitterCrystal.render(f5);
EmitterClamp1.render(f5);
EmitterClamp2.render(f5);
EmitterClamp3.render(f5);
EmitterClamp4.render(f5);
EmitterClamp5.render(f5);
EmitterClamp6.render(f5);
EmitterClamp7.render(f5);
EmitterClamp8.render(f5);
PowBox.render(f5);
PowPanel.render(f5);
Nix1.render(f5);
Nix2.render(f5);
Nix3.render(f5);
Nix11.render(f5);
Nix21.render(f5);
Nix31.render(f5);
Nix12.render(f5);
Nix22.render(f5);
Nix32.render(f5);
Pylon.render(f5);
Wire1.render(f5);
Wire2.render(f5);
Wire3.render(f5);
PowPylon.render(f5);
}
public void renderAnim(Entity entity, float f, float f1, float f2, float f3, float f4, float f5, float tran) {
Pump1.offsetX += tran;
Pump2.offsetX += tran;
render(entity, f, f1, f2, f3, f4, f5);
Pump1.offsetX -= tran;
Pump2.offsetX -= tran;
}
private void setRotation(ModelRenderer model, float x, float y, float z) {
model.rotateAngleX = x;
model.rotateAngleY = y;
model.rotateAngleZ = z;
}
public void setRotationAngles(float f, float f1, float f2, float f3, float f4, float f5, Entity entity) {
super.setRotationAngles(f, f1, f2, f3, f4, f5, entity);
}
}

7
com/hbm/tileentity/machine/TileEntityMachineBattery.java
View File

@ -22,7 +22,7 @@ public class TileEntityMachineBattery extends TileEntity implements ISidedInvent
private ItemStack slots[];
public long power = 0;
public final long maxPower = 1000000;
public long maxPower = 1000000;
public boolean conducts = false;
@ -37,6 +37,11 @@ public class TileEntityMachineBattery extends TileEntity implements ISidedInvent
public TileEntityMachineBattery() {
slots = new ItemStack[2];
}
public TileEntityMachineBattery(long maxPower) {
slots = new ItemStack[2];
this.maxPower = maxPower;
}
@Override
public int getSizeInventory() {

3
com/hbm/tileentity/machine/TileEntityMachineRadar.java
View File

@ -16,6 +16,7 @@ import com.hbm.packet.TERadarPacket;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.entity.Entity;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity;
@ -103,7 +104,7 @@ public class TileEntityMachineRadar extends TileEntity implements IConsumer {
continue;
}*/
if(!(e instanceof EntityMissileBaseAdvanced) && e.width * e.width * e.height >= 0.5D && e.posY >= yCoord + MainRegistry.radarBuffer) {
if(e instanceof EntityPlayer && e.posY >= yCoord + MainRegistry.radarBuffer) {
nearbyMissiles.add(new int[] { (int)e.posX, (int)e.posZ, 5, (int)e.posY });
}
}

4
com/hbm/tileentity/machine/TileEntityMachineTeleporter.java
View File

@ -4,6 +4,8 @@ import java.util.List;
import com.hbm.interfaces.IConsumer;
import com.hbm.lib.ModDamageSource;
import com.hbm.packet.AuxElectricityPacket;
import com.hbm.packet.PacketDispatcher;
import net.minecraft.entity.Entity;
import net.minecraft.entity.player.EntityPlayerMP;
@ -62,6 +64,8 @@ public class TileEntityMachineTeleporter extends TileEntity implements IConsumer
b0 = true;
}
}
PacketDispatcher.wrapper.sendToAll(new AuxElectricityPacket(xCoord, yCoord, zCoord, power));
}
if(b0)