From ffcee73017f681ed73eec33bd9e399a38e4f7277 Mon Sep 17 00:00:00 2001 From: JackCarterSmith Date: Sun, 4 Nov 2018 15:27:03 +0100 Subject: [PATCH] Clean Step #2 --- .../com/example/examplemod/ExampleMod.java | 31 -- .../orbsat/OrbitalSatellite.java | 81 ----- .../orbsat/client/ClientProxy.java | 287 ------------------ .../orbsat/client/gui/OSGuiHandler.java | 96 ------ .../client/handler/ClientEventHandler.java | 95 ------ .../client/handler/ParticleHandler.java | 75 ----- .../client/handler/ResourceHandler.java | 80 ----- .../orbsat/client/model/ModelDefender.java | 108 ------- .../client/render/ParticleDistortion.java | 101 ------ .../client/render/block/RenderDefender.java | 44 --- .../render/particle/ParticleLaserBeam.java | 235 -------------- .../render/tile/RenderTileDefender.java | 84 ----- .../orbsat/common/CommonProxy.java | 184 ----------- .../orbsat/common/OSBlocks.java | 115 ------- .../orbsat/common/OSItems.java | 75 ----- .../common/blocks/BlockContainerOS.java | 39 --- .../orbsat/common/blocks/BlockCustomDrop.java | 80 ----- .../orbsat/common/blocks/BlockOS.java | 37 --- .../orbsat/common/blocks/Defender.java | 144 --------- .../common/container/ContainerDataSync.java | 43 --- .../common/handler/FMLEventHandler.java | 22 -- .../common/items/AdvancedExtrapolCircuit.java | 13 - .../common/items/AdvancedTargetDevice.java | 13 - .../common/items/BasicExtrapolCircuit.java | 13 - .../common/items/BasicTargetDevice.java | 13 - .../common/items/InvolvedExtrapolCircuit.java | 13 - .../common/items/InvolvedTargetDevice.java | 13 - .../orbsat/common/items/ItemOS.java | 35 --- .../orbsat/common/items/PhotonCapacitor.java | 13 - .../orbsat/common/items/PhotonCondenser.java | 13 - .../orbsat/common/items/PhotonLense.java | 13 - .../orbsat/common/lib/OSConstants.java | 82 ----- .../orbsat/common/lib/OSRefs.java | 29 -- .../orbsat/common/lib/OSStrings.java | 15 - .../common/network/TileObjectPacket.java | 101 ------ .../common/tileentities/TileDefender.java | 161 ---------- .../common/tileentities/TileObjectSync.java | 40 --- .../orbsat/common/utils/DataUtils.java | 255 ---------------- .../orbsat/common/utils/ItemNBTHelper.java | 117 ------- .../orbsat/common/utils/OSLogHelper.java | 49 --- .../orbsat/common/utils/Utils.java | 210 ------------- .../resources/assets/orbsat/lang/en_US.lang | 23 -- .../textures/blocks/defenderLaserEvo.png | Bin 108 -> 0 bytes .../assets/orbsat/textures/blocks/machine.png | Bin 10430 -> 0 bytes .../orbsat/textures/models/laserBeam.png | Bin 1577 -> 0 bytes 45 files changed, 3290 deletions(-) delete mode 100644 src/main/java/com/example/examplemod/ExampleMod.java delete mode 100644 src/main/java/fr/jackcartersmith/orbsat/OrbitalSatellite.java delete mode 100644 src/main/java/fr/jackcartersmith/orbsat/client/ClientProxy.java delete mode 100644 src/main/java/fr/jackcartersmith/orbsat/client/gui/OSGuiHandler.java delete mode 100644 src/main/java/fr/jackcartersmith/orbsat/client/handler/ClientEventHandler.java delete mode 100644 src/main/java/fr/jackcartersmith/orbsat/client/handler/ParticleHandler.java delete mode 100644 src/main/java/fr/jackcartersmith/orbsat/client/handler/ResourceHandler.java delete mode 100644 src/main/java/fr/jackcartersmith/orbsat/client/model/ModelDefender.java delete mode 100644 src/main/java/fr/jackcartersmith/orbsat/client/render/ParticleDistortion.java delete mode 100644 src/main/java/fr/jackcartersmith/orbsat/client/render/block/RenderDefender.java delete mode 100644 src/main/java/fr/jackcartersmith/orbsat/client/render/particle/ParticleLaserBeam.java delete mode 100644 src/main/java/fr/jackcartersmith/orbsat/client/render/tile/RenderTileDefender.java delete mode 100644 src/main/java/fr/jackcartersmith/orbsat/common/CommonProxy.java delete mode 100644 src/main/java/fr/jackcartersmith/orbsat/common/OSBlocks.java delete mode 100644 src/main/java/fr/jackcartersmith/orbsat/common/OSItems.java delete mode 100644 src/main/java/fr/jackcartersmith/orbsat/common/blocks/BlockContainerOS.java delete mode 100644 src/main/java/fr/jackcartersmith/orbsat/common/blocks/BlockCustomDrop.java delete mode 100644 src/main/java/fr/jackcartersmith/orbsat/common/blocks/BlockOS.java delete mode 100644 src/main/java/fr/jackcartersmith/orbsat/common/blocks/Defender.java delete mode 100644 src/main/java/fr/jackcartersmith/orbsat/common/container/ContainerDataSync.java delete mode 100644 src/main/java/fr/jackcartersmith/orbsat/common/handler/FMLEventHandler.java delete mode 100644 src/main/java/fr/jackcartersmith/orbsat/common/items/AdvancedExtrapolCircuit.java delete mode 100644 src/main/java/fr/jackcartersmith/orbsat/common/items/AdvancedTargetDevice.java delete mode 100644 src/main/java/fr/jackcartersmith/orbsat/common/items/BasicExtrapolCircuit.java delete mode 100644 src/main/java/fr/jackcartersmith/orbsat/common/items/BasicTargetDevice.java delete mode 100644 src/main/java/fr/jackcartersmith/orbsat/common/items/InvolvedExtrapolCircuit.java delete mode 100644 src/main/java/fr/jackcartersmith/orbsat/common/items/InvolvedTargetDevice.java delete mode 100644 src/main/java/fr/jackcartersmith/orbsat/common/items/ItemOS.java delete mode 100644 src/main/java/fr/jackcartersmith/orbsat/common/items/PhotonCapacitor.java delete mode 100644 src/main/java/fr/jackcartersmith/orbsat/common/items/PhotonCondenser.java delete mode 100644 src/main/java/fr/jackcartersmith/orbsat/common/items/PhotonLense.java delete mode 100644 src/main/java/fr/jackcartersmith/orbsat/common/lib/OSConstants.java delete mode 100644 src/main/java/fr/jackcartersmith/orbsat/common/lib/OSRefs.java delete mode 100644 src/main/java/fr/jackcartersmith/orbsat/common/lib/OSStrings.java delete mode 100644 src/main/java/fr/jackcartersmith/orbsat/common/network/TileObjectPacket.java delete mode 100644 src/main/java/fr/jackcartersmith/orbsat/common/tileentities/TileDefender.java delete mode 100644 src/main/java/fr/jackcartersmith/orbsat/common/tileentities/TileObjectSync.java delete mode 100644 src/main/java/fr/jackcartersmith/orbsat/common/utils/DataUtils.java delete mode 100644 src/main/java/fr/jackcartersmith/orbsat/common/utils/ItemNBTHelper.java delete mode 100644 src/main/java/fr/jackcartersmith/orbsat/common/utils/OSLogHelper.java delete mode 100644 src/main/java/fr/jackcartersmith/orbsat/common/utils/Utils.java delete mode 100644 src/main/resources/assets/orbsat/lang/en_US.lang delete mode 100644 src/main/resources/assets/orbsat/textures/blocks/defenderLaserEvo.png delete mode 100644 src/main/resources/assets/orbsat/textures/blocks/machine.png delete mode 100644 src/main/resources/assets/orbsat/textures/models/laserBeam.png diff --git a/src/main/java/com/example/examplemod/ExampleMod.java b/src/main/java/com/example/examplemod/ExampleMod.java deleted file mode 100644 index 42a155b..0000000 --- a/src/main/java/com/example/examplemod/ExampleMod.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.example.examplemod; - -import net.minecraft.init.Blocks; -import net.minecraftforge.fml.common.Mod; -import net.minecraftforge.fml.common.Mod.EventHandler; -import net.minecraftforge.fml.common.event.FMLInitializationEvent; -import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; -import org.apache.logging.log4j.Logger; - -@Mod(modid = ExampleMod.MODID, name = ExampleMod.NAME, version = ExampleMod.VERSION) -public class ExampleMod -{ - public static final String MODID = "examplemod"; - public static final String NAME = "Example Mod"; - public static final String VERSION = "1.0"; - - private static Logger logger; - - @EventHandler - public void preInit(FMLPreInitializationEvent event) - { - logger = event.getModLog(); - } - - @EventHandler - public void init(FMLInitializationEvent event) - { - // some example code - logger.info("DIRT BLOCK >> {}", Blocks.DIRT.getRegistryName()); - } -} diff --git a/src/main/java/fr/jackcartersmith/orbsat/OrbitalSatellite.java b/src/main/java/fr/jackcartersmith/orbsat/OrbitalSatellite.java deleted file mode 100644 index 4654a23..0000000 --- a/src/main/java/fr/jackcartersmith/orbsat/OrbitalSatellite.java +++ /dev/null @@ -1,81 +0,0 @@ -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 OSCreaTab = 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); - } -} diff --git a/src/main/java/fr/jackcartersmith/orbsat/client/ClientProxy.java b/src/main/java/fr/jackcartersmith/orbsat/client/ClientProxy.java deleted file mode 100644 index a11a8b1..0000000 --- a/src/main/java/fr/jackcartersmith/orbsat/client/ClientProxy.java +++ /dev/null @@ -1,287 +0,0 @@ -package fr.jackcartersmith.orbsat.client; - -import cpw.mods.fml.client.FMLClientHandler; -import cpw.mods.fml.client.registry.ClientRegistry; -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 fr.jackcartersmith.orbsat.OrbitalSatellite; -import fr.jackcartersmith.orbsat.client.handler.ClientEventHandler; -import fr.jackcartersmith.orbsat.client.handler.ParticleHandler; -import fr.jackcartersmith.orbsat.client.handler.ResourceHandler; -import fr.jackcartersmith.orbsat.client.render.block.RenderDefender; -import fr.jackcartersmith.orbsat.client.render.particle.ParticleLaserBeam; -import fr.jackcartersmith.orbsat.client.render.tile.RenderTileDefender; -import fr.jackcartersmith.orbsat.common.CommonProxy; -import fr.jackcartersmith.orbsat.common.OSBlocks; -import fr.jackcartersmith.orbsat.common.tileentities.TileDefender; -import net.minecraft.client.Minecraft; -import net.minecraft.client.audio.ISound; -import net.minecraft.client.particle.EntityFX; -import net.minecraft.item.Item; -import net.minecraft.world.World; -import net.minecraftforge.client.MinecraftForgeClient; -import net.minecraftforge.common.MinecraftForge; - -public class ClientProxy extends CommonProxy { - private final static boolean debug = OrbitalSatellite.debug; - - @Override - public void preInit(FMLPreInitializationEvent event) { - if (debug) System.out.println("on Client side"); - super.preInit(event); - - ResourceHandler.init(event); - } - - @Override - public void init(FMLInitializationEvent event) { - super.init(event); - //FMLCommonHandler.instance().bus().register(new KeyInputHandler()); - FMLCommonHandler.instance().bus().register(new ClientEventHandler()); - //if (ConfigHandler.enableVersionChecker) FMLCommonHandler.instance().bus().register(new UpdateChecker()); - //MinecraftForge.EVENT_BUS.register(new HudHandler()); - MinecraftForge.EVENT_BUS.register(new ClientEventHandler()); - //KeyBindings.init(); - registerRenderIDs(); - registerRendering(); - } - - @Override - public void postInit(FMLPostInitializationEvent event) { - super.postInit(event); - } - - public void registerRendering() { - //Item Renderers - MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(OSBlocks.defender), new RenderDefender()); - - //TileEntitySpecialRenderers - ClientRegistry.bindTileEntitySpecialRenderer(TileDefender.class, new RenderTileDefender()); - - /* - //Item Renderers - MinecraftForgeClient.registerItemRenderer(ModItems.wyvernBow, new RenderBow()); - MinecraftForgeClient.registerItemRenderer(ModItems.draconicBow, new RenderBow()); - MinecraftForgeClient.registerItemRenderer(ModItems.mobSoul, new RenderMobSoul()); - MinecraftForgeClient.registerItemRenderer(ModItems.chaosShard, new RenderChaosShard()); - MinecraftForgeClient.registerItemRenderer(ModItems.reactorStabilizerParts, new RenderStabilizerPart()); - MinecraftForgeClient.registerItemRenderer(ModItems.chaosFragment, new RenderChaosFragment()); - - if (!ConfigHandler.useOldArmorModel) { - MinecraftForgeClient.registerItemRenderer(ModItems.wyvernHelm, new RenderArmor(ModItems.wyvernHelm)); - MinecraftForgeClient.registerItemRenderer(ModItems.wyvernChest, new RenderArmor(ModItems.wyvernChest)); - MinecraftForgeClient.registerItemRenderer(ModItems.wyvernLeggs, new RenderArmor(ModItems.wyvernLeggs)); - MinecraftForgeClient.registerItemRenderer(ModItems.wyvernBoots, new RenderArmor(ModItems.wyvernBoots)); - MinecraftForgeClient.registerItemRenderer(ModItems.draconicHelm, new RenderArmor(ModItems.draconicHelm)); - MinecraftForgeClient.registerItemRenderer(ModItems.draconicChest, new RenderArmor(ModItems.draconicChest)); - MinecraftForgeClient.registerItemRenderer(ModItems.draconicLeggs, new RenderArmor(ModItems.draconicLeggs)); - MinecraftForgeClient.registerItemRenderer(ModItems.draconicBoots, new RenderArmor(ModItems.draconicBoots)); - } - - if (!ConfigHandler.useOldD2DToolTextures) { - MinecraftForgeClient.registerItemRenderer(ModItems.draconicSword, new RenderTool("models/tools/DraconicSword.obj", "textures/models/tools/DraconicSword.png", (IRenderTweak) ModItems.draconicSword)); - MinecraftForgeClient.registerItemRenderer(ModItems.wyvernPickaxe, new RenderTool("models/tools/Pickaxe.obj", "textures/models/tools/Pickaxe.png", (IRenderTweak) ModItems.wyvernPickaxe)); - MinecraftForgeClient.registerItemRenderer(ModItems.draconicPickaxe, new RenderTool("models/tools/DraconicPickaxe.obj", "textures/models/tools/DraconicPickaxe.png", (IRenderTweak) ModItems.draconicPickaxe)); - MinecraftForgeClient.registerItemRenderer(ModItems.draconicAxe, new RenderTool("models/tools/DraconicLumberAxe.obj", "textures/models/tools/DraconicLumberAxe.png", (IRenderTweak) ModItems.draconicAxe)); - MinecraftForgeClient.registerItemRenderer(ModItems.wyvernShovel, new RenderTool("models/tools/Shovel.obj", "textures/models/tools/Shovel.png", (IRenderTweak) ModItems.wyvernShovel)); - MinecraftForgeClient.registerItemRenderer(ModItems.draconicShovel, new RenderTool("models/tools/DraconicShovel.obj", "textures/models/tools/DraconicShovel.png", (IRenderTweak) ModItems.draconicShovel)); - MinecraftForgeClient.registerItemRenderer(ModItems.wyvernSword, new RenderTool("models/tools/Sword.obj", "textures/models/tools/Sword.png", (IRenderTweak) ModItems.wyvernSword)); - MinecraftForgeClient.registerItemRenderer(ModItems.draconicDestructionStaff, new RenderTool("models/tools/DraconicStaffOfPower.obj", "textures/models/tools/DraconicStaffOfPower.png", (IRenderTweak) ModItems.draconicDestructionStaff)); - MinecraftForgeClient.registerItemRenderer(ModItems.draconicHoe, new RenderTool("models/tools/DraconicHoe.obj", "textures/models/tools/DraconicHoe.png", (IRenderTweak) ModItems.draconicHoe)); - MinecraftForgeClient.registerItemRenderer(ModItems.draconicBow, new RenderBowModel(true)); - MinecraftForgeClient.registerItemRenderer(ModItems.wyvernBow, new RenderBowModel(false)); - } - - MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(ModBlocks.draconiumChest), new RenderDraconiumChest()); - MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(ModBlocks.particleGenerator), new RenderParticleGen()); - MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(ModBlocks.energyInfuser), new RenderEnergyInfuser()); - MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(ModBlocks.energyCrystal), new RenderCrystal()); - MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(ModBlocks.reactorStabilizer), new RenderReactorStabilizer()); - MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(ModBlocks.reactorEnergyInjector), new RenderReactorEnergyInjector()); - MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(ModBlocks.reactorCore), new RenderReactorCore()); - MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(ModBlocks.chaosCrystal), new RenderChaosShard()); - MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(ModBlocks.upgradeModifier), new RenderUpgradeModifier()); - - //ISimpleBlockRendering - RenderingRegistry.registerBlockHandler(new RenderTeleporterStand()); - RenderingRegistry.registerBlockHandler(new RenderPortal()); - - //TileEntitySpecialRenderers - ClientRegistry.bindTileEntitySpecialRenderer(TileParticleGenerator.class, new RenderTileParticleGen()); - ClientRegistry.bindTileEntitySpecialRenderer(TileEnergyInfuser.class, new RenderTileEnergyInfiser()); - ClientRegistry.bindTileEntitySpecialRenderer(TileCustomSpawner.class, new RenderTileCustomSpawner()); - //ClientRegistry.bindTileEntitySpecialRenderer(TileTestBlock.class, new RenderTileCrystal()); - ClientRegistry.bindTileEntitySpecialRenderer(TileEnergyStorageCore.class, new RenderTileEnergyStorageCore()); - ClientRegistry.bindTileEntitySpecialRenderer(TileEnergyPylon.class, new RenderTileEnergyPylon()); - ClientRegistry.bindTileEntitySpecialRenderer(TilePlacedItem.class, new RenderTilePlacedItem()); - ClientRegistry.bindTileEntitySpecialRenderer(TileDissEnchanter.class, new RenderTileDissEnchanter()); - ClientRegistry.bindTileEntitySpecialRenderer(TileTeleporterStand.class, new RenderTileTeleporterStand()); - ClientRegistry.bindTileEntitySpecialRenderer(TileDraconiumChest.class, new RenderTileDraconiumChest()); - ClientRegistry.bindTileEntitySpecialRenderer(TileEnergyRelay.class, new RenderTileCrystal()); - ClientRegistry.bindTileEntitySpecialRenderer(TileEnergyTransceiver.class, new RenderTileCrystal()); - ClientRegistry.bindTileEntitySpecialRenderer(TileWirelessEnergyTransceiver.class, new RenderTileCrystal()); - ClientRegistry.bindTileEntitySpecialRenderer(TileReactorCore.class, new RenderTileReactorCore()); - ClientRegistry.bindTileEntitySpecialRenderer(TileReactorStabilizer.class, new RenderTileReactorStabilizer()); - ClientRegistry.bindTileEntitySpecialRenderer(TileReactorEnergyInjector.class, new RenderTileReactorEnergyInjector()); - ClientRegistry.bindTileEntitySpecialRenderer(TileChaosShard.class, new RenderTileChaosShard()); - ClientRegistry.bindTileEntitySpecialRenderer(TileUpgradeModifier.class, new RenderTileUpgradeModifier()); - - //Entitys - RenderingRegistry.registerEntityRenderingHandler(EntityCustomDragon.class, new RenderDragon()); - RenderingRegistry.registerEntityRenderingHandler(EntityChaosGuardian.class, new RenderDragon()); - RenderingRegistry.registerEntityRenderingHandler(EntityDragonHeart.class, new RenderDragonHeart()); - RenderingRegistry.registerEntityRenderingHandler(EntityDragonProjectile.class, new RenderDragonProjectile()); - RenderingRegistry.registerEntityRenderingHandler(EntityChaosCrystal.class, new RenderChaosCrystal()); - RenderingRegistry.registerEntityRenderingHandler(EntityChaosVortex.class, new RenderEntityChaosVortex()); - RenderingRegistry.registerEntityRenderingHandler(EntityCustomArrow.class, new RenderEntityCustomArrow()); - */ - } - - public void registerRenderIDs() { - //References.idTeleporterStand = RenderingRegistry.getNextAvailableRenderId(); - //References.idPortal = RenderingRegistry.getNextAvailableRenderId(); - } - - /* - * ------------- Code inspiration pour le faisceau d'energie du satellite - * - @Override - public ParticleEnergyBeam energyBeam(World worldObj, double x, double y, double z, double tx, double ty, double tz, int powerFlow, boolean advanced, ParticleEnergyBeam oldBeam, boolean render, int beamType) { - if (!worldObj.isRemote) return null; - ParticleEnergyBeam beam = oldBeam; - boolean inRange = ParticleHandler.isInRange(x, y, z, 50) || ParticleHandler.isInRange(tx, ty, tz, 50); - - if (beam == null || beam.isDead) { - if (inRange) { - beam = new ParticleEnergyBeam(worldObj, x, y, z, tx, ty, tz, 8, powerFlow, advanced, beamType); - - FMLClientHandler.instance().getClient().effectRenderer.addEffect(beam); - } - } else if (!inRange) { - beam.setDead(); - return null; - } else { - beam.update(powerFlow, render); - } - return beam; - } - - @Override - public ParticleEnergyField energyField(World worldObj, double x, double y, double z, int type, boolean advanced, ParticleEnergyField oldBeam, boolean render) { - if (!worldObj.isRemote) return null; - ParticleEnergyField beam = oldBeam; - boolean inRange = ParticleHandler.isInRange(x, y, z, 50); - - if (beam == null || beam.isDead) { - if (inRange) { - beam = new ParticleEnergyField(worldObj, x, y, z, 8, type, advanced); - - FMLClientHandler.instance().getClient().effectRenderer.addEffect(beam); - } - } else if (!inRange) { - beam.setDead(); - return null; - } else { - beam.update(render); - } - return beam; - } - - @Override - public ParticleReactorBeam reactorBeam(TileEntity tile, ParticleReactorBeam oldBeam, boolean render) { - if (!tile.getWorldObj().isRemote || !(tile instanceof IReactorPart)) return null; - ParticleReactorBeam beam = oldBeam; - boolean inRange = ParticleHandler.isInRange(tile.xCoord, tile.yCoord, tile.zCoord, 50); - - if (beam == null || beam.isDead) { - if (inRange) { - beam = new ParticleReactorBeam(tile); - - FMLClientHandler.instance().getClient().effectRenderer.addEffect(beam); - } - } else if (!inRange) { - beam.setDead(); - return null; - } else { - beam.update(render); - } - return beam; - } - */ - - @Override - //public ParticleLaserBeam energyBeam(World worldObj, double x, double y, double z, double tx, double ty, double tz, int powerFlow, boolean advanced, ParticleLaserBeam oldBeam, boolean render, int beamType) { - public ParticleLaserBeam energyBeam(World worldObj, double x, double y, double z, double tx, double ty, double tz, int powerFlow, int pulseLenght, ParticleLaserBeam oldBeam, boolean render, int beamType) { - if (!worldObj.isRemote) return null; - ParticleLaserBeam beam = oldBeam; - boolean inRange = ParticleHandler.isInRange(x, y, z, 50) || ParticleHandler.isInRange(tx, ty, tz, 50); - - if (beam == null || beam.isDead) { - if (inRange) { - beam = new ParticleLaserBeam(worldObj, x, y, z, tx, ty, tz, pulseLenght, powerFlow, beamType); - - FMLClientHandler.instance().getClient().effectRenderer.addEffect(beam); - } - } else if (!inRange) { - beam.setDead(); - return null; - } else { - beam.update(powerFlow, render); - } - return beam; - } - - public boolean isOp(String paramString) { - return Minecraft.getMinecraft().theWorld.getWorldInfo().getGameType().isCreative(); - } - - @Override - public void spawnParticle(Object particle, int range) { - if (particle instanceof EntityFX && ((EntityFX) particle).worldObj.isRemote) - ParticleHandler.spawnCustomParticle((EntityFX) particle, range); - } - - @Override - public ISound playISound(ISound sound) { - FMLClientHandler.instance().getClient().getSoundHandler().playSound(sound); - return sound; - } - - - - - - - - - /* - @Override - public void registerRender() - { - tesrRenderId = RenderingRegistry.getNextAvailableRenderId(); - RenderingRegistry.registerBlockHandler(new TESRInventoryRenderer()); - ClientRegistry.bindTileEntitySpecialRenderer(DefenderTileEntity.class, new TileEntityDefenderRenderer()); - ClientRegistry.bindTileEntitySpecialRenderer(PhotonAcceleratorTileEntity.class, new TileEntityPhotonAcceleratorRenderer()); - ClientRegistry.bindTileEntitySpecialRenderer(PhotonDeceleratorTileEntity.class, new TileEntityPhotonDeceleratorRenderer()); - ClientRegistry.bindTileEntitySpecialRenderer(InverterAdvTileEntity.class, new TileEntityInverterAdvRenderer()); - ClientRegistry.bindTileEntitySpecialRenderer(ExtenderTileEntity.class, new TileEntityExtenderRenderer()); - ClientRegistry.bindTileEntitySpecialRenderer(OverriderBlockTileEntity.class, new TileEntityOverriderRenderer()); - ClientRegistry.bindTileEntitySpecialRenderer(SateliteTileEntity.class, new SateliteRenderer()); - ClientRegistry.bindTileEntitySpecialRenderer(DefenderLaserTileEntity.class, new DefenderLaserRenderer()); - ClientRegistry.bindTileEntitySpecialRenderer(LaserLowTileEntity.class, new LaserLowRenderer()); - } - - @Override - public EntityPlayer getPlayerEntity(MessageContext ctx) { - // Note that if you simply return 'Minecraft.getMinecraft().thePlayer', - // your packets will not work as expected because you will be getting a - // client player even when you are on the server! - // Sounds absurd, but it's true. - - // Solution is to double-check side before returning the player: - return (ctx.side.isClient() ? Minecraft.getMinecraft().thePlayer : super.getPlayerEntity(ctx)); - } - */ -} diff --git a/src/main/java/fr/jackcartersmith/orbsat/client/gui/OSGuiHandler.java b/src/main/java/fr/jackcartersmith/orbsat/client/gui/OSGuiHandler.java deleted file mode 100644 index f100259..0000000 --- a/src/main/java/fr/jackcartersmith/orbsat/client/gui/OSGuiHandler.java +++ /dev/null @@ -1,96 +0,0 @@ -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; - } - -} diff --git a/src/main/java/fr/jackcartersmith/orbsat/client/handler/ClientEventHandler.java b/src/main/java/fr/jackcartersmith/orbsat/client/handler/ClientEventHandler.java deleted file mode 100644 index 7ce019d..0000000 --- a/src/main/java/fr/jackcartersmith/orbsat/client/handler/ClientEventHandler.java +++ /dev/null @@ -1,95 +0,0 @@ -package fr.jackcartersmith.orbsat.client.handler; - -import net.minecraft.client.Minecraft; - -public class ClientEventHandler { - //public static Map> playerShieldStatus = new HashMap>(); - - public static int elapsedTicks; - public static float previousSensitivity = 0; - public static boolean bowZoom = false; - public static boolean lastTickBowZoom = false; - public static int tickSet = 0; - public static float energyCrystalAlphaValue = 0f; - public static float energyCrystalAlphaTarget = 0f; - public static boolean playerHoldingWrench = false; - public static Minecraft mc; - //private static Random rand = new Random(); - //private static IModelCustom shieldSphere; - - public ClientEventHandler() { - //shieldSphere = AdvancedModelLoader.loadModel(ResourceHandler.getResource("models/shieldSphere.obj")); - } - - /* - @SubscribeEvent - public void tickEnd(TickEvent.ClientTickEvent event) { - if (event.phase != TickEvent.Phase.START || event.type != TickEvent.Type.CLIENT || event.side != Side.CLIENT) - return; - - for (Iterator>> i = playerShieldStatus.entrySet().iterator(); i.hasNext(); ) { - Map.Entry> entry = i.next(); - if (elapsedTicks - entry.getValue().getValue() > 5) i.remove(); - } - - - if (mc == null) mc = Minecraft.getMinecraft(); - else if (mc.theWorld != null) { - elapsedTicks++; - HudHandler.clientTick(); - - if (bowZoom && !lastTickBowZoom) { - previousSensitivity = Minecraft.getMinecraft().gameSettings.mouseSensitivity; - Minecraft.getMinecraft().gameSettings.mouseSensitivity = previousSensitivity / 3; - } else if (!bowZoom && lastTickBowZoom) { - Minecraft.getMinecraft().gameSettings.mouseSensitivity = previousSensitivity; - } - - lastTickBowZoom = bowZoom; - if (elapsedTicks - tickSet > 10) bowZoom = false; - - if (energyCrystalAlphaValue < energyCrystalAlphaTarget) energyCrystalAlphaValue += 0.01f; - if (energyCrystalAlphaValue > energyCrystalAlphaTarget) energyCrystalAlphaValue -= 0.01f; - - if (Math.abs(energyCrystalAlphaTarget - energyCrystalAlphaValue) <= 0.02f) - energyCrystalAlphaTarget = rand.nextFloat(); - - playerHoldingWrench = mc.thePlayer.getHeldItem() != null && mc.thePlayer.getHeldItem().getItem() == ModItems.wrench; - - searchForPlayerMount(); - } - } - - @SubscribeEvent(priority = EventPriority.LOW) - public void fovUpdate(FOVUpdateEvent event) { - - //region Bow FOV Update - if (event.entity.getHeldItem() != null && (event.entity.getHeldItem().getItem() instanceof WyvernBow || event.entity.getHeldItem().getItem() instanceof DraconicBow) && Minecraft.getMinecraft().gameSettings.keyBindUseItem.getIsKeyPressed()) { - - BowHandler.BowProperties properties = new BowHandler.BowProperties(event.entity.getHeldItem(), event.entity); - - event.newfov = ((6 - properties.zoomModifier) / 6) * event.fov; - -// if (ItemNBTHelper.getString(event.entity.getItemInUse(), "mode", "").equals("sharpshooter")){ -// if (event.entity.getItemInUse().getItem() instanceof WyvernBow) zMax = 1.35f; -// else if (event.entity.getItemInUse().getItem() instanceof DraconicBow) zMax = 2.5f; -// bowZoom = true; -// tickSet = elapsedTicks; -// } - - } - //endregion - - //region Armor move speed FOV effect cancellation - CustomArmorHandler.ArmorSummery summery = new CustomArmorHandler.ArmorSummery().getSummery(event.entity); - - if (summery != null && summery.speedModifier > 0) { - IAttributeInstance iattributeinstance = event.entity.getEntityAttribute(SharedMonsterAttributes.movementSpeed); - float f = (float) ((iattributeinstance.getAttributeValue() / (double) event.entity.capabilities.getWalkSpeed() + 1.0D) / 2.0D); - event.newfov /= f; - } - - //endregion - } - */ -} diff --git a/src/main/java/fr/jackcartersmith/orbsat/client/handler/ParticleHandler.java b/src/main/java/fr/jackcartersmith/orbsat/client/handler/ParticleHandler.java deleted file mode 100644 index 8e2c22b..0000000 --- a/src/main/java/fr/jackcartersmith/orbsat/client/handler/ParticleHandler.java +++ /dev/null @@ -1,75 +0,0 @@ -package fr.jackcartersmith.orbsat.client.handler; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import fr.jackcartersmith.orbsat.client.render.ParticleDistortion; -import net.minecraft.client.Minecraft; -import net.minecraft.client.particle.EntityFX; -import net.minecraft.world.World; - -@SideOnly(Side.CLIENT) -public class ParticleHandler { - private static Minecraft mc = Minecraft.getMinecraft(); - private static World theWorld = mc.theWorld; - - public static EntityFX spawnParticle(String particleName, double x, double y, double z, double motionX, double motionY, double motionZ, float scale) { - if (mc != null && mc.renderViewEntity != null && mc.effectRenderer != null) { - int var14 = mc.gameSettings.particleSetting; - if (var14 == 1 && theWorld.rand.nextInt(3) == 0) { - var14 = 2; - } - double var15 = mc.renderViewEntity.posX - x; - double var17 = mc.renderViewEntity.posY - y; - double var19 = mc.renderViewEntity.posZ - z; - EntityFX var21 = null; - double var22 = 16.0D; - if (var15 * var15 + var17 * var17 + var19 * var19 > var22 * var22) { - return null; - } else if (var14 > 1) { - return null; - } else { - if (particleName.equals("distortionParticle")) { - var21 = new ParticleDistortion(theWorld, x, y, z, (float) motionX, (float) motionY, (float) motionZ, scale); - } - - mc.effectRenderer.addEffect(var21); - return var21; - } - } - return null; - } - - public static EntityFX spawnCustomParticle(EntityFX particle) { - return spawnCustomParticle(particle, 64); - } - - public static EntityFX spawnCustomParticle(EntityFX particle, double vewRange) { - if (mc != null && mc.renderViewEntity != null && mc.effectRenderer != null) { - int var14 = mc.gameSettings.particleSetting; - if (var14 == 1 && theWorld.rand.nextInt(3) == 0) { - var14 = 2; - } - if (!isInRange(particle.posX, particle.posY, particle.posZ, vewRange)) { - return null; - } else if (var14 > 1) { - return null; - } else { - mc.effectRenderer.addEffect(particle); - return particle; - } - } - return null; - } - - public static boolean isInRange(double x, double y, double z, double vewRange) { - if (mc == null || mc.renderViewEntity == null || mc.effectRenderer == null) return false; - - double var15 = mc.renderViewEntity.posX - x; - double var17 = mc.renderViewEntity.posY - y; - double var19 = mc.renderViewEntity.posZ - z; - if (var15 * var15 + var17 * var17 + var19 * var19 > vewRange * vewRange) { - return false; - } - return true; - } -} diff --git a/src/main/java/fr/jackcartersmith/orbsat/client/handler/ResourceHandler.java b/src/main/java/fr/jackcartersmith/orbsat/client/handler/ResourceHandler.java deleted file mode 100644 index b665667..0000000 --- a/src/main/java/fr/jackcartersmith/orbsat/client/handler/ResourceHandler.java +++ /dev/null @@ -1,80 +0,0 @@ -package fr.jackcartersmith.orbsat.client.handler; - -import java.io.File; -import java.util.HashMap; -import java.util.Map; - -import cpw.mods.fml.common.FMLCommonHandler; -import cpw.mods.fml.common.event.FMLPreInitializationEvent; -import cpw.mods.fml.relauncher.ReflectionHelper; -import fr.jackcartersmith.orbsat.common.lib.OSRefs; -import net.minecraft.client.Minecraft; -import net.minecraft.client.particle.EffectRenderer; -import net.minecraft.util.ResourceLocation; - -public class ResourceHandler { - public static ResourceHandler instance = new ResourceHandler(); - private static ResourceLocation defaultParticles; - private static ResourceLocation particles = new ResourceLocation(OSRefs.RESOURCESPREFIX + "textures/particle/particles.png"); - private static Map cachedResources = new HashMap(); - - private static String savePath; - private static File saveFolder; - - - //-------------------- File Handling -----------------------// - - public static void init(FMLPreInitializationEvent event) { - FMLCommonHandler.instance().bus().register(instance); - - } - - public static File getConfigFolder() { - if (saveFolder == null) { - saveFolder = new File(savePath); - } - if (!saveFolder.exists()) saveFolder.mkdir(); - - return saveFolder; - } - - //----------------------------------------------------------// - - - public static void bindTexture(ResourceLocation texture) { - Minecraft.getMinecraft().renderEngine.bindTexture(texture); - } - - /** - * Binds the vanilla particle sheet - */ - public static void bindDefaultParticles() { - if (defaultParticles == null) { - try { - defaultParticles = (ResourceLocation) ReflectionHelper.getPrivateValue(EffectRenderer.class, null, "particleTextures", "field_110737_b"); - } - catch (Exception e) { - } - } - if (defaultParticles != null) bindTexture(defaultParticles); - } - - public static void bindParticles() { - bindTexture(particles); - } - - public static ResourceLocation getResource(String rs) { - if (!cachedResources.containsKey(rs)) - cachedResources.put(rs, new ResourceLocation(OSRefs.RESOURCESPREFIX + rs)); - return cachedResources.get(rs); - } - - public static ResourceLocation getResourceWOP(String rs) { - if (!cachedResources.containsKey(rs)) cachedResources.put(rs, new ResourceLocation(rs)); - return cachedResources.get(rs); - } - - public static void bindResource(String rs) { - bindTexture(ResourceHandler.getResource(rs)); - } -} diff --git a/src/main/java/fr/jackcartersmith/orbsat/client/model/ModelDefender.java b/src/main/java/fr/jackcartersmith/orbsat/client/model/ModelDefender.java deleted file mode 100644 index a92427f..0000000 --- a/src/main/java/fr/jackcartersmith/orbsat/client/model/ModelDefender.java +++ /dev/null @@ -1,108 +0,0 @@ -package fr.jackcartersmith.orbsat.client.model; - -import org.lwjgl.opengl.GL11; - -import net.minecraft.client.model.ModelBase; -import net.minecraft.client.model.ModelRenderer; -import net.minecraft.client.renderer.OpenGlHelper; - -public class ModelDefender extends ModelBase { - public ModelRenderer Shape1; - public ModelRenderer Shape2; - public ModelRenderer Shape3; - public ModelRenderer Shape4; - public ModelRenderer Shape5; - public ModelRenderer Shape6; - public ModelRenderer Shape7; - public ModelRenderer Shape8; - - public ModelDefender() - { - this.textureWidth = 128; - this.textureHeight = 128; - this.Shape1 = new ModelRenderer(this, 0, 0); - this.Shape1.addBox(-8.0F, 0.0F, -8.0F, 16, 1, 16); - this.Shape1.setRotationPoint(0.0F, 23.0F, 0.0F); - this.Shape1.setTextureSize(128, 128); - this.Shape1.mirror = true; - this.setRotateAngle(this.Shape1, 0.0F, 0.0F, 0.0F); - this.Shape2 = new ModelRenderer(this, 64, 0); - this.Shape2.addBox(0.0F, 0.0F, -4.0F, 1, 7, 8); - this.Shape2.setRotationPoint(0.0F, 16.0F, -7.0F); - this.Shape2.setTextureSize(128, 128); - this.Shape2.mirror = true; - this.setRotateAngle(this.Shape2, 0.0F, ((float)Math.PI / 2F), 0.0F); - this.Shape3 = new ModelRenderer(this, 64, 0); - this.Shape3.addBox(0.0F, 0.0F, -4.0F, 1, 7, 8); - this.Shape3.setRotationPoint(-7.0F, 16.0F, 0.0F); - this.Shape3.setTextureSize(128, 128); - this.Shape3.mirror = true; - this.setRotateAngle(this.Shape3, 0.0F, (float)Math.PI, 0.0F); - this.Shape4 = new ModelRenderer(this, 64, 0); - this.Shape4.addBox(0.0F, 0.0F, -4.0F, 1, 7, 8); - this.Shape4.setRotationPoint(0.0F, 16.0F, 7.0F); - this.Shape4.setTextureSize(128, 128); - this.Shape4.mirror = true; - this.setRotateAngle(this.Shape4, 0.0F, -((float)Math.PI / 2F), 0.0F); - this.Shape5 = new ModelRenderer(this, 64, 0); - this.Shape5.addBox(0.0F, 0.0F, -4.0F, 1, 7, 8); - this.Shape5.setRotationPoint(7.0F, 16.0F, 0.0F); - this.Shape5.setTextureSize(128, 128); - this.Shape5.mirror = true; - this.setRotateAngle(this.Shape5, 0.0F, 0.0F, 0.0F); - this.Shape6 = new ModelRenderer(this, 0, 21); - this.Shape6.addBox(-1.0F, 0.0F, -1.0F, 2, 22, 2); - this.Shape6.setRotationPoint(0.0F, 0.0F, 0.0F); - this.Shape6.setTextureSize(128, 128); - this.Shape6.mirror = true; - this.setRotateAngle(this.Shape6, 0.0F, 0.0F, 0.0F); - this.Shape7 = new ModelRenderer(this, 85, 0); - this.Shape7.addBox(-3.0F, -3.0F, -3.0F, 6, 6, 6); - this.Shape7.setRotationPoint(0.0F, -4.0F, 0.0F); - this.Shape7.setTextureSize(128, 128); - this.Shape7.mirror = true; - //this.setRotateAngle(this.Shape7, ((float)Math.sin(0)), (float)Math.sin(Math.PI/2), (float)Math.sin(3*Math.PI/2)); - this.Shape8 = new ModelRenderer(this, 10, 26); - this.Shape8.addBox(-3.0F, 0.0F, -3.0F, 6, 2, 6); - this.Shape8.setRotationPoint(0.0F, 20.0F, 0.0F); - this.Shape8.setTextureSize(128, 128); - this.Shape8.mirror = true; - this.setRotateAngle(this.Shape8, 0.0F, 0.0F, 0.0F); - } - - public void render() { - this.Shape1.render(0.0625F); - this.Shape2.render(0.0625F); - this.Shape3.render(0.0625F); - this.Shape4.render(0.0625F); - this.Shape5.render(0.0625F); - this.Shape6.render(0.0625F); - this.Shape8.render(0.0625F); - } - - public void renderCrystal(float brightness) { - float lastBrightnessX = OpenGlHelper.lastBrightnessX; - float lastBrightnessY = OpenGlHelper.lastBrightnessY; - - float b = brightness * 200F; - float colour = Math.min(2F, (brightness * 2F) + 0.5F); - if (brightness > 0F) GL11.glDisable(GL11.GL_LIGHTING); - GL11.glEnable(GL11.GL_BLEND); - GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); - OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, Math.min(200F, lastBrightnessX + b), Math.min(200F, lastBrightnessY + b)); - GL11.glColor4f(colour*10F, colour*0F, colour*20F, 0.9F); - this.Shape7.render(0.0625F); - GL11.glDisable(GL11.GL_BLEND); - OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, lastBrightnessX, lastBrightnessY); - if (brightness > 0F) GL11.glEnable(GL11.GL_LIGHTING); - } - - /** - * 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; - } -} diff --git a/src/main/java/fr/jackcartersmith/orbsat/client/render/ParticleDistortion.java b/src/main/java/fr/jackcartersmith/orbsat/client/render/ParticleDistortion.java deleted file mode 100644 index b847302..0000000 --- a/src/main/java/fr/jackcartersmith/orbsat/client/render/ParticleDistortion.java +++ /dev/null @@ -1,101 +0,0 @@ -package fr.jackcartersmith.orbsat.client.render; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import fr.jackcartersmith.orbsat.client.handler.ResourceHandler; -import net.minecraft.client.particle.EntityFX; -import net.minecraft.client.renderer.Tessellator; -import net.minecraft.world.World; - -public class ParticleDistortion extends EntityFX{ - double originalX; - double originalZ; - - public ParticleDistortion(World par1World, double par2, double par4, double par6, float par8, float par9, float par10, float scale) { - this(par1World, par2, par4, par6, 1.0F, par8, par9, par10, scale); - } - - public ParticleDistortion(World world, double par2, double par4, double par6, float par8, float par9, float par10, float par11, float scale) { - super(world, par2, par4, par6, 0.0D, 0.0D, 0.0D); - this.motionX = par9;//initial motion value X - this.motionY = par10;//initial motion value Y - this.motionZ = par11;//initial motion value Z - this.originalX = par9; - this.originalZ = par11; - if (par9 == 0.0F) { - par9 = 1.0F; - } - //float var12 = (float) Math.random() * 0.4F + 0.6F; - this.particleTextureIndexX = 0; // - this.particleTextureIndexY = 0; - - this.particleRed = 0.7F;//RGB of your particle - this.particleGreen = 0.8F; - this.particleBlue = 1.0F; - //this.particleScale *= 0.05f + world.rand.nextFloat()*0.005; - //this.particleScale *= par8; - this.particleScale = scale; - - this.particleMaxAge = 40 + world.rand.nextInt(40);//how soon the particle dies. You can use randomizer for this - this.noClip = true;//does your particle collide with blocks? - } - - - @Override - public void onUpdate() { - this.prevPosX = this.posX; - this.prevPosY = this.posY; - this.prevPosZ = this.posZ; - - if (this.particleAge++ >= this.particleMaxAge) { - this.setDead();//make sure to have this - } - this.moveEntity(this.motionX, this.motionY, this.motionZ);// also important if you want your particle to move - this.motionX = motionX * (1 - (worldObj.rand.nextFloat() / 10F)); - this.motionY = motionY * (1 - (worldObj.rand.nextFloat() / 10F)); - this.motionZ = motionZ * (1 - (worldObj.rand.nextFloat() / 10F)); - this.particleAlpha = (1F - ((float) this.particleAge / (float) this.particleMaxAge)) * 0.5F; - - } - - @Override - @SideOnly(Side.CLIENT) - public void renderParticle(Tessellator tessellator, float par2, float par3, float par4, float par5, float par6, float par7) {//Note U=X V=Y - - tessellator.draw(); - ResourceHandler.bindParticles(); - tessellator.startDrawingQuads(); - tessellator.setBrightness(200);//make sure you have this!! - - - float minU = 0.0F + 0F;//(float)this.particleTextureIndexX / 32.0F; - float maxU = 0.0F + 0.1245F;//minU + 0.124F; - float minV = 0F;//(float)this.particleTextureIndexY / 32.0F; - float maxV = 0.1245F;//minV + 0.124F; - float drawScale = 0.1F * this.particleScale; - - if (this.particleIcon != null) { - minU = this.particleIcon.getMinU(); - maxU = this.particleIcon.getMaxU(); - minV = this.particleIcon.getMinV(); - maxV = this.particleIcon.getMaxV(); - } - - float drawX = (float) (this.prevPosX + (this.posX - this.prevPosX) * (double) par2 - interpPosX); - float drawY = (float) (this.prevPosY + (this.posY - this.prevPosY) * (double) par2 - interpPosY); - float drawZ = (float) (this.prevPosZ + (this.posZ - this.prevPosZ) * (double) par2 - interpPosZ); - - tessellator.setColorRGBA_F(this.particleRed, this.particleGreen, this.particleBlue, this.particleAlpha); - tessellator.setColorRGBA(0, 255, 255, (int) (this.particleAlpha * 255F)); - - tessellator.addVertexWithUV((double) (drawX - par3 * drawScale - par6 * drawScale), (double) (drawY - par4 * drawScale), (double) (drawZ - par5 * drawScale - par7 * drawScale), (double) maxU, (double) maxV); - tessellator.addVertexWithUV((double) (drawX - par3 * drawScale + par6 * drawScale), (double) (drawY + par4 * drawScale), (double) (drawZ - par5 * drawScale + par7 * drawScale), (double) maxU, (double) minV); - tessellator.addVertexWithUV((double) (drawX + par3 * drawScale + par6 * drawScale), (double) (drawY + par4 * drawScale), (double) (drawZ + par5 * drawScale + par7 * drawScale), (double) minU, (double) minV); - tessellator.addVertexWithUV((double) (drawX + par3 * drawScale - par6 * drawScale), (double) (drawY - par4 * drawScale), (double) (drawZ + par5 * drawScale - par7 * drawScale), (double) minU, (double) maxV); - - tessellator.draw(); - ResourceHandler.bindDefaultParticles(); - tessellator.startDrawingQuads(); - - } -} diff --git a/src/main/java/fr/jackcartersmith/orbsat/client/render/block/RenderDefender.java b/src/main/java/fr/jackcartersmith/orbsat/client/render/block/RenderDefender.java deleted file mode 100644 index 9530c29..0000000 --- a/src/main/java/fr/jackcartersmith/orbsat/client/render/block/RenderDefender.java +++ /dev/null @@ -1,44 +0,0 @@ -package fr.jackcartersmith.orbsat.client.render.block; - -import org.lwjgl.opengl.GL11; - -import fr.jackcartersmith.orbsat.client.handler.ResourceHandler; -import fr.jackcartersmith.orbsat.client.render.tile.RenderTileDefender; -import net.minecraft.item.ItemStack; -import net.minecraftforge.client.IItemRenderer; - -public class RenderDefender implements IItemRenderer{ - @Override - public boolean handleRenderType(ItemStack item, ItemRenderType type) { - return true; - } - - @Override - public boolean shouldUseRenderHelper(ItemRenderType type, ItemStack item, ItemRendererHelper helper) { - return true; - } - - @Override - public void renderItem(ItemRenderType type, ItemStack item, Object... data) { - GL11.glPushMatrix(); - - if (type == ItemRenderType.INVENTORY) { - GL11.glScaled(0.76, 0.76, 0.76); - GL11.glTranslated(0.5, 1.0, 0.5); - GL11.glRotated(180, 0, 1, 0); - } else if (type == ItemRenderType.EQUIPPED || type == ItemRenderType.EQUIPPED_FIRST_PERSON) { - GL11.glTranslated(0.5, 2, 0.5); - GL11.glRotated(90, 0, 1, 0); - } else if (type == ItemRenderType.ENTITY) { - GL11.glScaled(3.0, 3.0, 3.0); - GL11.glTranslated(0.0, 1.5, 0.0); - GL11.glRotated(180, 0, 1, 0); - } - GL11.glRotated(180, 0, 0, 1); - - ResourceHandler.bindResource("textures/models/defender.png"); - RenderTileDefender.modelDefender.render(); - RenderTileDefender.modelDefender.renderCrystal(1F); - GL11.glPopMatrix(); - } -} diff --git a/src/main/java/fr/jackcartersmith/orbsat/client/render/particle/ParticleLaserBeam.java b/src/main/java/fr/jackcartersmith/orbsat/client/render/particle/ParticleLaserBeam.java deleted file mode 100644 index 097ebd9..0000000 --- a/src/main/java/fr/jackcartersmith/orbsat/client/render/particle/ParticleLaserBeam.java +++ /dev/null @@ -1,235 +0,0 @@ -package fr.jackcartersmith.orbsat.client.render.particle; - -import org.lwjgl.opengl.GL11; -import fr.jackcartersmith.orbsat.client.handler.ResourceHandler; -import fr.jackcartersmith.orbsat.common.lib.OSRefs; -import fr.jackcartersmith.orbsat.common.utils.Utils; -import net.minecraft.client.Minecraft; -import net.minecraft.client.particle.EntityFX; -import net.minecraft.client.renderer.Tessellator; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.util.MathHelper; -import net.minecraft.util.ResourceLocation; -import net.minecraft.world.World; - -public class ParticleLaserBeam extends EntityFX { - /** - * Power flow integer Ranges from 0 to 100 - */ - private int flow; - - /** - * Beam Target X - */ - private double tX = 0.0D; - /** - * Beam Target Y - */ - private double tY = 0.0D; - /** - * Beam Target Z - */ - private double tZ = 0.0D; - /** - * Modified Target X - */ - //private boolean advanced; - private boolean renderParticle = true; - private float length = 0.0F; - private float rotYaw = 0.0F; - private float rotPitch = 0.0F; - private float prevYaw = 0.0F; - private float prevPitch = 0.0F; - private EntityPlayer player; - - //todo make sure not dyrectly up or down on y axis, Set dead when player goes out of range, PaRTICLE eNGINE - - private static ResourceLocation beamTextureBasic = new ResourceLocation(OSRefs.MODID.toLowerCase(), "textures/models/laserBeam.png"); - - - /** - * @param offsetMode 0 = no offset, 1 = offset target end, 2 = offset start end, 3 offset both ends - */ - //public ParticleLaserBeam(World world, double x, double y, double z, double tX, double tY, double tZ, int maxAge, int flow, boolean advanced, int offsetMode) { - public ParticleLaserBeam(World world, double x, double y, double z, double tX, double tY, double tZ, int maxAge, int flow, int offsetMode) { - super(world, x, y, z, 0.0D, 0.0D, 0.0D); - this.particleRed = 1F; - this.particleGreen = 1F; - this.particleBlue = 1F; - this.noClip = true; - this.motionX = 0.0D; - this.motionY = 0.0D; - this.motionZ = 0.0D; - this.particleMaxAge = maxAge; - this.flow = flow; - this.prevYaw = rotationYaw; - this.prevPitch = rotPitch; - this.setSize(0.2F, 0.2F); - //this.advanced = advanced; - this.tX = tX; - this.tY = tY; - this.tZ = tZ; - - if (offsetMode > 0) { - double dist = Utils.getDistanceAtoB(x, z, tX, tZ); - if (dist == 0) dist = 0.1; - double xDist = x - tX; - double zDist = z - tZ; - double xOff = xDist / dist; - double zOff = zDist / dist; - if (xOff == 0 && zOff == 0) xOff = 1; - //LogHelper.info(xOff + " " + zOff); - double offM = 0.4D; - - if (offsetMode == 2 || offsetMode == 3) setPosition(posX - xOff * offM, posY, posZ - zOff * offM); - - if (offsetMode == 1 || offsetMode == 3) { - this.tX = tX + xOff * offM; - this.tY = tY; - this.tZ = tZ + zOff * offM; - } - } - - } - - public void update(int flow, boolean render) { - this.renderParticle = render; - for (this.flow = flow; this.particleMaxAge - this.particleAge < 4; ++this.particleMaxAge) { - } - } - - @Override - public void onUpdate() { - //1.570797f -// double sin = Math.sin(-1f + (float)(particleAge % 360) / 180f * 1.570797f); -// LogHelper.info(sin + " " + particleAge % 360); - - this.prevPosX = this.posX; - this.prevPosY = this.posY; - this.prevPosZ = this.posZ; - - this.prevYaw = this.rotYaw; - this.prevPitch = this.rotPitch; - - float xd = (float) (this.posX - this.tX); - float yd = (float) (this.posY - this.tY); - float zd = (float) (this.posZ - this.tZ); - this.length = MathHelper.sqrt_float(xd * xd + yd * yd + zd * zd); - double var7 = (double) MathHelper.sqrt_double((double) (xd * xd + zd * zd)); - this.rotYaw = (float) (Math.atan2((double) xd, (double) zd) * 180.0D / 3.141592653589793D); - this.rotPitch = (float) (Math.atan2((double) yd, var7) * 180.0D / 3.141592653589793D); - this.prevYaw = this.rotYaw; - this.prevPitch = this.rotPitch; - - - if (this.particleAge++ >= this.particleMaxAge) { - this.setDead(); - } - } - - private EntityPlayer getPlayer() { - if (player == null) { - player = Minecraft.getMinecraft().thePlayer; - } - return player; - } - - @Override - public void renderParticle(Tessellator tessellator, float partialTick, float rotX, float rotXZ, float rotZ, float rotYZ, float rotXY) { - if (!renderParticle) return; - tessellator.draw(); - GL11.glPushMatrix(); - //GL11.glPushAttrib(GL11.GL_ATTRIB_STACK_DEPTH); - float var9 = 1.0F; - float slide = (float) getPlayer().ticksExisted; - float size = (float) flow / 100f * 2f; //0.7F; - /* - if (advanced) Minecraft.getMinecraft().renderEngine.bindTexture(beamTextureAdvanced); - else Minecraft.getMinecraft().renderEngine.bindTexture(beamTextureBasic); - */ - Minecraft.getMinecraft().renderEngine.bindTexture(beamTextureBasic); - GL11.glTexParameterf(3553, 10242, 10497.0F); - GL11.glTexParameterf(3553, 10243, 10497.0F); - GL11.glDisable(GL11.GL_CULL_FACE); - float var11 = slide + partialTick; - float var12 = -var11 * 0.2F - (float) MathHelper.floor_float(-var11 * 0.1F); - GL11.glBlendFunc(770, 1); - GL11.glDepthMask(false); - float xx = (float) (this.prevPosX + (this.posX - this.prevPosX) * (double) partialTick - interpPosX); - float yy = (float) (this.prevPosY + (this.posY - this.prevPosY) * (double) partialTick - interpPosY); - float zz = (float) (this.prevPosZ + (this.posZ - this.prevPosZ) * (double) partialTick - interpPosZ); - GL11.glTranslated((double) xx, (double) yy, (double) zz); - float ry = (float) ((double) this.prevYaw + (double) (this.rotYaw - this.prevYaw) * (double) partialTick); - float rp = (float) ((double) this.prevPitch + (double) (this.rotPitch - this.prevPitch) * (double) partialTick); - GL11.glRotatef(90.0F, 1.0F, 0.0F, 0.0F); - GL11.glRotatef(180.0F + ry, 0.0F, 0.0F, -1.0F); - GL11.glRotatef(rp, 1.0F, 0.0F, 0.0F); - double var44 = -0.15D * (double) size; - double var17 = 0.15D * (double) size; - - GL11.glTranslated(0.03, 0, 0); - for (int t = 0; t < 2; ++t) { - double var29 = (double) (this.length * var9); - double var31 = 0D; - double var33 = 1D; - double var35 = (double) (-1.0F + var12 + (float) t / 3.0F); - double var37 = (double) (this.length * var9) + var35; - GL11.glRotatef(t * 90.0F, 0.0F, 1.0F, 0.0F); - tessellator.startDrawingQuads(); - tessellator.setBrightness(200); - tessellator.setColorRGBA_F(this.particleRed, this.particleGreen, this.particleBlue, 1f); - tessellator.addVertexWithUV(var44, var29, 0.0D, var33, var37); - tessellator.addVertexWithUV(var44, 0.0D, 0.0D, var33, var35); - tessellator.addVertexWithUV(var17, 0.0D, 0.0D, var31, var35); - tessellator.addVertexWithUV(var17, var29, 0.0D, var31, var37); - tessellator.draw(); - GL11.glRotatef(t * 90.0F, 0.0F, -1.0F, 0.0F); - } - - /* - if (ClientEventHandler.playerHoldingWrench) { - var44 = -0.15D * (double) 1; - var17 = 0.15D * (double) 1; - - //GL11.glColor4f(1f, 1f, 1f, 1f); - //GL11.glTranslated(0.1, 0, 0); - for (int t = 0; t < 2; ++t) { - double var29 = (double) (this.length * var9); - double var31 = 0D; - double var33 = 1D; - double var35 = (double) (-1.0F + var12 + (float) t / 3.0F); - double var37 = (double) (this.length * var9) + var35; - GL11.glRotatef(t * 90.0F, 0.0F, 1.0F, 0.0F); - tessellator.startDrawingQuads(); - tessellator.setBrightness(200); - tessellator.setColorRGBA_F(0f, 1f, 0f, 1f); - tessellator.addVertexWithUV(var44, var29, 0.0D, var33, var37); - tessellator.addVertexWithUV(var44, 0.0D, 0.0D, var33, var35); - tessellator.addVertexWithUV(var17, 0.0D, 0.0D, var31, var35); - tessellator.addVertexWithUV(var17, var29, 0.0D, var31, var37); - tessellator.draw(); - GL11.glRotatef(t * 90.0F, 0.0F, -1.0F, 0.0F); - } - } - */ - - - //GL11.glDepthMask(true); - GL11.glBlendFunc(770, 771); - GL11.glEnable(GL11.GL_CULL_FACE); - // GL11.glPopAttrib(); - GL11.glPopMatrix(); - - - ResourceHandler.bindDefaultParticles(); - tessellator.startDrawingQuads(); - } - - public int getFlow() { - return flow; - } - - public void setFlow(int flow) { - this.flow = flow; - } -} diff --git a/src/main/java/fr/jackcartersmith/orbsat/client/render/tile/RenderTileDefender.java b/src/main/java/fr/jackcartersmith/orbsat/client/render/tile/RenderTileDefender.java deleted file mode 100644 index cc838ac..0000000 --- a/src/main/java/fr/jackcartersmith/orbsat/client/render/tile/RenderTileDefender.java +++ /dev/null @@ -1,84 +0,0 @@ -package fr.jackcartersmith.orbsat.client.render.tile; - -import org.lwjgl.opengl.GL11; -import fr.jackcartersmith.orbsat.client.handler.ResourceHandler; -import fr.jackcartersmith.orbsat.client.model.ModelDefender; -import fr.jackcartersmith.orbsat.common.tileentities.TileDefender; -import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; -import net.minecraft.tileentity.TileEntity; - -public class RenderTileDefender extends TileEntitySpecialRenderer { - public static ModelDefender modelDefender = new ModelDefender(); - - - @Override - public void renderTileEntityAt(TileEntity tileEntity, double x, double y, double z, float partialTick) { - GL11.glPushMatrix(); - GL11.glTranslated(x + 0.5, y + 1.5, z + 0.5); - - renderCore((TileDefender) tileEntity, x, y, z, partialTick); - - GL11.glPopMatrix(); - } - - public void renderCore(TileDefender tile, double x, double y, double z, float partialTick) { - GL11.glPushMatrix(); - ResourceHandler.bindResource("textures/models/defender.png"); - GL11.glRotated(180, 2, 0, 0); - RenderTileDefender.modelDefender.render(); - - float ticks = ((float)Minecraft.getMinecraft().renderViewEntity.ticksExisted + partialTick) * tile.rotationSpeed; - if (tile.getWorldObj() != null) - { - GL11.glRotatef(ticks % 360.0F, 0.0F, 1.0F, 0.0F); - GL11.glRotatef(35.0F, 1.0F, 0.0F, 0.0F); - GL11.glRotatef(45.0F, 0.0F, 0.0F, 1.0F); - /* - GL11.glRotatef(ticks % 360.0F * tile.rotation, 0.0F, 1.0F, 0.0F); - GL11.glRotatef(35.0F * tile.rotation, 1.0F, 0.0F, 0.0F); - GL11.glRotatef(45.0F * tile.rotation, 0.0F, 0.0F, 1.0F); - */ - } - - GL11.glTranslatef(-0.125F,0.125F,0.125F); - RenderTileDefender.modelDefender.renderCrystal(tile.crystalBrightness); - GL11.glPopMatrix(); - - /* - switch (tile.facingDirection) { - case 1: - GL11.glRotated(180, -1, 0, 0); - break; - case 2: - GL11.glRotated(90, 1, 0, 0); - break; - case 3: - GL11.glRotated(90, -1, 0, 0); - break; - case 4: - GL11.glRotated(90, 0, 0, -1); - break; - case 5: - GL11.glRotated(90, 0, 0, 1); - } - - - modelDefender.render(null, 0F, 0F, 0F, 0F, 0F, scale); - GL11.glEnable(GL11.GL_BLEND); - //float rotation = tile.rotation + (partialTick * tile.rotationSpeed); - //GL11.glRotatef(tile.rotation + (partialTick * tile.rotationSpeed), 0F, 0F, 1F); - //GL11.glRotatef(-tile.rotation + (partialTick * tile.rotationSpeed), 0F, 0F, 1F); - //modelDefender.Shape7.rotateAngleY = tile.rotation * 90.0F; - //modelDefender.Shape7.rotateAngleZ = tile.rotation * 90.0F; - - modelDefender.Shape7.rotateAngleY = (float) (-Math.sin(tile.rotation)); - modelDefender.Shape7.rotateAngleZ = (float) (Math.sin(-2*Math.PI/3+tile.rotation)); - modelDefender.Shape7.rotateAngleX = (float) (Math.sin(2*Math.PI/3+tile.rotation)); - modelDefender.renderCrystal(null, 0F, tile.modelIllumination, 0F, 0F, 0F, scale); - GL11.glDisable(GL11.GL_BLEND); - - GL11.glPopMatrix(); - */ - } -} diff --git a/src/main/java/fr/jackcartersmith/orbsat/common/CommonProxy.java b/src/main/java/fr/jackcartersmith/orbsat/common/CommonProxy.java deleted file mode 100644 index e3b9a60..0000000 --- a/src/main/java/fr/jackcartersmith/orbsat/common/CommonProxy.java +++ /dev/null @@ -1,184 +0,0 @@ -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.registry.GameRegistry; -import cpw.mods.fml.relauncher.Side; -import fr.jackcartersmith.orbsat.OrbitalSatellite; -import fr.jackcartersmith.orbsat.client.gui.OSGuiHandler; -import fr.jackcartersmith.orbsat.client.render.particle.ParticleLaserBeam; -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.network.TileObjectPacket; -import fr.jackcartersmith.orbsat.common.tileentities.TileDefender; -import fr.jackcartersmith.orbsat.common.utils.OSLogHelper; -import net.minecraft.client.audio.ISound; -import net.minecraft.world.World; - -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(TileObjectPacket.Handler.class, TileObjectPacket.class, 0, Side.SERVER); - OrbitalSatellite.network.registerMessage(TileObjectPacket.Handler.class, TileObjectPacket.class, 1, Side.CLIENT); - //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(TileDefender.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); - */ - } - - /* - * ------------- Code inspiration pour le faisceau d'energie du satellite - * - public ParticleEnergyBeam energyBeam(World worldObj, double x, double y, double z, double tx, double ty, double tz, int powerFlow, boolean advanced, ParticleEnergyBeam oldBeam, boolean render, int beamType) { - return null; - } - - public ParticleEnergyField energyField(World worldObj, double x, double y, double z, int type, boolean advanced, ParticleEnergyField oldBeam, boolean render) { - return null; - } - - public ParticleReactorBeam reactorBeam(TileEntity tile, ParticleReactorBeam oldBeam, boolean render) { - return null; - } - */ - - //public ParticleLaserBeam energyBeam(World worldObj, double x, double y, double z, double tx, double ty, double tz, int powerFlow, boolean advanced, ParticleLaserBeam oldBeam, boolean render, int beamType) { - public ParticleLaserBeam energyBeam(World worldObj, double x, double y, double z, double tx, double ty, double tz, int powerFlow, int pulseLenght, ParticleLaserBeam oldBeam, boolean render, int beamType) { - return null; - } - - public void spawnParticle(Object particle, int range) {} - - public ISound playISound(ISound sound) { - return null; - } -} diff --git a/src/main/java/fr/jackcartersmith/orbsat/common/OSBlocks.java b/src/main/java/fr/jackcartersmith/orbsat/common/OSBlocks.java deleted file mode 100644 index b234c4c..0000000 --- a/src/main/java/fr/jackcartersmith/orbsat/common/OSBlocks.java +++ /dev/null @@ -1,115 +0,0 @@ -package fr.jackcartersmith.orbsat.common; - -import cpw.mods.fml.common.registry.GameRegistry; -import fr.jackcartersmith.orbsat.OrbitalSatellite; -import fr.jackcartersmith.orbsat.common.blocks.BlockOS; -import fr.jackcartersmith.orbsat.common.blocks.Defender; -import fr.jackcartersmith.orbsat.common.lib.OSRefs; -import net.minecraft.block.Block; -import net.minecraft.block.material.Material; -import net.minecraft.item.ItemBlock; -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(){ - defender = new Defender(); - - - - - /* - 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); - */ - } - - public static void register(BlockOS block) { - String name = block.getUnwrappedUnlocalizedName(block.getUnlocalizedName()); - //if (isEnabled(block)) GameRegistry.registerBlock(block, name.substring(name.indexOf(":") + 1)); - GameRegistry.registerBlock(block, name.substring(name.indexOf(":") + 1)); - } - - public static void register(BlockOS block, Class item) { - String name = block.getUnwrappedUnlocalizedName(block.getUnlocalizedName()); - //if (isEnabled(block)) GameRegistry.registerBlock(block, item, name.substring(name.indexOf(":") + 1)); - GameRegistry.registerBlock(block, item, name.substring(name.indexOf(":") + 1)); - } - - public static void registerOther(Block block) { - String name = block.getUnlocalizedName().substring(block.getUnlocalizedName().indexOf(".") + 1); - //if (isEnabled(block)) GameRegistry.registerBlock(block, name.substring(name.indexOf(":") + 1)); - GameRegistry.registerBlock(block, name.substring(name.indexOf(":") + 1)); - } -} diff --git a/src/main/java/fr/jackcartersmith/orbsat/common/OSItems.java b/src/main/java/fr/jackcartersmith/orbsat/common/OSItems.java deleted file mode 100644 index b901799..0000000 --- a/src/main/java/fr/jackcartersmith/orbsat/common/OSItems.java +++ /dev/null @@ -1,75 +0,0 @@ -package fr.jackcartersmith.orbsat.common; - -import cpw.mods.fml.common.registry.GameRegistry; -import fr.jackcartersmith.orbsat.common.items.AdvancedExtrapolCircuit; -import fr.jackcartersmith.orbsat.common.items.AdvancedTargetDevice; -import fr.jackcartersmith.orbsat.common.items.BasicExtrapolCircuit; -import fr.jackcartersmith.orbsat.common.items.BasicTargetDevice; -import fr.jackcartersmith.orbsat.common.items.InvolvedExtrapolCircuit; -import fr.jackcartersmith.orbsat.common.items.InvolvedTargetDevice; -import fr.jackcartersmith.orbsat.common.items.ItemOS; -import fr.jackcartersmith.orbsat.common.items.PhotonCapacitor; -import fr.jackcartersmith.orbsat.common.items.PhotonLense; -import fr.jackcartersmith.orbsat.common.items.PhotonCondenser; -import fr.jackcartersmith.orbsat.common.lib.OSRefs; - -@GameRegistry.ObjectHolder(OSRefs.MODID) -public class OSItems{ - public static ItemOS basicExtrapolCircuit; - public static ItemOS advancedExtrapolCircuit; - public static ItemOS involvedExtrapolCircuit; - public static ItemOS photonLense; - public static ItemOS basicTargetDevice; - public static ItemOS advancedTargetDevice; - public static ItemOS involvedTargetDevice; - public static ItemOS photonCondenser; - public static ItemOS photonCapacitor; - - public static void init() - { - photonLense = new PhotonLense(); - photonCondenser = new PhotonCondenser(); - photonCapacitor = new PhotonCapacitor(); - basicExtrapolCircuit = new BasicExtrapolCircuit(); - advancedExtrapolCircuit = new AdvancedExtrapolCircuit(); - involvedExtrapolCircuit = new InvolvedExtrapolCircuit(); - basicTargetDevice = new BasicTargetDevice(); - advancedTargetDevice = new AdvancedTargetDevice(); - involvedTargetDevice = new InvolvedTargetDevice(); - - - - - - - - /* - //Custom ItemStacks - wyvernEnergyCore = new ItemStack(ModItems.draconiumEnergyCore, 1, 0); - draconicEnergyCore = new ItemStack(ModItems.draconiumEnergyCore, 1, 1); - wyvernFluxCapacitor = new ItemStack(ModItems.draconiumFluxCapacitor, 1, 0); - draconicFluxCapacitor = new ItemStack(ModItems.draconiumFluxCapacitor, 1, 1); - - partStabFrame = new ItemStack(reactorStabilizerParts, 1, 0); - partStabRotorInner = new ItemStack(reactorStabilizerParts, 1, 1); - partStabRotorOuter = new ItemStack(reactorStabilizerParts, 1, 2); - partStabRotorAssembly = new ItemStack(reactorStabilizerParts, 1, 3); - partStabRing = new ItemStack(reactorStabilizerParts, 1, 4); - - nuggetDraconium = new ItemStack(nugget, 1, 0); - nuggetAwakened = new ItemStack(nugget, 1, 1); - */ - } - - public static void register(final ItemOS item) { - String name = item.getUnwrappedUnlocalizedName(item.getUnlocalizedName()); - //if (isEnabled(item)) GameRegistry.registerItem(item, name.substring(name.indexOf(":") + 1)); - GameRegistry.registerItem(item, name.substring(name.indexOf(":") + 1)); - } - - /* - public static boolean isEnabled(Item item) { - return !ConfigHandler.disabledNamesList.contains(item.getUnlocalizedName()); - } - */ -} diff --git a/src/main/java/fr/jackcartersmith/orbsat/common/blocks/BlockContainerOS.java b/src/main/java/fr/jackcartersmith/orbsat/common/blocks/BlockContainerOS.java deleted file mode 100644 index 3d58e4b..0000000 --- a/src/main/java/fr/jackcartersmith/orbsat/common/blocks/BlockContainerOS.java +++ /dev/null @@ -1,39 +0,0 @@ -package fr.jackcartersmith.orbsat.common.blocks; - -import net.minecraft.block.Block; -import net.minecraft.block.ITileEntityProvider; -import net.minecraft.block.material.Material; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.World; - -public class BlockContainerOS extends BlockOS implements ITileEntityProvider{ - public BlockContainerOS(final Material material) { - super(material); - this.isBlockContainer = true; - } - - public BlockContainerOS() { - super(Material.rock); - this.isBlockContainer = true; - } - - @Override - public TileEntity createNewTileEntity(World p_149915_1_, int p_149915_2_) { - return null; - } - - public void onBlockAdded(World world, int x, int y, int z) { - super.onBlockAdded(world, x, y, z); - } - - public void breakBlock(World world, int x, int y, int z, Block block, int meta) { - super.breakBlock(world, x, y, z, block, meta); - world.removeTileEntity(x, y, z); - } - - public boolean onBlockEventReceived(World world, int x, int y, int z, int p_149696_5_, int p_149696_6_) { - super.onBlockEventReceived(world, x, y, z, p_149696_5_, p_149696_6_); - TileEntity tileentity = world.getTileEntity(x, y, z); - return tileentity != null ? tileentity.receiveClientEvent(p_149696_5_, p_149696_6_) : false; - } -} diff --git a/src/main/java/fr/jackcartersmith/orbsat/common/blocks/BlockCustomDrop.java b/src/main/java/fr/jackcartersmith/orbsat/common/blocks/BlockCustomDrop.java deleted file mode 100644 index 9d64252..0000000 --- a/src/main/java/fr/jackcartersmith/orbsat/common/blocks/BlockCustomDrop.java +++ /dev/null @@ -1,80 +0,0 @@ -package fr.jackcartersmith.orbsat.common.blocks; - -import java.util.ArrayList; -import java.util.List; - -import com.google.common.collect.Lists; - -import net.minecraft.block.material.Material; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.IInventory; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.World; - -public abstract class BlockCustomDrop extends BlockContainerOS{ - public BlockCustomDrop(final Material material) { - super(material); - } - - /** - * If true the tile will drop its inventory when broken - */ - protected abstract boolean dropInventory(); - - /** - * If true the tile will drop a custom block with custom data when broken - */ - protected abstract boolean hasCustomDropps(); - - /** - * Use to specify custom drops - */ - protected abstract void getCustomTileEntityDrops(TileEntity te, List droppes); - - /* - private void getCustomDrops(TileEntity te, List droppes) { - if (te == null) return; - if (hasCustomDropps()) { - getCustomTileEntityDrops(te, droppes); - } - if (dropInventory() && te instanceof IInventory) { - droppes.addAll(InventoryUtils.getInventoryContents((IInventory) te)); - for (int i = 0; i < ((IInventory) te).getSizeInventory(); i++) - ((IInventory) te).setInventorySlotContents(i, null); - } - } - - @Override - public boolean removedByPlayer(World world, EntityPlayer player, int x, int y, int z, boolean willHarvest) { - if (willHarvest) { - TileEntity te = world.getTileEntity(x, y, z); - - boolean result = super.removedByPlayer(world, player, x, y, z, willHarvest); - - if (result) { - List teDrops = Lists.newArrayList(); - getCustomDrops(te, teDrops); - for (ItemStack drop : teDrops) - dropBlockAsItem(world, x, y, z, drop); - } - - return result; - } - - return super.removedByPlayer(world, player, x, y, z, willHarvest); - } - - @Override - public ArrayList getDrops(World world, int x, int y, int z, int metadata, int fortune) { - ArrayList result = Lists.newArrayList(); - if (!hasCustomDropps()) result.addAll(super.getDrops(world, x, y, z, metadata, fortune)); - if (hasCustomDropps() || dropInventory()) { - TileEntity te = world.getTileEntity(x, y, z); - getCustomDrops(te, result); - } - - return result; - } - */ -} diff --git a/src/main/java/fr/jackcartersmith/orbsat/common/blocks/BlockOS.java b/src/main/java/fr/jackcartersmith/orbsat/common/blocks/BlockOS.java deleted file mode 100644 index f6a626b..0000000 --- a/src/main/java/fr/jackcartersmith/orbsat/common/blocks/BlockOS.java +++ /dev/null @@ -1,37 +0,0 @@ -package fr.jackcartersmith.orbsat.common.blocks; - -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())); - } -} diff --git a/src/main/java/fr/jackcartersmith/orbsat/common/blocks/Defender.java b/src/main/java/fr/jackcartersmith/orbsat/common/blocks/Defender.java deleted file mode 100644 index 6a37549..0000000 --- a/src/main/java/fr/jackcartersmith/orbsat/common/blocks/Defender.java +++ /dev/null @@ -1,144 +0,0 @@ -package fr.jackcartersmith.orbsat.common.blocks; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import fr.jackcartersmith.orbsat.OrbitalSatellite; -import fr.jackcartersmith.orbsat.common.OSBlocks; -import fr.jackcartersmith.orbsat.common.lib.OSRefs; -import fr.jackcartersmith.orbsat.common.lib.OSStrings; -import fr.jackcartersmith.orbsat.common.tileentities.TileDefender; -import net.minecraft.block.material.Material; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.world.IBlockAccess; -import net.minecraft.world.World; - -public class Defender extends BlockOS { - public Defender() { - super(Material.iron); - this.setBlockName(OSStrings.defenderName); - this.setCreativeTab(OrbitalSatellite.OSCreaTab); - this.setStepSound(soundTypeStone); - OSBlocks.register(this); - } - - @SideOnly(Side.CLIENT) - @Override - public void registerBlockIcons(IIconRegister iconRegister) { - blockIcon = iconRegister.registerIcon(OSRefs.RESOURCESPREFIX + "machine"); - } - - @Override - public void setBlockBoundsBasedOnState(IBlockAccess access, int x, int y, int z) { - /* - TileDefender tile = access.getTileEntity(x, y, z) instanceof TileDefender ? (TileDefender) access.getTileEntity(x, y, z) : null; - if (tile != null) { - switch (tile.facingDirection) { - case 0: - this.setBlockBounds(0F, 0.885F, 0F, 1F, 1F, 1F); - break; - case 1: - this.setBlockBounds(0F, 0F, 0F, 1F, 0.125F, 1F); - break; - case 2: - this.setBlockBounds(0F, 0F, 0.885F, 1F, 1F, 1F); - break; - case 3: - this.setBlockBounds(0F, 0F, 0F, 1F, 1F, 0.125F); - break; - case 4: - this.setBlockBounds(0.885F, 0F, 0F, 1F, 1F, 1F); - break; - case 5: - this.setBlockBounds(0F, 0F, 0F, 0.125F, 1F, 1F); - break; - } - } - */ - this.setBlockBounds(0F, 0F, 0F, 1F, 0.5F, 1F); - super.setBlockBoundsBasedOnState(access, x, y, z); - } - - @Override - public AxisAlignedBB getCollisionBoundingBoxFromPool(World world, int x, int y, int z) { - /* - TileDefender tile = world.getTileEntity(x, y, z) instanceof TileTileDefender ? (TileTileDefender) world.getTileEntity(x, y, z) : null; - if (tile != null) { - switch (tile.facingDirection) { - case 0: - this.setBlockBounds(0F, 0.885F, 0F, 1F, 1F, 1F); - break; - case 1: - this.setBlockBounds(0F, 0F, 0F, 1F, 0.125F, 1F); - break; - case 2: - this.setBlockBounds(0F, 0F, 0.885F, 1F, 1F, 1F); - break; - case 3: - this.setBlockBounds(0F, 0F, 0F, 1F, 1F, 0.125F); - break; - case 4: - this.setBlockBounds(0.885F, 0F, 0F, 1F, 1F, 1F); - break; - case 5: - this.setBlockBounds(0F, 0F, 0F, 0.125F, 1F, 1F); - break; - } - } - */ - this.setBlockBounds(0F, 0F, 0F, 1F, 0.5F, 1F); - return super.getCollisionBoundingBoxFromPool(world, x, y, z); - } - - /* - @Override - public void onBlockPlacedBy(World world, int x, int y, int z, EntityLivingBase entity, ItemStack stack) { - int d = Utils.determineOrientation(x, y, z, entity); - TileReactorEnergyInjector tile = (TileReactorEnergyInjector) world.getTileEntity(x, y, z); - tile.facingDirection = ForgeDirection.getOrientation(d).getOpposite().ordinal(); - tile.onPlaced(); - } - */ - - @Override - public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float prx, float pry, float prz) { - TileDefender tile = (TileDefender) world.getTileEntity(x, y, z); - if (tile != null) { - if (!world.isRemote) { - //Do something here... - - //player.addChatComponentMessage(new ChatComponentText(Float.toString(tile.xAngle))); - //FMLNetworkHandler.openGui(player, OrbitalSatellite.instance, GuiHandler.GUIID_ENERGY_INFUSER, world, x, y, z); - } - } - world.markBlockForUpdate(x, y, z); - return true; - } - - @Override - public int getRenderType() { - return -1; - } - - @Override - public boolean isOpaqueCube() { - return false; - } - - @Override - public boolean renderAsNormalBlock() { - return false; - } - - @Override - public boolean hasTileEntity(int metadata) { - return true; - } - - @Override - public TileEntity createTileEntity(World world, int metadata) { - return new TileDefender(); - } -} diff --git a/src/main/java/fr/jackcartersmith/orbsat/common/container/ContainerDataSync.java b/src/main/java/fr/jackcartersmith/orbsat/common/container/ContainerDataSync.java deleted file mode 100644 index f2cf5da..0000000 --- a/src/main/java/fr/jackcartersmith/orbsat/common/container/ContainerDataSync.java +++ /dev/null @@ -1,43 +0,0 @@ -package fr.jackcartersmith.orbsat.common.container; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import fr.jackcartersmith.orbsat.OrbitalSatellite; -import fr.jackcartersmith.orbsat.common.lib.OSRefs; -import fr.jackcartersmith.orbsat.common.network.TileObjectPacket; -import fr.jackcartersmith.orbsat.common.tileentities.TileObjectSync; -import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.inventory.Container; - -public abstract class ContainerDataSync extends Container { - - //TODO WTF? Was i sleep coding when i wrote this? In 1.8 re write this as a common container class for all mod containers and use a dedicated sender/receiver method for each data type i want to send (Unless i think of something better between now and then) - - /** - * Sends two ints to the client-side Container. Normally the first int identifies which variable to update, and the second contains the new - * value. - * if tile != null the packet will be sent to the tile client tile instead of the client container. - */ - public Object sendObjectToClient(TileObjectSync tile, int index, Object object) { - for (Object p : crafters) { - OrbitalSatellite.network.sendTo(new TileObjectPacket(tile, OSRefs.INT_ID, index, object), (EntityPlayerMP) p); - } - return object; - } - - /** - * Sends two ints to the server-side Container. Normally the first int identifies which variable to update, and the second contains the new - * value. - * if tile != null the packet will be sent to the tile client tile instead of the client container. - */ - @SideOnly(Side.CLIENT) - public Object sendObjectToServer(TileObjectSync tile, int index, Object object) { - OrbitalSatellite.network.sendToServer(new TileObjectPacket(tile, OSRefs.INT_ID, index, object)); - return object; - } - - /** - * Called when a packet is received from ether the client or the server - */ - public abstract void receiveSyncData(int index, int value); -} diff --git a/src/main/java/fr/jackcartersmith/orbsat/common/handler/FMLEventHandler.java b/src/main/java/fr/jackcartersmith/orbsat/common/handler/FMLEventHandler.java deleted file mode 100644 index c76c954..0000000 --- a/src/main/java/fr/jackcartersmith/orbsat/common/handler/FMLEventHandler.java +++ /dev/null @@ -1,22 +0,0 @@ -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); - } -} diff --git a/src/main/java/fr/jackcartersmith/orbsat/common/items/AdvancedExtrapolCircuit.java b/src/main/java/fr/jackcartersmith/orbsat/common/items/AdvancedExtrapolCircuit.java deleted file mode 100644 index 06082da..0000000 --- a/src/main/java/fr/jackcartersmith/orbsat/common/items/AdvancedExtrapolCircuit.java +++ /dev/null @@ -1,13 +0,0 @@ -package fr.jackcartersmith.orbsat.common.items; - -import fr.jackcartersmith.orbsat.OrbitalSatellite; -import fr.jackcartersmith.orbsat.common.OSItems; -import fr.jackcartersmith.orbsat.common.lib.OSStrings; - -public class AdvancedExtrapolCircuit extends ItemOS{ - public AdvancedExtrapolCircuit() { - this.setUnlocalizedName(OSStrings.advancedExtrapolCircuitName); - this.setCreativeTab(OrbitalSatellite.OSCreaTab); - OSItems.register(this); - } -} diff --git a/src/main/java/fr/jackcartersmith/orbsat/common/items/AdvancedTargetDevice.java b/src/main/java/fr/jackcartersmith/orbsat/common/items/AdvancedTargetDevice.java deleted file mode 100644 index 40659f1..0000000 --- a/src/main/java/fr/jackcartersmith/orbsat/common/items/AdvancedTargetDevice.java +++ /dev/null @@ -1,13 +0,0 @@ -package fr.jackcartersmith.orbsat.common.items; - -import fr.jackcartersmith.orbsat.OrbitalSatellite; -import fr.jackcartersmith.orbsat.common.OSItems; -import fr.jackcartersmith.orbsat.common.lib.OSStrings; - -public class AdvancedTargetDevice extends ItemOS{ - public AdvancedTargetDevice() { - this.setUnlocalizedName(OSStrings.advancedTargetDeviceName); - this.setCreativeTab(OrbitalSatellite.OSCreaTab); - OSItems.register(this); - } -} diff --git a/src/main/java/fr/jackcartersmith/orbsat/common/items/BasicExtrapolCircuit.java b/src/main/java/fr/jackcartersmith/orbsat/common/items/BasicExtrapolCircuit.java deleted file mode 100644 index 343bfe7..0000000 --- a/src/main/java/fr/jackcartersmith/orbsat/common/items/BasicExtrapolCircuit.java +++ /dev/null @@ -1,13 +0,0 @@ -package fr.jackcartersmith.orbsat.common.items; - -import fr.jackcartersmith.orbsat.OrbitalSatellite; -import fr.jackcartersmith.orbsat.common.OSItems; -import fr.jackcartersmith.orbsat.common.lib.OSStrings; - -public class BasicExtrapolCircuit extends ItemOS{ - public BasicExtrapolCircuit() { - this.setUnlocalizedName(OSStrings.basicExtrapolCircuitName); - this.setCreativeTab(OrbitalSatellite.OSCreaTab); - OSItems.register(this); - } -} diff --git a/src/main/java/fr/jackcartersmith/orbsat/common/items/BasicTargetDevice.java b/src/main/java/fr/jackcartersmith/orbsat/common/items/BasicTargetDevice.java deleted file mode 100644 index 3470f04..0000000 --- a/src/main/java/fr/jackcartersmith/orbsat/common/items/BasicTargetDevice.java +++ /dev/null @@ -1,13 +0,0 @@ -package fr.jackcartersmith.orbsat.common.items; - -import fr.jackcartersmith.orbsat.OrbitalSatellite; -import fr.jackcartersmith.orbsat.common.OSItems; -import fr.jackcartersmith.orbsat.common.lib.OSStrings; - -public class BasicTargetDevice extends ItemOS{ - public BasicTargetDevice() { - this.setUnlocalizedName(OSStrings.basicTargetDeviceName); - this.setCreativeTab(OrbitalSatellite.OSCreaTab); - OSItems.register(this); - } -} diff --git a/src/main/java/fr/jackcartersmith/orbsat/common/items/InvolvedExtrapolCircuit.java b/src/main/java/fr/jackcartersmith/orbsat/common/items/InvolvedExtrapolCircuit.java deleted file mode 100644 index 504b1fe..0000000 --- a/src/main/java/fr/jackcartersmith/orbsat/common/items/InvolvedExtrapolCircuit.java +++ /dev/null @@ -1,13 +0,0 @@ -package fr.jackcartersmith.orbsat.common.items; - -import fr.jackcartersmith.orbsat.OrbitalSatellite; -import fr.jackcartersmith.orbsat.common.OSItems; -import fr.jackcartersmith.orbsat.common.lib.OSStrings; - -public class InvolvedExtrapolCircuit extends ItemOS{ - public InvolvedExtrapolCircuit() { - this.setUnlocalizedName(OSStrings.involvedExtrapolCircuitName); - this.setCreativeTab(OrbitalSatellite.OSCreaTab); - OSItems.register(this); - } -} diff --git a/src/main/java/fr/jackcartersmith/orbsat/common/items/InvolvedTargetDevice.java b/src/main/java/fr/jackcartersmith/orbsat/common/items/InvolvedTargetDevice.java deleted file mode 100644 index 9351211..0000000 --- a/src/main/java/fr/jackcartersmith/orbsat/common/items/InvolvedTargetDevice.java +++ /dev/null @@ -1,13 +0,0 @@ -package fr.jackcartersmith.orbsat.common.items; - -import fr.jackcartersmith.orbsat.OrbitalSatellite; -import fr.jackcartersmith.orbsat.common.OSItems; -import fr.jackcartersmith.orbsat.common.lib.OSStrings; - -public class InvolvedTargetDevice extends ItemOS{ - public InvolvedTargetDevice() { - this.setUnlocalizedName(OSStrings.involvedTargetDeviceName); - this.setCreativeTab(OrbitalSatellite.OSCreaTab); - OSItems.register(this); - } -} diff --git a/src/main/java/fr/jackcartersmith/orbsat/common/items/ItemOS.java b/src/main/java/fr/jackcartersmith/orbsat/common/items/ItemOS.java deleted file mode 100644 index ae800c9..0000000 --- a/src/main/java/fr/jackcartersmith/orbsat/common/items/ItemOS.java +++ /dev/null @@ -1,35 +0,0 @@ -package fr.jackcartersmith.orbsat.common.items; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import fr.jackcartersmith.orbsat.common.lib.OSRefs; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; - -public class ItemOS extends Item{ - public String getUnwrappedUnlocalizedName(final String unlocalizedName) { - return unlocalizedName.substring(unlocalizedName.indexOf(".") + 1); - } - - @Override - public String getUnlocalizedName() { - return String.format("item.%s%s", OSRefs.MODID.toLowerCase() + ":", getUnwrappedUnlocalizedName(super.getUnlocalizedName())); - } - - @Override - public String getUnlocalizedName(final ItemStack itemStack) { - return getUnlocalizedName(); - } - - @Override - @SideOnly(Side.CLIENT) - public void registerIcons(final IIconRegister iconRegister) { - this.itemIcon = iconRegister.registerIcon(OSRefs.RESOURCESPREFIX + getUnwrappedUnlocalizedName(super.getUnlocalizedName())); - } - - @Override - public boolean hasCustomEntity(ItemStack stack) { - return false; - } -} diff --git a/src/main/java/fr/jackcartersmith/orbsat/common/items/PhotonCapacitor.java b/src/main/java/fr/jackcartersmith/orbsat/common/items/PhotonCapacitor.java deleted file mode 100644 index b588126..0000000 --- a/src/main/java/fr/jackcartersmith/orbsat/common/items/PhotonCapacitor.java +++ /dev/null @@ -1,13 +0,0 @@ -package fr.jackcartersmith.orbsat.common.items; - -import fr.jackcartersmith.orbsat.OrbitalSatellite; -import fr.jackcartersmith.orbsat.common.OSItems; -import fr.jackcartersmith.orbsat.common.lib.OSStrings; - -public class PhotonCapacitor extends ItemOS{ - public PhotonCapacitor() { - this.setUnlocalizedName(OSStrings.photonCapacitorName); - this.setCreativeTab(OrbitalSatellite.OSCreaTab); - OSItems.register(this); - } -} diff --git a/src/main/java/fr/jackcartersmith/orbsat/common/items/PhotonCondenser.java b/src/main/java/fr/jackcartersmith/orbsat/common/items/PhotonCondenser.java deleted file mode 100644 index 01cfcdd..0000000 --- a/src/main/java/fr/jackcartersmith/orbsat/common/items/PhotonCondenser.java +++ /dev/null @@ -1,13 +0,0 @@ -package fr.jackcartersmith.orbsat.common.items; - -import fr.jackcartersmith.orbsat.OrbitalSatellite; -import fr.jackcartersmith.orbsat.common.OSItems; -import fr.jackcartersmith.orbsat.common.lib.OSStrings; - -public class PhotonCondenser extends ItemOS{ - public PhotonCondenser() { - this.setUnlocalizedName(OSStrings.photonCondenserName); - this.setCreativeTab(OrbitalSatellite.OSCreaTab); - OSItems.register(this); - } -} diff --git a/src/main/java/fr/jackcartersmith/orbsat/common/items/PhotonLense.java b/src/main/java/fr/jackcartersmith/orbsat/common/items/PhotonLense.java deleted file mode 100644 index 062c69c..0000000 --- a/src/main/java/fr/jackcartersmith/orbsat/common/items/PhotonLense.java +++ /dev/null @@ -1,13 +0,0 @@ -package fr.jackcartersmith.orbsat.common.items; - -import fr.jackcartersmith.orbsat.OrbitalSatellite; -import fr.jackcartersmith.orbsat.common.OSItems; -import fr.jackcartersmith.orbsat.common.lib.OSStrings; - -public class PhotonLense extends ItemOS{ - public PhotonLense() { - this.setUnlocalizedName(OSStrings.photonLenseName); - this.setCreativeTab(OrbitalSatellite.OSCreaTab); - OSItems.register(this); - } -} diff --git a/src/main/java/fr/jackcartersmith/orbsat/common/lib/OSConstants.java b/src/main/java/fr/jackcartersmith/orbsat/common/lib/OSConstants.java deleted file mode 100644 index a5869e1..0000000 --- a/src/main/java/fr/jackcartersmith/orbsat/common/lib/OSConstants.java +++ /dev/null @@ -1,82 +0,0 @@ -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("Logging", "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(); - } - } -} diff --git a/src/main/java/fr/jackcartersmith/orbsat/common/lib/OSRefs.java b/src/main/java/fr/jackcartersmith/orbsat/common/lib/OSRefs.java deleted file mode 100644 index c8726a9..0000000 --- a/src/main/java/fr/jackcartersmith/orbsat/common/lib/OSRefs.java +++ /dev/null @@ -1,29 +0,0 @@ -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; -} diff --git a/src/main/java/fr/jackcartersmith/orbsat/common/lib/OSStrings.java b/src/main/java/fr/jackcartersmith/orbsat/common/lib/OSStrings.java deleted file mode 100644 index 6690095..0000000 --- a/src/main/java/fr/jackcartersmith/orbsat/common/lib/OSStrings.java +++ /dev/null @@ -1,15 +0,0 @@ -package fr.jackcartersmith.orbsat.common.lib; - -public class OSStrings { - public static final String photonLenseName = "photonLense"; - public static final String photonCondenserName = "photonCondenser"; - public static final String photonCapacitorName = "photonCapacitor"; - public static final String basicExtrapolCircuitName = "basicExtrapolCircuit"; - public static final String advancedExtrapolCircuitName = "advancedExtrapolCircuit"; - public static final String involvedExtrapolCircuitName = "involvedExtrapolCircuit"; - public static final String basicTargetDeviceName = "basicTargetDevice"; - public static final String advancedTargetDeviceName = "advancedTargetDevice"; - public static final String involvedTargetDeviceName = "involvedTargetDevice"; - - public static final String defenderName = "defender"; -} diff --git a/src/main/java/fr/jackcartersmith/orbsat/common/network/TileObjectPacket.java b/src/main/java/fr/jackcartersmith/orbsat/common/network/TileObjectPacket.java deleted file mode 100644 index 104aeea..0000000 --- a/src/main/java/fr/jackcartersmith/orbsat/common/network/TileObjectPacket.java +++ /dev/null @@ -1,101 +0,0 @@ -package fr.jackcartersmith.orbsat.common.network; - -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 cpw.mods.fml.relauncher.Side; -import fr.jackcartersmith.orbsat.common.container.ContainerDataSync; -import fr.jackcartersmith.orbsat.common.tileentities.TileObjectSync; -import fr.jackcartersmith.orbsat.common.utils.DataUtils; -import io.netty.buffer.ByteBuf; -import net.minecraft.client.Minecraft; - -public class TileObjectPacket implements IMessage { - int x; - int y; - int z; - short index; - short dataType = -1; - Object object; - boolean isContainerPacket; - - /** - * Used for Tile and Container synchronization - */ - public TileObjectPacket() { - } - - public TileObjectPacket(TileObjectSync tile, byte dataType, int index, Object object) { - this.isContainerPacket = tile == null; - if (!isContainerPacket) { - this.x = tile.xCoord; - this.y = tile.yCoord; - this.z = tile.zCoord; - } - this.dataType = dataType; - this.object = object; - this.index = (short) index; - } - - @Override - public void toBytes(ByteBuf bytes) { - bytes.writeBoolean(isContainerPacket); - - if (!isContainerPacket) { - bytes.writeInt(x); - bytes.writeInt(y); - bytes.writeInt(z); - } - - bytes.writeByte(dataType); - bytes.writeShort(index); - - DataUtils.instance.writeObjectToBytes(bytes, dataType, object); - - } - - @Override - public void fromBytes(ByteBuf bytes) { - isContainerPacket = bytes.readBoolean(); - - if (!isContainerPacket) { - x = bytes.readInt(); - y = bytes.readInt(); - z = bytes.readInt(); - } - - dataType = bytes.readByte(); - index = bytes.readShort(); - - object = DataUtils.instance.readObjectFromBytes(bytes, dataType); - } - - public static class Handler implements IMessageHandler { - - @Override - public IMessage onMessage(TileObjectPacket message, MessageContext ctx) { - if (ctx.side == Side.CLIENT) { - if (message.isContainerPacket) { - ContainerDataSync container = Minecraft.getMinecraft().thePlayer.openContainer instanceof ContainerDataSync ? (ContainerDataSync) Minecraft.getMinecraft().thePlayer.openContainer : null; - if (container == null) return null; - container.receiveSyncData(message.index, (Integer) message.object); - } else { - if (!(Minecraft.getMinecraft().theWorld.getTileEntity(message.x, message.y, message.z) instanceof TileObjectSync)) - return null; - ((TileObjectSync) Minecraft.getMinecraft().theWorld.getTileEntity(message.x, message.y, message.z)).receiveObjectFromServer(message.index, message.object); - } - } else { - if (message.isContainerPacket) { - ContainerDataSync container = ctx.getServerHandler().playerEntity.openContainer instanceof ContainerDataSync ? (ContainerDataSync) ctx.getServerHandler().playerEntity.openContainer : null; - if (container == null) return null; - container.receiveSyncData(message.index, (Integer) message.object); - } else { - if (!(ctx.getServerHandler().playerEntity.worldObj.getTileEntity(message.x, message.y, message.z) instanceof TileObjectSync)) - return null; - ((TileObjectSync) ctx.getServerHandler().playerEntity.worldObj.getTileEntity(message.x, message.y, message.z)).receiveObjectFromClient(message.index, message.object); - } - } - return null; - } - } -} diff --git a/src/main/java/fr/jackcartersmith/orbsat/common/tileentities/TileDefender.java b/src/main/java/fr/jackcartersmith/orbsat/common/tileentities/TileDefender.java deleted file mode 100644 index 9d0a272..0000000 --- a/src/main/java/fr/jackcartersmith/orbsat/common/tileentities/TileDefender.java +++ /dev/null @@ -1,161 +0,0 @@ -package fr.jackcartersmith.orbsat.common.tileentities; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import fr.jackcartersmith.orbsat.OrbitalSatellite; -import fr.jackcartersmith.orbsat.client.render.particle.ParticleLaserBeam; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.network.NetworkManager; -import net.minecraft.network.Packet; -import net.minecraft.network.play.server.S35PacketUpdateTileEntity; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.AxisAlignedBB; -import net.minecraftforge.common.util.ForgeDirection; - -//public class TileDefender extends TileObjectSync implements IEnergyReceiver, ISidedInventory { -public class TileDefender extends TileEntity { - public float modelIllumination = 30F; - public int facingDirection = ForgeDirection.UP.ordinal(); - public boolean running = false; - public boolean runningCach = false; - public int pow = 75; - public float rotationSpeed = 4.0F; - public float crystalBrightness = 1.0F; - - - @SideOnly(Side.CLIENT) - private ParticleLaserBeam beam; - - @Override - public void updateEntity() { - /* - if (this.rotation != 1.0F) - { - if (this.rotation < 1.0F) - { - this.rotation += Math.max(this.rotation / 10.0F, 0.001F); - } - - if ((double)this.rotation > 0.999D) - { - this.rotation = 1.0F; - } - } - */ - - if (worldObj.isRemote) - beam = OrbitalSatellite.proxy.energyBeam(worldObj, this.xCoord + 0.52F, this.yCoord, this.zCoord + 0.48F, this.xCoord, this.yCoord + 1024, this.zCoord, pow, 8, beam, true, 0); - - - - - - - /* - if (this.active && this.startUp != 1.0F) - { - if (this.startUp < 1.0F) - { - this.startUp += Math.max(this.startUp / 10.0F, 0.001F); - } - - if ((double)this.startUp > 0.999D) - { - this.startUp = 1.0F; - } - } - - if (!this.active && this.startUp > 0.0F) - { - if (this.startUp > 0.0F) - { - this.startUp -= this.startUp / 10.0F; - } - - if ((double)this.startUp < 0.001D) - { - this.startUp = 0.0F; - } - } - */ - - - /* - targetSpeed = 1F; - - if (rotationSpeed < targetSpeed) rotationSpeed += 0.05F; - else if (rotationSpeed > targetSpeed) rotationSpeed -= 0.05F; - if (targetSpeed == 0 && rotationSpeed < 0) rotationSpeed = 0; - rotation += rotationSpeed; - */ - } - - /* - private boolean tryStartOrStop() { - if (items[0] != null && items[0].stackSize == 1 && items[0] != null && items[0].getItem() instanceof IEnergyContainerItem) { - IEnergyContainerItem item = (IEnergyContainerItem) items[0].getItem(); - if (item.getEnergyStored(items[0]) < item.getMaxEnergyStored(items[0])) { - running = true; - } else { - running = false; - } - } else { - running = false; - } - - return running; - } - */ - - @Override - public Packet getDescriptionPacket() { - NBTTagCompound tagCompound = new NBTTagCompound(); - this.writeToNBT(tagCompound); - return new S35PacketUpdateTileEntity(this.xCoord, this.yCoord, this.zCoord, 1, tagCompound); - } - - @Override - public void onDataPacket(NetworkManager net, S35PacketUpdateTileEntity pkt) { - readFromNBT(pkt.func_148857_g()); - } - - /* - public void detectAndSendChanges(boolean sendAnyway) { - if (runningCach != running || sendAnyway) { - runningCach = (Boolean) sendObjectToClient(OSRefs.BOOLEAN_ID, 0, running); - } - } - - @SideOnly(Side.CLIENT) - @Override - public void receiveObjectFromServer(int index, Object object) { - if (index == 0) running = (Boolean) object; - } - - @Override - public void writeToNBT(NBTTagCompound compound) { - super.writeToNBT(compound); - - masterLocation.writeToNBT(compound, "Master"); - compound.setInteger("Facing", facingDirection); - compound.setBoolean("IsValid", isValid); - compound.setInteger("RedstoneMode", redstoneMode); - } - */ - - @Override - public void readFromNBT(NBTTagCompound compound) { - super.readFromNBT(compound); - /* - masterLocation.readFromNBT(compound, "Master"); - facingDirection = compound.getInteger("Facing"); - isValid = compound.getBoolean("IsValid"); - redstoneMode = compound.getInteger("RedstoneMode"); - */ - } - - @Override - public AxisAlignedBB getRenderBoundingBox() { - return AxisAlignedBB.getBoundingBox(xCoord, yCoord, zCoord, xCoord + 1, yCoord + 1, zCoord + 1); - } -} diff --git a/src/main/java/fr/jackcartersmith/orbsat/common/tileentities/TileObjectSync.java b/src/main/java/fr/jackcartersmith/orbsat/common/tileentities/TileObjectSync.java deleted file mode 100644 index ff34bf9..0000000 --- a/src/main/java/fr/jackcartersmith/orbsat/common/tileentities/TileObjectSync.java +++ /dev/null @@ -1,40 +0,0 @@ -package fr.jackcartersmith.orbsat.common.tileentities; - -import cpw.mods.fml.common.network.NetworkRegistry.TargetPoint; -import fr.jackcartersmith.orbsat.OrbitalSatellite; -import fr.jackcartersmith.orbsat.common.network.TileObjectPacket; -import net.minecraft.tileentity.TileEntity; - -public abstract class TileObjectSync extends TileEntity{ - /** - * Sends a primitive to the client in the form of an object - */ - public Object sendObjectToClient(byte dataType, int index, Object object) { - return sendObjectToClient(dataType, index, object, new TargetPoint(worldObj.provider.dimensionId, xCoord, yCoord, zCoord, 64)); - } - - /** - * Sends a primitive to the client in the form of an object - */ - public Object sendObjectToClient(byte dataType, int index, Object object, TargetPoint point) { - OrbitalSatellite.network.sendToAllAround(new TileObjectPacket(this, dataType, index, object), point); - return object; - } - - public Object sendObjectToServer(byte dataType, int index, Object object) { - OrbitalSatellite.network.sendToServer(new TileObjectPacket(this, dataType, index, object)); - return object; - } - - /** - * Receives an object from the server - */ - public void receiveObjectFromClient(int index, Object object) { - } - - /** - * Receives an object from the server - */ - public void receiveObjectFromServer(int index, Object object) { - } -} diff --git a/src/main/java/fr/jackcartersmith/orbsat/common/utils/DataUtils.java b/src/main/java/fr/jackcartersmith/orbsat/common/utils/DataUtils.java deleted file mode 100644 index f6503fc..0000000 --- a/src/main/java/fr/jackcartersmith/orbsat/common/utils/DataUtils.java +++ /dev/null @@ -1,255 +0,0 @@ -package fr.jackcartersmith.orbsat.common.utils; - -import java.text.DecimalFormat; -import cpw.mods.fml.common.network.ByteBufUtils; -import fr.jackcartersmith.orbsat.common.lib.OSRefs; -import io.netty.buffer.ByteBuf; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; - -public class DataUtils { - public static DataUtils instance = new DataUtils(); - - public void writeObjectToBytes(ByteBuf bytes, int dataType, Object object){ - switch (dataType){ - case OSRefs.BYTE_ID: - bytes.writeByte((Byte)object); - break; - case OSRefs.SHORT_ID: - bytes.writeShort((Short) object); - break; - case OSRefs.INT_ID: - bytes.writeInt((Integer) object); - break; - case OSRefs.LONG_ID: - bytes.writeLong((Long) object); - break; - case OSRefs.FLOAT_ID: - bytes.writeFloat((Float) object); - break; - case OSRefs.DOUBLE_ID: - bytes.writeDouble((Double) object); - break; - case OSRefs.CHAR_ID: - bytes.writeChar((Character) object); - break; - case OSRefs.STRING_ID: - ByteBufUtils.writeUTF8String(bytes, (String) object); - break; - case OSRefs.BOOLEAN_ID: - bytes.writeBoolean((Boolean) object); - break; - case OSRefs.INT_PAIR_ID: - bytes.writeInt(((IntPair)object).i1); - bytes.writeInt(((IntPair)object).i2); - break; - } - } - - public Object readObjectFromBytes(ByteBuf bytes, int dataType){ - switch (dataType){ - case OSRefs.BYTE_ID: - return bytes.readByte(); - case OSRefs.SHORT_ID: - return bytes.readShort(); - case OSRefs.INT_ID: - return bytes.readInt(); - case OSRefs.LONG_ID: - return bytes.readLong(); - case OSRefs.FLOAT_ID: - return bytes.readFloat(); - case OSRefs.DOUBLE_ID: - return bytes.readDouble(); - case OSRefs.CHAR_ID: - return bytes.readChar(); - case OSRefs.STRING_ID: - return ByteBufUtils.readUTF8String(bytes); - case OSRefs.BOOLEAN_ID: - return bytes.readBoolean(); - case OSRefs.INT_PAIR_ID: - IntPair tx = new IntPair(0, 0); - tx.i1 = bytes.readInt(); - tx.i2 = bytes.readInt(); - return tx; - } - return null; - } - - public static void writeObjectToItem(ItemStack stack, Object value, int datatype, String name){ - switch (datatype){ - case OSRefs.BYTE_ID: - ItemNBTHelper.setByte(stack, name, (Byte) value); - break; - case OSRefs.SHORT_ID: - ItemNBTHelper.setShort(stack, name, (Short) value); - break; - case OSRefs.INT_ID: - ItemNBTHelper.setInteger(stack, name, (Integer) value); - break; - case OSRefs.LONG_ID: - ItemNBTHelper.setLong(stack, name, (Long) value); - break; - case OSRefs.FLOAT_ID: - ItemNBTHelper.setFloat(stack, name, (Float) value); - break; - case OSRefs.DOUBLE_ID: - ItemNBTHelper.setDouble(stack, name, (Double) value); - break; -// case OSRefs.CHAR_ID: -// ItemNBTHelper.setChar(stack, value.name, (Byte)value.value); -// break; - case OSRefs.STRING_ID: - ItemNBTHelper.setString(stack, name, (String) value); - break; - case OSRefs.BOOLEAN_ID: - ItemNBTHelper.setBoolean(stack, name, (Boolean) value); - break; - } - } - - public static void writeObjectToCompound(NBTTagCompound compound, Object value, int datatype, String name){ - switch (datatype){ - case OSRefs.BYTE_ID: - compound.setByte(name, (Byte) value); - break; - case OSRefs.SHORT_ID: - compound.setShort(name, (Short) value); - break; - case OSRefs.INT_ID: - compound.setInteger(name, (Integer) value); - break; - case OSRefs.LONG_ID: - compound.setLong(name, (Long) value); - break; - case OSRefs.FLOAT_ID: - compound.setFloat(name, (Float) value); - break; - case OSRefs.DOUBLE_ID: - compound.setDouble(name, (Double) value); - break; -// case OSRefs.CHAR_ID: -// ItemNBTHelper.setChar(stack, value.name, (Byte)value.value); -// break; - case OSRefs.STRING_ID: - compound.setString(name, (String) value); - break; - case OSRefs.BOOLEAN_ID: - compound.setBoolean(name, (Boolean) value); - break; - } - } - - public static Object readObjectFromItem(ItemStack stack, int dataType, String name, Object defaultExpected){ - switch (dataType){ - case OSRefs.BYTE_ID: - return ItemNBTHelper.getByte(stack, name, (Byte)defaultExpected); - case OSRefs.SHORT_ID: - return ItemNBTHelper.getShort(stack, name, (Short)defaultExpected); - case OSRefs.INT_ID: - return ItemNBTHelper.getInteger(stack, name, (Integer)defaultExpected); - case OSRefs.LONG_ID: - return ItemNBTHelper.getLong(stack, name, (Long)defaultExpected); - case OSRefs.FLOAT_ID: - return ItemNBTHelper.getFloat(stack, name, (Float)defaultExpected); - case OSRefs.DOUBLE_ID: - return ItemNBTHelper.getDouble(stack, name, (Double)defaultExpected); - //case OSRefs.CHAR_ID: - case OSRefs.STRING_ID: - return ItemNBTHelper.getString(stack, name, (String)defaultExpected); - case OSRefs.BOOLEAN_ID: - return ItemNBTHelper.getBoolean(stack, name, (Boolean)defaultExpected); - } - return null; - } - - public static Object readObjectFromItem(ItemStack stack, int dataType, String name){ - switch (dataType){ - case OSRefs.BYTE_ID: - return ItemNBTHelper.getByte(stack, name, (byte)0); - case OSRefs.SHORT_ID: - return ItemNBTHelper.getShort(stack, name, (short) 0); - case OSRefs.INT_ID: - return ItemNBTHelper.getInteger(stack, name, 0); - case OSRefs.LONG_ID: - return ItemNBTHelper.getLong(stack, name, 0L); - case OSRefs.FLOAT_ID: - return ItemNBTHelper.getFloat(stack, name, 0F); - case OSRefs.DOUBLE_ID: - return ItemNBTHelper.getDouble(stack, name, 0D); - //case OSRefs.CHAR_ID: - case OSRefs.STRING_ID: - return ItemNBTHelper.getString(stack, name, ""); - case OSRefs.BOOLEAN_ID: - return ItemNBTHelper.getBoolean(stack, name, false); - } - return null; - } - - public static Object readObjectFromCompound(NBTTagCompound compound, int dataType, String name, Object defaultExpected){ - switch (dataType){ - case OSRefs.BYTE_ID: - return compound.hasKey(name) ? compound.getByte(name) : (Byte)defaultExpected; - case OSRefs.SHORT_ID: - return compound.hasKey(name) ? compound.getShort(name) : (Short)defaultExpected; - case OSRefs.INT_ID: - return compound.hasKey(name) ? compound.getInteger(name) : (Integer)defaultExpected; - case OSRefs.LONG_ID: - return compound.hasKey(name) ? compound.getLong(name) : (Long)defaultExpected; - case OSRefs.FLOAT_ID: - return compound.hasKey(name) ? compound.getFloat(name) : (Float)defaultExpected; - case OSRefs.DOUBLE_ID: - return compound.hasKey(name) ? compound.getDouble(name) : (Double)defaultExpected; - //case OSRefs.CHAR_ID: - case OSRefs.STRING_ID: - return compound.hasKey(name) ? compound.getString(name) : (String)defaultExpected; - case OSRefs.BOOLEAN_ID: - return compound.hasKey(name) ? compound.getBoolean(name) : (Boolean)defaultExpected; - } - return null; - } - - public static class IntPair - { - public int i1; - public int i2; - - public IntPair(int i1, int i2) - { - this.i1 = i1; - this.i2 = i2; - } - } - - public static class XZPair{ - public X x; - public Z z; - - public XZPair(X x, Z z){ - this.x = x; - this.z = z; - } - - public X getKey() { return x; } - - public Z getValue() { return z; } - } - - public static class XYZTri{ - public X x; - public Y y; - public Z z; - - public XYZTri(X x, Y y, Z z){ - this.x = x; - this.y = y; - this.z = z; - } - } - - public static String formatFileSize(long size) { - if(size <= 0) return "0"; - final String[] units = new String[] { "B", "kB", "MB", "GB", "TB" }; - int digitGroups = (int) (Math.log10(size)/Math.log10(1024)); - return new DecimalFormat("#,##0.#").format(size/Math.pow(1024, digitGroups)) + " " + units[digitGroups]; - } -} diff --git a/src/main/java/fr/jackcartersmith/orbsat/common/utils/ItemNBTHelper.java b/src/main/java/fr/jackcartersmith/orbsat/common/utils/ItemNBTHelper.java deleted file mode 100644 index 1b3f38b..0000000 --- a/src/main/java/fr/jackcartersmith/orbsat/common/utils/ItemNBTHelper.java +++ /dev/null @@ -1,117 +0,0 @@ -package fr.jackcartersmith.orbsat.common.utils; - -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; - -public class ItemNBTHelper { - // SETTERS /////////////////////////////////////////////////////////////////// - public static NBTTagCompound getCompound(ItemStack stack){ - if (stack.getTagCompound() == null) stack.setTagCompound(new NBTTagCompound()); - return stack.getTagCompound(); - } - - public static ItemStack setByte(ItemStack stack, String tag, byte b) - { - NBTTagCompound compound = getCompound(stack); - compound.setByte(tag, b); - stack.setTagCompound(compound); - return stack; - } - - public static ItemStack setBoolean(ItemStack stack, String tag, boolean b) - { - NBTTagCompound compound = getCompound(stack); - compound.setBoolean(tag, b); - stack.setTagCompound(compound); - return stack; - } - - public static ItemStack setShort(ItemStack stack, String tag, short s) - { - NBTTagCompound compound = getCompound(stack); - compound.setShort(tag, s); - stack.setTagCompound(compound); - return stack; - } - - public static ItemStack setInteger(ItemStack stack, String tag, int i) - { - NBTTagCompound compound = getCompound(stack); - compound.setInteger(tag, i); - stack.setTagCompound(compound); - return stack; - } - - public static ItemStack setLong(ItemStack stack, String tag, long i) - { - NBTTagCompound compound = getCompound(stack); - compound.setLong(tag, i); - stack.setTagCompound(compound); - return stack; - } - - public static ItemStack setFloat(ItemStack stack, String tag, float f) - { - NBTTagCompound compound = getCompound(stack); - compound.setFloat(tag, f); - stack.setTagCompound(compound); - return stack; - } - - public static ItemStack setDouble(ItemStack stack, String tag, double d) - { - NBTTagCompound compound = getCompound(stack); - compound.setDouble(tag, d); - stack.setTagCompound(compound); - return stack; - } - - public static ItemStack setString(ItemStack stack, String tag, String s) { - NBTTagCompound compound = getCompound(stack); - compound.setString(tag, s); - stack.setTagCompound(compound); - return stack; - } - - // GETTERS /////////////////////////////////////////////////////////////////// - - public static boolean verifyExistance(ItemStack stack, String tag) { - NBTTagCompound compound = stack.getTagCompound(); - if (compound == null) - return false; - else - return stack.getTagCompound().hasKey(tag); - } - - public static byte getByte(ItemStack stack, String tag, byte defaultExpected) { - return verifyExistance(stack, tag) ? stack.getTagCompound().getByte(tag) : defaultExpected; - } - - public static boolean getBoolean(ItemStack stack, String tag, boolean defaultExpected) { - return verifyExistance(stack, tag) ? stack.getTagCompound().getBoolean(tag) : defaultExpected; - } - - public static short getShort(ItemStack stack, String tag, short defaultExpected) { - return verifyExistance(stack, tag) ? stack.getTagCompound().getShort(tag) : defaultExpected; - } - - public static int getInteger(ItemStack stack, String tag, int defaultExpected) { - return verifyExistance(stack, tag) ? stack.getTagCompound().getInteger(tag) : defaultExpected; - } - - public static long getLong(ItemStack stack, String tag, long defaultExpected) { - return verifyExistance(stack, tag) ? stack.getTagCompound().getLong(tag) : defaultExpected; - } - - public static float getFloat(ItemStack stack, String tag, float defaultExpected) { - return verifyExistance(stack, tag) ? stack.getTagCompound().getFloat(tag) : defaultExpected; - } - - public static double getDouble(ItemStack stack, String tag, double defaultExpected) { - return verifyExistance(stack, tag) ? stack.getTagCompound().getDouble(tag) : defaultExpected; - } - - public static String getString(ItemStack stack, String tag, String defaultExpected) { - return verifyExistance(stack, tag) ? stack.getTagCompound().getString(tag) : defaultExpected; - } -} diff --git a/src/main/java/fr/jackcartersmith/orbsat/common/utils/OSLogHelper.java b/src/main/java/fr/jackcartersmith/orbsat/common/utils/OSLogHelper.java deleted file mode 100644 index 280dac5..0000000 --- a/src/main/java/fr/jackcartersmith/orbsat/common/utils/OSLogHelper.java +++ /dev/null @@ -1,49 +0,0 @@ -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); - } -} diff --git a/src/main/java/fr/jackcartersmith/orbsat/common/utils/Utils.java b/src/main/java/fr/jackcartersmith/orbsat/common/utils/Utils.java deleted file mode 100644 index 41859a7..0000000 --- a/src/main/java/fr/jackcartersmith/orbsat/common/utils/Utils.java +++ /dev/null @@ -1,210 +0,0 @@ -package fr.jackcartersmith.orbsat.common.utils; - -import cpw.mods.fml.common.FMLCommonHandler; -import cpw.mods.fml.common.registry.GameData; -import net.minecraft.command.IEntitySelector; -import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.util.MathHelper; -import net.minecraft.world.World; - -public class Utils { - public static IEntitySelector selectLivingBase = new IEntitySelector() { - @Override - public boolean isEntityApplicable(Entity entity) { - return entity instanceof EntityLivingBase; - } - }; - - public static IEntitySelector selectPlayer = new IEntitySelector() { - @Override - public boolean isEntityApplicable(Entity entity) { - return entity instanceof EntityPlayer; - } - }; - - public static String formatNumber(double value){ - if (value < 1000D) - return String.valueOf(value); - else if (value < 1000000D) - return String.valueOf(Math.round(value)/1000D) + "K"; - else if (value < 1000000000D) - return String.valueOf(Math.round(value/1000D)/1000D) + "M"; - else if (value < 1000000000000D) - return String.valueOf(Math.round(value/1000000D)/1000D) + "B"; - else - return String.valueOf(Math.round(value/1000000000D)/1000D) + "T"; - } - - public static String formatNumber(long value){ - if (value < 1000L) - return String.valueOf(value); - else if (value < 1000000L) - return String.valueOf(Math.round(value)/1000D) + "K"; - else if (value < 1000000000L) - return String.valueOf(Math.round(value/1000L)/1000D) + "M"; - else if (value < 1000000000000L) - return String.valueOf(Math.round(value/1000000L)/1000D) + "B"; - else - return String.valueOf(Math.round(value/1000000000L)/1000D) + "T"; - } - - /** - * Add commas to a number e.g. 161253126 > 161,253,126 - */ - public static String addCommas(int value){ - String rawNumber = String.valueOf(value); - String formattedNumber = ""; - do { - int end = rawNumber.length(); - int start = Math.max(0, end - 3); - String part = rawNumber.substring(start, end); - rawNumber = rawNumber.substring(0, start); - formattedNumber = part + (formattedNumber.length() > 0 ? "," : "") + formattedNumber; - - }while (rawNumber.length() > 0); - return formattedNumber; - } - - /** - * Add commas to a number e.g. 161253126 > 161,253,126 - */ - public static String addCommas(long value){ - String rawNumber = String.valueOf(value); - String formattedNumber = ""; - do { - int end = rawNumber.length(); - int start = Math.max(0, end - 3); - String part = rawNumber.substring(start, end); - rawNumber = rawNumber.substring(0, start); - formattedNumber = part + (formattedNumber.length() > 0 ? "," : "") + formattedNumber; - - }while (rawNumber.length() > 0); - return formattedNumber; - } - - /** - * Calculates the exact distance between two points in 3D space - * @param x1 point A x - * @param y1 point A y - * @param z1 point A z - * @param x2 point B x - * @param y2 point B y - * @param z2 point B z - * @return The distance between point A and point B - */ - public static double getDistanceAtoB(double x1, double y1, double z1, double x2, double y2, double z2){ - double dx = x1-x2; - double dy = y1-y2; - double dz = z1-z2; - return Math.sqrt((dx*dx + dy*dy + dz*dz)); - } - - /** - * Calculates the exact distance between two points in 2D space - * @param x1 point A x - * @param z1 point A z - * @param x2 point B x - * @param z2 point B z - * @return The distance between point A and point B - */ - public static double getDistanceAtoB(double x1, double z1, double x2, double z2){ - double dx = x1-x2; - double dz = z1-z2; - return Math.sqrt((dx*dx + dz*dz )); - } - - public static double getDistanceSq(double x1, double y1, double z1, double x2, double y2, double z2){ - double dx = x1-x2; - double dy = y1-y2; - double dz = z1-z2; - return dx*dx + dy*dy + dz*dz; - } - - public static double getDistanceSq(double x1, double z1, double x2, double z2){ - double dx = x1-x2; - double dz = z1-z2; - return dx*dx + dz*dz; - } - - /** - * Returns true if this is a client connected to a remote server. - */ - public static boolean isConnectedToDedicatedServer() - { - return FMLCommonHandler.instance().getMinecraftServerInstance() == null; - } - - /** - * Get itemstack from name of item or block name. - */ - public static ItemStack getStackFromName(String name, int meta) - { - if (name.contains("tile.")) - { - name = name.replace("draconicevolution", "DraconicEvolution").replace("tile.", ""); - if (GameData.getBlockRegistry().getObject(name) != null) return new ItemStack(GameData.getBlockRegistry().getObject(name), 1, meta); - } - if (name.contains("item.")) - { - name = name.replace("draconicevolution", "DraconicEvolution").replace("item.", ""); - if (GameData.getItemRegistry().getObject(name) != null) return new ItemStack(GameData.getItemRegistry().getObject(name), 1, meta); - } - return null; - } - - /** - * Update the blocks an all 6 sides of a block. - */ - public static void updateNeabourBlocks(World world, int x, int y, int z) - { - world.notifyBlocksOfNeighborChange(x, y, z, world.getBlock(x, y, z)); - world.notifyBlocksOfNeighborChange(x - 1, y, z, world.getBlock(x, y, z)); - world.notifyBlocksOfNeighborChange(x + 1, y, z, world.getBlock(x, y, z)); - world.notifyBlocksOfNeighborChange(x, y - 1, z, world.getBlock(x, y, z)); - world.notifyBlocksOfNeighborChange(x, y + 1, z, world.getBlock(x, y, z)); - world.notifyBlocksOfNeighborChange(x, y, z - 1, world.getBlock(x, y, z)); - world.notifyBlocksOfNeighborChange(x, y, z + 1, world.getBlock(x, y, z)); - } - - /** - * Determine the orientation of a block based on the position of the entity that placed it. - */ - public static int determineOrientation(int x, int y, int z, EntityLivingBase entity) - { - if (MathHelper.abs((float) entity.posX - (float) x) < 2.0F && MathHelper.abs((float)entity.posZ - (float)z) < 2.0F) - { - double d0 = entity.posY + 1.82D - (double)entity.yOffset; - - if (d0 - (double)y > 2.0D) return 0; - - if ((double)y - d0 > 0.0D) return 1; - } - - int l = MathHelper.floor_double((double)(entity.rotationYaw * 4.0F / 360.0F) + 0.5D) & 3; - return l == 0 ? 3 : (l == 1 ? 4 : (l == 2 ? 2 : (l == 3 ? 5 : 0))); - } - - public static double round(double number, double multiplier){ - return Math.round(number * multiplier) / multiplier; - } - - public static int getNearestMultiple(int number, int multiple){ - int result = number; - - if (number < 0) result *= -1; - - if (result % multiple == 0) return number; - else if (result % multiple < multiple/2) result = result - result % multiple; - else result = result + (multiple - result % multiple); - - if (number < 0) result *= -1; - - return result; - } - - /**Simple method to convert a Double object to a primitive int*/ - public static int toInt(double d) { return (int)d; } -} diff --git a/src/main/resources/assets/orbsat/lang/en_US.lang b/src/main/resources/assets/orbsat/lang/en_US.lang deleted file mode 100644 index f0b503c..0000000 --- a/src/main/resources/assets/orbsat/lang/en_US.lang +++ /dev/null @@ -1,23 +0,0 @@ -// CreativeTabs ------------------------------------------- -itemGroup.orbsat=Orbital Bombardment - -// Items -------------------------------------------------- -item.orbsat:photonLense.name=Laser Lens -item.orbsat:photonCapacitor.name=Photon Condenser -item.orbsat:photonCondenser.name=Photon Capacitor -item.orbsat:basicExtrapolCircuit.name=Basic Extrapolation Circuit -item.orbsat:advancedExtrapolCircuit.name=Advanced Extrapolation Circuit -item.orbsat:InvolvedExtrapolCircuit.name=Involved Extrapolation Circuit -item.orbsat:basicTargetDevice.name=Basic Targeting Device -item.orbsat:advancedTargetDevice.name=Advanced Targeting Device -item.orbsat:involvedTargetDevice.name=Involved Targeting Device - -// Tiles -------------------------------------------------- -tile.orbsat:defender.name=Laser Defender -tile.obOverrider.name=Laser Satelite Overrider -tile.obExtender.name=Extender -tile.obSatelite.name=Laser Satelite Prototype LX-I -tile.obAccelerator.name=Photon Accelerator -tile.obDecelerator.name=Photon Deccelerator -tile.obInverterAdv.name=Advanced Photonic Converter -tile.obInverter.name=Photonic Converter \ No newline at end of file diff --git a/src/main/resources/assets/orbsat/textures/blocks/defenderLaserEvo.png b/src/main/resources/assets/orbsat/textures/blocks/defenderLaserEvo.png deleted file mode 100644 index 8e7ba289ad174e29c21e6eccd289f6c01e9b1fe1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 108 zcmeAS@N?(olHy`uVBq!ia0vp^0zj<5!3HFyJAa%3QpTPxjv*Dd-u7(dWnkbq^y9zC zJeTxleht&q0*wa~ETzKdu~wOy>TgWv3gA?kaA2+jhq;FEB+I^8w_?PA+8I1u{an^L HB{Ts5#EBlW diff --git a/src/main/resources/assets/orbsat/textures/blocks/machine.png b/src/main/resources/assets/orbsat/textures/blocks/machine.png deleted file mode 100644 index 0e7e0cc0af0c9597a2fa45c4dc16a3a12f3553a9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 10430 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 diff --git a/src/main/resources/assets/orbsat/textures/models/laserBeam.png b/src/main/resources/assets/orbsat/textures/models/laserBeam.png deleted file mode 100644 index 7480229457c4000bd5cd15ab10a79e8056ce86c5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1577 zcmV+^2G;qBP)WFU8GbZ8()Nlj2>E@cM*00oUnL_t(|+SOYzj_fuJ zeWb0Ot$&pw*dwF~{yB1qU;P86$|e3i(&YqMq)7GqV8&t!$u>z*vj{K~NCOzNYs+Ja zdL-YYWWobK^ouZnR{);?yaD(Lz|R0af4bp^w*~7L!t(VkuXw|PAE|u5W5Zu^!#lQL z-}&~NV0+(i`@Z6D0KeDc4*-7x_zvJ7`9|9#`pkIjhl0OJKPTP4$6sdv;@V4aZWsgT zLFofbAl{r|7y<^s5PhDv(!Tz`^nP<>1L&Ez2-pXWW6p3A*;a>0p3MNp5PM)-PZER!{^u}t7C=CJ=+S6+b{gb6 zElxA}Q(X+_8B7i|)Hx?#<3j#QYvp=N^^jMs9vWE1s$Sgsyr__iEQpJ!a zK4%P2=c^c!XNaHwLk?311%xZG@=1Dv-q6aWog2K&gn-a6T*=O=pUmywDho)5Qq$-N z=<@hWKLeQfaN)a%l3IPDSrA}YUt*ITyeyW)4f`V}h6n)U8_CEB(4Ahn__VAx__aM@ z+m5ec?jI8YL5Gao}SsyQ8LeDN$ZaVLPyT{lcO0qi0Ct zXCT0noUA(^xmV1NMl7;ub+J8F<2OJ~O2x6Fb70+1`Omjuvu)&R@Xv#keg0Hw+a>V3X;Jm$j4 zoh-0cF+?v6dF4>~9en?_xPa7^A-d--BO^dM>hKgcCj!V3Bkvwdpa+J|0_=3a;>uzE zsp5O%%3?Ab6U@O;1OV!N9sx810xT1}HmojIgN_C6Dl!PH!y`bi42!A-K#8GV zNldfFok;O)2rx0Ak{TqH?Mr z#B)4V3^3K56fJb;mI^29CJWkC1eyr}yB3fYb!F%d4_NtFA{V6vM3vSu0GR;+5@Z5d zTJfVPFzR)26`^LM#OMfs;{gCbFZ1yIC?v z#A;LoL|bIEw$~e@&wT-GdSq${9Rv&?146||kr8Z>RDzm;)&Nt)0FM9;NC$OFV$nMT z9s!so2AoBpk_9Bi>jBNZsVt0$stY!RY4j{$1L5^QJW*f2HfoS&$N~}?Ko%0@N`SHKns4onoRFCTz!Vbq5#& zV2X+z7zMAgQ`~d?mI)RFa9me> bh7tY+2FcQT8U`&O00000NkvXXu0mjf*DSF8