fix: a bunch of bugfixes

This commit is contained in:
LordMZTE 2022-11-10 21:41:55 +01:00
parent 02b2c82cb6
commit 57853b60c1
Signed by: LordMZTE
GPG key ID: B64802DC33A64FF6
102 changed files with 672 additions and 173 deletions

View file

@ -1,9 +1,6 @@
- glass button doesn't render in inventory - glass button doesn't render in inventory
- tons of missing packets (mostly gui stuff) - tons of missing packets (mostly gui stuff)
- can't apply camouflage texture - unable to mount turret after dismounting
- turret UI textures completely fürn oasch
- sounds completely fürn oasch
- unable to mount turret afte dismounting
- turret gui kekt - turret gui kekt
- no electricity in guis - no electricity in guis
- EMP tower drops nonsense - EMP tower drops nonsense
@ -14,3 +11,5 @@
- black hole doesn't suck in blocks - black hole doesn't suck in blocks
- no missiles?? - no missiles??
- remote detonator doesnt work - remote detonator doesnt work
- radar is completely borked
- emp tower only deletes missiles on client

View file

@ -1,11 +1,6 @@
package icbm.api; package icbm.api;
public enum LauncherType { public enum LauncherType {
TRADITIONAL("TRADITIONAL", 0), TRADITIONAL,
CRUISE("CRUISE", 1); CRUISE;
// $FF: synthetic field
private static final LauncherType[] $VALUES
= new LauncherType[] { TRADITIONAL, CRUISE };
private LauncherType(String var1, int var2) {}
} }

View file

@ -1,14 +1,10 @@
//
// Decompiled by Procyon v0.6.0
//
package icbm.gangshao; package icbm.gangshao;
import cpw.mods.fml.client.FMLClientHandler; import cpw.mods.fml.client.FMLClientHandler;
import cpw.mods.fml.client.registry.ClientRegistry; import cpw.mods.fml.client.registry.ClientRegistry;
import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;
import cpw.mods.fml.client.registry.RenderingRegistry; import cpw.mods.fml.client.registry.RenderingRegistry;
import icbm.gangshao.platform.TPlatform; import icbm.gangshao.platform.TTurretPlatform;
import icbm.gangshao.render.BlockRenderingHandler; import icbm.gangshao.render.BlockRenderingHandler;
import icbm.gangshao.render.FXBeam; import icbm.gangshao.render.FXBeam;
import icbm.gangshao.render.RAATurret; import icbm.gangshao.render.RAATurret;
@ -74,15 +70,15 @@ public class ClientProxy extends CommonProxy {
if (tileEntity != null) { if (tileEntity != null) {
switch (ID) { switch (ID) {
case 0: { case 0: {
return new GuiPlatformSlots(player.inventory, (TPlatform) tileEntity); return new GuiPlatformSlots(player.inventory, (TTurretPlatform) tileEntity);
} }
case 1: { case 1: {
return new GuiPlatformTerminal(player, (TPlatform) tileEntity); return new GuiPlatformTerminal(player, (TTurretPlatform) tileEntity);
} }
case 2: { case 2: {
return new GuiPlatformAccess(player, (TPlatform) tileEntity); return new GuiPlatformAccess(player, (TTurretPlatform) tileEntity);
} }
} }
} }

View file

@ -3,7 +3,7 @@ package icbm.gangshao;
import cpw.mods.fml.common.network.IGuiHandler; import cpw.mods.fml.common.network.IGuiHandler;
import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.common.registry.GameRegistry;
import icbm.gangshao.container.ContainerTurretPlatform; import icbm.gangshao.container.ContainerTurretPlatform;
import icbm.gangshao.platform.TPlatform; import icbm.gangshao.platform.TTurretPlatform;
import icbm.gangshao.turret.mount.TRailgunTurret; import icbm.gangshao.turret.mount.TRailgunTurret;
import icbm.gangshao.turret.sentries.TAATurret; import icbm.gangshao.turret.sentries.TAATurret;
import icbm.gangshao.turret.sentries.TLaserTurret; import icbm.gangshao.turret.sentries.TLaserTurret;
@ -24,7 +24,7 @@ public class CommonProxy implements IGuiHandler {
GameRegistry.registerTileEntity(TAATurret.class, "ICBMAATurret"); GameRegistry.registerTileEntity(TAATurret.class, "ICBMAATurret");
GameRegistry.registerTileEntity(TRailgunTurret.class, "ICBMRailgun"); GameRegistry.registerTileEntity(TRailgunTurret.class, "ICBMRailgun");
GameRegistry.registerTileEntity(TLaserTurret.class, "ICBMLeiSheF"); GameRegistry.registerTileEntity(TLaserTurret.class, "ICBMLeiSheF");
GameRegistry.registerTileEntity(TPlatform.class, "ICBMPlatform"); GameRegistry.registerTileEntity(TTurretPlatform.class, "ICBMPlatform");
GameRegistry.registerTileEntity(TileEntityMulti.class, "ICBMMultiblock"); GameRegistry.registerTileEntity(TileEntityMulti.class, "ICBMMultiblock");
} }
@ -44,7 +44,7 @@ public class CommonProxy implements IGuiHandler {
switch (ID) { switch (ID) {
case 0: { case 0: {
return new ContainerTurretPlatform( return new ContainerTurretPlatform(
player.inventory, (TPlatform) tileEntity player.inventory, (TTurretPlatform) tileEntity
); );
} }
} }

View file

@ -4,7 +4,7 @@ import icbm.gangshao.IAmmunition;
import icbm.gangshao.ITurretUpgrade; import icbm.gangshao.ITurretUpgrade;
import icbm.gangshao.SlotTurret; import icbm.gangshao.SlotTurret;
import icbm.gangshao.access.AccessLevel; import icbm.gangshao.access.AccessLevel;
import icbm.gangshao.platform.TPlatform; import icbm.gangshao.platform.TTurretPlatform;
import icbm.gangshao.turret.ItemAmmo; import icbm.gangshao.turret.ItemAmmo;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.entity.player.InventoryPlayer;
@ -14,10 +14,10 @@ import net.minecraft.item.ItemStack;
import universalelectricity.core.item.IItemElectric; import universalelectricity.core.item.IItemElectric;
public class ContainerTurretPlatform extends ContainerTerminal { public class ContainerTurretPlatform extends ContainerTerminal {
private TPlatform tileEntity; private TTurretPlatform tileEntity;
public ContainerTurretPlatform( public ContainerTurretPlatform(
final InventoryPlayer inventoryPlayer, final TPlatform tileEntity final InventoryPlayer inventoryPlayer, final TTurretPlatform tileEntity
) { ) {
super(inventoryPlayer, tileEntity); super(inventoryPlayer, tileEntity);
this.tileEntity = tileEntity; this.tileEntity = tileEntity;

View file

@ -73,18 +73,18 @@ public class BlockTurretPlatform extends BICBM {
) { ) {
final TileEntity tileEntity = world.getTileEntity(x, y, z); final TileEntity tileEntity = world.getTileEntity(x, y, z);
if (!(tileEntity instanceof TPlatform)) { if (!(tileEntity instanceof TTurretPlatform)) {
return false; return false;
} }
if (player.getCurrentEquippedItem() != null if (player.getCurrentEquippedItem() != null
&& side == ((TPlatform) tileEntity).deployDirection.ordinal() && side == ((TTurretPlatform) tileEntity).deployDirection.ordinal()
&& player.getCurrentEquippedItem().getItem() && player.getCurrentEquippedItem().getItem()
== Item.getItemFromBlock(ICBMSentry.blockTurret)) { == Item.getItemFromBlock(ICBMSentry.blockTurret)) {
return false; return false;
} }
if (((TPlatform) tileEntity).getTurret(false) != null && !world.isRemote) { if (((TTurretPlatform) tileEntity).getTurret(false) != null && !world.isRemote) {
player.openGui((Object) ICBMSentry.instance, 0, world, x, y, z); player.openGui((Object) ICBMSentry.instance, 0, world, x, y, z);
} }
@ -93,7 +93,7 @@ public class BlockTurretPlatform extends BICBM {
@Override @Override
public TileEntity createNewTileEntity(final World var1, int meta) { public TileEntity createNewTileEntity(final World var1, int meta) {
return new TPlatform(); return new TTurretPlatform();
} }
@Override @Override

View file

@ -16,8 +16,10 @@ import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTBase; import net.minecraft.nbt.NBTBase;
import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.nbt.NBTTagList; import net.minecraft.nbt.NBTTagList;
import net.minecraft.network.NetworkManager;
import net.minecraft.network.Packet;
import net.minecraft.network.play.server.S35PacketUpdateTileEntity;
import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.DamageSource;
import net.minecraft.world.IBlockAccess; import net.minecraft.world.IBlockAccess;
import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.common.util.ForgeDirection;
import universalelectricity.core.UniversalElectricity; import universalelectricity.core.UniversalElectricity;
@ -26,14 +28,13 @@ import universalelectricity.core.item.ElectricItemHelper;
import universalelectricity.core.vector.Vector3; import universalelectricity.core.vector.Vector3;
import universalelectricity.prefab.CustomDamageSource; import universalelectricity.prefab.CustomDamageSource;
public class TPlatform extends TileEntityTerminal implements IInventory { public class TTurretPlatform extends TileEntityTerminal implements IInventory {
private TTurretBase turret; private TTurretBase turret;
public ForgeDirection deployDirection; public ForgeDirection deployDirection;
public static final int UPGRADE_START_INDEX = 12; public static final int UPGRADE_START_INDEX = 12;
private static final int TURRET_UPGADE_SLOTS = 3;
public ItemStack[] containingItems; public ItemStack[] containingItems;
public TPlatform() { public TTurretPlatform() {
this.turret = null; this.turret = null;
this.deployDirection = ForgeDirection.UP; this.deployDirection = ForgeDirection.UP;
this.containingItems = new ItemStack[16]; this.containingItems = new ItemStack[16];
@ -402,4 +403,21 @@ public class TPlatform extends TileEntityTerminal implements IInventory {
return false; return false;
} }
@Override
public Packet getDescriptionPacket() {
NBTTagCompound nbt = new NBTTagCompound();
nbt.setDouble("wattsReceived", super.wattsReceived);
return new S35PacketUpdateTileEntity(this.xCoord, this.yCoord, this.zCoord,
this.getBlockMetadata(), nbt);
}
@Override
public void onDataPacket(NetworkManager net, S35PacketUpdateTileEntity pkt) {
NBTTagCompound nbt = pkt.func_148857_g();
super.wattsReceived = nbt.getDouble("wattsReceived");
}
} }

View file

@ -19,9 +19,10 @@ public class GuiButtonImage extends GuiButton {
this.type = type; this.type = type;
} }
@Override
public void public void
func_73737_a(final Minecraft par1Minecraft, final int width, final int hight) { drawButton(final Minecraft par1Minecraft, final int width, final int hight) {
// TODO: WTf // TODO: WTF
// if (this.drawButton) { // if (this.drawButton) {
par1Minecraft.renderEngine.bindTexture( par1Minecraft.renderEngine.bindTexture(
new ResourceLocation("icbm", "textures/gui/gui@.png") new ResourceLocation("icbm", "textures/gui/gui@.png")

View file

@ -7,7 +7,7 @@ import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly; import cpw.mods.fml.relauncher.SideOnly;
import icbm.gangshao.access.AccessLevel; import icbm.gangshao.access.AccessLevel;
import icbm.gangshao.access.UserAccess; import icbm.gangshao.access.UserAccess;
import icbm.gangshao.platform.TPlatform; import icbm.gangshao.platform.TTurretPlatform;
import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiButton;
import net.minecraft.client.gui.GuiTextField; import net.minecraft.client.gui.GuiTextField;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
@ -25,7 +25,7 @@ public class GuiPlatformAccess extends GuiPlatformBase implements IScroll {
private final HashMap<UserAccess, Vector2> outputMap; private final HashMap<UserAccess, Vector2> outputMap;
public GuiPlatformAccess( public GuiPlatformAccess(
final EntityPlayer entityPlayer, final TPlatform tileEntity final EntityPlayer entityPlayer, final TTurretPlatform tileEntity
) { ) {
super(entityPlayer, tileEntity); super(entityPlayer, tileEntity);
this.scroll = 0; this.scroll = 0;

View file

@ -3,7 +3,7 @@ package icbm.gangshao.shimian;
import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly; import cpw.mods.fml.relauncher.SideOnly;
import icbm.gangshao.ICBMSentry; import icbm.gangshao.ICBMSentry;
import icbm.gangshao.platform.TPlatform; import icbm.gangshao.platform.TTurretPlatform;
import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiButton;
import net.minecraft.client.renderer.RenderHelper; import net.minecraft.client.renderer.RenderHelper;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
@ -14,10 +14,10 @@ import universalelectricity.prefab.GuiBase;
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
public abstract class GuiPlatformBase extends GuiBase { public abstract class GuiPlatformBase extends GuiBase {
protected static final int MAX_BUTTON_ID = 3; protected static final int MAX_BUTTON_ID = 3;
protected TPlatform tileEntity; protected TTurretPlatform tileEntity;
protected EntityPlayer entityPlayer; protected EntityPlayer entityPlayer;
public GuiPlatformBase(final EntityPlayer player, final TPlatform tileEntity) { public GuiPlatformBase(final EntityPlayer player, final TTurretPlatform tileEntity) {
this.tileEntity = tileEntity; this.tileEntity = tileEntity;
this.entityPlayer = player; this.entityPlayer = player;
super.ySize = 190; super.ySize = 190;

View file

@ -4,7 +4,7 @@ import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly; import cpw.mods.fml.relauncher.SideOnly;
import icbm.gangshao.ICBMSentry; import icbm.gangshao.ICBMSentry;
import icbm.gangshao.container.ContainerTurretPlatform; import icbm.gangshao.container.ContainerTurretPlatform;
import icbm.gangshao.platform.TPlatform; import icbm.gangshao.platform.TTurretPlatform;
import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiButton;
import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.gui.inventory.GuiContainer;
import net.minecraft.client.renderer.RenderHelper; import net.minecraft.client.renderer.RenderHelper;
@ -17,11 +17,11 @@ import org.lwjgl.opengl.GL11;
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
public abstract class GuiPlatformContainer extends GuiContainer { public abstract class GuiPlatformContainer extends GuiContainer {
protected static final int MAX_BUTTON_ID = 3; protected static final int MAX_BUTTON_ID = 3;
protected TPlatform tileEntity; protected TTurretPlatform tileEntity;
protected EntityPlayer entityPlayer; protected EntityPlayer entityPlayer;
public GuiPlatformContainer( public GuiPlatformContainer(
final InventoryPlayer inventoryPlayer, final TPlatform tileEntity final InventoryPlayer inventoryPlayer, final TTurretPlatform tileEntity
) { ) {
super((Container) new ContainerTurretPlatform(inventoryPlayer, tileEntity)); super((Container) new ContainerTurretPlatform(inventoryPlayer, tileEntity));
this.tileEntity = tileEntity; this.tileEntity = tileEntity;
@ -29,6 +29,7 @@ public abstract class GuiPlatformContainer extends GuiContainer {
this.ySize = 190; this.ySize = 190;
} }
@Override
public void initGui() { public void initGui() {
super.initGui(); super.initGui();
this.buttonList.clear(); this.buttonList.clear();
@ -43,6 +44,7 @@ public abstract class GuiPlatformContainer extends GuiContainer {
)); ));
} }
@Override
public void updateScreen() { public void updateScreen() {
super.updateScreen(); super.updateScreen();
@ -51,7 +53,8 @@ public abstract class GuiPlatformContainer extends GuiContainer {
} }
} }
protected void func_73875_a(final GuiButton button) { @Override
protected void actionPerformed(final GuiButton button) {
if (this.tileEntity.getTurret(false) != null) { if (this.tileEntity.getTurret(false) != null) {
switch (button.id) { switch (button.id) {
case 0: { case 0: {
@ -93,7 +96,8 @@ public abstract class GuiPlatformContainer extends GuiContainer {
} }
} }
protected void func_74189_g(final int x, final int y) { @Override
protected void drawGuiContainerForegroundLayer(final int x, final int y) {
if (this.tileEntity.getTurret(false) != null) { if (this.tileEntity.getTurret(false) != null) {
final String title = this.tileEntity.getTurret(false).getName(); final String title = this.tileEntity.getTurret(false).getName();
this.fontRendererObj.drawString( this.fontRendererObj.drawString(
@ -110,7 +114,8 @@ public abstract class GuiPlatformContainer extends GuiContainer {
} }
} }
protected void func_74185_a(final float par1, final int x, final int y) { @Override
protected void drawGuiContainerBackgroundLayer(final float par1, final int x, final int y) {
this.mc.renderEngine.bindTexture( this.mc.renderEngine.bindTexture(
new ResourceLocation("icbm", "textures/gui/gui_base.png") new ResourceLocation("icbm", "textures/gui/gui_base.png")
); );

View file

@ -2,7 +2,7 @@ package icbm.gangshao.shimian;
import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly; import cpw.mods.fml.relauncher.SideOnly;
import icbm.gangshao.platform.TPlatform; import icbm.gangshao.platform.TTurretPlatform;
import icbm.gangshao.turret.TTurretBase; import icbm.gangshao.turret.TTurretBase;
import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.util.ResourceLocation; import net.minecraft.util.ResourceLocation;
@ -12,7 +12,7 @@ import universalelectricity.core.electricity.ElectricityDisplay;
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
public class GuiPlatformSlots extends GuiPlatformContainer { public class GuiPlatformSlots extends GuiPlatformContainer {
public GuiPlatformSlots( public GuiPlatformSlots(
final InventoryPlayer inventoryPlayer, final TPlatform tileEntity final InventoryPlayer inventoryPlayer, final TTurretPlatform tileEntity
) { ) {
super(inventoryPlayer, tileEntity); super(inventoryPlayer, tileEntity);
} }
@ -61,7 +61,7 @@ public class GuiPlatformSlots extends GuiPlatformContainer {
@Override @Override
protected void protected void
drawGuiContainerBackgroundLayer(final float par1, final int x, final int y) { drawGuiContainerBackgroundLayer(final float par1, final int x, final int y) {
// super.drawGuiContainerBackgroundLayer(par1, x, y); super.drawGuiContainerBackgroundLayer(par1, x, y);
this.mc.renderEngine.bindTexture( this.mc.renderEngine.bindTexture(
new ResourceLocation("icbm", "textures/gui/gui_platform_slot.png") new ResourceLocation("icbm", "textures/gui/gui_platform_slot.png")
); );

View file

@ -2,7 +2,7 @@ package icbm.gangshao.shimian;
import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly; import cpw.mods.fml.relauncher.SideOnly;
import icbm.gangshao.platform.TPlatform; import icbm.gangshao.platform.TTurretPlatform;
import icbm.gangshao.terminal.TileEntityTerminal; import icbm.gangshao.terminal.TileEntityTerminal;
import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiButton;
import net.minecraft.client.gui.GuiTextField; import net.minecraft.client.gui.GuiTextField;
@ -18,7 +18,7 @@ public class GuiPlatformTerminal extends GuiPlatformBase {
private GuiTextField commandLine; private GuiTextField commandLine;
public GuiPlatformTerminal( public GuiPlatformTerminal(
final EntityPlayer entityPlayer, final TPlatform tileEntity final EntityPlayer entityPlayer, final TTurretPlatform tileEntity
) { ) {
super(entityPlayer, tileEntity); super(entityPlayer, tileEntity);
this.tileEntity = tileEntity; this.tileEntity = tileEntity;

View file

@ -5,7 +5,7 @@ import java.util.List;
import icbm.gangshao.ISpecialAccess; import icbm.gangshao.ISpecialAccess;
import icbm.gangshao.access.AccessLevel; import icbm.gangshao.access.AccessLevel;
import icbm.gangshao.platform.TPlatform; import icbm.gangshao.platform.TTurretPlatform;
import icbm.gangshao.terminal.ITerminal; import icbm.gangshao.terminal.ITerminal;
import icbm.gangshao.terminal.TerminalCommand; import icbm.gangshao.terminal.TerminalCommand;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
@ -21,8 +21,8 @@ public class CommandAccess extends TerminalCommand {
final EntityPlayer player, final ITerminal terminal, final String[] args final EntityPlayer player, final ITerminal terminal, final String[] args
) { ) {
if (args[0].equalsIgnoreCase("access") && args.length > 1 && args[1] != null if (args[0].equalsIgnoreCase("access") && args.length > 1 && args[1] != null
&& terminal instanceof TPlatform) { && terminal instanceof TTurretPlatform) {
final TPlatform platform = (TPlatform) terminal; final TTurretPlatform platform = (TTurretPlatform) terminal;
final AccessLevel userAccess final AccessLevel userAccess
= terminal.getUserAccess(player.getDisplayName()); = terminal.getUserAccess(player.getDisplayName());
@ -93,6 +93,6 @@ public class CommandAccess extends TerminalCommand {
@Override @Override
public boolean canMachineUse(final ISpecialAccess mm) { public boolean canMachineUse(final ISpecialAccess mm) {
return mm instanceof TPlatform; return mm instanceof TTurretPlatform;
} }
} }

View file

@ -5,7 +5,7 @@ import java.util.List;
import icbm.gangshao.ISpecialAccess; import icbm.gangshao.ISpecialAccess;
import icbm.gangshao.access.AccessLevel; import icbm.gangshao.access.AccessLevel;
import icbm.gangshao.platform.TPlatform; import icbm.gangshao.platform.TTurretPlatform;
import icbm.gangshao.terminal.ITerminal; import icbm.gangshao.terminal.ITerminal;
import icbm.gangshao.terminal.TerminalCommand; import icbm.gangshao.terminal.TerminalCommand;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
@ -20,11 +20,11 @@ public class CommandDestroy extends TerminalCommand {
public boolean processCommand( public boolean processCommand(
final EntityPlayer player, final ITerminal terminal, final String[] args final EntityPlayer player, final ITerminal terminal, final String[] args
) { ) {
if (!(terminal instanceof TPlatform)) { if (!(terminal instanceof TTurretPlatform)) {
return false; return false;
} }
final TPlatform turret = (TPlatform) terminal; final TTurretPlatform turret = (TTurretPlatform) terminal;
if (args.length > 1) { if (args.length > 1) {
turret.destroyTurret(); turret.destroyTurret();
@ -57,6 +57,6 @@ public class CommandDestroy extends TerminalCommand {
@Override @Override
public boolean canMachineUse(final ISpecialAccess mm) { public boolean canMachineUse(final ISpecialAccess mm) {
return mm instanceof TPlatform; return mm instanceof TTurretPlatform;
} }
} }

View file

@ -6,7 +6,7 @@ import java.util.List;
import icbm.gangshao.ISpecialAccess; import icbm.gangshao.ISpecialAccess;
import icbm.gangshao.access.AccessLevel; import icbm.gangshao.access.AccessLevel;
import icbm.gangshao.access.UserAccess; import icbm.gangshao.access.UserAccess;
import icbm.gangshao.platform.TPlatform; import icbm.gangshao.platform.TTurretPlatform;
import icbm.gangshao.terminal.ITerminal; import icbm.gangshao.terminal.ITerminal;
import icbm.gangshao.terminal.TerminalCommand; import icbm.gangshao.terminal.TerminalCommand;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
@ -21,8 +21,8 @@ public class CommandGet extends TerminalCommand {
public boolean public boolean
processCommand(final EntityPlayer player, final ITerminal TE, final String[] args) { processCommand(final EntityPlayer player, final ITerminal TE, final String[] args) {
if (args[0].equalsIgnoreCase("get") && args.length > 1 && args[1] != null if (args[0].equalsIgnoreCase("get") && args.length > 1 && args[1] != null
&& TE instanceof TPlatform) { && TE instanceof TTurretPlatform) {
final TPlatform turret = (TPlatform) TE; final TTurretPlatform turret = (TTurretPlatform) TE;
if (args[1].equalsIgnoreCase("owner")) { if (args[1].equalsIgnoreCase("owner")) {
final List<UserAccess> userList final List<UserAccess> userList
@ -76,6 +76,6 @@ public class CommandGet extends TerminalCommand {
@Override @Override
public boolean canMachineUse(final ISpecialAccess mm) { public boolean canMachineUse(final ISpecialAccess mm) {
return mm instanceof TPlatform; return mm instanceof TTurretPlatform;
} }
} }

View file

@ -5,7 +5,7 @@ import java.util.List;
import icbm.gangshao.ISpecialAccess; import icbm.gangshao.ISpecialAccess;
import icbm.gangshao.access.AccessLevel; import icbm.gangshao.access.AccessLevel;
import icbm.gangshao.platform.TPlatform; import icbm.gangshao.platform.TTurretPlatform;
import icbm.gangshao.terminal.ITerminal; import icbm.gangshao.terminal.ITerminal;
import icbm.gangshao.terminal.TerminalCommand; import icbm.gangshao.terminal.TerminalCommand;
import icbm.gangshao.turret.sentries.TAutomaticTurret; import icbm.gangshao.turret.sentries.TAutomaticTurret;
@ -21,8 +21,8 @@ public class CommandTarget extends TerminalCommand {
public boolean processCommand( public boolean processCommand(
final EntityPlayer player, final ITerminal terminal, final String[] args final EntityPlayer player, final ITerminal terminal, final String[] args
) { ) {
if (terminal instanceof TPlatform) { if (terminal instanceof TTurretPlatform) {
final TPlatform turret = (TPlatform) terminal; final TTurretPlatform turret = (TTurretPlatform) terminal;
if (turret.getTurret(false) instanceof TAutomaticTurret) { if (turret.getTurret(false) instanceof TAutomaticTurret) {
final TAutomaticTurret sentry final TAutomaticTurret sentry
@ -108,7 +108,7 @@ public class CommandTarget extends TerminalCommand {
@Override @Override
public boolean canMachineUse(final ISpecialAccess mm) { public boolean canMachineUse(final ISpecialAccess mm) {
return mm instanceof TPlatform return mm instanceof TTurretPlatform
&& ((TPlatform) mm).getTurret(false) instanceof TAutomaticTurret; && ((TTurretPlatform) mm).getTurret(false) instanceof TAutomaticTurret;
} }
} }

View file

@ -10,7 +10,7 @@ import icbm.gangshao.ISentry;
import icbm.gangshao.damage.EntityTileDamagable; import icbm.gangshao.damage.EntityTileDamagable;
import icbm.gangshao.damage.IHealthTile; import icbm.gangshao.damage.IHealthTile;
import icbm.gangshao.packet.PacketTurret; import icbm.gangshao.packet.PacketTurret;
import icbm.gangshao.platform.TPlatform; import icbm.gangshao.platform.TTurretPlatform;
import icbm.gangshao.task.LookHelper; import icbm.gangshao.task.LookHelper;
import net.minecraft.entity.Entity; import net.minecraft.entity.Entity;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
@ -147,15 +147,15 @@ public abstract class TTurretBase
&& this.isAlive(); && this.isAlive();
} }
public TPlatform getPlatform() { public TTurretPlatform getPlatform() {
final TileEntity tileEntity = this.worldObj.getTileEntity( final TileEntity tileEntity = this.worldObj.getTileEntity(
this.xCoord + this.platformDirection.offsetX, this.xCoord + this.platformDirection.offsetX,
this.yCoord + this.platformDirection.offsetY, this.yCoord + this.platformDirection.offsetY,
this.zCoord + this.platformDirection.offsetZ this.zCoord + this.platformDirection.offsetZ
); );
if (tileEntity instanceof TPlatform) { if (tileEntity instanceof TTurretPlatform) {
return (TPlatform) tileEntity; return (TTurretPlatform) tileEntity;
} }
return null; return null;

View file

@ -76,8 +76,8 @@ public class ESeat extends Entity implements IEntityAdditionalSpawnData {
return; return;
} }
if (this.controller instanceof TPaoTaiQi) { if (this.controller instanceof TTurretSeat) {
((TPaoTaiQi) this.controller).entityFake = this; ((TTurretSeat) this.controller).entityFake = this;
} }
if (super.worldObj.isRemote && super.riddenByEntity != null) { if (super.worldObj.isRemote && super.riddenByEntity != null) {

View file

@ -23,7 +23,7 @@ import universalelectricity.prefab.implement.IRedstoneReceptor;
import universalelectricity.prefab.multiblock.IMultiBlock; import universalelectricity.prefab.multiblock.IMultiBlock;
import universalelectricity.prefab.multiblock.TileEntityMulti; import universalelectricity.prefab.multiblock.TileEntityMulti;
public class TRailgunTurret extends TPaoTaiQi implements IRedstoneReceptor { public class TRailgunTurret extends TTurretSeat implements IRedstoneReceptor {
private int gunChargingTicks; private int gunChargingTicks;
private boolean redstonePowerOn; private boolean redstonePowerOn;
private boolean isAntimatter; private boolean isAntimatter;
@ -158,7 +158,7 @@ public class TRailgunTurret extends TPaoTaiQi implements IRedstoneReceptor {
(double) this.xCoord, (double) this.xCoord,
(double) this.yCoord, (double) this.yCoord,
(double) this.zCoord, (double) this.zCoord,
"icbm.railgun", "icbm:railgun",
5.0f, 5.0f,
1.0f 1.0f
); );
@ -247,7 +247,7 @@ public class TRailgunTurret extends TPaoTaiQi implements IRedstoneReceptor {
(double) this.xCoord, (double) this.xCoord,
(double) this.yCoord, (double) this.yCoord,
(double) this.zCoord, (double) this.zCoord,
"icbm.railgun", "icbm:railgun",
5.0f, 5.0f,
1.0f 1.0f
); );

View file

@ -9,10 +9,10 @@ import net.minecraft.util.MovingObjectPosition;
import universalelectricity.core.vector.Vector3; import universalelectricity.core.vector.Vector3;
import universalelectricity.prefab.multiblock.IMultiBlock; import universalelectricity.prefab.multiblock.IMultiBlock;
public abstract class TPaoTaiQi extends TTurretBase implements IMultiBlock { public abstract class TTurretSeat extends TTurretBase implements IMultiBlock {
protected ESeat entityFake; protected ESeat entityFake;
public TPaoTaiQi() { public TTurretSeat() {
this.entityFake = null; this.entityFake = null;
} }

View file

@ -52,7 +52,7 @@ public class TAATurret extends TAutomaticTurret {
(double) this.xCoord, (double) this.xCoord,
(double) this.yCoord, (double) this.yCoord,
(double) this.zCoord, (double) this.zCoord,
"icbm.aagun", "icbm:aagun",
5.0f, 5.0f,
1.0f 1.0f
); );

View file

@ -9,7 +9,7 @@ import icbm.gangshao.ProjectileType;
import icbm.gangshao.damage.TileDamageSource; import icbm.gangshao.damage.TileDamageSource;
import icbm.gangshao.packet.PacketTurret; import icbm.gangshao.packet.PacketTurret;
import icbm.gangshao.packet.PacketTurret.Type; import icbm.gangshao.packet.PacketTurret.Type;
import icbm.gangshao.platform.TPlatform; import icbm.gangshao.platform.TTurretPlatform;
import icbm.gangshao.task.TaskManager; import icbm.gangshao.task.TaskManager;
import icbm.gangshao.task.TaskSearchTarget; import icbm.gangshao.task.TaskSearchTarget;
import icbm.gangshao.turret.TTurretBase; import icbm.gangshao.turret.TTurretBase;
@ -225,7 +225,7 @@ public abstract class TAutomaticTurret extends TTurretBase implements IAutoSentr
final IAmmunition bullet = (IAmmunition) ammoStack.getItem(); final IAmmunition bullet = (IAmmunition) ammoStack.getItem();
if (this.target instanceof EntityLiving) { if (this.target instanceof EntityLiving) {
final TPlatform platform = this.getPlatform(); final TTurretPlatform platform = this.getPlatform();
platform.wattsReceived -= this.getFiringRequest(); platform.wattsReceived -= this.getFiringRequest();
if (bullet.getType(ammoStack) == ProjectileType.CONVENTIONAL) { if (bullet.getType(ammoStack) == ProjectileType.CONVENTIONAL) {

View file

@ -5,7 +5,7 @@ import icbm.api.sentry.IAATarget;
import icbm.gangshao.ICBMSentry; import icbm.gangshao.ICBMSentry;
import icbm.gangshao.ProjectileType; import icbm.gangshao.ProjectileType;
import icbm.gangshao.damage.TileDamageSource; import icbm.gangshao.damage.TileDamageSource;
import icbm.gangshao.platform.TPlatform; import icbm.gangshao.platform.TTurretPlatform;
import net.minecraft.entity.EntityLiving; import net.minecraft.entity.EntityLiving;
import net.minecraft.util.DamageSource; import net.minecraft.util.DamageSource;
import net.minecraft.util.MathHelper; import net.minecraft.util.MathHelper;
@ -60,7 +60,7 @@ public class TLaserTurret extends TAutomaticTurret {
(double) this.xCoord, (double) this.xCoord,
(double) this.yCoord, (double) this.yCoord,
(double) this.zCoord, (double) this.zCoord,
"icbm.lasershot", "icbm:lasershot",
5.0f, 5.0f,
1.0f - this.worldObj.rand.nextFloat() * 0.2f 1.0f - this.worldObj.rand.nextFloat() * 0.2f
); );
@ -108,7 +108,7 @@ public class TLaserTurret extends TAutomaticTurret {
protected boolean onFire() { protected boolean onFire() {
if (!this.worldObj.isRemote && this.getPlatform() != null) { if (!this.worldObj.isRemote && this.getPlatform() != null) {
if (super.target instanceof EntityLiving) { if (super.target instanceof EntityLiving) {
final TPlatform platform = this.getPlatform(); final TTurretPlatform platform = this.getPlatform();
platform.wattsReceived -= this.getFiringRequest(); platform.wattsReceived -= this.getFiringRequest();
super.target.attackEntityFrom( super.target.attackEntityFrom(
(DamageSource) TileDamageSource.doLaserDamage(this), 2 (DamageSource) TileDamageSource.doLaserDamage(this), 2

View file

@ -35,7 +35,7 @@ public class TMachineGunTurret extends TAutomaticTurret {
(double) this.xCoord, (double) this.xCoord,
(double) this.yCoord, (double) this.yCoord,
(double) this.zCoord, (double) this.zCoord,
"icbm.machinegun", "icbm:machinegun",
5.0f, 5.0f,
1.0f 1.0f
); );

View file

@ -15,8 +15,8 @@ public class CommonProxy implements IGuiHandler {
public void preInit() {} public void preInit() {}
public void init() { public void init() {
GameRegistry.registerTileEntity((Class) TCamouflage.class, "ICBMYinXin"); GameRegistry.registerTileEntity((Class) TCamouflage.class, "ICBMCamouflage");
GameRegistry.registerTileEntity((Class) TProximityDetector.class, "ICBMYinGanQi"); GameRegistry.registerTileEntity((Class) TProximityDetector.class, "ICBMProximityDetector");
} }
public Object getClientGuiElement( public Object getClientGuiElement(

View file

@ -26,6 +26,7 @@ public class TProximityDetector
public Vector3 maxCoord; public Vector3 maxCoord;
public byte mode; public byte mode;
public boolean isInverted; public boolean isInverted;
public double wattsForDisplay;
public TProximityDetector() { public TProximityDetector() {
this.frequency = 0; this.frequency = 0;
@ -34,6 +35,7 @@ public class TProximityDetector
this.maxCoord = new Vector3(9.0, 9.0, 9.0); this.maxCoord = new Vector3(9.0, 9.0, 9.0);
this.mode = 0; this.mode = 0;
this.isInverted = false; this.isInverted = false;
this.wattsForDisplay = 0;
} }
@Override @Override
@ -49,6 +51,7 @@ public class TProximityDetector
super.updateEntity(); super.updateEntity();
if (!this.worldObj.isRemote && super.ticks % 20L == 0L) { if (!this.worldObj.isRemote && super.ticks % 20L == 0L) {
this.wattsForDisplay = super.wattsReceived;
this.worldObj.markBlockForUpdate(this.xCoord, this.yCoord, this.zCoord); this.worldObj.markBlockForUpdate(this.xCoord, this.yCoord, this.zCoord);
if (!this.isDisabled()) { if (!this.isDisabled()) {
@ -136,6 +139,7 @@ public class TProximityDetector
public Packet getDescriptionPacket() { public Packet getDescriptionPacket() {
NBTTagCompound nbt = new NBTTagCompound(); NBTTagCompound nbt = new NBTTagCompound();
nbt.setDouble("wattsForDisplay", this.wattsForDisplay);
nbt.setDouble("wattsReceived", super.wattsReceived); nbt.setDouble("wattsReceived", super.wattsReceived);
nbt.setShort("frequency", this.frequency); nbt.setShort("frequency", this.frequency);
nbt.setByte("mode", this.mode); nbt.setByte("mode", this.mode);
@ -152,6 +156,7 @@ public class TProximityDetector
public void onDataPacket(NetworkManager net, S35PacketUpdateTileEntity pkt) { public void onDataPacket(NetworkManager net, S35PacketUpdateTileEntity pkt) {
NBTTagCompound nbt = pkt.func_148857_g(); NBTTagCompound nbt = pkt.func_148857_g();
this.wattsForDisplay = nbt.getDouble("wattsForDisplay");
super.wattsReceived = nbt.getDouble("wattsReceived"); super.wattsReceived = nbt.getDouble("wattsReceived");
this.frequency = nbt.getShort("frequency"); this.frequency = nbt.getShort("frequency");
this.mode = nbt.getByte("mode"); this.mode = nbt.getByte("mode");

View file

@ -192,7 +192,7 @@ public class GProximityDetector extends GuiBase {
if (this.tileEntity.isDisabled()) { if (this.tileEntity.isDisabled()) {
status = "Disabled"; status = "Disabled";
} else if (this.tileEntity.prevWatts < this.tileEntity.getRequest().getWatts()) { } else if (this.tileEntity.wattsForDisplay < this.tileEntity.getRequest().getWatts()) {
status = "Insufficient electricity!"; status = "Insufficient electricity!";
} else { } else {
color = "§2"; color = "§2";

View file

@ -14,10 +14,10 @@ import icbm.zhapin.fx.FXPortal;
import icbm.zhapin.fx.FXShockwave; import icbm.zhapin.fx.FXShockwave;
import icbm.zhapin.fx.FXSmoke; import icbm.zhapin.fx.FXSmoke;
import icbm.zhapin.gui.GEmpTower; import icbm.zhapin.gui.GEmpTower;
import icbm.zhapin.gui.GFaSheDi; import icbm.zhapin.gui.GLauncherPlatform;
import icbm.zhapin.gui.GCruiseLauncher;
import icbm.zhapin.gui.GMissileLauncher; import icbm.zhapin.gui.GMissileLauncher;
import icbm.zhapin.gui.GRadarTower; import icbm.zhapin.gui.GRadarTower;
import icbm.zhapin.gui.GXiaoFaSheQi;
import icbm.zhapin.jiqi.TCruiseLauncher; import icbm.zhapin.jiqi.TCruiseLauncher;
import icbm.zhapin.jiqi.TEmpTower; import icbm.zhapin.jiqi.TEmpTower;
import icbm.zhapin.jiqi.TLauncher; import icbm.zhapin.jiqi.TLauncher;
@ -152,7 +152,7 @@ public class ClientProxy extends CommonProxy {
if (tileEntity != null || ID == 5) { if (tileEntity != null || ID == 5) {
switch (ID) { switch (ID) {
case 1: { case 1: {
return new GXiaoFaSheQi( return new GCruiseLauncher(
entityPlayer.inventory, (TCruiseLauncher) tileEntity entityPlayer.inventory, (TCruiseLauncher) tileEntity
); );
} }
@ -170,7 +170,7 @@ public class ClientProxy extends CommonProxy {
} }
case 7: { case 7: {
return new GFaSheDi( return new GLauncherPlatform(
entityPlayer.inventory, (TLauncherPlatform) tileEntity entityPlayer.inventory, (TLauncherPlatform) tileEntity
); );
} }

View file

@ -10,8 +10,8 @@ import icbm.zhapin.jiqi.TLauncherControlPanel;
import icbm.zhapin.jiqi.TLauncherPlatform; import icbm.zhapin.jiqi.TLauncherPlatform;
import icbm.zhapin.jiqi.TMissileCoordinator; import icbm.zhapin.jiqi.TMissileCoordinator;
import icbm.zhapin.jiqi.TRadarTower; import icbm.zhapin.jiqi.TRadarTower;
import icbm.zhapin.rongqi.CCruiseLauncher;
import icbm.zhapin.rongqi.CFaShiDi; import icbm.zhapin.rongqi.CFaShiDi;
import icbm.zhapin.rongqi.CXiaoFaSheQi;
import icbm.zhapin.zhapin.TExplosive; import icbm.zhapin.zhapin.TExplosive;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.server.gui.IUpdatePlayerListBox; import net.minecraft.server.gui.IUpdatePlayerListBox;
@ -61,7 +61,7 @@ public class CommonProxy implements IGuiHandler {
if (tileEntity != null) { if (tileEntity != null) {
switch (ID) { switch (ID) {
case 1: { case 1: {
return new CXiaoFaSheQi( return new CCruiseLauncher(
player.inventory, (TCruiseLauncher) tileEntity player.inventory, (TCruiseLauncher) tileEntity
); );
} }

View file

@ -33,7 +33,13 @@ import icbm.zhapin.dianqi.ItRadarGun;
import icbm.zhapin.dianqi.ItRemoteDetonator; import icbm.zhapin.dianqi.ItRemoteDetonator;
import icbm.zhapin.dianqi.ItRocketLauncher; import icbm.zhapin.dianqi.ItRocketLauncher;
import icbm.zhapin.jiqi.BMachine; import icbm.zhapin.jiqi.BMachine;
import icbm.zhapin.jiqi.CruiseLauncherGuiPacket;
import icbm.zhapin.jiqi.CruiseLauncherGuiPacketHandler;
import icbm.zhapin.jiqi.EmpTowerGuiPacket;
import icbm.zhapin.jiqi.EmpTowerGuiPacketHandler;
import icbm.zhapin.jiqi.IBMachine; import icbm.zhapin.jiqi.IBMachine;
import icbm.zhapin.jiqi.LauncherControlPanelGuiPacket;
import icbm.zhapin.jiqi.LauncherControlPanelGuiPacketHandler;
import icbm.zhapin.po.PChuanRanDu; import icbm.zhapin.po.PChuanRanDu;
import icbm.zhapin.po.PDaDu; import icbm.zhapin.po.PDaDu;
import icbm.zhapin.po.PDongShang; import icbm.zhapin.po.PDongShang;
@ -258,6 +264,21 @@ public class ICBMExplosion extends MainBase {
channel.registerMessage( channel.registerMessage(
ItemUsePacketHandler.class, ItemUsePacket.class, pktId++, Side.SERVER ItemUsePacketHandler.class, ItemUsePacket.class, pktId++, Side.SERVER
); );
channel.registerMessage(
EmpTowerGuiPacketHandler.class, EmpTowerGuiPacket.class, pktId++, Side.SERVER
);
channel.registerMessage(
LauncherControlPanelGuiPacketHandler.class,
LauncherControlPanelGuiPacket.class,
pktId++,
Side.SERVER
);
channel.registerMessage(
CruiseLauncherGuiPacketHandler.class,
CruiseLauncherGuiPacket.class,
pktId++,
Side.SERVER
);
} }
@Mod.EventHandler @Mod.EventHandler

View file

@ -45,7 +45,7 @@ public class ItemUsePacketHandler implements IMessageHandler<ItemUsePacket, IMes
position.intX(), position.intX(),
player.worldObj.getHeightValue(position.intX(), position.intZ()), player.worldObj.getHeightValue(position.intX(), position.intZ()),
position.intZ(), position.intZ(),
"icbm.airstrike", "icbm:airstrike",
5.0f, 5.0f,
(1.0f (1.0f
+ (player.worldObj.rand.nextFloat() + (player.worldObj.rand.nextFloat()

View file

@ -34,7 +34,7 @@ public class DAntiBallistic extends MissileBase {
missileObj.lockedTarget = nearestEntity; missileObj.lockedTarget = nearestEntity;
missileObj.didTargetLockBefore = true; missileObj.didTargetLockBefore = true;
missileObj.worldObj.playSoundAtEntity( missileObj.worldObj.playSoundAtEntity(
(Entity) missileObj, "icbm.targetlocked", 5.0f, 0.9f (Entity) missileObj, "icbm:targetlocked", 5.0f, 0.9f
); );
} }
} else { } else {

View file

@ -175,7 +175,7 @@ public class EMissile extends Entity
this.jiSuan(); this.jiSuan();
super.worldObj.playSoundAtEntity( super.worldObj.playSoundAtEntity(
(Entity) this, (Entity) this,
"icbm.missilelaunch", "icbm:missilelaunch",
4.0f, 4.0f,
(1.0f (1.0f
+ (super.worldObj.rand.nextFloat() - super.worldObj.rand.nextFloat()) * 0.2f) + (super.worldObj.rand.nextFloat() - super.worldObj.rand.nextFloat()) * 0.2f)

View file

@ -33,8 +33,9 @@ public class ItMissile extends ItICBM {
return "icbm.missile"; return "icbm.missile";
} }
@Override
public void getSubItems( public void getSubItems(
final int par1, final CreativeTabs par2CreativeTabs, final List par3List final Item par1, final CreativeTabs par2CreativeTabs, final List par3List
) { ) {
for (int i = 0; i < ZhaPin.E_SI_ID; ++i) { for (int i = 0; i < ZhaPin.E_SI_ID; ++i) {
par3List.add(new ItemStack((Item) this, 1, i)); par3List.add(new ItemStack((Item) this, 1, i));

View file

@ -37,7 +37,7 @@ public class ItModuleMissile extends ItMissile {
@Override @Override
public void getSubItems( public void getSubItems(
final int par1, final CreativeTabs par2CreativeTabs, final List par3List final Item par1, final CreativeTabs par2CreativeTabs, final List par3List
) { ) {
for (int i = 0; i < 5; ++i) { for (int i = 0; i < 5; ++i) {
par3List.add(new ItemStack((Item) this, 1, i)); par3List.add(new ItemStack((Item) this, 1, i));

View file

@ -1,7 +1,9 @@
package icbm.zhapin.gui; package icbm.zhapin.gui;
import icbm.zhapin.ICBMExplosion;
import icbm.zhapin.jiqi.CruiseLauncherGuiPacket;
import icbm.zhapin.jiqi.TCruiseLauncher; import icbm.zhapin.jiqi.TCruiseLauncher;
import icbm.zhapin.rongqi.CXiaoFaSheQi; import icbm.zhapin.rongqi.CCruiseLauncher;
import net.minecraft.client.gui.GuiTextField; import net.minecraft.client.gui.GuiTextField;
import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.gui.inventory.GuiContainer;
import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.entity.player.InventoryPlayer;
@ -12,7 +14,7 @@ import org.lwjgl.opengl.GL11;
import universalelectricity.core.electricity.ElectricityDisplay; import universalelectricity.core.electricity.ElectricityDisplay;
import universalelectricity.core.vector.Vector3; import universalelectricity.core.vector.Vector3;
public class GXiaoFaSheQi extends GuiContainer { public class GCruiseLauncher extends GuiContainer {
private TCruiseLauncher tileEntity; private TCruiseLauncher tileEntity;
private GuiTextField textFieldX; private GuiTextField textFieldX;
private GuiTextField textFieldZ; private GuiTextField textFieldZ;
@ -21,10 +23,10 @@ public class GXiaoFaSheQi extends GuiContainer {
private int containerWidth; private int containerWidth;
private int containerHeight; private int containerHeight;
public GXiaoFaSheQi( public GCruiseLauncher(
final InventoryPlayer par1InventoryPlayer, final TCruiseLauncher tileEntity final InventoryPlayer par1InventoryPlayer, final TCruiseLauncher tileEntity
) { ) {
super((Container) new CXiaoFaSheQi(par1InventoryPlayer, tileEntity)); super((Container) new CCruiseLauncher(par1InventoryPlayer, tileEntity));
this.tileEntity = tileEntity; this.tileEntity = tileEntity;
} }
@ -67,19 +69,16 @@ public class GXiaoFaSheQi extends GuiContainer {
Integer.parseInt(this.textFieldZ.getText()) Integer.parseInt(this.textFieldZ.getText())
); );
this.tileEntity.setTarget(newTarget); this.tileEntity.setTarget(newTarget);
// TODO: WTF ICBMExplosion.channel.sendToServer(new CruiseLauncherGuiPacket(this.tileEntity
// PacketDispatcher.sendPacketToServer(PacketManager.getPacket( ));
// "ICBM|E", this.tileEntity, 2, this.tileEntity.getTarget().x,
// this.tileEntity.getTarget().y, this.tileEntity.getTarget().z));
} catch (final NumberFormatException ex) {} } catch (final NumberFormatException ex) {}
try { try {
final short newFrequency final short newFrequency
= (short) Math.max(Short.parseShort(this.textFieldFreq.getText()), 0); = (short) Math.max(Short.parseShort(this.textFieldFreq.getText()), 0);
this.tileEntity.setFrequency(newFrequency); this.tileEntity.setFrequency(newFrequency);
// TODO: WTF ICBMExplosion.channel.sendToServer(new CruiseLauncherGuiPacket(this.tileEntity
// PacketDispatcher.sendPacketToServer(PacketManager.getPacket( ));
// "ICBM|E", this.tileEntity, 1, this.tileEntity.getFrequency()));
} catch (final NumberFormatException ex2) {} } catch (final NumberFormatException ex2) {}
} }

View file

@ -1,11 +1,14 @@
package icbm.zhapin.gui; package icbm.zhapin.gui;
import icbm.zhapin.ICBMExplosion;
import icbm.zhapin.jiqi.EmpTowerGuiPacket;
import icbm.zhapin.jiqi.TEmpTower; import icbm.zhapin.jiqi.TEmpTower;
import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiButton;
import net.minecraft.client.gui.GuiTextField; import net.minecraft.client.gui.GuiTextField;
import net.minecraft.util.ResourceLocation; import net.minecraft.util.ResourceLocation;
import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL11;
import universalelectricity.core.electricity.ElectricityDisplay; import universalelectricity.core.electricity.ElectricityDisplay;
import universalelectricity.core.vector.Vector3;
import universalelectricity.prefab.GuiBase; import universalelectricity.prefab.GuiBase;
public class GEmpTower extends GuiBase { public class GEmpTower extends GuiBase {
@ -34,17 +37,6 @@ public class GEmpTower extends GuiBase {
(this.textFieldBanJing = new GuiTextField(this.fontRendererObj, 72, 28, 30, 12)) (this.textFieldBanJing = new GuiTextField(this.fontRendererObj, 72, 28, 30, 12))
.setMaxStringLength(3); .setMaxStringLength(3);
this.textFieldBanJing.setText(this.tileEntity.radius + ""); this.textFieldBanJing.setText(this.tileEntity.radius + "");
// TODO: WTF
// PacketDispatcher.sendPacketToServer(PacketManager.getPacket("ICBM|E",
// this.tileEntity, -1, true));
}
@Override
public void onGuiClosed() {
super.onGuiClosed();
// TODO: WTF
// PacketDispatcher.sendPacketToServer(PacketManager.getPacket("ICBM|E",
// this.tileEntity, -1, false));
} }
@Override @Override
@ -66,9 +58,9 @@ public class GEmpTower extends GuiBase {
} }
} }
// TODO: WTF ICBMExplosion.channel.sendToServer(new EmpTowerGuiPacket(
// PacketDispatcher.sendPacketToServer(PacketManager.getPacket("ICBM|E", new Vector3(this.tileEntity), this.tileEntity.radius, this.tileEntity.holzOhJa
// this.tileEntity, 3, this.tileEntity.muoShi)); ));
} }
@Override @Override
@ -81,9 +73,11 @@ public class GEmpTower extends GuiBase {
Math.max(Integer.parseInt(this.textFieldBanJing.getText()), 10), 150 Math.max(Integer.parseInt(this.textFieldBanJing.getText()), 10), 150
); );
this.tileEntity.radius = radius; this.tileEntity.radius = radius;
// TODO: WTF ICBMExplosion.channel.sendToServer(new EmpTowerGuiPacket(
// PacketDispatcher.sendPacketToServer(PacketManager.getPacket("ICBM|E", new Vector3(this.tileEntity),
// this.tileEntity, 2, this.tileEntity.banJing)); this.tileEntity.radius,
this.tileEntity.holzOhJa
));
} catch (final NumberFormatException ex) {} } catch (final NumberFormatException ex) {}
} }

View file

@ -9,12 +9,12 @@ import net.minecraft.util.ResourceLocation;
import net.minecraft.util.StatCollector; import net.minecraft.util.StatCollector;
import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL11;
public class GFaSheDi extends GuiContainer { public class GLauncherPlatform extends GuiContainer {
private TLauncherPlatform tileEntity; private TLauncherPlatform tileEntity;
private int containerWidth; private int containerWidth;
private int containerHeight; private int containerHeight;
public GFaSheDi( public GLauncherPlatform(
final InventoryPlayer par1InventoryPlayer, final TLauncherPlatform tileEntity final InventoryPlayer par1InventoryPlayer, final TLauncherPlatform tileEntity
) { ) {
super((Container) new CFaShiDi(par1InventoryPlayer, tileEntity)); super((Container) new CFaShiDi(par1InventoryPlayer, tileEntity));

View file

@ -1,5 +1,7 @@
package icbm.zhapin.gui; package icbm.zhapin.gui;
import icbm.zhapin.ICBMExplosion;
import icbm.zhapin.jiqi.LauncherControlPanelGuiPacket;
import icbm.zhapin.jiqi.TLauncherControlPanel; import icbm.zhapin.jiqi.TLauncherControlPanel;
import net.minecraft.client.gui.GuiTextField; import net.minecraft.client.gui.GuiTextField;
import net.minecraft.util.ResourceLocation; import net.minecraft.util.ResourceLocation;
@ -72,28 +74,27 @@ public class GMissileLauncher extends GuiBase {
Integer.parseInt(this.tFZ.getText()) Integer.parseInt(this.tFZ.getText())
); );
this.tileEntity.setTarget(newTarget); this.tileEntity.setTarget(newTarget);
// TODO: WTF ICBMExplosion.channel.sendToServer(
// PacketDispatcher.sendPacketToServer(PacketManager.getPacket( new LauncherControlPanelGuiPacket(this.tileEntity)
// "ICBM|E", this.tileEntity, 2, this.tileEntity.getTarget().x, );
// this.tileEntity.getTarget().y, this.tileEntity.getTarget().z));
} catch (final NumberFormatException ex) {} } catch (final NumberFormatException ex) {}
try { try {
final short newFrequency final short newFrequency
= (short) Math.max(Short.parseShort(this.tFFreq.getText()), 0); = (short) Math.max(Short.parseShort(this.tFFreq.getText()), 0);
this.tileEntity.setFrequency(newFrequency); this.tileEntity.setFrequency(newFrequency);
// TODO: WTF ICBMExplosion.channel.sendToServer(
// PacketDispatcher.sendPacketToServer(PacketManager.getPacket( new LauncherControlPanelGuiPacket(this.tileEntity)
// "ICBM|E", this.tileEntity, 1, this.tileEntity.getFrequency())); );
} catch (final NumberFormatException ex2) {} } catch (final NumberFormatException ex2) {}
try { try {
final short newGaoDu = (short final short newGaoDu = (short
) Math.max(Math.min(Short.parseShort(this.tFGaoDu.getText()), 99), 3); ) Math.max(Math.min(Short.parseShort(this.tFGaoDu.getText()), 99), 3);
this.tileEntity.height = newGaoDu; this.tileEntity.height = newGaoDu;
// TODO: WTF ICBMExplosion.channel.sendToServer(
// PacketDispatcher.sendPacketToServer(PacketManager.getPacket( new LauncherControlPanelGuiPacket(this.tileEntity)
// "ICBM|E", this.tileEntity, 3, this.tileEntity.gaoDu)); );
} catch (final NumberFormatException ex3) {} } catch (final NumberFormatException ex3) {}
} }

View file

@ -0,0 +1,38 @@
package icbm.zhapin.jiqi;
import cpw.mods.fml.common.network.simpleimpl.IMessage;
import io.netty.buffer.ByteBuf;
import universalelectricity.core.vector.Vector3;
public class CruiseLauncherGuiPacket implements IMessage {
Vector3 pos;
int frequency;
Vector3 target;
public CruiseLauncherGuiPacket() {}
public CruiseLauncherGuiPacket(TCruiseLauncher te) {
this.pos = new Vector3(te);
this.frequency = te.getFrequency();
this.target = te.getTarget();
}
@Override
public void fromBytes(ByteBuf buf) {
this.pos = new Vector3(buf.readInt(), buf.readInt(), buf.readInt());
this.frequency = buf.readInt();
this.target = new Vector3(buf.readInt(), buf.readInt(), buf.readInt());
}
@Override
public void toBytes(ByteBuf buf) {
buf.writeInt(this.pos.intX());
buf.writeInt(this.pos.intY());
buf.writeInt(this.pos.intZ());
buf.writeInt(this.frequency);
buf.writeInt(this.target.intX());
buf.writeInt(this.target.intY());
buf.writeInt(this.target.intZ());
}
}

View file

@ -0,0 +1,26 @@
package icbm.zhapin.jiqi;
import cpw.mods.fml.common.network.simpleimpl.IMessage;
import cpw.mods.fml.common.network.simpleimpl.IMessageHandler;
import cpw.mods.fml.common.network.simpleimpl.MessageContext;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;
public class CruiseLauncherGuiPacketHandler
implements IMessageHandler<CruiseLauncherGuiPacket, IMessage> {
@Override
public IMessage onMessage(CruiseLauncherGuiPacket message, MessageContext ctx) {
World world = ctx.getServerHandler().playerEntity.worldObj;
TileEntity te = message.pos.getTileEntity(world);
if (te instanceof TCruiseLauncher) {
TCruiseLauncher cl = (TCruiseLauncher)te;
cl.setFrequency(message.frequency);
cl.setTarget(message.target);
}
return null;
}
}

View file

@ -0,0 +1,36 @@
package icbm.zhapin.jiqi;
import cpw.mods.fml.common.network.simpleimpl.IMessage;
import io.netty.buffer.ByteBuf;
import universalelectricity.core.vector.Vector3;
public class EmpTowerGuiPacket implements IMessage {
Vector3 pos;
int radius;
byte holzOhJa;
public EmpTowerGuiPacket(Vector3 pos, int radius, byte holzOhJa) {
this.holzOhJa = holzOhJa;
this.pos = pos;
this.radius = radius;
}
public EmpTowerGuiPacket() {}
@Override
public void fromBytes(ByteBuf buf) {
this.pos = new Vector3(buf.readInt(), buf.readInt(), buf.readInt());
this.radius = buf.readInt();
this.holzOhJa = buf.readByte();
}
@Override
public void toBytes(ByteBuf buf) {
buf.writeInt(this.pos.intX());
buf.writeInt(this.pos.intY());
buf.writeInt(this.pos.intZ());
buf.writeInt(this.radius);
buf.writeByte(this.holzOhJa);
}
}

View file

@ -0,0 +1,24 @@
package icbm.zhapin.jiqi;
import cpw.mods.fml.common.network.simpleimpl.IMessage;
import cpw.mods.fml.common.network.simpleimpl.IMessageHandler;
import cpw.mods.fml.common.network.simpleimpl.MessageContext;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;
public class EmpTowerGuiPacketHandler
implements IMessageHandler<EmpTowerGuiPacket, IMessage> {
@Override
public IMessage onMessage(EmpTowerGuiPacket message, MessageContext ctx) {
World world = ctx.getServerHandler().playerEntity.worldObj;
TileEntity te = message.pos.getTileEntity(world);
if (te instanceof TEmpTower) {
((TEmpTower) te).radius = message.radius;
((TEmpTower) te).holzOhJa = message.holzOhJa;
}
return null;
}
}

View file

@ -0,0 +1,44 @@
package icbm.zhapin.jiqi;
import cpw.mods.fml.common.network.simpleimpl.IMessage;
import io.netty.buffer.ByteBuf;
import universalelectricity.core.vector.Vector3;
public class LauncherControlPanelGuiPacket implements IMessage {
Vector3 pos;
int frequency;
Vector3 target;
short height;
public LauncherControlPanelGuiPacket() {}
public LauncherControlPanelGuiPacket(TLauncherControlPanel te) {
this.pos = new Vector3(te);
this.frequency = te.getFrequency();
this.target = te.getTarget();
this.height = te.height;
}
@Override
public void fromBytes(ByteBuf buf) {
this.pos = new Vector3(buf.readInt(), buf.readInt(), buf.readInt());
this.frequency = buf.readInt();
this.target = new Vector3(buf.readInt(), buf.readInt(), buf.readInt());
this.height = buf.readShort();
}
@Override
public void toBytes(ByteBuf buf) {
buf.writeInt(this.pos.intX());
buf.writeInt(this.pos.intY());
buf.writeInt(this.pos.intZ());
buf.writeInt(this.frequency);
buf.writeInt(this.target.intX());
buf.writeInt(this.target.intY());
buf.writeInt(this.target.intZ());
buf.writeShort(this.height);
}
}

View file

@ -0,0 +1,29 @@
package icbm.zhapin.jiqi;
import cpw.mods.fml.common.network.simpleimpl.IMessage;
import cpw.mods.fml.common.network.simpleimpl.IMessageHandler;
import cpw.mods.fml.common.network.simpleimpl.MessageContext;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;
public class LauncherControlPanelGuiPacketHandler
implements IMessageHandler<LauncherControlPanelGuiPacket, IMessage> {
@Override
public IMessage onMessage(LauncherControlPanelGuiPacket message, MessageContext ctx) {
World world = ctx.getServerHandler().playerEntity.worldObj;
TileEntity te = message.pos.getTileEntity(world);
if (te instanceof TLauncherControlPanel) {
TLauncherControlPanel lcp = ((TLauncherControlPanel) te);
lcp.setFrequency(message.frequency);
lcp.target = message.target;
if (lcp.getTier() < 2)
lcp.target.y = 0.0;
lcp.height = (short) Math.max(Math.min(message.height, 99), 3);
}
return null;
}
}

View file

@ -20,13 +20,13 @@ import universalelectricity.prefab.multiblock.IMultiBlock;
public class TEmpTower public class TEmpTower
extends TileEntityUniversalStorable implements IMultiBlock, IRedstoneReceptor { extends TileEntityUniversalStorable implements IMultiBlock, IRedstoneReceptor {
public static final int MAX_RADIUS = 150; public static final int MAX_RADIUS = 150;
public float xuanZhuan; public float rotation;
private float xuanZhuanLu; private float xuanZhuanLu;
public byte holzOhJa; public byte holzOhJa;
public int radius; public int radius;
public TEmpTower() { public TEmpTower() {
this.xuanZhuan = 0.0f; this.rotation = 0.0f;
this.holzOhJa = 0; this.holzOhJa = 0;
this.radius = 60; this.radius = 60;
RadarRegistry.register(this); RadarRegistry.register(this);
@ -48,7 +48,7 @@ public class TEmpTower
(double) this.xCoord, (double) this.xCoord,
(double) this.yCoord, (double) this.yCoord,
(double) this.zCoord, (double) this.zCoord,
"icbm.machinehum", "icbm:machinehum",
0.5f, 0.5f,
(float) (0.8500000238418579 * this.getJoules() / this.getMaxJoules()) (float) (0.8500000238418579 * this.getJoules() / this.getMaxJoules())
); );
@ -56,10 +56,10 @@ public class TEmpTower
this.xuanZhuanLu this.xuanZhuanLu
= (float) (Math.pow(this.getJoules() / this.getMaxJoules(), 2.0) * 0.5); = (float) (Math.pow(this.getJoules() / this.getMaxJoules(), 2.0) * 0.5);
this.xuanZhuan += this.xuanZhuanLu; this.rotation += this.xuanZhuanLu;
if (this.xuanZhuan > 360.0f) { if (this.rotation > 360.0f) {
this.xuanZhuan = 0.0f; this.rotation = 0.0f;
} }
} }

View file

@ -81,6 +81,8 @@ public class TLauncherControlPanel
nbt.setInteger("tier", this.tier); nbt.setInteger("tier", this.tier);
nbt.setInteger("frequency", this.getFrequency()); nbt.setInteger("frequency", this.getFrequency());
nbt.setShort("height", this.height); nbt.setShort("height", this.height);
nbt.setInteger("disabledTicks", this.disabledTicks);
nbt.setTag("target", super.target.writeToNBT(new NBTTagCompound()));
return new S35PacketUpdateTileEntity( return new S35PacketUpdateTileEntity(
this.xCoord, this.yCoord, this.zCoord, this.getBlockMetadata(), nbt this.xCoord, this.yCoord, this.zCoord, this.getBlockMetadata(), nbt
@ -103,6 +105,8 @@ public class TLauncherControlPanel
this.tier = nbt.getInteger("tier"); this.tier = nbt.getInteger("tier");
this.setFrequency(nbt.getInteger("frequency")); this.setFrequency(nbt.getInteger("frequency"));
this.height = nbt.getShort("height"); this.height = nbt.getShort("height");
this.disabledTicks = nbt.getInteger("disabledTicks");
super.target = Vector3.readFromNBT(nbt.getCompoundTag("target"));
} }
// TODO: WTF // TODO: WTF

View file

@ -25,7 +25,7 @@ public class REmpTower extends TileEntitySpecialRenderer {
GL11.glTranslatef((float) x + 0.5f, (float) y + 1.5f, (float) z + 0.5f); GL11.glTranslatef((float) x + 0.5f, (float) y + 1.5f, (float) z + 0.5f);
this.bindTexture(new ResourceLocation("icbm", "textures/models/emp_tower.png")); this.bindTexture(new ResourceLocation("icbm", "textures/models/emp_tower.png"));
GL11.glRotatef(180.0f, 0.0f, 0.0f, 1.0f); GL11.glRotatef(180.0f, 0.0f, 0.0f, 1.0f);
REmpTower.MODEL.render(tileEntity.xuanZhuan, 0.0625f); REmpTower.MODEL.render(tileEntity.rotation, 0.0625f);
GL11.glPopMatrix(); GL11.glPopMatrix();
} }

View file

@ -11,10 +11,10 @@ import net.minecraft.item.ItemStack;
import universalelectricity.core.item.IItemElectric; import universalelectricity.core.item.IItemElectric;
import universalelectricity.prefab.SlotSpecific; import universalelectricity.prefab.SlotSpecific;
public class CXiaoFaSheQi extends Container { public class CCruiseLauncher extends Container {
private TCruiseLauncher tileEntity; private TCruiseLauncher tileEntity;
public CXiaoFaSheQi( public CCruiseLauncher(
final InventoryPlayer par1InventoryPlayer, final TCruiseLauncher tileEntity final InventoryPlayer par1InventoryPlayer, final TCruiseLauncher tileEntity
) { ) {
this.tileEntity = tileEntity; this.tileEntity = tileEntity;

View file

@ -109,7 +109,7 @@ public class ExAntiGravitational extends ZhaPin {
position.x, position.x,
position.y, position.y,
position.z, position.z,
"icbm.antigravity", "icbm:antigravity",
6.0f, 6.0f,
(1.0f + (worldObj.rand.nextFloat() - worldObj.rand.nextFloat()) * 0.2f) * 0.7f (1.0f + (worldObj.rand.nextFloat() - worldObj.rand.nextFloat()) * 0.2f) * 0.7f
); );

View file

@ -37,7 +37,7 @@ public class ExAntimatter extends ZhaPin {
position.x, position.x,
position.y, position.y,
position.z, position.z,
"icbm.antimatter", "icbm:antimatter",
7.0f, 7.0f,
(float) (worldObj.rand.nextFloat() * 0.1 + 0.8999999761581421) (float) (worldObj.rand.nextFloat() * 0.1 + 0.8999999761581421)
); );
@ -109,7 +109,7 @@ public class ExAntimatter extends ZhaPin {
if (fuseTicks % 25 == 0) { if (fuseTicks % 25 == 0) {
worldObj.playSoundEffect( worldObj.playSoundEffect(
position.x, position.y, position.z, "icbm.alarm", 4.0f, 1.0f position.x, position.y, position.z, "icbm:alarm", 4.0f, 1.0f
); );
} }
} }

View file

@ -100,7 +100,7 @@ public class ExChemical extends ZhaPin {
position.x + 0.5, position.x + 0.5,
position.y + 0.5, position.y + 0.5,
position.z + 0.5, position.z + 0.5,
"icbm.gasleak", "icbm:gasleak",
4.0f, 4.0f,
(1.0f + (worldObj.rand.nextFloat() - worldObj.rand.nextFloat()) * 0.2f) * 1.0f (1.0f + (worldObj.rand.nextFloat() - worldObj.rand.nextFloat()) * 0.2f) * 1.0f
); );

View file

@ -32,7 +32,7 @@ public class ExDebilitation extends ZhaPin {
position.x, position.x,
position.y, position.y,
position.z, position.z,
"icbm.debilitation", "icbm:debilitation",
4.0f, 4.0f,
(1.0f + (worldObj.rand.nextFloat() - worldObj.rand.nextFloat()) * 0.2f) * 0.7f (1.0f + (worldObj.rand.nextFloat() - worldObj.rand.nextFloat()) * 0.2f) * 0.7f
); );

View file

@ -90,7 +90,7 @@ public class ExEmpSignal extends ZhaPin {
position.x, position.x,
position.y, position.y,
position.z, position.z,
"icbm.emp", "icbm:emp",
4.0f, 4.0f,
(1.0f + (worldObj.rand.nextFloat() - worldObj.rand.nextFloat()) * 0.2f) * 0.7f (1.0f + (worldObj.rand.nextFloat() - worldObj.rand.nextFloat()) * 0.2f) * 0.7f
); );

View file

@ -106,7 +106,7 @@ public class ExEmpWave extends ZhaPin {
position.x, position.x,
position.y, position.y,
position.z, position.z,
"icbm.emp", "icbm:emp",
4.0f, 4.0f,
(1.0f + (worldObj.rand.nextFloat() - worldObj.rand.nextFloat()) * 0.2f) * 0.7f (1.0f + (worldObj.rand.nextFloat() - worldObj.rand.nextFloat()) * 0.2f) * 0.7f
); );

View file

@ -170,7 +170,7 @@ public class ExEndothermic extends ZhaPin {
} }
worldObj.playSoundEffect( worldObj.playSoundEffect(
position.x, position.y, position.z, "icbm.redmatter", 4.0f, 0.8f position.x, position.y, position.z, "icbm:redmatter", 4.0f, 0.8f
); );
return callCount <= 35; return callCount <= 35;
} }

View file

@ -175,7 +175,7 @@ public class ExEndothermic2 extends ZhaPin {
position.x + 0.5, position.x + 0.5,
position.y + 0.5, position.y + 0.5,
position.z + 0.5, position.z + 0.5,
"icbm.redmatter", "icbm:redmatter",
6.0f, 6.0f,
(1.0f + (worldObj.rand.nextFloat() - worldObj.rand.nextFloat()) * 0.2f) (1.0f + (worldObj.rand.nextFloat() - worldObj.rand.nextFloat()) * 0.2f)
* 1.0f * 1.0f

View file

@ -167,7 +167,7 @@ public class ExExothermic extends ZhaPin {
} }
worldObj.playSoundEffect( worldObj.playSoundEffect(
position.x, position.y, position.z, "icbm.beamcharging", 4.0f, 0.8f position.x, position.y, position.z, "icbm:beamcharging", 4.0f, 0.8f
); );
return callCount <= 35; return callCount <= 35;
} }
@ -184,7 +184,7 @@ public class ExExothermic extends ZhaPin {
if (!worldObj.isRemote) { if (!worldObj.isRemote) {
((EExplosion) explosionSource).entityList.get(0).setDead(); ((EExplosion) explosionSource).entityList.get(0).setDead();
worldObj.playSoundEffect( worldObj.playSoundEffect(
position.x, position.y, position.z, "icbm.powerdown", 4.0f, 0.8f position.x, position.y, position.z, "icbm:powerdown", 4.0f, 0.8f
); );
if (this.canFocusBeam(worldObj, position)) { if (this.canFocusBeam(worldObj, position)) {

View file

@ -225,7 +225,7 @@ public class ExExothermic2 extends ZhaPin {
position.x + 0.5, position.x + 0.5,
position.y + 0.5, position.y + 0.5,
position.z + 0.5, position.z + 0.5,
"icbm.explosionfire", "icbm:explosionfire",
6.0f, 6.0f,
(1.0f + (worldObj.rand.nextFloat() - worldObj.rand.nextFloat()) * 0.2f) (1.0f + (worldObj.rand.nextFloat() - worldObj.rand.nextFloat()) * 0.2f)
* 1.0f * 1.0f

View file

@ -155,7 +155,7 @@ public class ExHypersonic extends ZhaPin {
position.x, position.x,
position.y, position.y,
position.z, position.z,
"icbm.hypersonic", "icbm:hypersonic",
6.0f, 6.0f,
(1.0f + (worldObj.rand.nextFloat() - worldObj.rand.nextFloat()) * 0.1f) * 0.9f (1.0f + (worldObj.rand.nextFloat() - worldObj.rand.nextFloat()) * 0.1f) * 0.9f
); );

View file

@ -135,7 +135,7 @@ public class ExIncendiary extends ZhaPin {
position.x + 0.5, position.x + 0.5,
position.y + 0.5, position.y + 0.5,
position.z + 0.5, position.z + 0.5,
"icbm.explosionfire", "icbm:explosionfire",
4.0f, 4.0f,
(1.0f + (worldObj.rand.nextFloat() - worldObj.rand.nextFloat()) * 0.2f) * 1.0f (1.0f + (worldObj.rand.nextFloat() - worldObj.rand.nextFloat()) * 0.2f) * 1.0f
); );

View file

@ -81,7 +81,7 @@ public class ExNuclear extends ExThr {
position.x, position.x,
position.y, position.y,
position.z, position.z,
"icbm.explosion", "icbm:explosion",
7.0f, 7.0f,
(1.0f + (worldObj.rand.nextFloat() - worldObj.rand.nextFloat()) * 0.2f) * 0.7f (1.0f + (worldObj.rand.nextFloat() - worldObj.rand.nextFloat()) * 0.2f) * 0.7f
); );
@ -128,7 +128,7 @@ public class ExNuclear extends ExThr {
position.x, position.x,
position.y, position.y,
position.z, position.z,
"icbm.explosion", "icbm:explosion",
10.0f, 10.0f,
(1.0f + (worldObj.rand.nextFloat() - worldObj.rand.nextFloat()) * 0.2f) * 0.7f (1.0f + (worldObj.rand.nextFloat() - worldObj.rand.nextFloat()) * 0.2f) * 0.7f
); );
@ -152,7 +152,7 @@ public class ExNuclear extends ExThr {
(double) (int) position.x, (double) (int) position.x,
(double) (int) position.y, (double) (int) position.y,
(double) (int) position.z, (double) (int) position.z,
"icbm.alarm", "icbm:alarm",
4.0f, 4.0f,
1.0f 1.0f
); );

View file

@ -91,7 +91,7 @@ public class ExPushPull extends ZhaPin {
position.x, position.x,
position.y, position.y,
position.z, position.z,
"random.explode", "random:explode",
4.0f, 4.0f,
(1.0f + (worldObj.rand.nextFloat() - worldObj.rand.nextFloat()) * 0.2f) * 0.7f (1.0f + (worldObj.rand.nextFloat() - worldObj.rand.nextFloat()) * 0.2f) * 0.7f
); );

View file

@ -242,7 +242,7 @@ public class ExRedMatter extends ZhaPin {
position.x, position.x,
position.y, position.y,
position.z, position.z,
"icbm.explosion", "icbm:explosion",
7.0f, 7.0f,
(1.0f + (worldObj.rand.nextFloat() - worldObj.rand.nextFloat()) * 0.2f (1.0f + (worldObj.rand.nextFloat() - worldObj.rand.nextFloat()) * 0.2f
) * 0.7f ) * 0.7f
@ -266,7 +266,7 @@ public class ExRedMatter extends ZhaPin {
position.x + (Math.random() - 0.5) * radius, position.x + (Math.random() - 0.5) * radius,
position.y + (Math.random() - 0.5) * radius, position.y + (Math.random() - 0.5) * radius,
position.z + (Math.random() - 0.5) * radius, position.z + (Math.random() - 0.5) * radius,
"icbm.collapse", "icbm:collapse",
6.0f - worldObj.rand.nextFloat(), 6.0f - worldObj.rand.nextFloat(),
1.0f - worldObj.rand.nextFloat() * 0.4f 1.0f - worldObj.rand.nextFloat() * 0.4f
); );
@ -276,7 +276,7 @@ public class ExRedMatter extends ZhaPin {
position.x, position.x,
position.y, position.y,
position.z, position.z,
"icbm.redmatter", "icbm:redmatter",
3.0f, 3.0f,
(1.0f + (worldObj.rand.nextFloat() - worldObj.rand.nextFloat()) * 0.2f) * 1.0f (1.0f + (worldObj.rand.nextFloat() - worldObj.rand.nextFloat()) * 0.2f) * 1.0f
); );

View file

@ -110,7 +110,7 @@ public class ExSonic extends ZhaPin {
position.x, position.x,
position.y, position.y,
position.z, position.z,
"icbm.sonicwave", "icbm:sonicwave",
4.0f, 4.0f,
(1.0f + (worldObj.rand.nextFloat() - worldObj.rand.nextFloat()) * 0.2f) * 0.7f (1.0f + (worldObj.rand.nextFloat() - worldObj.rand.nextFloat()) * 0.2f) * 0.7f
); );

View file

@ -43,7 +43,7 @@ public class ExThermobaric extends ExThr {
position.x, position.x,
position.y, position.y,
position.z, position.z,
"icbm.explosion", "icbm:explosion",
7.0f, 7.0f,
(1.0f + (worldObj.rand.nextFloat() - worldObj.rand.nextFloat()) * 0.2f) * 0.7f (1.0f + (worldObj.rand.nextFloat() - worldObj.rand.nextFloat()) * 0.2f) * 0.7f
); );
@ -128,7 +128,7 @@ public class ExThermobaric extends ExThr {
position.x, position.x,
position.y, position.y,
position.z, position.z,
"icbm.explosion", "icbm:explosion",
10.0f, 10.0f,
(1.0f + (worldObj.rand.nextFloat() - worldObj.rand.nextFloat()) * 0.2f) * 0.7f (1.0f + (worldObj.rand.nextFloat() - worldObj.rand.nextFloat()) * 0.2f) * 0.7f
); );

View file

@ -0,0 +1,263 @@
{
"aagun": {
"category": "master",
"sounds": [
{
"name": "aagun",
"stream": false
}
]
},
"airstrike": {
"category": "master",
"sounds": [
{
"name": "airstrike",
"stream": false
}
]
},
"alarm": {
"category": "master",
"sounds": [
{
"name": "alarm",
"stream": false
}
]
},
"antigravity": {
"category": "master",
"sounds": [
{
"name": "antigravity",
"stream": false
}
]
},
"antimatter": {
"category": "master",
"sounds": [
{
"name": "antimatter",
"stream": false
}
]
},
"beamcharging": {
"category": "master",
"sounds": [
{
"name": "beamcharging",
"stream": false
}
]
},
"collapse": {
"category": "master",
"sounds": [
{
"name": "collapse1",
"stream": false
},
{
"name": "collapse2",
"stream": false
},
{
"name": "collapse2",
"stream": false
},
{
"name": "collapse3",
"stream": false
},
{
"name": "collapse4",
"stream": false
},
{
"name": "collapse5",
"stream": false
},
{
"name": "collapse6",
"stream": false
},
{
"name": "collapse8",
"stream": false
}
]
},
"debilitation": {
"category": "master",
"sounds": [
{
"name": "debilitation",
"stream": false
}
]
},
"emp": {
"category": "master",
"sounds": [
{
"name": "emp",
"stream": false
}
]
},
"explosion": {
"category": "master",
"sounds": [
{
"name": "explosion1",
"stream": false
}
]
},
"explosionfire": {
"category": "master",
"sounds": [
{
"name": "explosionfire",
"stream": false
}
]
},
"gasleak": {
"category": "master",
"sounds": [
{
"name": "gasleak",
"stream": false
}
]
},
"hypersonic": {
"category": "master",
"sounds": [
{
"name": "hypersonic",
"stream": false
}
]
},
"laser": {
"category": "master",
"sounds": [
{
"name": "laser",
"stream": false
}
]
},
"lasershot": {
"category": "master",
"sounds": [
{
"name": "lasershot",
"stream": false
}
]
},
"machinegun": {
"category": "master",
"sounds": [
{
"name": "machinegun1",
"stream": false
},
{
"name": "machinegun2",
"stream": false
}
]
},
"machinehum": {
"category": "master",
"sounds": [
{
"name": "machinehum",
"stream": false
}
]
},
"missileinair": {
"category": "master",
"sounds": [
{
"name": "missileinair",
"stream": false
}
]
},
"missilelaunch": {
"category": "master",
"sounds": [
{
"name": "missilelaunch1",
"stream": false
},
{
"name": "missilelaunch2",
"stream": false
}
]
},
"powerdown": {
"category": "master",
"sounds": [
{
"name": "powerdown",
"stream": false
}
]
},
"radaralarm": {
"category": "master",
"sounds": [
{
"name": "radaralarm",
"stream": false
}
]
},
"railgun": {
"category": "master",
"sounds": [
{
"name": "railgun",
"stream": false
}
]
},
"redmatter": {
"category": "master",
"sounds": [
{
"name": "redmatter",
"stream": false
}
]
},
"sonicwave": {
"category": "master",
"sounds": [
{
"name": "sonicwave",
"stream": false
}
]
},
"targetlocked": {
"category": "master",
"sounds": [
{
"name": "targetlocked",
"stream": false
}
]
}
}

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Some files were not shown because too many files have changed in this diff Show more