JCS-Prod/Orbital-Satellite
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Rebase mod on DE mod construct

Browse Source
This commit is contained in:
JackCarterSmith 2018-03-24 17:46:29 +01:00
parent 1eb87c4026
commit fea69bdad9
74 changed files with 1054 additions and 587 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
build.gradle
View File

@ -17,12 +17,17 @@ buildscript {
apply plugin: 'forge'
version = "0.1"
version = "0.1.8"
group= "fr.jackcartersmith.orbsat" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
archivesBaseName = "orbsat"
apply plugin: 'java'
sourceCompatibility = 1.8
targetCompatibility = 1.8
minecraft {
version = "1.7.10-10.13.4.1558-1.7.10"
replace '${version}', project.version
runDir = "eclipse"
}
@ -39,9 +44,17 @@ dependencies {
// for more info...
// http://www.gradle.org/docs/current/userguide/artifact_dependencies_tutorial.html
// http://www.gradle.org/docs/current/userguide/dependency_management.html
compile fileTree(dir: 'externalLibs', include: '*.jar')
}
jar {
manifest {
attributes 'FMLAT': 'OrbitalSatellite_dc.cfg'
}
}
processResources
{
// this will ensure that this task is redone when the versions change.
@ -60,4 +73,16 @@ processResources
from(sourceSets.main.resources.srcDirs) {
exclude 'mcmod.info'
}
}
task deobfJar(type: Jar) {
from sourceSets.main.output
classifier = 'deobf'
manifest {
attributes 'FMLAT': 'OrbitalSatellite_dc.cfg'
}
}
artifacts {
archives deobfJar
}

2
gradle/wrapper/gradle-wrapper.properties vendored
View File

@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-2.0-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-2.7-bin.zip

89
src/main/java/fr/jackcartersmith/ob/OrbitalBombardment.java
View File

@ -1,89 +0,0 @@
package fr.jackcartersmith.ob;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.init.Blocks;
import cpw.mods.fml.common.Mod;
import cpw.mods.fml.common.Mod.EventHandler;
import cpw.mods.fml.common.Mod.Instance;
import cpw.mods.fml.common.SidedProxy;
import cpw.mods.fml.common.event.FMLInitializationEvent;
import cpw.mods.fml.common.event.FMLPostInitializationEvent;
import cpw.mods.fml.common.event.FMLPreInitializationEvent;
import cpw.mods.fml.common.network.NetworkRegistry;
import cpw.mods.fml.common.network.simpleimpl.SimpleNetworkWrapper;
import cpw.mods.fml.common.registry.EntityRegistry;
import cpw.mods.fml.relauncher.Side;
import fr.jackcartersmith.ob.blocks.OBBlocks;
import fr.jackcartersmith.ob.entities.LaserLightEntity;
import fr.jackcartersmith.ob.entities.MeteorEntity;
import fr.jackcartersmith.ob.gui.GuiHandlerForOb;
import fr.jackcartersmith.ob.items.OBItems;
import fr.jackcartersmith.ob.libs.OBConstants;
import fr.jackcartersmith.ob.libs.OBCreativeTabs;
import fr.jackcartersmith.ob.proxy.CommonProxy;
@Mod(modid = OrbitalBombardment.MODID, version = OrbitalBombardment.VERSION)
public class OrbitalBombardment
{
@Instance("ob")
public static OrbitalBombardment instance;
@SidedProxy(clientSide = "fr.jackcartersmith.ob.proxy.ClientProxy", serverSide = "fr.jackcartersmith.ob.proxy.CommonProxy")
public static CommonProxy proxy;
public static SimpleNetworkWrapper obNetwork = NetworkRegistry.INSTANCE.newSimpleChannel("OB");
//private GuiHandlerForOb guiHandlerForOb = new GuiHandlerForOb();
public static int sateliteModelId;
public int lastChargerX;
public int lastChargerY;
public int lastChargerZ;
public int lastExtenderX;
public int lastExtenderY;
public int lastExtenderZ;
public int lastGeneralX;
public int lastGeneralY;
public int lastGeneralZ;
public static int mobid = 0;
public static final String MODID = "ob";
public static final String VERSION = "2.0";
public static CreativeTabs OBCreativeTabs = new OBCreativeTabs("ob_creative_tabs");
@EventHandler
public void preInit(FMLPreInitializationEvent event)
{
//Init conf file
OBConstants.init(event.getSuggestedConfigurationFile());
//Create packet channel for OB and register packets
obNetwork = NetworkRegistry.INSTANCE.newSimpleChannel("OB");
obNetwork.registerMessage(OBNetwork.Handler.class, OBNetwork.class, 1, Side.SERVER);
obNetwork.registerMessage(OBNetworkClient.Handler.class, OBNetworkClient.class, 2, Side.CLIENT);
//Init Items and Blocks
OBItems.init();
OBBlocks.init();
}
@EventHandler
public void init(FMLInitializationEvent event)
{
EntityRegistry.registerModEntity(MeteorEntity.class, "meteor", 1, instance, 80, 3, true);
EntityRegistry.registerModEntity(LaserLightEntity.class, "LaserLightEntity", 2, instance, 80, 3, true);
//Register GuiHandler for all GUI
NetworkRegistry.INSTANCE.registerGuiHandler(OrbitalBombardment.instance, new GuiHandlerForOb());
proxy.registerRender();
}
@EventHandler
public void postInit(FMLPostInitializationEvent event)
{
}
}

5
src/main/java/fr/jackcartersmith/ob/blocks/DefLasBlock.java
View File

@ -20,7 +20,7 @@ public class DefLasBlock extends BlockContainer
public void setBlockBoundsBasedOnState(IBlockAccess world, int x, int y, int z)
{
this.setBlockBounds(0.0F, 0.0F, 0.0F, 0.0F, 10000.0F, 0.0F);
this.setBlockBounds(0.0F, 0.0F, 0.0F, 0.0F, 1000.0F, 0.0F);
}
@SideOnly(Side.CLIENT)
@ -57,6 +57,7 @@ public class DefLasBlock extends BlockContainer
/**
* The type of render function that is called for this block
*/
@Override
public int getRenderType()
{
return ClientProxy.tesrRenderId;
@ -66,6 +67,7 @@ public class DefLasBlock extends BlockContainer
* Is this block (a) opaque and (b) a full 1m cube? This determines whether or not to render the shared face of two
* adjacent blocks and also whether the player can attach torches, redstone wire, etc to this block.
*/
@Override
public boolean isOpaqueCube()
{
return false;
@ -74,6 +76,7 @@ public class DefLasBlock extends BlockContainer
/**
* If this block doesn't render as an ordinary block it will return False (examples: signs, buttons, stairs, etc)
*/
@Override
public boolean renderAsNormalBlock()
{
return false;

5
src/main/java/fr/jackcartersmith/ob/blocks/DefenderBlock.java
View File

@ -2,8 +2,8 @@ package fr.jackcartersmith.ob.blocks;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import fr.jackcartersmith.ob.OrbitalBombardment;
import fr.jackcartersmith.ob.proxy.ClientProxy;
import fr.jackcartersmith.orbsat.OrbitalSatellite;
import net.minecraft.block.Block;
import net.minecraft.block.BlockContainer;
import net.minecraft.block.material.Material;
@ -60,6 +60,7 @@ public class DefenderBlock extends BlockContainer
/**
* The type of render function that is called for this block
*/
@Override
public int getRenderType()
{
return ClientProxy.tesrRenderId;
@ -69,6 +70,7 @@ public class DefenderBlock extends BlockContainer
* Is this block (a) opaque and (b) a full 1m cube? This determines whether or not to render the shared face of two
* adjacent blocks and also whether the player can attach torches, redstone wire, etc to this block.
*/
@Override
public boolean isOpaqueCube()
{
return false;
@ -77,6 +79,7 @@ public class DefenderBlock extends BlockContainer
/**
* If this block doesn't render as an ordinary block it will return False (examples: signs, buttons, stairs, etc)
*/
@Override
public boolean renderAsNormalBlock()
{
return false;

4
src/main/java/fr/jackcartersmith/ob/blocks/DefenderLaserTileEntity.java
View File

@ -4,7 +4,7 @@ import java.util.Iterator;
import java.util.List;
import fr.jackcartersmith.ob.interfaces.PhotonRecieving;
import fr.jackcartersmith.ob.libs.OBConstants;
import fr.jackcartersmith.orbsat.common.lib.OSConstants;
import net.minecraft.entity.Entity;
import net.minecraft.entity.monster.EntityMob;
import net.minecraft.util.AxisAlignedBB;
@ -54,7 +54,7 @@ public class DefenderLaserTileEntity extends PhotonRecieving
public List getNearByEntitiesForDamage(int x, int y, int z)
{
int radius = OBConstants.DefenderRadius;
int radius = OSConstants.DefenderRadius;
List entities = this.worldObj.getEntitiesWithinAABB(EntityMob.class, AxisAlignedBB.getBoundingBox((double)(x - 5), (double)(y - 5), (double)(z - 5), (double)(x + 5), (double)(y + 5), (double)(z + 5)));
return entities;
}

17
src/main/java/fr/jackcartersmith/ob/blocks/DefenderTileEntity.java
View File

@ -1,9 +1,10 @@
package fr.jackcartersmith.ob.blocks;
import fr.jackcartersmith.ob.OBNetworkClient;
import fr.jackcartersmith.ob.OrbitalBombardment;
import fr.jackcartersmith.ob.interfaces.PhotonRecieving;
import fr.jackcartersmith.ob.libs.OBConstants;
import fr.jackcartersmith.orbsat.OBNetworkClient;
import fr.jackcartersmith.orbsat.OrbitalSatellite;
import fr.jackcartersmith.orbsat.common.OSBlocks;
import fr.jackcartersmith.orbsat.common.lib.OSConstants;
import java.util.ArrayList;
import java.util.List;
@ -54,8 +55,8 @@ public class DefenderTileEntity extends PhotonRecieving
int x = (int)mob.lastTickPosX;
int y = (int)mob.lastTickPosY;
int z = (int)mob.lastTickPosZ;
this.worldObj.setBlock(x, y, z, OBBlocks.laserDef);
this.worldObj.setBlock(thisX, thisY + 1, thisZ, OBBlocks.laserDef);
this.worldObj.setBlock(x, y, z, OSBlocks.laserDef);
this.worldObj.setBlock(thisX, thisY + 1, thisZ, OSBlocks.laserDef);
this.removeCharge(500);
}
}
@ -70,7 +71,7 @@ public class DefenderTileEntity extends PhotonRecieving
public List getNearByEntities()
{
int radius = OBConstants.DefenderRadius;
int radius = OSConstants.DefenderRadius;
List entities = this.worldObj.getEntitiesWithinAABB(EntityMob.class, AxisAlignedBB.getBoundingBox((double)(this.xCoord - radius), (double)(this.yCoord - radius), (double)(this.zCoord - radius), (double)(this.xCoord + radius), (double)(this.yCoord + radius), (double)(this.zCoord + radius)));
return entities;
}
@ -85,7 +86,7 @@ public class DefenderTileEntity extends PhotonRecieving
bos.add(this.zCoord);
bos.add(this.getCurrentCharge());
OrbitalBombardment.obNetwork.sendToAll(new OBNetworkClient(bos));
OrbitalSatellite.obNetwork.sendToAll(new OBNetworkClient(bos));
}
public void sendChangeToClient19()
@ -98,6 +99,6 @@ public class DefenderTileEntity extends PhotonRecieving
bos.add(this.zCoord);
bos.add(0);
OrbitalBombardment.obNetwork.sendToAll(new OBNetworkClient(bos));
OrbitalSatellite.obNetwork.sendToAll(new OBNetworkClient(bos));
}
}

10
src/main/java/fr/jackcartersmith/ob/blocks/ExtenderBlock.java
View File

@ -2,8 +2,8 @@ package fr.jackcartersmith.ob.blocks;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import fr.jackcartersmith.ob.OrbitalBombardment;
import fr.jackcartersmith.ob.proxy.ClientProxy;
import fr.jackcartersmith.orbsat.OrbitalSatellite;
import net.minecraft.block.Block;
import net.minecraft.block.BlockContainer;
import net.minecraft.block.material.Material;
@ -41,10 +41,10 @@ public class ExtenderBlock extends BlockContainer
*/
public boolean onBlockActivated(World par1World, int par2, int par3, int par4, EntityPlayer par5EntityPlayer, int par6, float par7, float par8, float par9)
{
OrbitalBombardment.instance.lastExtenderX = par2;
OrbitalBombardment.instance.lastExtenderY = par3;
OrbitalBombardment.instance.lastExtenderZ = par4;
par5EntityPlayer.openGui(OrbitalBombardment.instance, 3, par1World, par2, par3, par4);
OrbitalSatellite.instance.lastExtenderX = par2;
OrbitalSatellite.instance.lastExtenderY = par3;
OrbitalSatellite.instance.lastExtenderZ = par4;
par5EntityPlayer.openGui(OrbitalSatellite.instance, 3, par1World, par2, par3, par4);
return true;
}

24
src/main/java/fr/jackcartersmith/ob/blocks/ExtenderTileEntity.java
View File

@ -1,8 +1,10 @@
package fr.jackcartersmith.ob.blocks;
import fr.jackcartersmith.ob.OBNetworkClient;
import fr.jackcartersmith.ob.OrbitalBombardment;
import fr.jackcartersmith.ob.libs.OBConstants;
import fr.jackcartersmith.orbsat.OBNetworkClient;
import fr.jackcartersmith.orbsat.OrbitalSatellite;
import fr.jackcartersmith.orbsat.common.OSBlocks;
import fr.jackcartersmith.orbsat.common.lib.OSConstants;
import java.util.ArrayList;
import java.util.List;
@ -20,7 +22,7 @@ public class ExtenderTileEntity extends TileEntity
public ExtenderTileEntity()
{
this.maxCharge = OBConstants.ExtenderMaxCharge;
this.maxCharge = OSConstants.ExtenderMaxCharge;
}
/**
@ -63,7 +65,7 @@ public class ExtenderTileEntity extends TileEntity
int overriderCharge;
int overriderMax;
if (north == OBBlocks.overrider)
if (north == OSBlocks.overrider)
{
entity = (OverriderBlockTileEntity)par1world.getTileEntity(this.xCoord + 1, this.yCoord, this.zCoord);
overriderCharge = entity.getCurrentCharge();
@ -82,7 +84,7 @@ public class ExtenderTileEntity extends TileEntity
}
}
if (south == OBBlocks.overrider)
if (south == OSBlocks.overrider)
{
entity = (OverriderBlockTileEntity)par1world.getTileEntity(this.xCoord - 1, this.yCoord, this.zCoord);
overriderCharge = entity.currentCharge;
@ -101,7 +103,7 @@ public class ExtenderTileEntity extends TileEntity
}
}
if (east == OBBlocks.overrider)
if (east == OSBlocks.overrider)
{
entity = (OverriderBlockTileEntity)par1world.getTileEntity(this.xCoord, this.yCoord, this.zCoord + 1);
overriderCharge = entity.currentCharge;
@ -120,7 +122,7 @@ public class ExtenderTileEntity extends TileEntity
}
}
if (west == OBBlocks.overrider)
if (west == OSBlocks.overrider)
{
entity = (OverriderBlockTileEntity)par1world.getTileEntity(this.xCoord, this.yCoord, this.zCoord - 1);
overriderCharge = entity.currentCharge;
@ -139,7 +141,7 @@ public class ExtenderTileEntity extends TileEntity
}
}
if (top == OBBlocks.overrider)
if (top == OSBlocks.overrider)
{
entity = (OverriderBlockTileEntity)par1world.getTileEntity(this.xCoord, this.yCoord + 1, this.zCoord);
overriderCharge = entity.currentCharge;
@ -158,7 +160,7 @@ public class ExtenderTileEntity extends TileEntity
}
}
if (bottom == OBBlocks.overrider)
if (bottom == OSBlocks.overrider)
{
entity = (OverriderBlockTileEntity)par1world.getTileEntity(this.xCoord, this.yCoord - 1, this.zCoord);
overriderCharge = entity.currentCharge;
@ -195,6 +197,6 @@ public class ExtenderTileEntity extends TileEntity
bos.add(this.zCoord);
bos.add(this.currentCharge);
OrbitalBombardment.obNetwork.sendToAll(new OBNetworkClient(bos));
OrbitalSatellite.obNetwork.sendToAll(new OBNetworkClient(bos));
}
}

4
src/main/java/fr/jackcartersmith/ob/blocks/InverterAdvTileEntity.java
View File

@ -1,14 +1,14 @@
package fr.jackcartersmith.ob.blocks;
import fr.jackcartersmith.ob.interfaces.PhotonProducing;
import fr.jackcartersmith.ob.libs.OBConstants;
import fr.jackcartersmith.orbsat.common.lib.OSConstants;
import net.minecraft.nbt.NBTTagCompound;
public class InverterAdvTileEntity extends PhotonProducing
{
public InverterAdvTileEntity()
{
this.setChargeRate(OBConstants.AdvPhotonInvChargeRate);
this.setChargeRate(OSConstants.AdvPhotonInvChargeRate);
}
/**

4
src/main/java/fr/jackcartersmith/ob/blocks/InverterTileEntity.java
View File

@ -1,14 +1,14 @@
package fr.jackcartersmith.ob.blocks;
import fr.jackcartersmith.ob.interfaces.PhotonProducing;
import fr.jackcartersmith.ob.libs.OBConstants;
import fr.jackcartersmith.orbsat.common.lib.OSConstants;
import net.minecraft.nbt.NBTTagCompound;
public class InverterTileEntity extends PhotonProducing
{
public InverterTileEntity()
{
this.setChargeRate(OBConstants.PhotonInvChargeRate);
this.setChargeRate(OSConstants.PhotonInvChargeRate);
}
/**

62
src/main/java/fr/jackcartersmith/ob/blocks/OBBlocks.java
View File

@ -1,62 +0,0 @@
package fr.jackcartersmith.ob.blocks;
import cpw.mods.fml.common.registry.GameRegistry;
import fr.jackcartersmith.ob.OrbitalBombardment;
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
public class OBBlocks {
public static Block laserLow;
public static Block overrider;
public static Block photonInverter;
public static Block photonInverterAdv;
public static Block extender;
public static Block furnace;
public static Block satelite;
public static Block photonDecelerator;
public static Block photonAccelerator;
public static Block defender;
public static Block laserDef;
public static void init(){
laserLow = new LaserLowBlock(Material.air).setBlockName("obLaserLow").setBlockTextureName(OrbitalBombardment.MODID + ":laserLow").setHardness(-1.0F).setResistance(-1.0F).setLightLevel(25.0F);;
GameRegistry.registerBlock(laserLow, "ob_laserLow");
GameRegistry.registerTileEntity(LaserLowTileEntity.class, "laserLowTileEntity");
laserDef = new DefLasBlock(Material.air).setBlockName("obDefenderLaser").setBlockTextureName(OrbitalBombardment.MODID + ":laserLow").setHardness(10.0F).setResistance(25.0F).setLightLevel(5.0F);;
GameRegistry.registerBlock(laserDef, "ob_defenderLaser");
GameRegistry.registerTileEntity(DefenderLaserTileEntity.class, "defenderLaserTileEntity");
overrider = new OverriderBlock(Material.anvil).setBlockName("obOverrider").setBlockTextureName(OrbitalBombardment.MODID + ":overrider").setHardness(10.0F).setResistance(25.0F).setCreativeTab(OrbitalBombardment.OBCreativeTabs);;
GameRegistry.registerBlock(overrider, "ob_overrider");
GameRegistry.registerTileEntity(OverriderBlockTileEntity.class, "overriderBlockTileEntity");
photonInverter = new PhotonInverterBlock(Material.iron).setBlockName("obInverter").setBlockTextureName(OrbitalBombardment.MODID + ":solarPanel").setHardness(2.0F).setResistance(15.0F).setStepSound(Block.soundTypeStone).setCreativeTab(OrbitalBombardment.OBCreativeTabs);;
GameRegistry.registerBlock(photonInverter, "ob_inverter");
GameRegistry.registerTileEntity(InverterTileEntity.class, "inverter");
photonInverterAdv = new PhotonInverterAdvBlock(Material.iron).setBlockName("obInverterAdv").setBlockTextureName(OrbitalBombardment.MODID + ":solarPanel").setHardness(2.0F).setResistance(15.0F).setStepSound(Block.soundTypeStone).setCreativeTab(OrbitalBombardment.OBCreativeTabs);;
GameRegistry.registerBlock(photonInverterAdv, "ob_photonInverterAdv");
GameRegistry.registerTileEntity(InverterAdvTileEntity.class, "inverterAdv");
extender = new ExtenderBlock(Material.anvil).setBlockName("obExtender").setBlockTextureName(OrbitalBombardment.MODID + ":extender").setHardness(10.0F).setResistance(25.0F).setCreativeTab(OrbitalBombardment.OBCreativeTabs);;
GameRegistry.registerBlock(extender, "ob_extender");
GameRegistry.registerTileEntity(ExtenderTileEntity.class, "extenderTileEntity");
satelite = new SateliteBlock(Material.anvil).setHardness(10.0F).setBlockName("obSatelite").setBlockTextureName(OrbitalBombardment.MODID + ":satelite").setResistance(25.0F).setCreativeTab(OrbitalBombardment.OBCreativeTabs);
GameRegistry.registerBlock(satelite, "ob_satelite");
GameRegistry.registerTileEntity(SateliteTileEntity.class, "sateliteTileEntity");
photonDecelerator = new PhotonDeceleratorBlock(Material.iron).setBlockName("obDecelerator").setBlockTextureName(OrbitalBombardment.MODID + ":photonDecelerator").setHardness(2.0F).setResistance(15.0F).setStepSound(Block.soundTypeStone).setCreativeTab(OrbitalBombardment.OBCreativeTabs);
GameRegistry.registerBlock(photonDecelerator, "ob_decelerator");
GameRegistry.registerTileEntity(PhotonDeceleratorTileEntity.class, "PhotonDeceleratorTileEntity");
photonAccelerator = new PhotonAcceleratorBlock(Material.iron).setBlockName("obAccelerator").setBlockTextureName(OrbitalBombardment.MODID + ":photonAccelerator").setHardness(2.0F).setResistance(15.0F).setStepSound(Block.soundTypeMetal).setCreativeTab(OrbitalBombardment.OBCreativeTabs);
GameRegistry.registerBlock(photonAccelerator, "ob_accelerator");
GameRegistry.registerTileEntity(PhotonAcceleratorTileEntity.class, "PhotonAcceleratorTileEntity");
defender = new DefenderBlock(Material.anvil).setBlockName("obDefender").setBlockTextureName(OrbitalBombardment.MODID + ":defender").setLightLevel(0.2F).setResistance(25.0F).setHardness(10.0F).setCreativeTab(OrbitalBombardment.OBCreativeTabs);
GameRegistry.registerBlock(defender, "ob_defender");
GameRegistry.registerTileEntity(DefenderTileEntity.class, "DefenderTileEntity");
}
}

13
src/main/java/fr/jackcartersmith/ob/blocks/OverriderBlock.java
View File

@ -2,8 +2,9 @@ package fr.jackcartersmith.ob.blocks;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import fr.jackcartersmith.ob.OrbitalBombardment;
import fr.jackcartersmith.ob.proxy.ClientProxy;
import fr.jackcartersmith.orbsat.OrbitalSatellite;
import fr.jackcartersmith.orbsat.common.OSBlocks;
import net.minecraft.block.Block;
import net.minecraft.block.BlockContainer;
import net.minecraft.block.material.Material;
@ -57,7 +58,7 @@ public class OverriderBlock extends BlockContainer
*/
public void breakBlock(World par1World, int par2, int par3, int par4, Block block, int par6)
{
if (par1World.getBlock(par2, par3 + 1, par4) == OBBlocks.satelite)
if (par1World.getBlock(par2, par3 + 1, par4) == OSBlocks.satelite)
{
par1World.removeTileEntity(par2, par3 + 1, par4);
par1World.setBlockToAir(par2, par3 + 1, par4);
@ -74,10 +75,10 @@ public class OverriderBlock extends BlockContainer
if (!player.isSneaking())
{
OrbitalBombardment.instance.lastChargerX = x;
OrbitalBombardment.instance.lastChargerY = y;
OrbitalBombardment.instance.lastChargerZ = z;
player.openGui(OrbitalBombardment.instance, 0, world, (int)player.posX, (int)player.posY, (int)player.posZ);
OrbitalSatellite.instance.lastChargerX = x;
OrbitalSatellite.instance.lastChargerY = y;
OrbitalSatellite.instance.lastChargerZ = z;
player.openGui(OrbitalSatellite.instance, 0, world, (int)player.posX, (int)player.posY, (int)player.posZ);
}
return true;

16
src/main/java/fr/jackcartersmith/ob/blocks/OverriderBlockTileEntity.java
View File

@ -1,10 +1,10 @@
package fr.jackcartersmith.ob.blocks;
import fr.jackcartersmith.ob.OBNetwork;
import fr.jackcartersmith.ob.OBNetworkClient;
import fr.jackcartersmith.ob.OrbitalBombardment;
import fr.jackcartersmith.ob.interfaces.PhotonConsuming;
import fr.jackcartersmith.ob.libs.OBConstants;
import fr.jackcartersmith.orbsat.OBNetwork;
import fr.jackcartersmith.orbsat.OBNetworkClient;
import fr.jackcartersmith.orbsat.OrbitalSatellite;
import fr.jackcartersmith.orbsat.common.lib.OSConstants;
import java.util.ArrayList;
import java.util.HashMap;
@ -52,7 +52,7 @@ public class OverriderBlockTileEntity extends PhotonConsuming
*/
public void updateEntity()
{
this.maxCharge = OBConstants.OverriderMaxCharge;
this.maxCharge = OSConstants.OverriderMaxCharge;
if (this.currentCharge > this.maxCharge)
{
@ -121,7 +121,7 @@ public class OverriderBlockTileEntity extends PhotonConsuming
bos.add(this.zCoord);
bos.add(this.getCurrentCharge());
OrbitalBombardment.obNetwork.sendToAll(new OBNetworkClient(bos));
OrbitalSatellite.obNetwork.sendToAll(new OBNetworkClient(bos));
}
public void sendChangeToClient5()
@ -134,7 +134,7 @@ public class OverriderBlockTileEntity extends PhotonConsuming
bos.add(this.zCoord);
bos.add(this.shotsLeft);
OrbitalBombardment.obNetwork.sendToAll(new OBNetworkClient(bos));
OrbitalSatellite.obNetwork.sendToAll(new OBNetworkClient(bos));
}
public void sendChangeToServer21(int xCoord, int yCoord, int zCoord, int power, EntityClientPlayerMP mp)
@ -147,6 +147,6 @@ public class OverriderBlockTileEntity extends PhotonConsuming
bos.add(zCoord);
bos.add(power);
OrbitalBombardment.obNetwork.sendToServer(new OBNetwork(bos));
OrbitalSatellite.obNetwork.sendToServer(new OBNetwork(bos));
}
}

10
src/main/java/fr/jackcartersmith/ob/blocks/PhotonAcceleratorBlock.java
View File

@ -2,8 +2,8 @@ package fr.jackcartersmith.ob.blocks;
import java.util.Random;
import fr.jackcartersmith.ob.OrbitalBombardment;
import fr.jackcartersmith.ob.proxy.ClientProxy;
import fr.jackcartersmith.orbsat.OrbitalSatellite;
import net.minecraft.block.Block;
import net.minecraft.block.BlockContainer;
import net.minecraft.block.material.Material;
@ -41,10 +41,10 @@ public class PhotonAcceleratorBlock extends BlockContainer
if (!player.isSneaking())
{
OrbitalBombardment.instance.lastGeneralX = x;
OrbitalBombardment.instance.lastGeneralY = y;
OrbitalBombardment.instance.lastGeneralZ = z;
player.openGui(OrbitalBombardment.instance, 4, world, (int)player.posX, (int)player.posY, (int)player.posZ);
OrbitalSatellite.instance.lastGeneralX = x;
OrbitalSatellite.instance.lastGeneralY = y;
OrbitalSatellite.instance.lastGeneralZ = z;
player.openGui(OrbitalSatellite.instance, 4, world, (int)player.posX, (int)player.posY, (int)player.posZ);
}
return true;

10
src/main/java/fr/jackcartersmith/ob/blocks/PhotonDeceleratorBlock.java
View File

@ -2,8 +2,8 @@ package fr.jackcartersmith.ob.blocks;
import java.util.Random;
import fr.jackcartersmith.ob.OrbitalBombardment;
import fr.jackcartersmith.ob.proxy.ClientProxy;
import fr.jackcartersmith.orbsat.OrbitalSatellite;
import net.minecraft.block.Block;
import net.minecraft.block.BlockContainer;
import net.minecraft.block.material.Material;
@ -33,10 +33,10 @@ public class PhotonDeceleratorBlock extends BlockContainer
if (!player.isSneaking())
{
OrbitalBombardment.instance.lastGeneralX = x;
OrbitalBombardment.instance.lastGeneralY = y;
OrbitalBombardment.instance.lastGeneralZ = z;
player.openGui(OrbitalBombardment.instance, 5, world, (int)player.posX, (int)player.posY, (int)player.posZ);
OrbitalSatellite.instance.lastGeneralX = x;
OrbitalSatellite.instance.lastGeneralY = y;
OrbitalSatellite.instance.lastGeneralZ = z;
player.openGui(OrbitalSatellite.instance, 5, world, (int)player.posX, (int)player.posY, (int)player.posZ);
}
return true;

4
src/main/java/fr/jackcartersmith/ob/blocks/PhotonInverterAdvBlock.java
View File

@ -2,8 +2,8 @@ package fr.jackcartersmith.ob.blocks;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import fr.jackcartersmith.ob.OrbitalBombardment;
import fr.jackcartersmith.ob.proxy.ClientProxy;
import fr.jackcartersmith.orbsat.OrbitalSatellite;
import net.minecraft.block.Block;
import net.minecraft.block.BlockContainer;
import net.minecraft.block.material.Material;
@ -47,7 +47,7 @@ public class PhotonInverterAdvBlock extends BlockContainer
*/
public boolean onBlockActivated(World par1World, int par2, int par3, int par4, EntityPlayer par5EntityPlayer, int par6, float par7, float par8, float par9)
{
par5EntityPlayer.openGui(OrbitalBombardment.instance, 2, par1World, par2, par3, par4);
par5EntityPlayer.openGui(OrbitalSatellite.instance, 2, par1World, par2, par3, par4);
return true;
}

8
src/main/java/fr/jackcartersmith/ob/blocks/PhotonInverterBlock.java
View File

@ -2,7 +2,7 @@ package fr.jackcartersmith.ob.blocks;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import fr.jackcartersmith.ob.OrbitalBombardment;
import fr.jackcartersmith.orbsat.OrbitalSatellite;
import net.minecraft.block.Block;
import net.minecraft.block.BlockContainer;
import net.minecraft.block.material.Material;
@ -31,8 +31,8 @@ public class PhotonInverterBlock extends BlockContainer
*/
public void registerBlockIcons(IIconRegister icon)
{
this.topIcon = icon.registerIcon(OrbitalBombardment.MODID + ":solarPanelTop");
this.sideIcon = icon.registerIcon(OrbitalBombardment.MODID + ":solarPanelSides");
this.topIcon = icon.registerIcon(OrbitalSatellite.MODID + ":solarPanelTop");
this.sideIcon = icon.registerIcon(OrbitalSatellite.MODID + ":solarPanelSides");
}
@SideOnly(Side.CLIENT)
@ -53,7 +53,7 @@ public class PhotonInverterBlock extends BlockContainer
*/
public boolean onBlockActivated(World par1World, int par2, int par3, int par4, EntityPlayer par5EntityPlayer, int par6, float par7, float par8, float par9)
{
par5EntityPlayer.openGui(OrbitalBombardment.instance, 1, par1World, par2, par3, par4);
par5EntityPlayer.openGui(OrbitalSatellite.instance, 1, par1World, par2, par3, par4);
return true;
}

4
src/main/java/fr/jackcartersmith/ob/blocks/SateliteBlock.java
View File

@ -2,8 +2,8 @@ package fr.jackcartersmith.ob.blocks;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import fr.jackcartersmith.ob.OrbitalBombardment;
import fr.jackcartersmith.ob.proxy.ClientProxy;
import fr.jackcartersmith.orbsat.OrbitalSatellite;
import net.minecraft.block.Block;
import net.minecraft.block.BlockContainer;
import net.minecraft.block.material.Material;
@ -17,7 +17,7 @@ public class SateliteBlock extends BlockContainer
public SateliteBlock(Material par2Material)
{
super(par2Material);
OrbitalBombardment var10001 = OrbitalBombardment.instance;
OrbitalSatellite var10001 = OrbitalSatellite.instance;
}
public void setBlockBoundsBasedOnState(IBlockAccess world, int x, int y, int z)

6
src/main/java/fr/jackcartersmith/ob/entities/MeteorEntity.java
View File

@ -2,8 +2,8 @@ package fr.jackcartersmith.ob.entities;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import fr.jackcartersmith.ob.OBNetwork;
import fr.jackcartersmith.ob.OrbitalBombardment;
import fr.jackcartersmith.orbsat.OBNetwork;
import fr.jackcartersmith.orbsat.OrbitalSatellite;
import net.minecraft.client.Minecraft;
import net.minecraft.client.entity.EntityClientPlayerMP;
import net.minecraft.entity.monster.EntitySlime;
@ -148,6 +148,6 @@ public class MeteorEntity extends EntitySlime
bos.add(zCoord);
bos.add(power);
OrbitalBombardment.obNetwork.sendToServer(new OBNetwork(bos));
OrbitalSatellite.obNetwork.sendToServer(new OBNetwork(bos));
}
}

8
src/main/java/fr/jackcartersmith/ob/interfaces/PhotonProducing.java
View File

@ -4,9 +4,9 @@ import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import fr.jackcartersmith.ob.OBNetworkClient;
import fr.jackcartersmith.ob.OrbitalBombardment;
import fr.jackcartersmith.ob.blocks.InverterAdvTileEntity;
import fr.jackcartersmith.orbsat.OBNetworkClient;
import fr.jackcartersmith.orbsat.OrbitalSatellite;
import net.minecraft.tileentity.TileEntity;
public class PhotonProducing extends TileEntity
@ -215,7 +215,7 @@ public class PhotonProducing extends TileEntity
bos.add(this.zCoord);
bos.add(this.getScaledOutput());
OrbitalBombardment.obNetwork.sendToAll(new OBNetworkClient(bos));
OrbitalSatellite.obNetwork.sendToAll(new OBNetworkClient(bos));
}
public void sendChangeToClient15()
@ -228,6 +228,6 @@ public class PhotonProducing extends TileEntity
bos.add(this.zCoord);
bos.add(this.getPowerIncoming());
OrbitalBombardment.obNetwork.sendToAll(new OBNetworkClient(bos));
OrbitalSatellite.obNetwork.sendToAll(new OBNetworkClient(bos));
}
}

14
src/main/java/fr/jackcartersmith/ob/interfaces/PhotonSending.java
View File

@ -5,9 +5,9 @@ import java.util.Iterator;
import java.util.List;
import cpw.mods.fml.common.network.simpleimpl.IMessage;
import fr.jackcartersmith.ob.OBNetworkClient;
import fr.jackcartersmith.ob.OrbitalBombardment;
import fr.jackcartersmith.ob.libs.OBConstants;
import fr.jackcartersmith.orbsat.OBNetworkClient;
import fr.jackcartersmith.orbsat.OrbitalSatellite;
import fr.jackcartersmith.orbsat.common.lib.OSConstants;
import net.minecraft.client.Minecraft;
import net.minecraft.network.play.client.C17PacketCustomPayload;
@ -21,7 +21,7 @@ public class PhotonSending extends PhotonConsuming
public List<PhotonRecieving> getNearbyPhotonRecievingEntities()
{
int radius = OBConstants.PhotonSendingRadius;
int radius = OSConstants.PhotonSendingRadius;
ArrayList entities = new ArrayList();
int xC = this.xCoord;
int yC = this.yCoord;
@ -153,7 +153,7 @@ public class PhotonSending extends PhotonConsuming
bos.add(this.zCoord);
bos.add(this.getOutputRate());
OrbitalBombardment.obNetwork.sendToAll(new OBNetworkClient(bos));
OrbitalSatellite.obNetwork.sendToAll(new OBNetworkClient(bos));
}
public void sendChangeToClient9()
@ -166,7 +166,7 @@ public class PhotonSending extends PhotonConsuming
bos.add(this.zCoord);
bos.add(this.getScaledOutput());
OrbitalBombardment.obNetwork.sendToAll(new OBNetworkClient(bos));
OrbitalSatellite.obNetwork.sendToAll(new OBNetworkClient(bos));
}
public void sendChangeToClient11()
@ -202,6 +202,6 @@ public class PhotonSending extends PhotonConsuming
bos.add(this.zCoord);
bos.add(this.getListSize());
OrbitalBombardment.obNetwork.sendToAll(new OBNetworkClient(bos));
OrbitalSatellite.obNetwork.sendToAll(new OBNetworkClient(bos));
}
}

6
src/main/java/fr/jackcartersmith/ob/items/DesignatorHighItem.java
View File

@ -1,11 +1,11 @@
package fr.jackcartersmith.ob.items;
import fr.jackcartersmith.ob.OrbitalBombardment;
import fr.jackcartersmith.orbsat.OrbitalSatellite;
import net.minecraft.item.Item;
public class DesignatorHighItem extends Item {
public DesignatorHighItem(){
this.setCreativeTab(OrbitalBombardment.OBCreativeTabs);
this.setTextureName(OrbitalBombardment.MODID + ":item_ob_designatorHigh");
this.setCreativeTab(OrbitalSatellite.OBCreativeTabs);
this.setTextureName(OrbitalSatellite.MODID + ":item_ob_designatorHigh");
}
}

6
src/main/java/fr/jackcartersmith/ob/items/DesignatorLowItem.java
View File

@ -1,11 +1,11 @@
package fr.jackcartersmith.ob.items;
import fr.jackcartersmith.ob.OrbitalBombardment;
import fr.jackcartersmith.orbsat.OrbitalSatellite;
import net.minecraft.item.Item;
public class DesignatorLowItem extends Item {
public DesignatorLowItem(){
this.setCreativeTab(OrbitalBombardment.OBCreativeTabs);
this.setTextureName(OrbitalBombardment.MODID + ":item_ob_designatorLow");
this.setCreativeTab(OrbitalSatellite.OBCreativeTabs);
this.setTextureName(OrbitalSatellite.MODID + ":item_ob_designatorLow");
}
}

6
src/main/java/fr/jackcartersmith/ob/items/DesignatorMedItem.java
View File

@ -1,11 +1,11 @@
package fr.jackcartersmith.ob.items;
import fr.jackcartersmith.ob.OrbitalBombardment;
import fr.jackcartersmith.orbsat.OrbitalSatellite;
import net.minecraft.item.Item;
public class DesignatorMedItem extends Item {
public DesignatorMedItem(){
this.setCreativeTab(OrbitalBombardment.OBCreativeTabs);
this.setTextureName(OrbitalBombardment.MODID + ":item_ob_designatorMed");
this.setCreativeTab(OrbitalSatellite.OBCreativeTabs);
this.setTextureName(OrbitalSatellite.MODID + ":item_ob_designatorMed");
}
}

6
src/main/java/fr/jackcartersmith/ob/items/LaserGunHighItem$1.java
View File

@ -1,6 +1,6 @@
package fr.jackcartersmith.ob.items;
import fr.jackcartersmith.ob.blocks.OBBlocks;
import fr.jackcartersmith.orbsat.common.OSBlocks;
import net.minecraft.client.entity.EntityClientPlayerMP;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.world.World;
@ -39,8 +39,8 @@ class LaserGunHighItem$1 extends Thread
if (this.val$par3World.isRemote)
{
this.val$par3World.setBlock(this.val$par4, this.val$par5 + 1, this.val$par6, OBBlocks.laserLow);
this.val$par3World.setBlock(this.this$0.linkedSatelite.xCoord, this.this$0.linkedSatelite.yCoord + 1, this.this$0.linkedSatelite.zCoord, OBBlocks.laserLow);
this.val$par3World.setBlock(this.val$par4, this.val$par5 + 1, this.val$par6, OSBlocks.laserLow);
this.val$par3World.setBlock(this.this$0.linkedSatelite.xCoord, this.this$0.linkedSatelite.yCoord + 1, this.this$0.linkedSatelite.zCoord, OSBlocks.laserLow);
}
try

12
src/main/java/fr/jackcartersmith/ob/items/LaserGunHighItem$2.java
View File

@ -1,7 +1,7 @@
package fr.jackcartersmith.ob.items;
import fr.jackcartersmith.ob.blocks.OBBlocks;
import fr.jackcartersmith.ob.libs.OBConstants;
import fr.jackcartersmith.orbsat.common.OSBlocks;
import fr.jackcartersmith.orbsat.common.lib.OSConstants;
import net.minecraft.client.entity.EntityClientPlayerMP;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.world.World;
@ -42,8 +42,8 @@ class LaserGunHighItem$2 extends Thread
if (this.val$par3World.isRemote)
{
this.val$par3World.setBlock(this.val$par4, this.val$par5 + 1, this.val$par6, OBBlocks.laserLow);
this.val$par3World.setBlock(this.this$0.linkedSatelite.xCoord, this.this$0.linkedSatelite.yCoord + 1, this.this$0.linkedSatelite.zCoord, OBBlocks.laserLow);
this.val$par3World.setBlock(this.val$par4, this.val$par5 + 1, this.val$par6, OSBlocks.laserLow);
this.val$par3World.setBlock(this.this$0.linkedSatelite.xCoord, this.this$0.linkedSatelite.yCoord + 1, this.this$0.linkedSatelite.zCoord, OSBlocks.laserLow);
}
try
@ -62,9 +62,9 @@ class LaserGunHighItem$2 extends Thread
if (this.val$par6 != 0)
{
for (i = 0; i < OBConstants.DesignatorHighMeteorAmount; ++i)
for (i = 0; i < OSConstants.DesignatorHighMeteorAmount; ++i)
{
this.this$0.sendChangeToServer2(this.val$par4, this.val$par5 + 100, this.val$par6, OBConstants.DesignatorHighMeteorDamage, (EntityClientPlayerMP)this.val$par2EntityPlayer);
this.this$0.sendChangeToServer2(this.val$par4, this.val$par5 + 100, this.val$par6, OSConstants.DesignatorHighMeteorDamage, (EntityClientPlayerMP)this.val$par2EntityPlayer);
}
}
}

10
src/main/java/fr/jackcartersmith/ob/items/LaserGunHighItem$3.java
View File

@ -1,7 +1,7 @@
package fr.jackcartersmith.ob.items;
import fr.jackcartersmith.ob.blocks.OBBlocks;
import fr.jackcartersmith.ob.libs.OBConstants;
import fr.jackcartersmith.orbsat.common.OSBlocks;
import fr.jackcartersmith.orbsat.common.lib.OSConstants;
import net.minecraft.client.entity.EntityClientPlayerMP;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.world.World;
@ -40,8 +40,8 @@ class LaserGunHighItem$3 extends Thread
if (this.val$par3World.isRemote)
{
this.val$par3World.setBlock(this.val$par4, this.val$par5 + 1, this.val$par6, OBBlocks.laserLow);
this.val$par3World.setBlock(this.this$0.linkedSatelite.xCoord, this.this$0.linkedSatelite.yCoord + 1, this.this$0.linkedSatelite.zCoord, OBBlocks.laserLow);
this.val$par3World.setBlock(this.val$par4, this.val$par5 + 1, this.val$par6, OSBlocks.laserLow);
this.val$par3World.setBlock(this.this$0.linkedSatelite.xCoord, this.this$0.linkedSatelite.yCoord + 1, this.this$0.linkedSatelite.zCoord, OSBlocks.laserLow);
}
try
@ -59,7 +59,7 @@ class LaserGunHighItem$3 extends Thread
if (this.val$par3World.isRemote)
{
EntityClientPlayerMP var3 = (EntityClientPlayerMP)this.val$par2EntityPlayer;
this.this$0.sendChangeToServer(this.val$par4, this.val$par5, this.val$par6, OBConstants.DesignatorHighPhotonStrikePower, var3);
this.this$0.sendChangeToServer(this.val$par4, this.val$par5, this.val$par6, OSConstants.DesignatorHighPhotonStrikePower, var3);
}
}
}

10
src/main/java/fr/jackcartersmith/ob/items/LaserGunHighItem$4.java
View File

@ -1,7 +1,7 @@
package fr.jackcartersmith.ob.items;
import fr.jackcartersmith.ob.blocks.OBBlocks;
import fr.jackcartersmith.ob.libs.OBConstants;
import fr.jackcartersmith.orbsat.common.OSBlocks;
import fr.jackcartersmith.orbsat.common.lib.OSConstants;
import net.minecraft.client.entity.EntityClientPlayerMP;
import net.minecraft.entity.effect.EntityLightningBolt;
import net.minecraft.entity.player.EntityPlayer;
@ -42,8 +42,8 @@ class LaserGunHighItem$4 implements Runnable
if (this.val$par3World.isRemote)
{
this.val$par3World.setBlock(this.val$par4, this.val$par5 + 1, this.val$par6, OBBlocks.laserLow);
this.val$par3World.setBlock(this.this$0.linkedSatelite.xCoord, this.this$0.linkedSatelite.yCoord + 1, this.this$0.linkedSatelite.zCoord, OBBlocks.laserLow);
this.val$par3World.setBlock(this.val$par4, this.val$par5 + 1, this.val$par6, OSBlocks.laserLow);
this.val$par3World.setBlock(this.this$0.linkedSatelite.xCoord, this.this$0.linkedSatelite.yCoord + 1, this.this$0.linkedSatelite.zCoord, OSBlocks.laserLow);
}
try
@ -68,7 +68,7 @@ class LaserGunHighItem$4 implements Runnable
EntityClientPlayerMP var4 = (EntityClientPlayerMP)this.val$par2EntityPlayer;
for (int i = 0; i < OBConstants.DesignatorHighLightning; ++i)
for (int i = 0; i < OSConstants.DesignatorHighLightning; ++i)
{
this.this$0.sendChangeToServer3(this.val$par4, this.val$par5, this.val$par6, 1, var4);
this.val$par3World.spawnEntityInWorld(new EntityLightningBolt(this.val$par3World, (double)this.val$par4, (double)this.val$par5, (double)this.val$par6));

34
src/main/java/fr/jackcartersmith/ob/items/LaserGunHighItem.java
View File

@ -5,10 +5,10 @@ import java.util.List;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import fr.jackcartersmith.ob.OBNetwork;
import fr.jackcartersmith.ob.OrbitalBombardment;
import fr.jackcartersmith.ob.blocks.OverriderBlockTileEntity;
import fr.jackcartersmith.ob.libs.OBConstants;
import fr.jackcartersmith.orbsat.OBNetwork;
import fr.jackcartersmith.orbsat.OrbitalSatellite;
import fr.jackcartersmith.orbsat.common.lib.OSConstants;
import net.minecraft.client.entity.EntityClientPlayerMP;
import net.minecraft.entity.Entity;
import net.minecraft.entity.player.EntityPlayer;
@ -28,8 +28,8 @@ public class LaserGunHighItem extends Item
public LaserGunHighItem()
{
this.setCreativeTab(OrbitalBombardment.OBCreativeTabs);
this.setTextureName(OrbitalBombardment.MODID + ":item_ob_laserGunHigh");
this.setCreativeTab(OrbitalSatellite.OBCreativeTabs);
this.setTextureName(OrbitalSatellite.MODID + ":item_ob_laserGunHigh");
this.setMaxStackSize(1);
}
@ -85,7 +85,7 @@ public class LaserGunHighItem extends Item
{
if (par2World.isRemote)
{
this.pos = par3EntityPlayer.rayTrace((double)OBConstants.DesignatorCommitRange, 1.0F);
this.pos = par3EntityPlayer.rayTrace((double)OSConstants.DesignatorCommitRange, 1.0F);
}
try
@ -171,21 +171,21 @@ public class LaserGunHighItem extends Item
if (this.linkedSatelite != null && this.linkedSatelite.getWorldObj().provider.dimensionId == par2EntityPlayer.dimension)
{
if (this.linkedSatelite.getCurrentCharge() >= OBConstants.DesignatorHighStrikePUUsage && this.linkedSatelite.shotsLeft > 0)
if (this.linkedSatelite.getCurrentCharge() >= OSConstants.DesignatorHighStrikePUUsage && this.linkedSatelite.shotsLeft > 0)
{
EntityClientPlayerMP mp;
if (par3World.isRemote && !par2EntityPlayer.isSneaking() && this.currentMode != "Penetrating Strike")
{
mp = (EntityClientPlayerMP)par2EntityPlayer;
this.sendChangeToServer15(this.linkedSatelite.xCoord, this.linkedSatelite.yCoord, this.linkedSatelite.zCoord, OBConstants.DesignatorHighStrikePUUsage, mp);
this.sendChangeToServer15(this.linkedSatelite.xCoord, this.linkedSatelite.yCoord, this.linkedSatelite.zCoord, OSConstants.DesignatorHighStrikePUUsage, mp);
--this.linkedSatelite.shotsLeft;
}
if (par3World.isRemote && !par2EntityPlayer.isSneaking() && this.currentMode == "Penetrating Strike")
{
mp = (EntityClientPlayerMP)par2EntityPlayer;
this.sendChangeToServer15(this.linkedSatelite.xCoord, this.linkedSatelite.yCoord, this.linkedSatelite.zCoord, OBConstants.DesignatorHighStrikePUUsage, mp);
this.sendChangeToServer15(this.linkedSatelite.xCoord, this.linkedSatelite.yCoord, this.linkedSatelite.zCoord, OSConstants.DesignatorHighStrikePUUsage, mp);
--this.linkedSatelite.shotsLeft;
}
@ -226,9 +226,9 @@ public class LaserGunHighItem extends Item
}
else
{
if (par3World.isRemote && this.linkedSatelite.getCurrentCharge() < OBConstants.DesignatorHighStrikePUUsage)
if (par3World.isRemote && this.linkedSatelite.getCurrentCharge() < OSConstants.DesignatorHighStrikePUUsage)
{
par2EntityPlayer.addChatMessage(new ChatComponentText("Not enough photon charge on overrider. Needs " + OBConstants.DesignatorHighStrikePUUsage + "PU and only has " + this.linkedSatelite.getCurrentCharge()));
par2EntityPlayer.addChatMessage(new ChatComponentText("Not enough photon charge on overrider. Needs " + OSConstants.DesignatorHighStrikePUUsage + "PU and only has " + this.linkedSatelite.getCurrentCharge()));
}
if (par3World.isRemote && this.linkedSatelite.shotsLeft < 1)
@ -300,7 +300,7 @@ public class LaserGunHighItem extends Item
bos.add(zCoord);
bos.add(power);
OrbitalBombardment.obNetwork.sendToServer(new OBNetwork(bos));
OrbitalSatellite.obNetwork.sendToServer(new OBNetwork(bos));
}
@SideOnly(Side.CLIENT)
@ -314,7 +314,7 @@ public class LaserGunHighItem extends Item
bos.add(zCoord);
bos.add(power);
OrbitalBombardment.obNetwork.sendToServer(new OBNetwork(bos));
OrbitalSatellite.obNetwork.sendToServer(new OBNetwork(bos));
}
public void sendChangeToServer3(int xCoord, int yCoord, int zCoord, int power, EntityClientPlayerMP mp)
@ -327,7 +327,7 @@ public class LaserGunHighItem extends Item
bos.add(zCoord);
bos.add(power);
OrbitalBombardment.obNetwork.sendToServer(new OBNetwork(bos));
OrbitalSatellite.obNetwork.sendToServer(new OBNetwork(bos));
}
public void sendChangeToServer12(int xCoord, int yCoord, int zCoord, int power, EntityClientPlayerMP mp)
@ -340,7 +340,7 @@ public class LaserGunHighItem extends Item
bos.add(zCoord);
bos.add(1);
OrbitalBombardment.obNetwork.sendToServer(new OBNetwork(bos));
OrbitalSatellite.obNetwork.sendToServer(new OBNetwork(bos));
}
public void sendChangeToServer15(int xCoord, int yCoord, int zCoord, int power, EntityClientPlayerMP mp)
@ -353,7 +353,7 @@ public class LaserGunHighItem extends Item
bos.add(zCoord);
bos.add(power);
OrbitalBombardment.obNetwork.sendToServer(new OBNetwork(bos));
OrbitalSatellite.obNetwork.sendToServer(new OBNetwork(bos));
}
public void sendChangeToServer24()
@ -366,6 +366,6 @@ public class LaserGunHighItem extends Item
bos.add(1);
bos.add(1);
OrbitalBombardment.obNetwork.sendToServer(new OBNetwork(bos));
OrbitalSatellite.obNetwork.sendToServer(new OBNetwork(bos));
}
}

6
src/main/java/fr/jackcartersmith/ob/items/LaserGunLowItem$1.java
View File

@ -1,6 +1,6 @@
package fr.jackcartersmith.ob.items;
import fr.jackcartersmith.ob.blocks.OBBlocks;
import fr.jackcartersmith.orbsat.common.OSBlocks;
import net.minecraft.client.entity.EntityClientPlayerMP;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.world.World;
@ -39,8 +39,8 @@ class LaserGunLowItem$1 extends Thread
if (this.val$par3World.isRemote)
{
this.val$par3World.setBlock(this.val$par4, this.val$par5 + 1, this.val$par6, OBBlocks.laserLow);
this.val$par3World.setBlock(this.this$0.linkedSatelite.xCoord, this.this$0.linkedSatelite.yCoord + 1, this.this$0.linkedSatelite.zCoord, OBBlocks.laserLow);
this.val$par3World.setBlock(this.val$par4, this.val$par5 + 1, this.val$par6, OSBlocks.laserLow);
this.val$par3World.setBlock(this.this$0.linkedSatelite.xCoord, this.this$0.linkedSatelite.yCoord + 1, this.this$0.linkedSatelite.zCoord, OSBlocks.laserLow);
}
try

12
src/main/java/fr/jackcartersmith/ob/items/LaserGunLowItem$2.java
View File

@ -1,7 +1,7 @@
package fr.jackcartersmith.ob.items;
import fr.jackcartersmith.ob.blocks.OBBlocks;
import fr.jackcartersmith.ob.libs.OBConstants;
import fr.jackcartersmith.orbsat.common.OSBlocks;
import fr.jackcartersmith.orbsat.common.lib.OSConstants;
import net.minecraft.client.entity.EntityClientPlayerMP;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.world.World;
@ -42,8 +42,8 @@ class LaserGunLowItem$2 extends Thread
if (this.val$par3World.isRemote)
{
this.val$par3World.setBlock(this.val$par4, this.val$par5 + 1, this.val$par6, OBBlocks.laserLow);
this.val$par3World.setBlock(this.this$0.linkedSatelite.xCoord, this.this$0.linkedSatelite.yCoord + 1, this.this$0.linkedSatelite.zCoord, OBBlocks.laserLow);
this.val$par3World.setBlock(this.val$par4, this.val$par5 + 1, this.val$par6, OSBlocks.laserLow);
this.val$par3World.setBlock(this.this$0.linkedSatelite.xCoord, this.this$0.linkedSatelite.yCoord + 1, this.this$0.linkedSatelite.zCoord, OSBlocks.laserLow);
}
try
@ -60,9 +60,9 @@ class LaserGunLowItem$2 extends Thread
if (this.val$par6 != 0)
{
for (i = 0; i < OBConstants.DesignatorLowMeteorAmount; ++i)
for (i = 0; i < OSConstants.DesignatorLowMeteorAmount; ++i)
{
this.this$0.sendChangeToServer2(this.val$par4, this.val$par5 + 100, this.val$par6, OBConstants.DesignatorLowMeteorDamage, (EntityClientPlayerMP)this.val$par2EntityPlayer);
this.this$0.sendChangeToServer2(this.val$par4, this.val$par5 + 100, this.val$par6, OSConstants.DesignatorLowMeteorDamage, (EntityClientPlayerMP)this.val$par2EntityPlayer);
}
}
}

10
src/main/java/fr/jackcartersmith/ob/items/LaserGunLowItem$3.java
View File

@ -1,7 +1,7 @@
package fr.jackcartersmith.ob.items;
import fr.jackcartersmith.ob.blocks.OBBlocks;
import fr.jackcartersmith.ob.libs.OBConstants;
import fr.jackcartersmith.orbsat.common.OSBlocks;
import fr.jackcartersmith.orbsat.common.lib.OSConstants;
import net.minecraft.client.entity.EntityClientPlayerMP;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.world.World;
@ -40,8 +40,8 @@ class LaserGunLowItem$3 extends Thread
if (this.val$par3World.isRemote)
{
this.val$par3World.setBlock(this.val$par4, this.val$par5 + 1, this.val$par6, OBBlocks.laserLow);
this.val$par3World.setBlock(this.this$0.linkedSatelite.xCoord, this.this$0.linkedSatelite.yCoord + 1, this.this$0.linkedSatelite.zCoord, OBBlocks.laserLow);
this.val$par3World.setBlock(this.val$par4, this.val$par5 + 1, this.val$par6, OSBlocks.laserLow);
this.val$par3World.setBlock(this.this$0.linkedSatelite.xCoord, this.this$0.linkedSatelite.yCoord + 1, this.this$0.linkedSatelite.zCoord, OSBlocks.laserLow);
}
try
@ -59,7 +59,7 @@ class LaserGunLowItem$3 extends Thread
if (this.val$par3World.isRemote)
{
EntityClientPlayerMP var3 = (EntityClientPlayerMP)this.val$par2EntityPlayer;
this.this$0.sendChangeToServer(this.val$par4, this.val$par5, this.val$par6, OBConstants.DesignatorLowPhotonStrikePower, var3);
this.this$0.sendChangeToServer(this.val$par4, this.val$par5, this.val$par6, OSConstants.DesignatorLowPhotonStrikePower, var3);
}
}
}

10
src/main/java/fr/jackcartersmith/ob/items/LaserGunLowItem$4.java
View File

@ -1,7 +1,7 @@
package fr.jackcartersmith.ob.items;
import fr.jackcartersmith.ob.blocks.OBBlocks;
import fr.jackcartersmith.ob.libs.OBConstants;
import fr.jackcartersmith.orbsat.common.OSBlocks;
import fr.jackcartersmith.orbsat.common.lib.OSConstants;
import net.minecraft.client.entity.EntityClientPlayerMP;
import net.minecraft.entity.effect.EntityLightningBolt;
import net.minecraft.entity.player.EntityPlayer;
@ -42,8 +42,8 @@ class LaserGunLowItem$4 implements Runnable
if (this.val$par3World.isRemote)
{
this.val$par3World.setBlock(this.val$par4, this.val$par5 + 1, this.val$par6, OBBlocks.laserLow);
this.val$par3World.setBlock(this.this$0.linkedSatelite.xCoord, this.this$0.linkedSatelite.yCoord + 1, this.this$0.linkedSatelite.zCoord, OBBlocks.laserLow);
this.val$par3World.setBlock(this.val$par4, this.val$par5 + 1, this.val$par6, OSBlocks.laserLow);
this.val$par3World.setBlock(this.this$0.linkedSatelite.xCoord, this.this$0.linkedSatelite.yCoord + 1, this.this$0.linkedSatelite.zCoord, OSBlocks.laserLow);
}
try
@ -68,7 +68,7 @@ class LaserGunLowItem$4 implements Runnable
EntityClientPlayerMP var4 = (EntityClientPlayerMP)this.val$par2EntityPlayer;
for (int i = 0; i < OBConstants.DesignatorLowLightning; ++i)
for (int i = 0; i < OSConstants.DesignatorLowLightning; ++i)
{
this.this$0.sendChangeToServer3(this.val$par4, this.val$par5, this.val$par6, 1, var4);
this.val$par3World.spawnEntityInWorld(new EntityLightningBolt(this.val$par3World, (double)this.val$par4, (double)this.val$par5, (double)this.val$par6));

34
src/main/java/fr/jackcartersmith/ob/items/LaserGunLowItem.java
View File

@ -5,10 +5,10 @@ import java.util.List;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import fr.jackcartersmith.ob.OBNetwork;
import fr.jackcartersmith.ob.OrbitalBombardment;
import fr.jackcartersmith.ob.blocks.OverriderBlockTileEntity;
import fr.jackcartersmith.ob.libs.OBConstants;
import fr.jackcartersmith.orbsat.OBNetwork;
import fr.jackcartersmith.orbsat.OrbitalSatellite;
import fr.jackcartersmith.orbsat.common.lib.OSConstants;
import net.minecraft.client.entity.EntityClientPlayerMP;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.entity.Entity;
@ -27,8 +27,8 @@ public class LaserGunLowItem extends Item {
public MovingObjectPosition pos;
public LaserGunLowItem(){
this.setCreativeTab(OrbitalBombardment.OBCreativeTabs);
this.setTextureName(OrbitalBombardment.MODID + ":item_ob_laserGunLow");
this.setCreativeTab(OrbitalSatellite.OBCreativeTabs);
this.setTextureName(OrbitalSatellite.MODID + ":item_ob_laserGunLow");
this.setMaxStackSize(1);
}
@ -84,7 +84,7 @@ public class LaserGunLowItem extends Item {
{
if (par2World.isRemote)
{
this.pos = par3EntityPlayer.rayTrace((double)OBConstants.DesignatorCommitRange, 1.0F);
this.pos = par3EntityPlayer.rayTrace((double)OSConstants.DesignatorCommitRange, 1.0F);
}
try
@ -172,21 +172,21 @@ public class LaserGunLowItem extends Item {
if (this.linkedSatelite != null && this.linkedSatelite.getWorldObj().provider.dimensionId == par2EntityPlayer.dimension)
{
if (this.linkedSatelite.getCurrentCharge() >= OBConstants.DesignatorLowStrikePUUsage && this.linkedSatelite.shotsLeft > 0)
if (this.linkedSatelite.getCurrentCharge() >= OSConstants.DesignatorLowStrikePUUsage && this.linkedSatelite.shotsLeft > 0)
{
EntityClientPlayerMP mp;
if (par3World.isRemote && !par2EntityPlayer.isSneaking() && this.currentMode != "Penetrating Strike")
{
mp = (EntityClientPlayerMP)par2EntityPlayer;
this.sendChangeToServer15(this.linkedSatelite.xCoord, this.linkedSatelite.yCoord, this.linkedSatelite.zCoord, OBConstants.DesignatorLowStrikePUUsage, mp);
this.sendChangeToServer15(this.linkedSatelite.xCoord, this.linkedSatelite.yCoord, this.linkedSatelite.zCoord, OSConstants.DesignatorLowStrikePUUsage, mp);
--this.linkedSatelite.shotsLeft;
}
if (par3World.isRemote && !par2EntityPlayer.isSneaking() && this.currentMode == "Penetrating Strike")
{
mp = (EntityClientPlayerMP)par2EntityPlayer;
this.sendChangeToServer15(this.linkedSatelite.xCoord, this.linkedSatelite.yCoord, this.linkedSatelite.zCoord, OBConstants.DesignatorLowStrikePUUsage, mp);
this.sendChangeToServer15(this.linkedSatelite.xCoord, this.linkedSatelite.yCoord, this.linkedSatelite.zCoord, OSConstants.DesignatorLowStrikePUUsage, mp);
--this.linkedSatelite.shotsLeft;
}
@ -227,9 +227,9 @@ public class LaserGunLowItem extends Item {
}
else
{
if (par3World.isRemote && this.linkedSatelite.getCurrentCharge() < OBConstants.DesignatorLowStrikePUUsage)
if (par3World.isRemote && this.linkedSatelite.getCurrentCharge() < OSConstants.DesignatorLowStrikePUUsage)
{
par2EntityPlayer.addChatMessage(new ChatComponentText("Not enough photon charge on overrider. Needs " + OBConstants.DesignatorLowStrikePUUsage + "PU and only has " + this.linkedSatelite.getCurrentCharge()));
par2EntityPlayer.addChatMessage(new ChatComponentText("Not enough photon charge on overrider. Needs " + OSConstants.DesignatorLowStrikePUUsage + "PU and only has " + this.linkedSatelite.getCurrentCharge()));
}
if (par3World.isRemote && this.linkedSatelite.shotsLeft < 1)
@ -301,7 +301,7 @@ public class LaserGunLowItem extends Item {
bos.add(zCoord);
bos.add(power);
OrbitalBombardment.obNetwork.sendToServer(new OBNetwork(bos));
OrbitalSatellite.obNetwork.sendToServer(new OBNetwork(bos));
}
@SideOnly(Side.CLIENT)
@ -315,7 +315,7 @@ public class LaserGunLowItem extends Item {
bos.add(zCoord);
bos.add(power);
OrbitalBombardment.obNetwork.sendToServer(new OBNetwork(bos));
OrbitalSatellite.obNetwork.sendToServer(new OBNetwork(bos));
}
public void sendChangeToServer3(int xCoord, int yCoord, int zCoord, int power, EntityClientPlayerMP mp)
@ -328,7 +328,7 @@ public class LaserGunLowItem extends Item {
bos.add(zCoord);
bos.add(power);
OrbitalBombardment.obNetwork.sendToServer(new OBNetwork(bos));
OrbitalSatellite.obNetwork.sendToServer(new OBNetwork(bos));
}
public void sendChangeToServer12(int xCoord, int yCoord, int zCoord, int power, EntityClientPlayerMP mp)
@ -341,7 +341,7 @@ public class LaserGunLowItem extends Item {
bos.add(zCoord);
bos.add(1);
OrbitalBombardment.obNetwork.sendToServer(new OBNetwork(bos));
OrbitalSatellite.obNetwork.sendToServer(new OBNetwork(bos));
}
public void sendChangeToServer15(int xCoord, int yCoord, int zCoord, int power, EntityClientPlayerMP mp)
@ -354,7 +354,7 @@ public class LaserGunLowItem extends Item {
bos.add(zCoord);
bos.add(power);
OrbitalBombardment.obNetwork.sendToServer(new OBNetwork(bos));
OrbitalSatellite.obNetwork.sendToServer(new OBNetwork(bos));
}
public void sendChangeToServer24()
@ -367,6 +367,6 @@ public class LaserGunLowItem extends Item {
bos.add(1);
bos.add(1);
OrbitalBombardment.obNetwork.sendToServer(new OBNetwork(bos));
OrbitalSatellite.obNetwork.sendToServer(new OBNetwork(bos));
}
}

6
src/main/java/fr/jackcartersmith/ob/items/LaserGunMedItem$1.java
View File

@ -1,6 +1,6 @@
package fr.jackcartersmith.ob.items;
import fr.jackcartersmith.ob.blocks.OBBlocks;
import fr.jackcartersmith.orbsat.common.OSBlocks;
import net.minecraft.client.entity.EntityClientPlayerMP;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.world.World;
@ -39,8 +39,8 @@ class LaserGunMedItem$1 extends Thread
if (this.val$par3World.isRemote)
{
this.val$par3World.setBlock(this.val$par4, this.val$par5 + 1, this.val$par6, OBBlocks.laserLow);
this.val$par3World.setBlock(this.this$0.linkedSatelite.xCoord, this.this$0.linkedSatelite.yCoord + 1, this.this$0.linkedSatelite.zCoord, OBBlocks.laserLow);
this.val$par3World.setBlock(this.val$par4, this.val$par5 + 1, this.val$par6, OSBlocks.laserLow);
this.val$par3World.setBlock(this.this$0.linkedSatelite.xCoord, this.this$0.linkedSatelite.yCoord + 1, this.this$0.linkedSatelite.zCoord, OSBlocks.laserLow);
}
try

12
src/main/java/fr/jackcartersmith/ob/items/LaserGunMedItem$2.java
View File

@ -1,7 +1,7 @@
package fr.jackcartersmith.ob.items;
import fr.jackcartersmith.ob.blocks.OBBlocks;
import fr.jackcartersmith.ob.libs.OBConstants;
import fr.jackcartersmith.orbsat.common.OSBlocks;
import fr.jackcartersmith.orbsat.common.lib.OSConstants;
import net.minecraft.client.entity.EntityClientPlayerMP;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.world.World;
@ -42,8 +42,8 @@ class LaserGunMedItem$2 extends Thread
if (this.val$par3World.isRemote)
{
this.val$par3World.setBlock(this.val$par4, this.val$par5 + 1, this.val$par6, OBBlocks.laserLow);
this.val$par3World.setBlock(this.this$0.linkedSatelite.xCoord, this.this$0.linkedSatelite.yCoord + 1, this.this$0.linkedSatelite.zCoord, OBBlocks.laserLow);
this.val$par3World.setBlock(this.val$par4, this.val$par5 + 1, this.val$par6, OSBlocks.laserLow);
this.val$par3World.setBlock(this.this$0.linkedSatelite.xCoord, this.this$0.linkedSatelite.yCoord + 1, this.this$0.linkedSatelite.zCoord, OSBlocks.laserLow);
}
try
@ -62,9 +62,9 @@ class LaserGunMedItem$2 extends Thread
if (this.val$par6 != 0)
{
for (i = 0; i < OBConstants.DesignatorMedMeteorAmount; ++i)
for (i = 0; i < OSConstants.DesignatorMedMeteorAmount; ++i)
{
this.this$0.sendChangeToServer2(this.val$par4, this.val$par5 + 100, this.val$par6, OBConstants.DesignatorMedMeteorDamage, (EntityClientPlayerMP)this.val$par2EntityPlayer);
this.this$0.sendChangeToServer2(this.val$par4, this.val$par5 + 100, this.val$par6, OSConstants.DesignatorMedMeteorDamage, (EntityClientPlayerMP)this.val$par2EntityPlayer);
}
}
}

10
src/main/java/fr/jackcartersmith/ob/items/LaserGunMedItem$3.java
View File

@ -1,7 +1,7 @@
package fr.jackcartersmith.ob.items;
import fr.jackcartersmith.ob.blocks.OBBlocks;
import fr.jackcartersmith.ob.libs.OBConstants;
import fr.jackcartersmith.orbsat.common.OSBlocks;
import fr.jackcartersmith.orbsat.common.lib.OSConstants;
import net.minecraft.client.entity.EntityClientPlayerMP;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.world.World;
@ -40,8 +40,8 @@ class LaserGunMedItem$3 extends Thread
if (this.val$par3World.isRemote)
{
this.val$par3World.setBlock(this.val$par4, this.val$par5 + 1, this.val$par6, OBBlocks.laserLow);
this.val$par3World.setBlock(this.this$0.linkedSatelite.xCoord, this.this$0.linkedSatelite.yCoord + 1, this.this$0.linkedSatelite.zCoord, OBBlocks.laserLow);
this.val$par3World.setBlock(this.val$par4, this.val$par5 + 1, this.val$par6, OSBlocks.laserLow);
this.val$par3World.setBlock(this.this$0.linkedSatelite.xCoord, this.this$0.linkedSatelite.yCoord + 1, this.this$0.linkedSatelite.zCoord, OSBlocks.laserLow);
}
try
@ -59,7 +59,7 @@ class LaserGunMedItem$3 extends Thread
if (this.val$par3World.isRemote)
{
EntityClientPlayerMP var3 = (EntityClientPlayerMP)this.val$par2EntityPlayer;
this.this$0.sendChangeToServer(this.val$par4, this.val$par5, this.val$par6, OBConstants.DesignatorMedPhotonStrikePower, var3);
this.this$0.sendChangeToServer(this.val$par4, this.val$par5, this.val$par6, OSConstants.DesignatorMedPhotonStrikePower, var3);
}
}
}

10
src/main/java/fr/jackcartersmith/ob/items/LaserGunMedItem$4.java
View File

@ -1,7 +1,7 @@
package fr.jackcartersmith.ob.items;
import fr.jackcartersmith.ob.blocks.OBBlocks;
import fr.jackcartersmith.ob.libs.OBConstants;
import fr.jackcartersmith.orbsat.common.OSBlocks;
import fr.jackcartersmith.orbsat.common.lib.OSConstants;
import net.minecraft.client.entity.EntityClientPlayerMP;
import net.minecraft.entity.effect.EntityLightningBolt;
import net.minecraft.entity.player.EntityPlayer;
@ -42,8 +42,8 @@ class LaserGunMedItem$4 implements Runnable
if (this.val$par3World.isRemote)
{
this.val$par3World.setBlock(this.val$par4, this.val$par5 + 1, this.val$par6, OBBlocks.laserLow);
this.val$par3World.setBlock(this.this$0.linkedSatelite.xCoord, this.this$0.linkedSatelite.yCoord + 1, this.this$0.linkedSatelite.zCoord, OBBlocks.laserLow);
this.val$par3World.setBlock(this.val$par4, this.val$par5 + 1, this.val$par6, OSBlocks.laserLow);
this.val$par3World.setBlock(this.this$0.linkedSatelite.xCoord, this.this$0.linkedSatelite.yCoord + 1, this.this$0.linkedSatelite.zCoord, OSBlocks.laserLow);
}
try
@ -68,7 +68,7 @@ class LaserGunMedItem$4 implements Runnable
EntityClientPlayerMP var4 = (EntityClientPlayerMP)this.val$par2EntityPlayer;
for (int i = 0; i < OBConstants.DesignatorMedLightning; ++i)
for (int i = 0; i < OSConstants.DesignatorMedLightning; ++i)
{
this.this$0.sendChangeToServer3(this.val$par4, this.val$par5, this.val$par6, 1, var4);
this.val$par3World.spawnEntityInWorld(new EntityLightningBolt(this.val$par3World, (double)this.val$par4, (double)this.val$par5, (double)this.val$par6));

34
src/main/java/fr/jackcartersmith/ob/items/LaserGunMedItem.java
View File

@ -5,10 +5,10 @@ import java.util.List;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import fr.jackcartersmith.ob.OBNetwork;
import fr.jackcartersmith.ob.OrbitalBombardment;
import fr.jackcartersmith.ob.blocks.OverriderBlockTileEntity;
import fr.jackcartersmith.ob.libs.OBConstants;
import fr.jackcartersmith.orbsat.OBNetwork;
import fr.jackcartersmith.orbsat.OrbitalSatellite;
import fr.jackcartersmith.orbsat.common.lib.OSConstants;
import net.minecraft.client.entity.EntityClientPlayerMP;
import net.minecraft.entity.Entity;
import net.minecraft.entity.player.EntityPlayer;
@ -28,8 +28,8 @@ public class LaserGunMedItem extends Item
public LaserGunMedItem()
{
this.setCreativeTab(OrbitalBombardment.OBCreativeTabs);
this.setTextureName(OrbitalBombardment.MODID + ":item_ob_laserGunMed");
this.setCreativeTab(OrbitalSatellite.OBCreativeTabs);
this.setTextureName(OrbitalSatellite.MODID + ":item_ob_laserGunMed");
this.setMaxStackSize(1);
}
@ -85,7 +85,7 @@ public class LaserGunMedItem extends Item
{
if (par2World.isRemote)
{
this.pos = par3EntityPlayer.rayTrace((double)OBConstants.DesignatorCommitRange, 1.0F);
this.pos = par3EntityPlayer.rayTrace((double)OSConstants.DesignatorCommitRange, 1.0F);
}
try
@ -171,21 +171,21 @@ public class LaserGunMedItem extends Item
if (this.linkedSatelite != null && this.linkedSatelite.getWorldObj().provider.dimensionId == par2EntityPlayer.dimension)
{
if (this.linkedSatelite.getCurrentCharge() >= OBConstants.DesignatorMedStrikePUUsage && this.linkedSatelite.shotsLeft > 0)
if (this.linkedSatelite.getCurrentCharge() >= OSConstants.DesignatorMedStrikePUUsage && this.linkedSatelite.shotsLeft > 0)
{
EntityClientPlayerMP mp;
if (par3World.isRemote && !par2EntityPlayer.isSneaking() && this.currentMode != "Penetrating Strike")
{
mp = (EntityClientPlayerMP)par2EntityPlayer;
this.sendChangeToServer15(this.linkedSatelite.xCoord, this.linkedSatelite.yCoord, this.linkedSatelite.zCoord, OBConstants.DesignatorMedStrikePUUsage, mp);
this.sendChangeToServer15(this.linkedSatelite.xCoord, this.linkedSatelite.yCoord, this.linkedSatelite.zCoord, OSConstants.DesignatorMedStrikePUUsage, mp);
--this.linkedSatelite.shotsLeft;
}
if (par3World.isRemote && !par2EntityPlayer.isSneaking() && this.currentMode == "Penetrating Strike")
{
mp = (EntityClientPlayerMP)par2EntityPlayer;
this.sendChangeToServer15(this.linkedSatelite.xCoord, this.linkedSatelite.yCoord, this.linkedSatelite.zCoord, OBConstants.DesignatorMedStrikePUUsage, mp);
this.sendChangeToServer15(this.linkedSatelite.xCoord, this.linkedSatelite.yCoord, this.linkedSatelite.zCoord, OSConstants.DesignatorMedStrikePUUsage, mp);
--this.linkedSatelite.shotsLeft;
}
@ -226,9 +226,9 @@ public class LaserGunMedItem extends Item
}
else
{
if (par3World.isRemote && this.linkedSatelite.getCurrentCharge() < OBConstants.DesignatorMedStrikePUUsage)
if (par3World.isRemote && this.linkedSatelite.getCurrentCharge() < OSConstants.DesignatorMedStrikePUUsage)
{
par2EntityPlayer.addChatMessage(new ChatComponentText("Not enough photon charge on overrider. Needs " + OBConstants.DesignatorMedStrikePUUsage + "PU and only has " + this.linkedSatelite.getCurrentCharge()));
par2EntityPlayer.addChatMessage(new ChatComponentText("Not enough photon charge on overrider. Needs " + OSConstants.DesignatorMedStrikePUUsage + "PU and only has " + this.linkedSatelite.getCurrentCharge()));
}
if (par3World.isRemote && this.linkedSatelite.shotsLeft < 1)
@ -299,7 +299,7 @@ public class LaserGunMedItem extends Item
bos.add(zCoord);
bos.add(power);
OrbitalBombardment.obNetwork.sendToServer(new OBNetwork(bos));
OrbitalSatellite.obNetwork.sendToServer(new OBNetwork(bos));
}
@SideOnly(Side.CLIENT)
@ -313,7 +313,7 @@ public class LaserGunMedItem extends Item
bos.add(zCoord);
bos.add(power);
OrbitalBombardment.obNetwork.sendToServer(new OBNetwork(bos));
OrbitalSatellite.obNetwork.sendToServer(new OBNetwork(bos));
}
public void sendChangeToServer3(int xCoord, int yCoord, int zCoord, int power, EntityClientPlayerMP mp)
@ -326,7 +326,7 @@ public class LaserGunMedItem extends Item
bos.add(zCoord);
bos.add(power);
OrbitalBombardment.obNetwork.sendToServer(new OBNetwork(bos));
OrbitalSatellite.obNetwork.sendToServer(new OBNetwork(bos));
}
public void sendChangeToServer12(int xCoord, int yCoord, int zCoord, int power, EntityClientPlayerMP mp)
@ -339,7 +339,7 @@ public class LaserGunMedItem extends Item
bos.add(zCoord);
bos.add(1);
OrbitalBombardment.obNetwork.sendToServer(new OBNetwork(bos));
OrbitalSatellite.obNetwork.sendToServer(new OBNetwork(bos));
}
public void sendChangeToServer15(int xCoord, int yCoord, int zCoord, int power, EntityClientPlayerMP mp)
@ -352,7 +352,7 @@ public class LaserGunMedItem extends Item
bos.add(zCoord);
bos.add(power);
OrbitalBombardment.obNetwork.sendToServer(new OBNetwork(bos));
OrbitalSatellite.obNetwork.sendToServer(new OBNetwork(bos));
}
public void sendChangeToServer24()
@ -365,6 +365,6 @@ public class LaserGunMedItem extends Item
bos.add(1);
bos.add(1);
OrbitalBombardment.obNetwork.sendToServer(new OBNetwork(bos));
OrbitalSatellite.obNetwork.sendToServer(new OBNetwork(bos));
}
}

6
src/main/java/fr/jackcartersmith/ob/items/LenseItem.java
View File

@ -1,11 +1,11 @@
package fr.jackcartersmith.ob.items;
import fr.jackcartersmith.ob.OrbitalBombardment;
import fr.jackcartersmith.orbsat.OrbitalSatellite;
import net.minecraft.item.Item;
public class LenseItem extends Item{
public LenseItem(){
this.setCreativeTab(OrbitalBombardment.OBCreativeTabs);
this.setTextureName(OrbitalBombardment.MODID + ":item_ob_lense");
this.setCreativeTab(OrbitalSatellite.OBCreativeTabs);
this.setTextureName(OrbitalSatellite.MODID + ":item_ob_lense");
}
}

2
src/main/java/fr/jackcartersmith/ob/items/OBItems.java
View File

@ -1,7 +1,7 @@
package fr.jackcartersmith.ob.items;
import cpw.mods.fml.common.registry.GameRegistry;
import fr.jackcartersmith.ob.OrbitalBombardment;
import fr.jackcartersmith.orbsat.OrbitalSatellite;
import net.minecraft.item.Item;
public class OBItems {

6
src/main/java/fr/jackcartersmith/ob/items/PhotonCapacitorItem.java
View File

@ -1,11 +1,11 @@
package fr.jackcartersmith.ob.items;
import fr.jackcartersmith.ob.OrbitalBombardment;
import fr.jackcartersmith.orbsat.OrbitalSatellite;
import net.minecraft.item.Item;
public class PhotonCapacitorItem extends Item{
public PhotonCapacitorItem(){
this.setCreativeTab(OrbitalBombardment.OBCreativeTabs);
this.setTextureName(OrbitalBombardment.MODID + ":item_ob_capacitor");
this.setCreativeTab(OrbitalSatellite.OBCreativeTabs);
this.setTextureName(OrbitalSatellite.MODID + ":item_ob_capacitor");
}
}

6
src/main/java/fr/jackcartersmith/ob/items/PhotonCondenserItem.java
View File

@ -1,11 +1,11 @@
package fr.jackcartersmith.ob.items;
import fr.jackcartersmith.ob.OrbitalBombardment;
import fr.jackcartersmith.orbsat.OrbitalSatellite;
import net.minecraft.item.Item;
public class PhotonCondenserItem extends Item {
public PhotonCondenserItem(){
this.setCreativeTab(OrbitalBombardment.OBCreativeTabs);
this.setTextureName(OrbitalBombardment.MODID + ":item_ob_condenser");
this.setCreativeTab(OrbitalSatellite.OBCreativeTabs);
this.setTextureName(OrbitalSatellite.MODID + ":item_ob_condenser");
}
}

122
src/main/java/fr/jackcartersmith/ob/libs/OBConstants.java
View File

@ -1,122 +0,0 @@
package fr.jackcartersmith.ob.libs;
import java.io.File;
import net.minecraftforge.common.config.Configuration;
public class OBConstants {
public static int BlocksIdsStartAt;
public static int ItemIdsStartAt;
public static int SateliteLaunchPUCost;
public static int PhotonSendingRadius;
public static int PhotonSendingMaxRate;
public static int DefenderRadius;
public static int OverriderMaxCharge;
public static int ExtenderMaxCharge;
public static int AdvPhotonInvChargeRate;
public static int AdvPhotonInvChargeRateConstant;
public static int PhotonInvChargeRate;
public static int PhotonInvChargeRateConstant;
public static int DesignatorCommitRange;
public static int DesignatorLowStrikePUUsage;
public static int DesignatorLowPhotonStrikePower;
public static int DesignatorLowMeteorAmount;
public static int DesignatorLowMeteorDamage;
public static int DesignatorLowLightning;
public static int DesignatorMedStrikePUUsage;
public static int DesignatorMedPhotonStrikePower;
public static int DesignatorMedMeteorAmount;
public static int DesignatorMedMeteorDamage;
public static int DesignatorMedLightning;
public static int DesignatorHighStrikePUUsage;
public static int DesignatorHighPhotonStrikePower;
public static int DesignatorHighMeteorAmount;
public static int DesignatorHighMeteorDamage;
public static int DesignatorHighLightning;
public static void init(File configFile)
{
/* 48 */ Configuration config = new Configuration(configFile);
/* 50 */ config.load();
/* 56 */ DesignatorCommitRange = config.get("Designator Max Range", "DesignatorCommitRange", 50).getInt();
/* 58 */ OverriderMaxCharge = config.get("Max Charge on Blocks", "OverriderMaxCharge", 50000).getInt();
/* 60 */ ExtenderMaxCharge = config.get("Max Charge on Blocks", "ExtenderMaxCharge", 60000).getInt();
/* 63 */ AdvPhotonInvChargeRateConstant = config.get("Charge Rates", "AdvPhotonInvChargeRate", 5).getInt();
/* 65 */ PhotonInvChargeRateConstant = config.get("Charge Rates", "PhotonInvChargeRate", 1).getInt();
/* 68 */ DefenderRadius = config.get("Defender Options", "DefenderAttackRadius", 15).getInt();
/* 71 */ SateliteLaunchPUCost = config.get("Satelite Launch PU Cost", "SateliteLaunchPUCost", 25000).getInt();
/* 73 */ AdvPhotonInvChargeRate = AdvPhotonInvChargeRateConstant;
/* 74 */ PhotonInvChargeRate = PhotonInvChargeRateConstant;
/* 76 */ PhotonSendingRadius = config.get("Photon Sender Radius", "PhotonSendRadius", 30).getInt();
/* 79 */ PhotonSendingMaxRate = config.get("Photon Sending Rate", "PhotonSendingMaxRate", 1000).getInt();
/* 83 */ DesignatorLowStrikePUUsage = config.get("Low Focus Designator Custom Settings", "DesignatorLowStrikePUUsage", 2500).getInt();
/* 86 */ DesignatorLowPhotonStrikePower = config.get("Low Focus Designator Custom Settings", "DesignatorLowPhotonStrikePower", 10).getInt();
/* 89 */ DesignatorLowMeteorAmount = config.get("Low Focus Designator Custom Settings", "DesignatorLowMeteorAmount", 2).getInt();
/* 92 */ DesignatorLowMeteorDamage = config.get("Low Focus Designator Custom Settings", "DesignatorLowMeteorDamage", 5).getInt();
/* 95 */ DesignatorLowLightning = config.get("Low Focus Designator Custom Settings", "DesignatorLowLightning", 1).getInt();
/* 100 */ DesignatorMedStrikePUUsage = config.get("Med Focus Designator Custom Settings", "DesignatorMedStrikePUUsage", 12000).getInt();
/* 103 */ DesignatorMedPhotonStrikePower = config.get("Med Focus Designator Custom Settings", "DesignatorMedPhotonStrikePower", 30).getInt();
/* 106 */ DesignatorMedMeteorAmount = config.get("Med Focus Designator Custom Settings", "DesignatorMedMeteorAmount", 7).getInt();
/* 109 */ DesignatorMedMeteorDamage = config.get("Med Focus Designator Custom Settings", "DesignatorMedMeteorDamage", 7).getInt();
/* 112 */ DesignatorMedLightning = config.get("Med Focus Designator Custom Settings", "DesignatorMedLightning", 1).getInt();
/* 117 */ DesignatorHighStrikePUUsage = config.get("High Focus Designator Custom Settings", "DesignatorHighStrikePUUsage", 20000).getInt();
/* 120 */ DesignatorHighPhotonStrikePower = config.get("High Focus Designator Custom Settings", "DesignatorHighPhotonStrikePower", 50).getInt();
/* 123 */ DesignatorHighMeteorAmount = config.get("High Focus Designator Custom Settings", "DesignatorHighMeteorAmount", 10).getInt();
/* 126 */ DesignatorHighMeteorDamage = config.get("High Focus Designator Custom Settings", "DesignatorHighMeteorDamage", 10).getInt();
/* 129 */ DesignatorHighLightning = config.get("High Focus Designator Custom Settings", "DesignatorHighLightning", 1).getInt();
/* 133 */ config.save();
}
}

22
src/main/java/fr/jackcartersmith/ob/libs/OBCreativeTabs.java
View File

@ -1,22 +0,0 @@
package fr.jackcartersmith.ob.libs;
import fr.jackcartersmith.ob.OrbitalBombardment;
import fr.jackcartersmith.ob.blocks.OBBlocks;
import fr.jackcartersmith.ob.items.OBItems;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.Item;
public class OBCreativeTabs extends CreativeTabs {
public OBCreativeTabs(String label) {
super(label);
}
@Override
public Item getTabIconItem() {
return OBItems.designatorLow;
}
}

16
src/main/java/fr/jackcartersmith/ob/libs/TESRInventoryRenderer.java
View File

@ -3,7 +3,6 @@ package fr.jackcartersmith.ob.libs;
import org.lwjgl.opengl.GL11;
import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;
import fr.jackcartersmith.ob.blocks.OBBlocks;
import fr.jackcartersmith.ob.models.SateliteRenderer;
import fr.jackcartersmith.ob.models.TileEntityDefenderRenderer;
import fr.jackcartersmith.ob.models.TileEntityExtenderRenderer;
@ -12,6 +11,7 @@ import fr.jackcartersmith.ob.models.TileEntityOverriderRenderer;
import fr.jackcartersmith.ob.models.TileEntityPhotonAcceleratorRenderer;
import fr.jackcartersmith.ob.models.TileEntityPhotonDeceleratorRenderer;
import fr.jackcartersmith.ob.proxy.ClientProxy;
import fr.jackcartersmith.orbsat.common.OSBlocks;
import net.minecraft.block.Block;
import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.RenderBlocks;
@ -29,7 +29,7 @@ public class TESRInventoryRenderer implements ISimpleBlockRenderingHandler
@Override
public void renderInventoryBlock(Block arg0, int arg1, int arg2, RenderBlocks arg3)
{
if(arg0 == OBBlocks.defender && arg1 == 0)
if(arg0 == OSBlocks.defender && arg1 == 0)
{
GL11.glPushMatrix();
GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F);
@ -38,7 +38,7 @@ public class TESRInventoryRenderer implements ISimpleBlockRenderingHandler
TileEntityDefenderRenderer.model.renderAll();
GL11.glPopMatrix();
}
else if(arg0 == OBBlocks.photonAccelerator && arg1 == 0)
else if(arg0 == OSBlocks.photonAccelerator && arg1 == 0)
{
GL11.glPushMatrix();
GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F);
@ -47,7 +47,7 @@ public class TESRInventoryRenderer implements ISimpleBlockRenderingHandler
TileEntityPhotonAcceleratorRenderer.model.renderAll();
GL11.glPopMatrix();
}
else if(arg0 == OBBlocks.photonDecelerator && arg1 == 0)
else if(arg0 == OSBlocks.photonDecelerator && arg1 == 0)
{
GL11.glPushMatrix();
GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F);
@ -56,7 +56,7 @@ public class TESRInventoryRenderer implements ISimpleBlockRenderingHandler
TileEntityPhotonDeceleratorRenderer.model.renderAll();
GL11.glPopMatrix();
}
else if(arg0 == OBBlocks.photonInverterAdv && arg1 == 0)
else if(arg0 == OSBlocks.photonInverterAdv && arg1 == 0)
{
GL11.glPushMatrix();
GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F);
@ -65,7 +65,7 @@ public class TESRInventoryRenderer implements ISimpleBlockRenderingHandler
TileEntityInverterAdvRenderer.model.renderAll();
GL11.glPopMatrix();
}
else if(arg0 == OBBlocks.extender && arg1 == 0)
else if(arg0 == OSBlocks.extender && arg1 == 0)
{
GL11.glPushMatrix();
GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F);
@ -74,7 +74,7 @@ public class TESRInventoryRenderer implements ISimpleBlockRenderingHandler
TileEntityExtenderRenderer.model.renderAll();
GL11.glPopMatrix();
}
else if(arg0 == OBBlocks.overrider && arg1 == 0)
else if(arg0 == OSBlocks.overrider && arg1 == 0)
{
GL11.glPushMatrix();
GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F);
@ -83,7 +83,7 @@ public class TESRInventoryRenderer implements ISimpleBlockRenderingHandler
TileEntityOverriderRenderer.model.renderAll();
GL11.glPopMatrix();
}
else if(arg0 == OBBlocks.satelite && arg1 == 0)
else if(arg0 == OSBlocks.satelite && arg1 == 0)
{
GL11.glPushMatrix();
GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F);

45
src/main/java/fr/jackcartersmith/ob/models/DefenderLaserRenderer.java
View File

@ -1,6 +1,6 @@
package fr.jackcartersmith.ob.models;
import org.lwjgl.opengl.GL11;
import org.lwjgl.opengl.*;
import fr.jackcartersmith.ob.blocks.DefenderLaserTileEntity;
import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher;
@ -10,8 +10,8 @@ import net.minecraft.util.ResourceLocation;
public class DefenderLaserRenderer extends TileEntitySpecialRenderer
{
public static ModelLaser model = new ModelLaser();
public static ResourceLocation location = new ResourceLocation("ob", "textures/blocks/laserLow.png");
public ModelDefenderLaserEvo model = new ModelDefenderLaserEvo();
public static ResourceLocation location = new ResourceLocation("ob", "textures/blocks/defenderLaserEvo.png");
float comeIn = 0.0F;
float counter = 0.0F;
String color = "";
@ -22,26 +22,37 @@ public class DefenderLaserRenderer extends TileEntitySpecialRenderer
}
public void renderAModelAt(DefenderLaserTileEntity tile, double d, double d1, double d2, float f)
{
if (tile.getWorldObj() != null)
{
;
}
float rotation = tile.rotate;
this.bindTexture(location);
{
GL11.glPushMatrix();
float scale = (1F / 16F);
//float coreRotation = tile.coreRotation + (partialTick * tile.coreSpeed);
//float ringRotation = tile.ringRotation + (partialTick * tile.ringSpeed);
/*
GL11.glTranslatef((float)d + 0.5F, (float)d1 + 1.5F, (float)d2 + 0.5F);
GL11.glScalef(1.0F, -1.0F, 1.0F);
GL11.glRotatef(rotation * 90.0F, 0.0F, 1.0F, 0.0F);
//GL11.glRotatef(rotation * 90.0F, 0.0F, 1.0F, 0.0F);
GL11.glEnable(GL11.GL_BLEND);
GL11.glDisable(GL11.GL_ALPHA_TEST);
GL11.glBlendFunc(GL11.GL_ONE, GL11.GL_ONE);
GL11.glColor4d(1.0D, 0.0D, 10.0D, 200.0D);
this.model.Shape1.rotateAngleY = rotation;
this.model.renderSpecific(this.model.Shape1);
GL11.glDisable(GL11.GL_BLEND);
GL11.glEnable(GL11.GL_ALPHA_TEST);
GL11.glEnable(GL11.GL_LIGHTING);
GL11.glColor3d(0.5, 0.0, 0.5);
//GL11.glColor4d(1.0D, 0.0D, 10.0D, 200.0D);
//this.model.Shape1.rotateAngleY = rotation;
//this.model.renderSpecific(this.model.Shape1);
*/
this.bindTexture(location);
//GL11.glRotated(90, 1, 0, 0);
//GL11.glTranslated(0, -0.58, 0);
//GL11.glScaled(0.95, 0.95, 0.95);
//GL11.glEnable(GL11.GL_BLEND);
//GL11.glDisable(GL11.GL_ALPHA_TEST);
//GL11.glBlendFunc(GL11.GL_ONE, GL11.GL_ONE);
GL11.glTranslatef((float)d + 0.5F, (float)d1 + 1.5F, (float)d2 + 0.5F);
GL11.glScalef(1.0F, -1.0F, 1.0F);
//GL11.glRotatef(rotation * 90.0F, 0.0F, 1.0F, 0.0F);
model.render(null, -70F, 30F, 0F, 0F, 0F, scale);
//GL11.glDisable(GL11.GL_BLEND);
//GL11.glEnable(GL11.GL_ALPHA_TEST);
GL11.glPopMatrix();
}

5
src/main/java/fr/jackcartersmith/ob/models/LaserLowRenderer.java
View File

@ -11,7 +11,8 @@ import net.minecraft.util.ResourceLocation;
public class LaserLowRenderer extends TileEntitySpecialRenderer
{
public static ModelLaser model = new ModelLaser();
//public ModelLaser model = new ModelLaser();
public static ModelLaser model = new ModelLaser();
public static ResourceLocation location = new ResourceLocation("ob", "textures/blocks/laserLow.png");
float comeIn = 0.0F;
float counter = 0.0F;
@ -32,7 +33,7 @@ public class LaserLowRenderer extends TileEntitySpecialRenderer
float rotation = tile.rotate;
this.comeIn = tile.insideCounter;
float counter = tile.color;
float grow = tile.grow;
//float grow = tile.grow;
int r = (int)(50.0F - counter);
int g = (int)(50.0F - counter);
int b = (int)(50.0F - counter);

61
src/main/java/fr/jackcartersmith/ob/models/ModelDefenderLaserEvo.java Normal file
View File

@ -0,0 +1,61 @@
package fr.jackcartersmith.ob.models;
import net.minecraft.client.model.ModelBase;
import net.minecraft.client.model.ModelRenderer;
import net.minecraft.client.renderer.OpenGlHelper;
import net.minecraft.entity.Entity;
import org.lwjgl.opengl.GL11;
/**
* ModelDefenderLaserLow - JackCarterSmith
* Created using Tabula 4.1.1
*/
public class ModelDefenderLaserEvo extends ModelBase {
public ModelRenderer l1;
public ModelRenderer l2;
public ModelDefenderLaserEvo() {
this.textureWidth = 16;
this.textureHeight = 32;
this.l1 = new ModelRenderer(this, 0, 0);
this.l1.setRotationPoint(0.0F, 8.0F, 0.0F);
this.l1.addBox(-2.5F, -19000.0F, -2.5F, 5, 10000, 5, 0.0F);
this.l2 = new ModelRenderer(this, 0, 0);
this.l2.setRotationPoint(0.0F, 8.0F, 0.0F);
this.l2.addBox(-2.5F, -19000.0F, -2.5F, 5, 20000, 5, 0.0F);
this.setRotateAngle(l2, 0.0F, 0.7853981633974483F, 0.0F);
}
@Override
public void render(Entity entity, float embitterRotation, float brightness, float f2, float f3, float f4, float scale) {
float lastBrightnessX = OpenGlHelper.lastBrightnessX;
float lastBrightnessY = OpenGlHelper.lastBrightnessY;
float b = brightness * 200F;
float colour_r = Math.min(2F, (brightness * 1F) + 0.1F);
float colour_g = Math.min(2F, (brightness * 0F) + 0.1F);
float colour_b = Math.min(2F, (brightness * 2F) + 0.1F);
OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, Math.min(200F, lastBrightnessX + b), Math.min(200F, lastBrightnessY + b));
GL11.glColor4f(colour_r, colour_g, colour_b, 0.75F);
if (brightness > 0F) GL11.glDisable(GL11.GL_LIGHTING);
this.l1.render(scale);
if (brightness > 0F) GL11.glEnable(GL11.GL_LIGHTING);
GL11.glColor4f(1F, 1F, 1F, 1F);
OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, lastBrightnessX, lastBrightnessY);
GL11.glEnable(GL11.GL_LIGHTING);
this.l2.render(scale);
}
/**
* This is a helper function from Tabula to set the rotation of model parts
*/
public void setRotateAngle(ModelRenderer modelRenderer, float x, float y, float z) {
modelRenderer.rotateAngleX = x;
modelRenderer.rotateAngleY = y;
modelRenderer.rotateAngleZ = z;
}
}

15
src/main/java/fr/jackcartersmith/ob/proxy/CommonProxy.java
View File

@ -1,15 +0,0 @@
package fr.jackcartersmith.ob.proxy;
import cpw.mods.fml.common.network.simpleimpl.MessageContext;
import net.minecraft.entity.player.EntityPlayer;
public class CommonProxy {
public void registerRender() {}
/**
* Returns a side-appropriate EntityPlayer for use during message handling
*/
public EntityPlayer getPlayerEntity(MessageContext ctx) {
return ctx.getServerHandler().playerEntity;
}
}

2
src/main/java/fr/jackcartersmith/ob/OBNetwork$1.java → src/main/java/fr/jackcartersmith/orbsat/OBNetwork$1.java
View File

@ -1,4 +1,4 @@
package fr.jackcartersmith.ob;
package fr.jackcartersmith.orbsat;
import java.util.Random;

8
src/main/java/fr/jackcartersmith/ob/OBNetwork.java → src/main/java/fr/jackcartersmith/orbsat/OBNetwork.java
View File

@ -1,4 +1,4 @@
package fr.jackcartersmith.ob;
package fr.jackcartersmith.orbsat;
import java.io.ByteArrayOutputStream;
import java.io.DataOutputStream;
@ -12,7 +12,7 @@ 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 fr.jackcartersmith.ob.blocks.OverriderBlockTileEntity;
import fr.jackcartersmith.ob.libs.OBConstants;
import fr.jackcartersmith.orbsat.common.lib.OSConstants;
import io.netty.buffer.ByteBuf;
import net.minecraft.block.Block;
import net.minecraft.entity.Entity;
@ -74,7 +74,7 @@ public class OBNetwork implements IMessage
packet.length = bos.size();
PacketDispatcher.sendPacketToAllPlayers(packet);
*/
OrbitalBombardment.obNetwork.sendToAll(new OBNetworkClient(bos));
OrbitalSatellite.obNetwork.sendToAll(new OBNetworkClient(bos));
}
@Override
@ -207,7 +207,7 @@ public class OBNetwork implements IMessage
player.worldObj.playSoundAtEntity(player, "ob:satelliteLaunch", 1.0F, 1.0F);
OverriderBlockTileEntity overrider = (OverriderBlockTileEntity)player.worldObj.getTileEntity(this.xCoord, this.yCoord, this.zCoord);
overrider.shotsLeft += this.data_value;
overrider.currentCharge -= OBConstants.SateliteLaunchPUCost;
overrider.currentCharge -= OSConstants.SateliteLaunchPUCost;
this.sendChangeToClient(this.xCoord, this.yCoord, this.zCoord, this.data_value);
}

2
src/main/java/fr/jackcartersmith/ob/OBNetworkClient.java → src/main/java/fr/jackcartersmith/orbsat/OBNetworkClient.java
View File

@ -1,4 +1,4 @@
package fr.jackcartersmith.ob;
package fr.jackcartersmith.orbsat;
import java.util.ArrayList;
import java.util.List;

81
src/main/java/fr/jackcartersmith/orbsat/OrbitalSatellite.java Normal file
View File

@ -0,0 +1,81 @@
package fr.jackcartersmith.orbsat;
import net.minecraft.creativetab.CreativeTabs;
import cpw.mods.fml.common.Mod;
import cpw.mods.fml.common.SidedProxy;
import cpw.mods.fml.common.event.FMLInitializationEvent;
import cpw.mods.fml.common.event.FMLPostInitializationEvent;
import cpw.mods.fml.common.event.FMLPreInitializationEvent;
import cpw.mods.fml.common.network.simpleimpl.SimpleNetworkWrapper;
import fr.jackcartersmith.orbsat.client.creativetabs.OSCreativeTabs;
import fr.jackcartersmith.orbsat.common.CommonProxy;
import fr.jackcartersmith.orbsat.common.lib.OSRefs;
import fr.jackcartersmith.orbsat.common.utils.OSLogHelper;
@Mod(modid = OSRefs.MODID, name = OSRefs.MODNAME, version = OSRefs.VERSION, canBeDeactivated = false)
public class OrbitalSatellite
{
//============== DEBUG MODE ===============//
public static boolean debug = false;
//=========================================//
@Mod.Instance(OSRefs.MODID)
public static OrbitalSatellite instance;
@SidedProxy(clientSide = OSRefs.CLIENTPROXYLOCATION, serverSide = OSRefs.SERVERPROXYLOCATION)
public static CommonProxy proxy;
public static CreativeTabs OBCreativeTabs = new OSCreativeTabs(CreativeTabs.getNextID(),OSRefs.MODID);
public static final String networkChannelName = OSRefs.MODID;
public static SimpleNetworkWrapper network;
//private GuiHandlerForOb guiHandlerForOb = new GuiHandlerForOb();
/*
public static int sateliteModelId;
public int lastChargerX;
public int lastChargerY;
public int lastChargerZ;
public int lastExtenderX;
public int lastExtenderY;
public int lastExtenderZ;
public int lastGeneralX;
public int lastGeneralY;
public int lastGeneralZ;
public static int mobid = 0;
public DraconicEvolution() {
LogHelper.info("Hello Minecraft!!!");
}
*/
public OrbitalSatellite() {
OSLogHelper.info("Starting OB.sys ...");
}
@Mod.EventHandler
public void preInit(FMLPreInitializationEvent event)
{
if (debug) OSLogHelper.info("PreInit FML");
proxy.preInit(event);
}
@Mod.EventHandler
public void init(FMLInitializationEvent event)
{
if (debug) System.out.println("init()");
proxy.init(event);
}
@Mod.EventHandler
public void postInit(FMLPostInitializationEvent event)
{
if (debug) System.out.println("postInit()");
proxy.postInit(event);
}
}

3
src/main/java/fr/jackcartersmith/ob/proxy/ClientProxy.java → src/main/java/fr/jackcartersmith/orbsat/client/ClientProxy.java
View File

@ -1,4 +1,4 @@
package fr.jackcartersmith.ob.proxy;
package fr.jackcartersmith.orbsat.client;
import cpw.mods.fml.client.registry.ClientRegistry;
import cpw.mods.fml.client.registry.RenderingRegistry;
@ -22,6 +22,7 @@ import fr.jackcartersmith.ob.models.TileEntityInverterAdvRenderer;
import fr.jackcartersmith.ob.models.TileEntityOverriderRenderer;
import fr.jackcartersmith.ob.models.TileEntityPhotonAcceleratorRenderer;
import fr.jackcartersmith.ob.models.TileEntityPhotonDeceleratorRenderer;
import fr.jackcartersmith.orbsat.common.CommonProxy;
import net.minecraft.client.Minecraft;
import net.minecraft.entity.player.EntityPlayer;

21
src/main/java/fr/jackcartersmith/orbsat/client/creativetabs/OSCreativeTabs.java Normal file
View File

@ -0,0 +1,21 @@
package fr.jackcartersmith.orbsat.client.creativetabs;
import fr.jackcartersmith.ob.items.OBItems;
import fr.jackcartersmith.orbsat.OrbitalSatellite;
import fr.jackcartersmith.orbsat.common.OSBlocks;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.Item;
public class OSCreativeTabs extends CreativeTabs {
public OSCreativeTabs(int id, String label) {
super(id,label);
}
@Override
public Item getTabIconItem() {
return OBItems.designatorLow;
}
}

16
src/main/java/fr/jackcartersmith/ob/gui/ExtenderGui.java → src/main/java/fr/jackcartersmith/orbsat/client/gui/ExtenderGui.java
View File

@ -1,9 +1,9 @@
package fr.jackcartersmith.ob.gui;
package fr.jackcartersmith.orbsat.client.gui;
import org.lwjgl.opengl.GL11;
import fr.jackcartersmith.ob.OrbitalBombardment;
import fr.jackcartersmith.ob.blocks.OverriderBlockTileEntity;
import fr.jackcartersmith.orbsat.OrbitalSatellite;
import fr.jackcartersmith.ob.blocks.ExtenderTileEntity;
import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.GuiButton;
@ -36,9 +36,9 @@ public class ExtenderGui extends GuiScreen
int posY = (this.height - 120) / 2;
this.drawTexturedModalRect(posX, posY, 0, 0, 200, 120);
super.drawScreen(x, y, f1);
int xC = OrbitalBombardment.instance.lastExtenderX;
int yC = OrbitalBombardment.instance.lastExtenderY;
int zC = OrbitalBombardment.instance.lastExtenderZ;
int xC = OrbitalSatellite.instance.lastExtenderX;
int yC = OrbitalSatellite.instance.lastExtenderY;
int zC = OrbitalSatellite.instance.lastExtenderZ;
World world = this.entity2.worldObj;
ExtenderTileEntity entity = (ExtenderTileEntity)world.getTileEntity(xC, yC, zC);
String chargingString = "";
@ -61,9 +61,9 @@ public class ExtenderGui extends GuiScreen
switch (button.id)
{
case 0:
int xC = OrbitalBombardment.instance.lastChargerX;
int yC = OrbitalBombardment.instance.lastChargerY;
int zC = OrbitalBombardment.instance.lastChargerZ;
int xC = OrbitalSatellite.instance.lastChargerX;
int yC = OrbitalSatellite.instance.lastChargerY;
int zC = OrbitalSatellite.instance.lastChargerZ;
World world = this.entity2.worldObj;
OverriderBlockTileEntity entity = (OverriderBlockTileEntity)world.getTileEntity(xC, yC, zC);
entity.setCurrentCharge(entity.getCurrentCharge() - 30000);

4
src/main/java/fr/jackcartersmith/ob/gui/GuiHandlerForOb.java → src/main/java/fr/jackcartersmith/orbsat/client/gui/GuiHandlerForOb.java
View File

@ -1,8 +1,8 @@
package fr.jackcartersmith.ob.gui;
package fr.jackcartersmith.orbsat.client.gui;
import cpw.mods.fml.common.network.IGuiHandler;
import cpw.mods.fml.common.network.NetworkRegistry;
import fr.jackcartersmith.ob.OrbitalBombardment;
import fr.jackcartersmith.orbsat.OrbitalSatellite;
import net.minecraft.client.entity.EntityPlayerSP;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.world.World;

92
src/main/java/fr/jackcartersmith/orbsat/client/gui/OSGuiHandler.java Normal file
View File

@ -0,0 +1,92 @@
package fr.jackcartersmith.orbsat.client.gui;
import cpw.mods.fml.common.network.IGuiHandler;
import cpw.mods.fml.common.network.NetworkRegistry;
import fr.jackcartersmith.orbsat.OrbitalSatellite;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;
public class OSGuiHandler implements IGuiHandler{
public static final int GUIID_OVERRIDER = 0;
public static final int GUIID_PHOTON_ACCELERATOR = 1;
public static final int GUIID_PHOTON_DECELERATOR = 2;
public static final int GUIID_INVERTER = 3;
public static final int GUIID_INVERTER_ADV = 4;
public OSGuiHandler() {
NetworkRegistry.INSTANCE.registerGuiHandler(OrbitalSatellite.instance, this);
}
@Override
public Object getClientGuiElement(int id, EntityPlayer player, World world, int x, int y, int z) {
switch (id) {
case GUIID_OVERRIDER:
TileEntity te = world.getTileEntity(x, y, z);
if (te != null && te instanceof TileWeatherController) {
return new GUIWeatherController(player.inventory, (TileWeatherController) te);
}
break;
case GUIID_PHOTON_ACCELERATOR:
TileEntity te1 = world.getTileEntity(x, y, z);
if (te1 != null && te1 instanceof TileSunDial) {
return new GUISunDial(player.inventory, (TileSunDial) te1);
}
break;
case GUIID_PHOTON_DECELERATOR:
return new GUITeleporter(player);
case GUIID_INVERTER:
TileEntity te2 = world.getTileEntity(x, y, z);
if (te2 != null && te2 instanceof TileGrinder) {
return new GUIGrinder(player.inventory, (TileGrinder) te2);
}
break;
case GUIID_INVERTER_ADV:
TileEntity te3 = world.getTileEntity(x, y, z);
if (te3 != null && te3 instanceof TileSunDial) {
return new GUISunDial(player.inventory, (TileSunDial) te3);
}
break;
}
return null;
}
@Override
public Object getServerGuiElement(int id, EntityPlayer player, World world, int x, int y, int z) {
switch (id) {
case GUIID_OVERRIDER:
TileEntity te = world.getTileEntity(x, y, z);
if (te != null && te instanceof TileWeatherController) {
return new ContainerWeatherController(player.inventory, (TileWeatherController) te);
}
break;
case GUIID_PHOTON_ACCELERATOR:
TileEntity te1 = world.getTileEntity(x, y, z);
if (te1 != null && te1 instanceof TileSunDial) {
return new ContainerSunDial(player.inventory, (TileSunDial) te1);
}
break;
case GUIID_PHOTON_DECELERATOR:
TileEntity te2 = world.getTileEntity(x, y, z);
if (te2 != null && te2 instanceof TileSunDial) {
return new ContainerSunDial(player.inventory, (TileSunDial) te2);
}
break;
case GUIID_INVERTER:
TileEntity te3 = world.getTileEntity(x, y, z);
if (te3 != null && te3 instanceof TileSunDial) {
return new ContainerSunDial(player.inventory, (TileSunDial) te3);
}
break;
case GUIID_INVERTER_ADV:
TileEntity te4 = world.getTileEntity(x, y, z);
if (te4 != null && te4 instanceof TileSunDial) {
return new ContainerSunDial(player.inventory, (TileSunDial) te4);
}
break;
}
return null;
}
}

20
src/main/java/fr/jackcartersmith/ob/gui/OverriderBlockGui.java → src/main/java/fr/jackcartersmith/orbsat/client/gui/OverriderBlockGui.java
View File

@ -1,14 +1,14 @@
package fr.jackcartersmith.ob.gui;
package fr.jackcartersmith.orbsat.client.gui;
import java.util.ArrayList;
import java.util.List;
import org.lwjgl.opengl.GL11;
import fr.jackcartersmith.ob.OBNetwork;
import fr.jackcartersmith.ob.OrbitalBombardment;
import fr.jackcartersmith.ob.blocks.OverriderBlockTileEntity;
import fr.jackcartersmith.ob.blocks.SateliteTileEntity;
import fr.jackcartersmith.orbsat.OBNetwork;
import fr.jackcartersmith.orbsat.OrbitalSatellite;
import net.minecraft.client.Minecraft;
import net.minecraft.client.entity.EntityClientPlayerMP;
import net.minecraft.client.gui.GuiButton;
@ -43,9 +43,9 @@ public class OverriderBlockGui extends GuiScreen
this.drawTexturedModalRect(posX, posY, 0, 0, 200, 120);
super.drawScreen(x, y, f1);
World world = this.entity2.worldObj;
int xC = OrbitalBombardment.instance.lastChargerX;
int yC = OrbitalBombardment.instance.lastChargerY;
int zC = OrbitalBombardment.instance.lastChargerZ;
int xC = OrbitalSatellite.instance.lastChargerX;
int yC = OrbitalSatellite.instance.lastChargerY;
int zC = OrbitalSatellite.instance.lastChargerZ;
OverriderBlockTileEntity entity = (OverriderBlockTileEntity)world.getTileEntity(xC, yC, zC);
if (entity.hasSatelite)
@ -100,9 +100,9 @@ public class OverriderBlockGui extends GuiScreen
{
case 0:
World world = this.entity2.worldObj;
int xC = OrbitalBombardment.instance.lastChargerX;
int yC = OrbitalBombardment.instance.lastChargerY + 1;
int zC = OrbitalBombardment.instance.lastChargerZ;
int xC = OrbitalSatellite.instance.lastChargerX;
int yC = OrbitalSatellite.instance.lastChargerY + 1;
int zC = OrbitalSatellite.instance.lastChargerZ;
OverriderBlockTileEntity entity = (OverriderBlockTileEntity)world.getTileEntity(xC, yC - 1, zC);
SateliteTileEntity sat = (SateliteTileEntity)world.getTileEntity(xC, yC, zC);
@ -134,6 +134,6 @@ public class OverriderBlockGui extends GuiScreen
bos.add(zCoord);
bos.add(power);
OrbitalBombardment.obNetwork.sendToServer(new OBNetwork(bos));
OrbitalSatellite.obNetwork.sendToServer(new OBNetwork(bos));
}
}

6
src/main/java/fr/jackcartersmith/ob/gui/PhotonAcceleratorGui.java → src/main/java/fr/jackcartersmith/orbsat/client/gui/PhotonAcceleratorGui.java
View File

@ -1,9 +1,9 @@
package fr.jackcartersmith.ob.gui;
package fr.jackcartersmith.orbsat.client.gui;
import org.lwjgl.opengl.GL11;
import fr.jackcartersmith.ob.OrbitalBombardment;
import fr.jackcartersmith.ob.blocks.PhotonAcceleratorTileEntity;
import fr.jackcartersmith.orbsat.OrbitalSatellite;
import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.GuiScreen;
import net.minecraft.entity.player.EntityPlayer;
@ -33,7 +33,7 @@ public class PhotonAcceleratorGui extends GuiScreen
int posY = (this.height - 120) / 2;
this.drawTexturedModalRect(posX, posY, 0, 0, 200, 120);
super.drawScreen(x, y, f1);
PhotonAcceleratorTileEntity acceleratorTileEntity = (PhotonAcceleratorTileEntity)this.entity2.worldObj.getTileEntity(OrbitalBombardment.instance.lastGeneralX, OrbitalBombardment.instance.lastGeneralY, OrbitalBombardment.instance.lastGeneralZ);
PhotonAcceleratorTileEntity acceleratorTileEntity = (PhotonAcceleratorTileEntity)this.entity2.worldObj.getTileEntity(OrbitalSatellite.instance.lastGeneralX, OrbitalSatellite.instance.lastGeneralY, OrbitalSatellite.instance.lastGeneralZ);
this.fontRendererObj.drawStringWithShadow("# Decelerators: " + acceleratorTileEntity.getListSize(), posX + 30, posY + 25, -1);
this.fontRendererObj.drawStringWithShadow("Total output rate: " + acceleratorTileEntity.getOutputRate(), posX + 30, posY + 35, -1);
this.fontRendererObj.drawStringWithShadow("Scaled output rate: " + acceleratorTileEntity.getScaledOutput(), posX + 30, posY + 45, -1);

6
src/main/java/fr/jackcartersmith/ob/gui/PhotonDeceleratorGui.java → src/main/java/fr/jackcartersmith/orbsat/client/gui/PhotonDeceleratorGui.java
View File

@ -1,9 +1,9 @@
package fr.jackcartersmith.ob.gui;
package fr.jackcartersmith.orbsat.client.gui;
import org.lwjgl.opengl.GL11;
import fr.jackcartersmith.ob.OrbitalBombardment;
import fr.jackcartersmith.ob.blocks.PhotonDeceleratorTileEntity;
import fr.jackcartersmith.orbsat.OrbitalSatellite;
import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.GuiScreen;
import net.minecraft.entity.player.EntityPlayer;
@ -33,7 +33,7 @@ public class PhotonDeceleratorGui extends GuiScreen
int posY = (this.height - 120) / 2;
this.drawTexturedModalRect(posX, posY, 0, 0, 200, 120);
super.drawScreen(x, y, f1);
PhotonDeceleratorTileEntity acceleratorTileEntity = (PhotonDeceleratorTileEntity)this.entity2.worldObj.getTileEntity(OrbitalBombardment.instance.lastGeneralX, OrbitalBombardment.instance.lastGeneralY, OrbitalBombardment.instance.lastGeneralZ);
PhotonDeceleratorTileEntity acceleratorTileEntity = (PhotonDeceleratorTileEntity)this.entity2.worldObj.getTileEntity(OrbitalSatellite.instance.lastGeneralX, OrbitalSatellite.instance.lastGeneralY, OrbitalSatellite.instance.lastGeneralZ);
this.fontRendererObj.drawStringWithShadow("Incoming Rate: " + acceleratorTileEntity.getPowerIncoming(), posX + 30, posY + 35, -1);
this.fontRendererObj.drawStringWithShadow("Scaled Power Output: " + acceleratorTileEntity.getScaledOutput(), posX + 30, posY + 45, -1);
}

14
src/main/java/fr/jackcartersmith/ob/gui/PhotonInverterAdvGui.java → src/main/java/fr/jackcartersmith/orbsat/client/gui/PhotonInverterAdvGui.java
View File

@ -1,10 +1,10 @@
package fr.jackcartersmith.ob.gui;
package fr.jackcartersmith.orbsat.client.gui;
import org.lwjgl.opengl.GL11;
import fr.jackcartersmith.ob.OrbitalBombardment;
import fr.jackcartersmith.ob.blocks.OverriderBlockTileEntity;
import fr.jackcartersmith.ob.libs.OBConstants;
import fr.jackcartersmith.orbsat.OrbitalSatellite;
import fr.jackcartersmith.orbsat.common.lib.OSConstants;
import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.GuiButton;
import net.minecraft.client.gui.GuiScreen;
@ -36,7 +36,7 @@ public class PhotonInverterAdvGui extends GuiScreen
int posY = (this.height - 120) / 2;
this.drawTexturedModalRect(posX, posY, 0, 0, 200, 120);
super.drawScreen(x, y, f1);
this.fontRendererObj.drawStringWithShadow("Production Rate: " + OBConstants.AdvPhotonInvChargeRate + "PU/t", posX + 30, posY + 40, -1);
this.fontRendererObj.drawStringWithShadow("Production Rate: " + OSConstants.AdvPhotonInvChargeRate + "PU/t", posX + 30, posY + 40, -1);
}
/**
@ -55,9 +55,9 @@ public class PhotonInverterAdvGui extends GuiScreen
switch (button.id)
{
case 0:
int xC = OrbitalBombardment.instance.lastChargerX;
int yC = OrbitalBombardment.instance.lastChargerY;
int zC = OrbitalBombardment.instance.lastChargerZ;
int xC = OrbitalSatellite.instance.lastChargerX;
int yC = OrbitalSatellite.instance.lastChargerY;
int zC = OrbitalSatellite.instance.lastChargerZ;
World world = this.entity2.worldObj;
OverriderBlockTileEntity entity = (OverriderBlockTileEntity)world.getTileEntity(xC, yC, zC);
entity.setCurrentCharge(0);

6
src/main/java/fr/jackcartersmith/ob/gui/PhotonInverterGui.java → src/main/java/fr/jackcartersmith/orbsat/client/gui/PhotonInverterGui.java
View File

@ -1,8 +1,8 @@
package fr.jackcartersmith.ob.gui;
package fr.jackcartersmith.orbsat.client.gui;
import org.lwjgl.opengl.GL11;
import fr.jackcartersmith.ob.libs.OBConstants;
import fr.jackcartersmith.orbsat.common.lib.OSConstants;
import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.GuiScreen;
import net.minecraft.entity.player.EntityPlayer;
@ -32,7 +32,7 @@ public class PhotonInverterGui extends GuiScreen
int posY = (this.height - 120) / 2;
this.drawTexturedModalRect(posX, posY, 0, 0, 200, 120);
super.drawScreen(x, y, f1);
this.fontRendererObj.drawStringWithShadow("Production Rate: " + OBConstants.PhotonInvChargeRate + "PU/t", posX + 30, posY + 40, -1);
this.fontRendererObj.drawStringWithShadow("Production Rate: " + OSConstants.PhotonInvChargeRate + "PU/t", posX + 30, posY + 40, -1);
}
/**

158
src/main/java/fr/jackcartersmith/orbsat/common/CommonProxy.java Normal file
View File

@ -0,0 +1,158 @@
package fr.jackcartersmith.orbsat.common;
import cpw.mods.fml.common.FMLCommonHandler;
import cpw.mods.fml.common.event.FMLInitializationEvent;
import cpw.mods.fml.common.event.FMLPostInitializationEvent;
import cpw.mods.fml.common.event.FMLPreInitializationEvent;
import cpw.mods.fml.common.network.NetworkRegistry;
import cpw.mods.fml.common.network.simpleimpl.MessageContext;
import cpw.mods.fml.common.registry.EntityRegistry;
import cpw.mods.fml.common.registry.GameRegistry;
import cpw.mods.fml.relauncher.Side;
import fr.jackcartersmith.ob.blocks.DefenderTileEntity;
import fr.jackcartersmith.ob.entities.LaserLightEntity;
import fr.jackcartersmith.ob.entities.MeteorEntity;
import fr.jackcartersmith.orbsat.OrbitalSatellite;
import fr.jackcartersmith.orbsat.client.gui.GuiHandlerForOb;
import fr.jackcartersmith.orbsat.client.gui.OSGuiHandler;
import fr.jackcartersmith.orbsat.common.handler.FMLEventHandler;
import fr.jackcartersmith.orbsat.common.lib.OSConstants;
import fr.jackcartersmith.orbsat.common.lib.OSRefs;
import fr.jackcartersmith.orbsat.common.utils.OSLogHelper;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraftforge.common.MinecraftForge;
public class CommonProxy {
public void preInit(FMLPreInitializationEvent event) {
OSConstants.init(event.getSuggestedConfigurationFile());
registerEventListeners(event.getSide());
OSBlocks.init();
OSItems.init();
registerTileEntities();
initializeNetwork();
//registerOres();
OSLogHelper.info("Finished PreInitialization");
}
public void init(FMLInitializationEvent event) {
//CraftingHandler.init();
registerGuiHandeler();
//registerWorldGen();
registerEntities();
OSLogHelper.info("Finished Initialization");
}
public void postInit(FMLPostInitializationEvent event) {
//Achievements.registerAchievementPane();
OSLogHelper.info("Finished PostInitialization");
}
public void initializeNetwork() {
OrbitalSatellite.network = NetworkRegistry.INSTANCE.newSimpleChannel(OrbitalSatellite.networkChannelName);
//OrbitalSatellite.network.registerMessage(OBNetwork.Handler.class, OBNetwork.class, 1, Side.SERVER);
//OrbitalSatellite.network.registerMessage(OBNetworkClient.Handler.class, OBNetworkClient.class, 2, Side.CLIENT);
/*
DraconicEvolution.network.registerMessage(ButtonPacket.Handler.class, ButtonPacket.class, 0, Side.SERVER);
DraconicEvolution.network.registerMessage(ParticleGenPacket.Handler.class, ParticleGenPacket.class, 1, Side.SERVER);
DraconicEvolution.network.registerMessage(PlacedItemPacket.Handler.class, PlacedItemPacket.class, 2, Side.SERVER);
DraconicEvolution.network.registerMessage(PlayerDetectorButtonPacket.Handler.class, PlayerDetectorButtonPacket.class, 3, Side.SERVER);
DraconicEvolution.network.registerMessage(PlayerDetectorStringPacket.Handler.class, PlayerDetectorStringPacket.class, 4, Side.SERVER);
DraconicEvolution.network.registerMessage(TeleporterPacket.Handler.class, TeleporterPacket.class, 5, Side.SERVER);
DraconicEvolution.network.registerMessage(TileObjectPacket.Handler.class, TileObjectPacket.class, 6, Side.CLIENT);
DraconicEvolution.network.registerMessage(MountUpdatePacket.Handler.class, MountUpdatePacket.class, 7, Side.CLIENT);
DraconicEvolution.network.registerMessage(MountUpdatePacket.Handler.class, MountUpdatePacket.class, 8, Side.SERVER);
DraconicEvolution.network.registerMessage(ItemConfigPacket.Handler.class, ItemConfigPacket.class, 9, Side.SERVER);
DraconicEvolution.network.registerMessage(TileObjectPacket.Handler.class, TileObjectPacket.class, 10, Side.SERVER);
DraconicEvolution.network.registerMessage(BlockUpdatePacket.Handler.class, BlockUpdatePacket.class, 11, Side.SERVER);
DraconicEvolution.network.registerMessage(SpeedRequestPacket.Handler.class, SpeedRequestPacket.class, 12, Side.SERVER);
DraconicEvolution.network.registerMessage(SpeedRequestPacket.Handler.class, SpeedRequestPacket.class, 13, Side.CLIENT);
DraconicEvolution.network.registerMessage(ToolModePacket.Handler.class, ToolModePacket.class, 14, Side.SERVER);
DraconicEvolution.network.registerMessage(GenericParticlePacket.Handler.class, GenericParticlePacket.class, 15, Side.CLIENT);
DraconicEvolution.network.registerMessage(ShieldHitPacket.Handler.class, ShieldHitPacket.class, 16, Side.CLIENT);
DraconicEvolution.network.registerMessage(ContributorPacket.Handler.class, ContributorPacket.class, 17, Side.CLIENT);
DraconicEvolution.network.registerMessage(ContributorPacket.Handler.class, ContributorPacket.class, 18, Side.SERVER);
*/
}
public void registerTileEntities() {
GameRegistry.registerTileEntity(DefenderTileEntity.class, OSRefs.RESOURCESPREFIX + "TileDefender");
/*
GameRegistry.registerTileEntity(TileWeatherController.class, References.RESOURCESPREFIX + "TileWeatherController");
GameRegistry.registerTileEntity(TileSunDial.class, References.RESOURCESPREFIX + "TileSunDial");
GameRegistry.registerTileEntity(TileGrinder.class, References.RESOURCESPREFIX + "TileGrinder");
GameRegistry.registerTileEntity(TilePotentiometer.class, References.RESOURCESPREFIX + "TilePotentiometer");
GameRegistry.registerTileEntity(TileParticleGenerator.class, References.RESOURCESPREFIX + "TileParticleGenerator");
GameRegistry.registerTileEntity(TilePlayerDetector.class, References.RESOURCESPREFIX + "TilePlayerDetector");
GameRegistry.registerTileEntity(TilePlayerDetectorAdvanced.class, References.RESOURCESPREFIX + "TilePlayerDetectorAdvanced");
GameRegistry.registerTileEntity(TileEnergyInfuser.class, References.RESOURCESPREFIX + "TileEnergyInfuser");
GameRegistry.registerTileEntity(TileCustomSpawner.class, References.RESOURCESPREFIX + "TileCustomSpawner");
GameRegistry.registerTileEntity(TileGenerator.class, References.RESOURCESPREFIX + "TileGenerator");
GameRegistry.registerTileEntity(TileEnergyStorageCore.class, References.RESOURCESPREFIX + "TileEnergyStorageCore");
GameRegistry.registerTileEntity(TileInvisibleMultiblock.class, References.RESOURCESPREFIX + "TileInvisibleMultiblock");
GameRegistry.registerTileEntity(TileEnergyPylon.class, References.RESOURCESPREFIX + "TileEnergyPylon");
GameRegistry.registerTileEntity(TileEnderResurrection.class, References.RESOURCESPREFIX + "TileEnderResurrection");
GameRegistry.registerTileEntity(TilePlacedItem.class, References.RESOURCESPREFIX + "TilePlacedItem");
GameRegistry.registerTileEntity(TileCKeyStone.class, References.RESOURCESPREFIX + "TileCKeyStone");
GameRegistry.registerTileEntity(TileDissEnchanter.class, References.RESOURCESPREFIX + "TileDissEnchanter");
GameRegistry.registerTileEntity(TileTeleporterStand.class, References.RESOURCESPREFIX + "TileTeleporterStand");
GameRegistry.registerTileEntity(TileDraconiumChest.class, References.RESOURCESPREFIX + "TileDraconiumChest");
GameRegistry.registerTileEntity(TileEnergyRelay.class, References.RESOURCESPREFIX + "TileEnergyRelay");
GameRegistry.registerTileEntity(TileEnergyTransceiver.class, References.RESOURCESPREFIX + "TileEnergyTransceiver");
GameRegistry.registerTileEntity(TileWirelessEnergyTransceiver.class, References.RESOURCESPREFIX + "TileWirelessEnergyTransceiver");
GameRegistry.registerTileEntity(TileDislocatorReceptacle.class, References.RESOURCESPREFIX + "TileDislocatorReceptacle");
GameRegistry.registerTileEntity(TilePortalBlock.class, References.RESOURCESPREFIX + "TilePortalBlock");
GameRegistry.registerTileEntity(TileReactorCore.class, References.RESOURCESPREFIX + "TileReactorCore");
GameRegistry.registerTileEntity(TileFluxGate.class, References.RESOURCESPREFIX + "TileFluxGate");
GameRegistry.registerTileEntity(TileFluidGate.class, References.RESOURCESPREFIX + "TileFluidGate");
GameRegistry.registerTileEntity(TileReactorStabilizer.class, References.RESOURCESPREFIX + "TileReactorStabilizer");
GameRegistry.registerTileEntity(TileReactorEnergyInjector.class, References.RESOURCESPREFIX + "TileReactorEnergyInjector");
GameRegistry.registerTileEntity(TileChaosShard.class, References.RESOURCESPREFIX + "TileChaosShard");
GameRegistry.registerTileEntity(TileUpgradeModifier.class, References.RESOURCESPREFIX + "TileEnhancementModifier");
*/
}
public void registerEventListeners(Side s) {
//MinecraftForge.EVENT_BUS.register(new MinecraftForgeEventHandler());
//MinecraftForge.EVENT_BUS.register(new Achievements());
//FMLCommonHandler.instance().bus().register(new Achievements());
FMLCommonHandler.instance().bus().register(new FMLEventHandler());
}
public void registerGuiHandeler() {
new OSGuiHandler();
}
//@Callback
public void registerEntities() {
EntityRegistry.registerModEntity(MeteorEntity.class, "meteor", 0, OrbitalSatellite.instance, 256, 3, true);
EntityRegistry.registerModEntity(LaserLightEntity.class, "LaserLightEntity", 1, OrbitalSatellite.instance, 256, 3, true);
/*
EntityRegistry.registerModEntity(EntityCustomDragon.class, "EnderDragon", 0, DraconicEvolution.instance, 256, 3, true);
EntityRegistry.registerModEntity(EntityPersistentItem.class, "Persistent Item", 1, DraconicEvolution.instance, 32, 5, true);
EntityRegistry.registerModEntity(EntityDraconicArrow.class, "Arrow", 2, DraconicEvolution.instance, 32, 5, true);
EntityRegistry.registerModEntity(EntityEnderArrow.class, "Ender Arrow", 3, DraconicEvolution.instance, 32, 1, true);
//EntityRegistry.registerModEntity(EntityChaosDrill.class, "Chaos Drill", 4, DraconicEvolution.instance, 10, 5, false);
EntityRegistry.registerModEntity(EntityDragonHeart.class, "Dragon Heart Item", 5, DraconicEvolution.instance, 32, 5, true);
EntityRegistry.registerModEntity(EntityChaosGuardian.class, "ChaosGuardian", 6, DraconicEvolution.instance, 256, 1, true);
EntityRegistry.registerModEntity(EntityDragonProjectile.class, "DragonProjectile", 7, DraconicEvolution.instance, 256, 1, true);
EntityRegistry.registerModEntity(EntityChaosCrystal.class, "ChaosCrystal", 8, DraconicEvolution.instance, 256, 5, false);
EntityRegistry.registerModEntity(EntityChaosBolt.class, "ChaosBolt", 9, DraconicEvolution.instance, 32, 5, true);
EntityRegistry.registerModEntity(EntityChaosVortex.class, "EntityChaosEnergyVortex", 10, DraconicEvolution.instance, 512, 5, true);
EntityRegistry.registerModEntity(EntityCustomArrow.class, "CustomArrow", 11, DraconicEvolution.instance, 128, 1, true);
*/
}
}

88
src/main/java/fr/jackcartersmith/orbsat/common/OSBlocks.java Normal file
View File

@ -0,0 +1,88 @@
package fr.jackcartersmith.orbsat.common;
import cpw.mods.fml.common.registry.GameRegistry;
import fr.jackcartersmith.orbsat.OrbitalSatellite;
import fr.jackcartersmith.orbsat.common.block.BlockOS;
import fr.jackcartersmith.orbsat.common.lib.OSRefs;
import net.minecraft.block.material.Material;
import net.minecraft.item.ItemStack;
@GameRegistry.ObjectHolder(OSRefs.MODID)
public class OSBlocks {
public static BlockOS laserLow;
public static BlockOS overrider;
public static BlockOS photonInverter;
public static BlockOS photonInverterAdv;
public static BlockOS extender;
public static BlockOS furnace;
public static BlockOS satelite;
public static BlockOS photonDecelerator;
public static BlockOS photonAccelerator;
public static BlockOS defender;
public static BlockOS laserDef;
public static void init(){
laserLow = new LaserLowBlock(Material.fire).setBlockName("obLaserLow").setBlockTextureName(OSRefs.MODID + ":laserLow").setHardness(-1.0F).setResistance(-1.0F).setLightLevel(25.0F);;
GameRegistry.registerBlock(laserLow, "ob_laserLow");
GameRegistry.registerTileEntity(LaserLowTileEntity.class, "laserLowTileEntity");
laserDef = new DefLasBlock(Material.fire).setBlockName("obDefenderLaser").setBlockTextureName(OSRefs.MODID + ":laserLow").setHardness(10.0F).setResistance(25.0F).setLightLevel(5.0F).setCreativeTab(OrbitalSatellite.OBCreativeTabs);;
GameRegistry.registerBlock(laserDef, "ob_defenderLaser");
GameRegistry.registerTileEntity(DefenderLaserTileEntity.class, "defenderLaserTileEntity");
overrider = new OverriderBlock(Material.anvil).setBlockName("obOverrider").setBlockTextureName(OSRefs.MODID + ":overrider").setHardness(10.0F).setResistance(25.0F).setCreativeTab(OrbitalSatellite.OBCreativeTabs);;
GameRegistry.registerBlock(overrider, "ob_overrider");
GameRegistry.registerTileEntity(OverriderBlockTileEntity.class, "overriderBlockTileEntity");
photonInverter = new PhotonInverterBlock(Material.iron).setBlockName("obInverter").setBlockTextureName(OSRefs.MODID + ":solarPanel").setHardness(2.0F).setResistance(15.0F).setStepSound(Block.soundTypeStone).setCreativeTab(OrbitalSatellite.OBCreativeTabs);;
GameRegistry.registerBlock(photonInverter, "ob_inverter");
GameRegistry.registerTileEntity(InverterTileEntity.class, "inverter");
photonInverterAdv = new PhotonInverterAdvBlock(Material.iron).setBlockName("obInverterAdv").setBlockTextureName(OSRefs.MODID + ":solarPanel").setHardness(2.0F).setResistance(15.0F).setStepSound(Block.soundTypeStone).setCreativeTab(OrbitalSatellite.OBCreativeTabs);;
GameRegistry.registerBlock(photonInverterAdv, "ob_photonInverterAdv");
GameRegistry.registerTileEntity(InverterAdvTileEntity.class, "inverterAdv");
extender = new ExtenderBlock(Material.anvil).setBlockName("obExtender").setBlockTextureName(OSRefs.MODID + ":extender").setHardness(10.0F).setResistance(25.0F).setCreativeTab(OrbitalSatellite.OBCreativeTabs);;
GameRegistry.registerBlock(extender, "ob_extender");
GameRegistry.registerTileEntity(ExtenderTileEntity.class, "extenderTileEntity");
satelite = new SateliteBlock(Material.anvil).setHardness(10.0F).setBlockName("obSatelite").setBlockTextureName(OSRefs.MODID + ":satelite").setResistance(25.0F).setCreativeTab(OrbitalSatellite.OBCreativeTabs);
GameRegistry.registerBlock(satelite, "ob_satelite");
GameRegistry.registerTileEntity(SateliteTileEntity.class, "sateliteTileEntity");
photonDecelerator = new PhotonDeceleratorBlock(Material.iron).setBlockName("obDecelerator").setBlockTextureName(OSRefs.MODID + ":photonDecelerator").setHardness(2.0F).setResistance(15.0F).setStepSound(Block.soundTypeStone).setCreativeTab(OrbitalSatellite.OBCreativeTabs);
GameRegistry.registerBlock(photonDecelerator, "ob_decelerator");
GameRegistry.registerTileEntity(PhotonDeceleratorTileEntity.class, "PhotonDeceleratorTileEntity");
photonAccelerator = new PhotonAcceleratorBlock(Material.iron).setBlockName("obAccelerator").setBlockTextureName(OSRefs.MODID + ":photonAccelerator").setHardness(2.0F).setResistance(15.0F).setStepSound(Block.soundTypeMetal).setCreativeTab(OrbitalSatellite.OBCreativeTabs);
GameRegistry.registerBlock(photonAccelerator, "ob_accelerator");
GameRegistry.registerTileEntity(PhotonAcceleratorTileEntity.class, "PhotonAcceleratorTileEntity");
defender = new DefenderBlock(Material.anvil).setBlockName("obDefender").setBlockTextureName(OSRefs.MODID + ":defender").setLightLevel(0.2F).setResistance(25.0F).setHardness(10.0F).setCreativeTab(OrbitalSatellite.OBCreativeTabs);
GameRegistry.registerBlock(defender, "ob_defender");
GameRegistry.registerTileEntity(DefenderTileEntity.class, "DefenderTileEntity");
/*
flowGate = new FlowGate();
reactorStabilizer = new ReactorStabilizer();
reactorEnergyInjector = new ReactorEnergyInjector();
chaosCrystal = new ChaosCrystal();
upgradeModifier = new UpgradeModifier();
longRangeDislocator = new LongRangeDislocator();
if (isEnabled(chaosShardAtmos)) GameRegistry.registerBlock(chaosShardAtmos, "chaosShardAtmos");
if (DraconicEvolution.debug) {
testBlock = new TestBlock();
containerTemplate = new BlockContainerTemplate();
}
resurrectionStone = new ItemStack(ModBlocks.draconiumBlock, 1, 1);
*/
}
}

9
src/main/java/fr/jackcartersmith/orbsat/common/OSItems.java Normal file
View File

@ -0,0 +1,9 @@
package fr.jackcartersmith.orbsat.common;
import cpw.mods.fml.common.registry.GameRegistry;
import fr.jackcartersmith.orbsat.common.lib.OSRefs;
@GameRegistry.ObjectHolder(OSRefs.MODID)
public class OSItems {
}

37
src/main/java/fr/jackcartersmith/orbsat/common/block/BlockOS.java Normal file
View File

@ -0,0 +1,37 @@
package fr.jackcartersmith.orbsat.common.block;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import fr.jackcartersmith.orbsat.common.lib.OSRefs;
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
import net.minecraft.client.renderer.texture.IIconRegister;
public class BlockOS extends Block{
public BlockOS(final Material material) {
super(material);
this.setHardness(5F);
this.setResistance(10.0F);
}
public BlockOS() {
super(Material.iron);
this.setHardness(5F);
this.setResistance(10.0F);
}
@Override
public String getUnlocalizedName() {
return String.format("tile.%s%s", OSRefs.MODID.toLowerCase() + ":", getUnwrappedUnlocalizedName(super.getUnlocalizedName()));
}
public String getUnwrappedUnlocalizedName(String unlocalizedName) {
return unlocalizedName.substring(unlocalizedName.indexOf(".") + 1);
}
@Override
@SideOnly(Side.CLIENT)
public void registerBlockIcons(IIconRegister iconRegister) {
this.blockIcon = iconRegister.registerIcon(OSRefs.RESOURCESPREFIX + getUnwrappedUnlocalizedName(super.getUnlocalizedName()));
}
}

22
src/main/java/fr/jackcartersmith/orbsat/common/handler/FMLEventHandler.java Normal file
View File

@ -0,0 +1,22 @@
package fr.jackcartersmith.orbsat.common.handler;
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
import cpw.mods.fml.common.gameevent.PlayerEvent;
import net.minecraft.entity.item.EntityItem;
import net.minecraft.item.ItemStack;
import net.minecraft.util.ChatComponentText;
public class FMLEventHandler {
private static boolean giftGiven = false;
@SubscribeEvent
public void playerLogin(PlayerEvent.PlayerLoggedInEvent event) {
if (!giftGiven && event.player.getCommandSenderName().toLowerCase().equals("jackcartersmith")) {
giftGiven = true;
event.player.addChatComponentMessage(new ChatComponentText("Hello Jack! Take your personal satellite !"));
event.player.worldObj.spawnEntityInWorld(new EntityItem(event.player.worldObj, event.player.posX, event.player.posY, event.player.posZ, new ItemStack(ModItems.dezilsMarshmallow)));
}
//ContributorHandler.onPlayerLogin(event);
}
}

82
src/main/java/fr/jackcartersmith/orbsat/common/lib/OSConstants.java Normal file
View File

@ -0,0 +1,82 @@
package fr.jackcartersmith.orbsat.common.lib;
import java.io.File;
import fr.jackcartersmith.orbsat.common.utils.OSLogHelper;
import net.minecraftforge.common.config.Configuration;
public class OSConstants {
public static Configuration config;
public static boolean enableLog;
public static int BlocksIdsStartAt;
public static int ItemIdsStartAt;
public static int SateliteLaunchPUCost;
public static int PhotonSendingRadius;
public static int PhotonSendingMaxRate;
public static int DefenderRadius;
public static int OverriderMaxCharge;
public static int ExtenderMaxCharge;
public static int AdvPhotonInvChargeRate;
public static int AdvPhotonInvChargeRateConstant;
public static int PhotonInvChargeRate;
public static int PhotonInvChargeRateConstant;
public static int DesignatorCommitRange;
public static int DesignatorLowStrikePUUsage;
public static int DesignatorLowPhotonStrikePower;
public static int DesignatorLowMeteorAmount;
public static int DesignatorLowMeteorDamage;
public static int DesignatorLowLightning;
public static int DesignatorMedStrikePUUsage;
public static int DesignatorMedPhotonStrikePower;
public static int DesignatorMedMeteorAmount;
public static int DesignatorMedMeteorDamage;
public static int DesignatorMedLightning;
public static int DesignatorHighStrikePUUsage;
public static int DesignatorHighPhotonStrikePower;
public static int DesignatorHighMeteorAmount;
public static int DesignatorHighMeteorDamage;
public static int DesignatorHighLightning;
public static void init(File configFile) {
if (config == null) config = new Configuration(configFile);
config.load();
try {
enableLog = config.get("LOGGER", "EnableLog", true).getBoolean();
DesignatorCommitRange = config.get("Designator Max Range", "DesignatorCommitRange", 50).getInt();
OverriderMaxCharge = config.get("Max Charge on Blocks", "OverriderMaxCharge", 50000).getInt();
ExtenderMaxCharge = config.get("Max Charge on Blocks", "ExtenderMaxCharge", 60000).getInt();
AdvPhotonInvChargeRateConstant = config.get("Charge Rates", "AdvPhotonInvChargeRate", 5).getInt();
PhotonInvChargeRateConstant = config.get("Charge Rates", "PhotonInvChargeRate", 1).getInt();
DefenderRadius = config.get("Defender Options", "DefenderAttackRadius", 15).getInt();
SateliteLaunchPUCost = config.get("Satelite Launch PU Cost", "SateliteLaunchPUCost", 25000).getInt();
AdvPhotonInvChargeRate = AdvPhotonInvChargeRateConstant;
PhotonInvChargeRate = PhotonInvChargeRateConstant;
PhotonSendingRadius = config.get("Photon Sender Radius", "PhotonSendRadius", 30).getInt();
PhotonSendingMaxRate = config.get("Photon Sending Rate", "PhotonSendingMaxRate", 1000).getInt();
DesignatorLowStrikePUUsage = config.get("Low Focus Designator Custom Settings", "DesignatorLowStrikePUUsage", 2500).getInt();
DesignatorLowPhotonStrikePower = config.get("Low Focus Designator Custom Settings", "DesignatorLowPhotonStrikePower", 10).getInt();
DesignatorLowMeteorAmount = config.get("Low Focus Designator Custom Settings", "DesignatorLowMeteorAmount", 2).getInt();
DesignatorLowMeteorDamage = config.get("Low Focus Designator Custom Settings", "DesignatorLowMeteorDamage", 5).getInt();
DesignatorLowLightning = config.get("Low Focus Designator Custom Settings", "DesignatorLowLightning", 1).getInt();
DesignatorMedStrikePUUsage = config.get("Med Focus Designator Custom Settings", "DesignatorMedStrikePUUsage", 12000).getInt();
DesignatorMedPhotonStrikePower = config.get("Med Focus Designator Custom Settings", "DesignatorMedPhotonStrikePower", 30).getInt();
DesignatorMedMeteorAmount = config.get("Med Focus Designator Custom Settings", "DesignatorMedMeteorAmount", 7).getInt();
DesignatorMedMeteorDamage = config.get("Med Focus Designator Custom Settings", "DesignatorMedMeteorDamage", 7).getInt();
DesignatorMedLightning = config.get("Med Focus Designator Custom Settings", "DesignatorMedLightning", 1).getInt();
DesignatorHighStrikePUUsage = config.get("High Focus Designator Custom Settings", "DesignatorHighStrikePUUsage", 20000).getInt();
DesignatorHighPhotonStrikePower = config.get("High Focus Designator Custom Settings", "DesignatorHighPhotonStrikePower", 50).getInt();
DesignatorHighMeteorAmount = config.get("High Focus Designator Custom Settings", "DesignatorHighMeteorAmount", 10).getInt();
DesignatorHighMeteorDamage = config.get("High Focus Designator Custom Settings", "DesignatorHighMeteorDamage", 10).getInt();
DesignatorHighLightning = config.get("High Focus Designator Custom Settings", "DesignatorHighLightning", 1).getInt();
}
catch (Exception e) {
OSLogHelper.error("Unable to load Config");
e.printStackTrace();
}
finally {
if (config.hasChanged()) config.save();
}
}
}

29
src/main/java/fr/jackcartersmith/orbsat/common/lib/OSRefs.java Normal file
View File

@ -0,0 +1,29 @@
package fr.jackcartersmith.orbsat.common.lib;
public class OSRefs {
public static final String MODID = "orbsat";
public static final String MODNAME = "Orbital Satellite";
public static final String VERSION = "0.1";
public static final String MCVERSION = "1.7.10";
public static final String CLIENTPROXYLOCATION = "fr.jackcartersmith.orbsat.client.ClientProxy";
public static final String SERVERPROXYLOCATION = "fr.jackcartersmith.orbsat.common.CommonProxy";
//public static final String GUIFACTORY = "fr.jackcartersmith.ob.client.gui.DEGUIFactory";
public static final String RESOURCESPREFIX = MODID.toLowerCase() + ":";
//======================Render IDs========================//
public static int idTeleporterStand = -1;
public static int idPortal = -1;
//======================Data Types========================//
public static final byte BYTE_ID = 0;
public static final byte SHORT_ID = 1;
public static final byte INT_ID = 2;
public static final byte LONG_ID = 3;
public static final byte FLOAT_ID = 4;
public static final byte DOUBLE_ID = 5;
public static final byte BOOLEAN_ID = 6;
public static final byte CHAR_ID = 7;
public static final byte STRING_ID = 8;
public static final byte INT_PAIR_ID = 9;
}

49
src/main/java/fr/jackcartersmith/orbsat/common/utils/OSLogHelper.java Normal file
View File

@ -0,0 +1,49 @@
package fr.jackcartersmith.orbsat.common.utils;
import org.apache.logging.log4j.Level;
import cpw.mods.fml.common.FMLLog;
import fr.jackcartersmith.orbsat.common.lib.OSConstants;
import fr.jackcartersmith.orbsat.common.lib.OSRefs;
public class OSLogHelper {
public static void log(Level logLevel, Object object) {
if (!OSConstants.enableLog) {
return;
}
FMLLog.log(OSRefs.MODNAME, logLevel, String.valueOf(object));
}
public static void all(Object object) {
log(Level.ALL, object);
}
public static void debug(Object object) {
log(Level.DEBUG, object);
}
public static void error(Object object) {
log(Level.ERROR, object);
}
public static void fatal(Object object) {
log(Level.FATAL, object);
}
public static void info(Object object) {
log(Level.INFO, object);
}
public static void off(Object object) {
log(Level.OFF, object);
}
public static void trace(Object object) {
log(Level.TRACE, object);
}
public static void warn(Object object) {
log(Level.WARN, object);
}
}

BIN
src/main/resources/assets/ob/textures/blocks/defenderLaserEvo.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 108 B