diff --git a/src/main/java/fr/jackcartersmith/orbsat/OBNetwork$1.java b/ob/OBNetwork$1.java similarity index 100% rename from src/main/java/fr/jackcartersmith/orbsat/OBNetwork$1.java rename to ob/OBNetwork$1.java diff --git a/src/main/java/fr/jackcartersmith/orbsat/OBNetwork.java b/ob/OBNetwork.java similarity index 100% rename from src/main/java/fr/jackcartersmith/orbsat/OBNetwork.java rename to ob/OBNetwork.java diff --git a/src/main/java/fr/jackcartersmith/orbsat/OBNetworkClient.java b/ob/OBNetworkClient.java similarity index 100% rename from src/main/java/fr/jackcartersmith/orbsat/OBNetworkClient.java rename to ob/OBNetworkClient.java diff --git a/src/main/java/fr/jackcartersmith/ob/blocks/DefLasBlock.java b/ob/blocks/DefLasBlock.java similarity index 100% rename from src/main/java/fr/jackcartersmith/ob/blocks/DefLasBlock.java rename to ob/blocks/DefLasBlock.java diff --git a/src/main/java/fr/jackcartersmith/ob/blocks/DefenderBlock.java b/ob/blocks/DefenderBlock.java similarity index 100% rename from src/main/java/fr/jackcartersmith/ob/blocks/DefenderBlock.java rename to ob/blocks/DefenderBlock.java diff --git a/src/main/java/fr/jackcartersmith/ob/blocks/DefenderLaserTileEntity.java b/ob/blocks/DefenderLaserTileEntity.java similarity index 100% rename from src/main/java/fr/jackcartersmith/ob/blocks/DefenderLaserTileEntity.java rename to ob/blocks/DefenderLaserTileEntity.java diff --git a/src/main/java/fr/jackcartersmith/ob/blocks/DefenderTileEntity.java b/ob/blocks/DefenderTileEntity.java similarity index 100% rename from src/main/java/fr/jackcartersmith/ob/blocks/DefenderTileEntity.java rename to ob/blocks/DefenderTileEntity.java diff --git a/src/main/java/fr/jackcartersmith/ob/blocks/ExtenderBlock.java b/ob/blocks/ExtenderBlock.java similarity index 100% rename from src/main/java/fr/jackcartersmith/ob/blocks/ExtenderBlock.java rename to ob/blocks/ExtenderBlock.java diff --git a/src/main/java/fr/jackcartersmith/ob/blocks/ExtenderTileEntity.java b/ob/blocks/ExtenderTileEntity.java similarity index 100% rename from src/main/java/fr/jackcartersmith/ob/blocks/ExtenderTileEntity.java rename to ob/blocks/ExtenderTileEntity.java diff --git a/src/main/java/fr/jackcartersmith/ob/blocks/InverterAdvTileEntity.java b/ob/blocks/InverterAdvTileEntity.java similarity index 100% rename from src/main/java/fr/jackcartersmith/ob/blocks/InverterAdvTileEntity.java rename to ob/blocks/InverterAdvTileEntity.java diff --git a/src/main/java/fr/jackcartersmith/ob/blocks/InverterTileEntity.java b/ob/blocks/InverterTileEntity.java similarity index 100% rename from src/main/java/fr/jackcartersmith/ob/blocks/InverterTileEntity.java rename to ob/blocks/InverterTileEntity.java diff --git a/src/main/java/fr/jackcartersmith/ob/blocks/LaserLowBlock.java b/ob/blocks/LaserLowBlock.java similarity index 93% rename from src/main/java/fr/jackcartersmith/ob/blocks/LaserLowBlock.java rename to ob/blocks/LaserLowBlock.java index 886e053..a2ecb7f 100644 --- a/src/main/java/fr/jackcartersmith/ob/blocks/LaserLowBlock.java +++ b/ob/blocks/LaserLowBlock.java @@ -2,8 +2,8 @@ package fr.jackcartersmith.ob.blocks; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import fr.jackcartersmith.ob.items.OBItems; import fr.jackcartersmith.ob.proxy.ClientProxy; +import fr.jackcartersmith.orbsat.common.OSItems; import net.minecraft.block.Block; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; @@ -81,17 +81,17 @@ public class LaserLowBlock extends BlockContainer try { - if (Minecraft.getMinecraft().thePlayer.getCurrentEquippedItem().getUnlocalizedName().equals(OBItems.laserGunHighItem.getUnlocalizedName())) + if (Minecraft.getMinecraft().thePlayer.getCurrentEquippedItem().getUnlocalizedName().equals(OSItems.laserGunHighItem.getUnlocalizedName())) { color = "red"; } - if (Minecraft.getMinecraft().thePlayer.getCurrentEquippedItem().getUnlocalizedName().equals(OBItems.laserGunMedItem.getUnlocalizedName())) + if (Minecraft.getMinecraft().thePlayer.getCurrentEquippedItem().getUnlocalizedName().equals(OSItems.laserGunMedItem.getUnlocalizedName())) { color = "orange"; } - if (Minecraft.getMinecraft().thePlayer.getCurrentEquippedItem().getUnlocalizedName().equals(OBItems.laserGunLowItem.getUnlocalizedName())) + if (Minecraft.getMinecraft().thePlayer.getCurrentEquippedItem().getUnlocalizedName().equals(OSItems.laserGunLowItem.getUnlocalizedName())) { color = "blue"; } diff --git a/src/main/java/fr/jackcartersmith/ob/blocks/LaserLowTileEntity.java b/ob/blocks/LaserLowTileEntity.java similarity index 100% rename from src/main/java/fr/jackcartersmith/ob/blocks/LaserLowTileEntity.java rename to ob/blocks/LaserLowTileEntity.java diff --git a/src/main/java/fr/jackcartersmith/ob/blocks/OverriderBlock.java b/ob/blocks/OverriderBlock.java similarity index 100% rename from src/main/java/fr/jackcartersmith/ob/blocks/OverriderBlock.java rename to ob/blocks/OverriderBlock.java diff --git a/src/main/java/fr/jackcartersmith/ob/blocks/OverriderBlockTileEntity.java b/ob/blocks/OverriderBlockTileEntity.java similarity index 100% rename from src/main/java/fr/jackcartersmith/ob/blocks/OverriderBlockTileEntity.java rename to ob/blocks/OverriderBlockTileEntity.java diff --git a/src/main/java/fr/jackcartersmith/ob/blocks/PhotonAcceleratorBlock.java b/ob/blocks/PhotonAcceleratorBlock.java similarity index 100% rename from src/main/java/fr/jackcartersmith/ob/blocks/PhotonAcceleratorBlock.java rename to ob/blocks/PhotonAcceleratorBlock.java diff --git a/src/main/java/fr/jackcartersmith/ob/blocks/PhotonAcceleratorTileEntity.java b/ob/blocks/PhotonAcceleratorTileEntity.java similarity index 100% rename from src/main/java/fr/jackcartersmith/ob/blocks/PhotonAcceleratorTileEntity.java rename to ob/blocks/PhotonAcceleratorTileEntity.java diff --git a/src/main/java/fr/jackcartersmith/ob/blocks/PhotonDeceleratorBlock.java b/ob/blocks/PhotonDeceleratorBlock.java similarity index 100% rename from src/main/java/fr/jackcartersmith/ob/blocks/PhotonDeceleratorBlock.java rename to ob/blocks/PhotonDeceleratorBlock.java diff --git a/src/main/java/fr/jackcartersmith/ob/blocks/PhotonDeceleratorTileEntity.java b/ob/blocks/PhotonDeceleratorTileEntity.java similarity index 100% rename from src/main/java/fr/jackcartersmith/ob/blocks/PhotonDeceleratorTileEntity.java rename to ob/blocks/PhotonDeceleratorTileEntity.java diff --git a/src/main/java/fr/jackcartersmith/ob/blocks/PhotonInverterAdvBlock.java b/ob/blocks/PhotonInverterAdvBlock.java similarity index 100% rename from src/main/java/fr/jackcartersmith/ob/blocks/PhotonInverterAdvBlock.java rename to ob/blocks/PhotonInverterAdvBlock.java diff --git a/src/main/java/fr/jackcartersmith/ob/blocks/PhotonInverterBlock.java b/ob/blocks/PhotonInverterBlock.java similarity index 100% rename from src/main/java/fr/jackcartersmith/ob/blocks/PhotonInverterBlock.java rename to ob/blocks/PhotonInverterBlock.java diff --git a/src/main/java/fr/jackcartersmith/ob/blocks/SateliteBlock.java b/ob/blocks/SateliteBlock.java similarity index 100% rename from src/main/java/fr/jackcartersmith/ob/blocks/SateliteBlock.java rename to ob/blocks/SateliteBlock.java diff --git a/src/main/java/fr/jackcartersmith/ob/blocks/SateliteTileEntity.java b/ob/blocks/SateliteTileEntity.java similarity index 100% rename from src/main/java/fr/jackcartersmith/ob/blocks/SateliteTileEntity.java rename to ob/blocks/SateliteTileEntity.java diff --git a/src/main/java/fr/jackcartersmith/ob/entities/LaserLightEntity.java b/ob/entities/LaserLightEntity.java similarity index 100% rename from src/main/java/fr/jackcartersmith/ob/entities/LaserLightEntity.java rename to ob/entities/LaserLightEntity.java diff --git a/src/main/java/fr/jackcartersmith/ob/entities/LaserLightEntityRenderer.java b/ob/entities/LaserLightEntityRenderer.java similarity index 100% rename from src/main/java/fr/jackcartersmith/ob/entities/LaserLightEntityRenderer.java rename to ob/entities/LaserLightEntityRenderer.java diff --git a/src/main/java/fr/jackcartersmith/ob/entities/MeteorEntity.java b/ob/entities/MeteorEntity.java similarity index 100% rename from src/main/java/fr/jackcartersmith/ob/entities/MeteorEntity.java rename to ob/entities/MeteorEntity.java diff --git a/src/main/java/fr/jackcartersmith/ob/entities/MeteorRenderer.java b/ob/entities/MeteorRenderer.java similarity index 100% rename from src/main/java/fr/jackcartersmith/ob/entities/MeteorRenderer.java rename to ob/entities/MeteorRenderer.java diff --git a/src/main/java/fr/jackcartersmith/ob/entities/ModelMeteor.java b/ob/entities/ModelMeteor.java similarity index 100% rename from src/main/java/fr/jackcartersmith/ob/entities/ModelMeteor.java rename to ob/entities/ModelMeteor.java diff --git a/src/main/java/fr/jackcartersmith/orbsat/client/gui/ExtenderGui.java b/ob/gui/ExtenderGui.java similarity index 100% rename from src/main/java/fr/jackcartersmith/orbsat/client/gui/ExtenderGui.java rename to ob/gui/ExtenderGui.java diff --git a/src/main/java/fr/jackcartersmith/orbsat/client/gui/GuiHandlerForOb.java b/ob/gui/GuiHandlerForOb.java similarity index 100% rename from src/main/java/fr/jackcartersmith/orbsat/client/gui/GuiHandlerForOb.java rename to ob/gui/GuiHandlerForOb.java diff --git a/src/main/java/fr/jackcartersmith/orbsat/client/gui/OverriderBlockGui.java b/ob/gui/OverriderBlockGui.java similarity index 100% rename from src/main/java/fr/jackcartersmith/orbsat/client/gui/OverriderBlockGui.java rename to ob/gui/OverriderBlockGui.java diff --git a/src/main/java/fr/jackcartersmith/orbsat/client/gui/PhotonAcceleratorGui.java b/ob/gui/PhotonAcceleratorGui.java similarity index 100% rename from src/main/java/fr/jackcartersmith/orbsat/client/gui/PhotonAcceleratorGui.java rename to ob/gui/PhotonAcceleratorGui.java diff --git a/src/main/java/fr/jackcartersmith/orbsat/client/gui/PhotonDeceleratorGui.java b/ob/gui/PhotonDeceleratorGui.java similarity index 100% rename from src/main/java/fr/jackcartersmith/orbsat/client/gui/PhotonDeceleratorGui.java rename to ob/gui/PhotonDeceleratorGui.java diff --git a/src/main/java/fr/jackcartersmith/orbsat/client/gui/PhotonInverterAdvGui.java b/ob/gui/PhotonInverterAdvGui.java similarity index 100% rename from src/main/java/fr/jackcartersmith/orbsat/client/gui/PhotonInverterAdvGui.java rename to ob/gui/PhotonInverterAdvGui.java diff --git a/src/main/java/fr/jackcartersmith/orbsat/client/gui/PhotonInverterGui.java b/ob/gui/PhotonInverterGui.java similarity index 100% rename from src/main/java/fr/jackcartersmith/orbsat/client/gui/PhotonInverterGui.java rename to ob/gui/PhotonInverterGui.java diff --git a/src/main/java/fr/jackcartersmith/ob/interfaces/PhotonConsuming.java b/ob/interfaces/PhotonConsuming.java similarity index 100% rename from src/main/java/fr/jackcartersmith/ob/interfaces/PhotonConsuming.java rename to ob/interfaces/PhotonConsuming.java diff --git a/src/main/java/fr/jackcartersmith/ob/interfaces/PhotonProducing.java b/ob/interfaces/PhotonProducing.java similarity index 100% rename from src/main/java/fr/jackcartersmith/ob/interfaces/PhotonProducing.java rename to ob/interfaces/PhotonProducing.java diff --git a/src/main/java/fr/jackcartersmith/ob/interfaces/PhotonRecieving.java b/ob/interfaces/PhotonRecieving.java similarity index 100% rename from src/main/java/fr/jackcartersmith/ob/interfaces/PhotonRecieving.java rename to ob/interfaces/PhotonRecieving.java diff --git a/src/main/java/fr/jackcartersmith/ob/interfaces/PhotonSending.java b/ob/interfaces/PhotonSending.java similarity index 100% rename from src/main/java/fr/jackcartersmith/ob/interfaces/PhotonSending.java rename to ob/interfaces/PhotonSending.java diff --git a/src/main/java/fr/jackcartersmith/ob/items/DesignatorHighItem.java b/ob/items/DesignatorHighItem.java similarity index 100% rename from src/main/java/fr/jackcartersmith/ob/items/DesignatorHighItem.java rename to ob/items/DesignatorHighItem.java diff --git a/src/main/java/fr/jackcartersmith/ob/items/DesignatorLowItem.java b/ob/items/DesignatorLowItem.java similarity index 100% rename from src/main/java/fr/jackcartersmith/ob/items/DesignatorLowItem.java rename to ob/items/DesignatorLowItem.java diff --git a/src/main/java/fr/jackcartersmith/ob/items/DesignatorMedItem.java b/ob/items/DesignatorMedItem.java similarity index 100% rename from src/main/java/fr/jackcartersmith/ob/items/DesignatorMedItem.java rename to ob/items/DesignatorMedItem.java diff --git a/src/main/java/fr/jackcartersmith/ob/items/LaserGunHighItem$1.java b/ob/items/LaserGunHighItem$1.java similarity index 100% rename from src/main/java/fr/jackcartersmith/ob/items/LaserGunHighItem$1.java rename to ob/items/LaserGunHighItem$1.java diff --git a/src/main/java/fr/jackcartersmith/ob/items/LaserGunHighItem$2.java b/ob/items/LaserGunHighItem$2.java similarity index 100% rename from src/main/java/fr/jackcartersmith/ob/items/LaserGunHighItem$2.java rename to ob/items/LaserGunHighItem$2.java diff --git a/src/main/java/fr/jackcartersmith/ob/items/LaserGunHighItem$3.java b/ob/items/LaserGunHighItem$3.java similarity index 100% rename from src/main/java/fr/jackcartersmith/ob/items/LaserGunHighItem$3.java rename to ob/items/LaserGunHighItem$3.java diff --git a/src/main/java/fr/jackcartersmith/ob/items/LaserGunHighItem$4.java b/ob/items/LaserGunHighItem$4.java similarity index 100% rename from src/main/java/fr/jackcartersmith/ob/items/LaserGunHighItem$4.java rename to ob/items/LaserGunHighItem$4.java diff --git a/src/main/java/fr/jackcartersmith/ob/items/LaserGunHighItem.java b/ob/items/LaserGunHighItem.java similarity index 100% rename from src/main/java/fr/jackcartersmith/ob/items/LaserGunHighItem.java rename to ob/items/LaserGunHighItem.java diff --git a/src/main/java/fr/jackcartersmith/ob/items/LaserGunLowItem$1.java b/ob/items/LaserGunLowItem$1.java similarity index 100% rename from src/main/java/fr/jackcartersmith/ob/items/LaserGunLowItem$1.java rename to ob/items/LaserGunLowItem$1.java diff --git a/src/main/java/fr/jackcartersmith/ob/items/LaserGunLowItem$2.java b/ob/items/LaserGunLowItem$2.java similarity index 100% rename from src/main/java/fr/jackcartersmith/ob/items/LaserGunLowItem$2.java rename to ob/items/LaserGunLowItem$2.java diff --git a/src/main/java/fr/jackcartersmith/ob/items/LaserGunLowItem$3.java b/ob/items/LaserGunLowItem$3.java similarity index 100% rename from src/main/java/fr/jackcartersmith/ob/items/LaserGunLowItem$3.java rename to ob/items/LaserGunLowItem$3.java diff --git a/src/main/java/fr/jackcartersmith/ob/items/LaserGunLowItem$4.java b/ob/items/LaserGunLowItem$4.java similarity index 100% rename from src/main/java/fr/jackcartersmith/ob/items/LaserGunLowItem$4.java rename to ob/items/LaserGunLowItem$4.java diff --git a/src/main/java/fr/jackcartersmith/ob/items/LaserGunLowItem.java b/ob/items/LaserGunLowItem.java similarity index 100% rename from src/main/java/fr/jackcartersmith/ob/items/LaserGunLowItem.java rename to ob/items/LaserGunLowItem.java diff --git a/src/main/java/fr/jackcartersmith/ob/items/LaserGunMedItem$1.java b/ob/items/LaserGunMedItem$1.java similarity index 100% rename from src/main/java/fr/jackcartersmith/ob/items/LaserGunMedItem$1.java rename to ob/items/LaserGunMedItem$1.java diff --git a/src/main/java/fr/jackcartersmith/ob/items/LaserGunMedItem$2.java b/ob/items/LaserGunMedItem$2.java similarity index 100% rename from src/main/java/fr/jackcartersmith/ob/items/LaserGunMedItem$2.java rename to ob/items/LaserGunMedItem$2.java diff --git a/src/main/java/fr/jackcartersmith/ob/items/LaserGunMedItem$3.java b/ob/items/LaserGunMedItem$3.java similarity index 100% rename from src/main/java/fr/jackcartersmith/ob/items/LaserGunMedItem$3.java rename to ob/items/LaserGunMedItem$3.java diff --git a/src/main/java/fr/jackcartersmith/ob/items/LaserGunMedItem$4.java b/ob/items/LaserGunMedItem$4.java similarity index 100% rename from src/main/java/fr/jackcartersmith/ob/items/LaserGunMedItem$4.java rename to ob/items/LaserGunMedItem$4.java diff --git a/src/main/java/fr/jackcartersmith/ob/items/LaserGunMedItem.java b/ob/items/LaserGunMedItem.java similarity index 100% rename from src/main/java/fr/jackcartersmith/ob/items/LaserGunMedItem.java rename to ob/items/LaserGunMedItem.java diff --git a/src/main/java/fr/jackcartersmith/ob/items/LenseItem.java b/ob/items/LenseItem.java similarity index 100% rename from src/main/java/fr/jackcartersmith/ob/items/LenseItem.java rename to ob/items/LenseItem.java diff --git a/src/main/java/fr/jackcartersmith/ob/items/PhotonCapacitorItem.java b/ob/items/PhotonCapacitorItem.java similarity index 100% rename from src/main/java/fr/jackcartersmith/ob/items/PhotonCapacitorItem.java rename to ob/items/PhotonCapacitorItem.java diff --git a/src/main/java/fr/jackcartersmith/ob/items/PhotonCondenserItem.java b/ob/items/PhotonCondenserItem.java similarity index 100% rename from src/main/java/fr/jackcartersmith/ob/items/PhotonCondenserItem.java rename to ob/items/PhotonCondenserItem.java diff --git a/src/main/java/fr/jackcartersmith/ob/libs/TESRInventoryRenderer.java b/ob/libs/TESRInventoryRenderer.java similarity index 100% rename from src/main/java/fr/jackcartersmith/ob/libs/TESRInventoryRenderer.java rename to ob/libs/TESRInventoryRenderer.java diff --git a/src/main/java/fr/jackcartersmith/ob/models/DefenderLaserRenderer.java b/ob/models/DefenderLaserRenderer.java similarity index 100% rename from src/main/java/fr/jackcartersmith/ob/models/DefenderLaserRenderer.java rename to ob/models/DefenderLaserRenderer.java diff --git a/src/main/java/fr/jackcartersmith/ob/models/LaserLowRenderer.java b/ob/models/LaserLowRenderer.java similarity index 100% rename from src/main/java/fr/jackcartersmith/ob/models/LaserLowRenderer.java rename to ob/models/LaserLowRenderer.java diff --git a/src/main/java/fr/jackcartersmith/ob/models/ModelDefender.java b/ob/models/ModelDefender.java similarity index 100% rename from src/main/java/fr/jackcartersmith/ob/models/ModelDefender.java rename to ob/models/ModelDefender.java diff --git a/src/main/java/fr/jackcartersmith/ob/models/ModelDefenderLaserEvo.java b/ob/models/ModelDefenderLaserEvo.java similarity index 100% rename from src/main/java/fr/jackcartersmith/ob/models/ModelDefenderLaserEvo.java rename to ob/models/ModelDefenderLaserEvo.java diff --git a/src/main/java/fr/jackcartersmith/ob/models/ModelExtender.java b/ob/models/ModelExtender.java similarity index 100% rename from src/main/java/fr/jackcartersmith/ob/models/ModelExtender.java rename to ob/models/ModelExtender.java diff --git a/src/main/java/fr/jackcartersmith/ob/models/ModelLaser.java b/ob/models/ModelLaser.java similarity index 100% rename from src/main/java/fr/jackcartersmith/ob/models/ModelLaser.java rename to ob/models/ModelLaser.java diff --git a/src/main/java/fr/jackcartersmith/ob/models/ModelLaserLight.java b/ob/models/ModelLaserLight.java similarity index 100% rename from src/main/java/fr/jackcartersmith/ob/models/ModelLaserLight.java rename to ob/models/ModelLaserLight.java diff --git a/src/main/java/fr/jackcartersmith/ob/models/ModelLaunchingSatelite.java b/ob/models/ModelLaunchingSatelite.java similarity index 100% rename from src/main/java/fr/jackcartersmith/ob/models/ModelLaunchingSatelite.java rename to ob/models/ModelLaunchingSatelite.java diff --git a/src/main/java/fr/jackcartersmith/ob/models/ModelOverrider.java b/ob/models/ModelOverrider.java similarity index 100% rename from src/main/java/fr/jackcartersmith/ob/models/ModelOverrider.java rename to ob/models/ModelOverrider.java diff --git a/src/main/java/fr/jackcartersmith/ob/models/ModelPhotonAccelerator.java b/ob/models/ModelPhotonAccelerator.java similarity index 100% rename from src/main/java/fr/jackcartersmith/ob/models/ModelPhotonAccelerator.java rename to ob/models/ModelPhotonAccelerator.java diff --git a/src/main/java/fr/jackcartersmith/ob/models/ModelPhotonDecelerator.java b/ob/models/ModelPhotonDecelerator.java similarity index 100% rename from src/main/java/fr/jackcartersmith/ob/models/ModelPhotonDecelerator.java rename to ob/models/ModelPhotonDecelerator.java diff --git a/src/main/java/fr/jackcartersmith/ob/models/ModelPhotonInverter.java b/ob/models/ModelPhotonInverter.java similarity index 100% rename from src/main/java/fr/jackcartersmith/ob/models/ModelPhotonInverter.java rename to ob/models/ModelPhotonInverter.java diff --git a/src/main/java/fr/jackcartersmith/ob/models/SateliteRenderer.java b/ob/models/SateliteRenderer.java similarity index 100% rename from src/main/java/fr/jackcartersmith/ob/models/SateliteRenderer.java rename to ob/models/SateliteRenderer.java diff --git a/src/main/java/fr/jackcartersmith/ob/models/TileEntityDefenderRenderer.java b/ob/models/TileEntityDefenderRenderer.java similarity index 100% rename from src/main/java/fr/jackcartersmith/ob/models/TileEntityDefenderRenderer.java rename to ob/models/TileEntityDefenderRenderer.java diff --git a/src/main/java/fr/jackcartersmith/ob/models/TileEntityExtenderRenderer.java b/ob/models/TileEntityExtenderRenderer.java similarity index 100% rename from src/main/java/fr/jackcartersmith/ob/models/TileEntityExtenderRenderer.java rename to ob/models/TileEntityExtenderRenderer.java diff --git a/src/main/java/fr/jackcartersmith/ob/models/TileEntityInverterAdvRenderer.java b/ob/models/TileEntityInverterAdvRenderer.java similarity index 100% rename from src/main/java/fr/jackcartersmith/ob/models/TileEntityInverterAdvRenderer.java rename to ob/models/TileEntityInverterAdvRenderer.java diff --git a/src/main/java/fr/jackcartersmith/ob/models/TileEntityOverriderRenderer.java b/ob/models/TileEntityOverriderRenderer.java similarity index 100% rename from src/main/java/fr/jackcartersmith/ob/models/TileEntityOverriderRenderer.java rename to ob/models/TileEntityOverriderRenderer.java diff --git a/src/main/java/fr/jackcartersmith/ob/models/TileEntityPhotonAcceleratorRenderer.java b/ob/models/TileEntityPhotonAcceleratorRenderer.java similarity index 100% rename from src/main/java/fr/jackcartersmith/ob/models/TileEntityPhotonAcceleratorRenderer.java rename to ob/models/TileEntityPhotonAcceleratorRenderer.java diff --git a/src/main/java/fr/jackcartersmith/ob/models/TileEntityPhotonDeceleratorRenderer.java b/ob/models/TileEntityPhotonDeceleratorRenderer.java similarity index 100% rename from src/main/java/fr/jackcartersmith/ob/models/TileEntityPhotonDeceleratorRenderer.java rename to ob/models/TileEntityPhotonDeceleratorRenderer.java diff --git a/src/main/java/fr/jackcartersmith/ob/rendering/AccelPositionsDto.java b/ob/rendering/AccelPositionsDto.java similarity index 100% rename from src/main/java/fr/jackcartersmith/ob/rendering/AccelPositionsDto.java rename to ob/rendering/AccelPositionsDto.java diff --git a/src/main/java/fr/jackcartersmith/ob/rendering/LineDto.java b/ob/rendering/LineDto.java similarity index 100% rename from src/main/java/fr/jackcartersmith/ob/rendering/LineDto.java rename to ob/rendering/LineDto.java diff --git a/src/main/java/fr/jackcartersmith/ob/items/OBItems.java b/src/main/java/fr/jackcartersmith/ob/items/OBItems.java deleted file mode 100644 index 77a9bd5..0000000 --- a/src/main/java/fr/jackcartersmith/ob/items/OBItems.java +++ /dev/null @@ -1,40 +0,0 @@ -package fr.jackcartersmith.ob.items; - -import cpw.mods.fml.common.registry.GameRegistry; -import fr.jackcartersmith.orbsat.OrbitalSatellite; -import net.minecraft.item.Item; - -public class OBItems { - public static Item designatorLow; - public static Item designatorMed; - public static Item designatorHigh; - public static Item lenseItem; - public static Item laserGunLowItem; - public static Item laserGunMedItem; - public static Item laserGunHighItem; - public static Item thrusterFuelItem; - public static Item photonCondenserItem; - public static Item photonCapacitor; - - public static void init() - { - designatorLow = new DesignatorLowItem().setUnlocalizedName("item_ob_designatorLow"); - GameRegistry.registerItem(designatorLow, "ob_designatorLow"); - designatorMed = new DesignatorMedItem().setUnlocalizedName("item_ob_designatorMed"); - GameRegistry.registerItem(designatorMed, "ob_designatorMed"); - designatorHigh = new DesignatorHighItem().setUnlocalizedName("item_ob_designatorHigh"); - GameRegistry.registerItem(designatorHigh, "ob_designatorHigh"); - lenseItem = new LenseItem().setUnlocalizedName("item_ob_lense"); - GameRegistry.registerItem(lenseItem, "ob_lense_item"); - laserGunLowItem = new LaserGunLowItem().setUnlocalizedName("item_ob_laserGunLow"); - GameRegistry.registerItem(laserGunLowItem, "ob_laserGunLow"); - laserGunMedItem = new LaserGunMedItem().setUnlocalizedName("item_ob_laserGunMed"); - GameRegistry.registerItem(laserGunMedItem, "ob_laserGunMed"); - laserGunHighItem = new LaserGunHighItem().setUnlocalizedName("item_ob_laserGunHigh"); - GameRegistry.registerItem(laserGunHighItem, "ob_laserGunHigh"); - photonCondenserItem = new PhotonCondenserItem().setUnlocalizedName("item_ob_condenser"); - GameRegistry.registerItem(photonCondenserItem, "ob_condenser_item"); - photonCapacitor = new PhotonCapacitorItem().setUnlocalizedName("item_ob_capacitor"); - GameRegistry.registerItem(photonCapacitor, "ob_capacitor_item"); - } -} diff --git a/src/main/java/fr/jackcartersmith/orbsat/OrbitalSatellite.java b/src/main/java/fr/jackcartersmith/orbsat/OrbitalSatellite.java index ff0a104..4654a23 100644 --- a/src/main/java/fr/jackcartersmith/orbsat/OrbitalSatellite.java +++ b/src/main/java/fr/jackcartersmith/orbsat/OrbitalSatellite.java @@ -25,7 +25,7 @@ public class OrbitalSatellite @SidedProxy(clientSide = OSRefs.CLIENTPROXYLOCATION, serverSide = OSRefs.SERVERPROXYLOCATION) public static CommonProxy proxy; - public static CreativeTabs OBCreativeTabs = new OSCreativeTabs(CreativeTabs.getNextID(),OSRefs.MODID); + public static CreativeTabs OSCreaTab = new OSCreativeTabs(CreativeTabs.getNextID(),OSRefs.MODID); public static final String networkChannelName = OSRefs.MODID; public static SimpleNetworkWrapper network; diff --git a/src/main/java/fr/jackcartersmith/orbsat/client/ClientProxy.java b/src/main/java/fr/jackcartersmith/orbsat/client/ClientProxy.java index 70cd3f5..2e9ec74 100644 --- a/src/main/java/fr/jackcartersmith/orbsat/client/ClientProxy.java +++ b/src/main/java/fr/jackcartersmith/orbsat/client/ClientProxy.java @@ -1,34 +1,233 @@ package fr.jackcartersmith.orbsat.client; +import cpw.mods.fml.client.FMLClientHandler; import cpw.mods.fml.client.registry.ClientRegistry; import cpw.mods.fml.client.registry.RenderingRegistry; +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.simpleimpl.MessageContext; -import fr.jackcartersmith.ob.blocks.DefenderLaserTileEntity; -import fr.jackcartersmith.ob.blocks.DefenderTileEntity; -import fr.jackcartersmith.ob.blocks.ExtenderTileEntity; -import fr.jackcartersmith.ob.blocks.InverterAdvTileEntity; -import fr.jackcartersmith.ob.blocks.LaserLowTileEntity; -import fr.jackcartersmith.ob.blocks.OverriderBlockTileEntity; -import fr.jackcartersmith.ob.blocks.PhotonAcceleratorTileEntity; -import fr.jackcartersmith.ob.blocks.PhotonDeceleratorTileEntity; -import fr.jackcartersmith.ob.blocks.SateliteTileEntity; -import fr.jackcartersmith.ob.libs.TESRInventoryRenderer; -import fr.jackcartersmith.ob.models.DefenderLaserRenderer; -import fr.jackcartersmith.ob.models.LaserLowRenderer; -import fr.jackcartersmith.ob.models.SateliteRenderer; -import fr.jackcartersmith.ob.models.TileEntityDefenderRenderer; -import fr.jackcartersmith.ob.models.TileEntityExtenderRenderer; -import fr.jackcartersmith.ob.models.TileEntityInverterAdvRenderer; -import fr.jackcartersmith.ob.models.TileEntityOverriderRenderer; -import fr.jackcartersmith.ob.models.TileEntityPhotonAcceleratorRenderer; -import fr.jackcartersmith.ob.models.TileEntityPhotonDeceleratorRenderer; +import fr.jackcartersmith.orbsat.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.common.CommonProxy; import net.minecraft.client.Minecraft; +import net.minecraft.client.audio.ISound; +import net.minecraft.client.particle.EntityFX; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.World; +import net.minecraftforge.client.MinecraftForgeClient; +import net.minecraftforge.common.MinecraftForge; -public class ClientProxy extends CommonProxy{ - public static int tesrRenderId; +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(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; + } + */ + + 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() { @@ -55,4 +254,5 @@ public class ClientProxy extends CommonProxy{ // 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/creativetabs/OSCreativeTabs.java b/src/main/java/fr/jackcartersmith/orbsat/client/creativetabs/OSCreativeTabs.java index 16a161b..cc07cc3 100644 --- a/src/main/java/fr/jackcartersmith/orbsat/client/creativetabs/OSCreativeTabs.java +++ b/src/main/java/fr/jackcartersmith/orbsat/client/creativetabs/OSCreativeTabs.java @@ -1,8 +1,6 @@ package fr.jackcartersmith.orbsat.client.creativetabs; -import fr.jackcartersmith.ob.items.OBItems; -import fr.jackcartersmith.orbsat.OrbitalSatellite; -import fr.jackcartersmith.orbsat.common.OSBlocks; +import fr.jackcartersmith.orbsat.common.OSItems; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; @@ -15,7 +13,7 @@ public class OSCreativeTabs extends CreativeTabs { @Override public Item getTabIconItem() { - return OBItems.designatorLow; + return OSItems.basicExtrapolCircuit; } } diff --git a/src/main/java/fr/jackcartersmith/orbsat/client/gui/OSGuiHandler.java b/src/main/java/fr/jackcartersmith/orbsat/client/gui/OSGuiHandler.java index 635b8dd..f100259 100644 --- a/src/main/java/fr/jackcartersmith/orbsat/client/gui/OSGuiHandler.java +++ b/src/main/java/fr/jackcartersmith/orbsat/client/gui/OSGuiHandler.java @@ -21,6 +21,7 @@ public class OSGuiHandler implements IGuiHandler{ @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); @@ -49,11 +50,13 @@ public class OSGuiHandler implements IGuiHandler{ } 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); @@ -86,6 +89,7 @@ public class OSGuiHandler implements IGuiHandler{ } 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 new file mode 100644 index 0000000..7ce019d --- /dev/null +++ b/src/main/java/fr/jackcartersmith/orbsat/client/handler/ClientEventHandler.java @@ -0,0 +1,95 @@ +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 new file mode 100644 index 0000000..8e2c22b --- /dev/null +++ b/src/main/java/fr/jackcartersmith/orbsat/client/handler/ParticleHandler.java @@ -0,0 +1,75 @@ +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 new file mode 100644 index 0000000..b665667 --- /dev/null +++ b/src/main/java/fr/jackcartersmith/orbsat/client/handler/ResourceHandler.java @@ -0,0 +1,80 @@ +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/render/ParticleDistortion.java b/src/main/java/fr/jackcartersmith/orbsat/client/render/ParticleDistortion.java new file mode 100644 index 0000000..b847302 --- /dev/null +++ b/src/main/java/fr/jackcartersmith/orbsat/client/render/ParticleDistortion.java @@ -0,0 +1,101 @@ +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/common/CommonProxy.java b/src/main/java/fr/jackcartersmith/orbsat/common/CommonProxy.java index 9305b99..28439ad 100644 --- a/src/main/java/fr/jackcartersmith/orbsat/common/CommonProxy.java +++ b/src/main/java/fr/jackcartersmith/orbsat/common/CommonProxy.java @@ -9,17 +9,16 @@ import cpw.mods.fml.common.network.simpleimpl.MessageContext; import cpw.mods.fml.common.registry.EntityRegistry; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; -import fr.jackcartersmith.ob.blocks.DefenderTileEntity; -import fr.jackcartersmith.ob.entities.LaserLightEntity; -import fr.jackcartersmith.ob.entities.MeteorEntity; import fr.jackcartersmith.orbsat.OrbitalSatellite; -import fr.jackcartersmith.orbsat.client.gui.GuiHandlerForOb; import fr.jackcartersmith.orbsat.client.gui.OSGuiHandler; import fr.jackcartersmith.orbsat.common.handler.FMLEventHandler; import fr.jackcartersmith.orbsat.common.lib.OSConstants; import fr.jackcartersmith.orbsat.common.lib.OSRefs; import fr.jackcartersmith.orbsat.common.utils.OSLogHelper; +import net.minecraft.client.audio.ISound; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; public class CommonProxy { @@ -82,7 +81,7 @@ public class CommonProxy { } public void registerTileEntities() { - GameRegistry.registerTileEntity(DefenderTileEntity.class, OSRefs.RESOURCESPREFIX + "TileDefender"); + //GameRegistry.registerTileEntity(DefenderTileEntity.class, OSRefs.RESOURCESPREFIX + "TileDefender"); @@ -134,8 +133,8 @@ public class CommonProxy { //@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(MeteorEntity.class, "meteor", 0, OrbitalSatellite.instance, 256, 3, true); + //EntityRegistry.registerModEntity(LaserLightEntity.class, "LaserLightEntity", 1, OrbitalSatellite.instance, 256, 3, true); @@ -155,4 +154,26 @@ public class CommonProxy { 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 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 index e674875..f4ed0df 100644 --- a/src/main/java/fr/jackcartersmith/orbsat/common/OSBlocks.java +++ b/src/main/java/fr/jackcartersmith/orbsat/common/OSBlocks.java @@ -2,7 +2,7 @@ package fr.jackcartersmith.orbsat.common; import cpw.mods.fml.common.registry.GameRegistry; import fr.jackcartersmith.orbsat.OrbitalSatellite; -import fr.jackcartersmith.orbsat.common.block.BlockOS; +import fr.jackcartersmith.orbsat.common.blocks.BlockOS; import fr.jackcartersmith.orbsat.common.lib.OSRefs; import net.minecraft.block.material.Material; import net.minecraft.item.ItemStack; @@ -22,6 +22,8 @@ public class OSBlocks { public static BlockOS laserDef; public static void init(){ + + /* laserLow = new LaserLowBlock(Material.fire).setBlockName("obLaserLow").setBlockTextureName(OSRefs.MODID + ":laserLow").setHardness(-1.0F).setResistance(-1.0F).setLightLevel(25.0F);; GameRegistry.registerBlock(laserLow, "ob_laserLow"); GameRegistry.registerTileEntity(LaserLowTileEntity.class, "laserLowTileEntity"); @@ -61,7 +63,7 @@ public class OSBlocks { 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"); - + */ diff --git a/src/main/java/fr/jackcartersmith/orbsat/common/OSItems.java b/src/main/java/fr/jackcartersmith/orbsat/common/OSItems.java index 01ca66d..e1859ca 100644 --- a/src/main/java/fr/jackcartersmith/orbsat/common/OSItems.java +++ b/src/main/java/fr/jackcartersmith/orbsat/common/OSItems.java @@ -1,9 +1,78 @@ -package fr.jackcartersmith.orbsat.common; - -import cpw.mods.fml.common.registry.GameRegistry; -import fr.jackcartersmith.orbsat.common.lib.OSRefs; - -@GameRegistry.ObjectHolder(OSRefs.MODID) -public class OSItems { - -} +package fr.jackcartersmith.orbsat.common; + +import cpw.mods.fml.common.registry.GameRegistry; +import fr.jackcartersmith.orbsat.OrbitalSatellite; +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; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; + +@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/block/BlockOS.java b/src/main/java/fr/jackcartersmith/orbsat/common/blocks/BlockOS.java similarity index 93% rename from src/main/java/fr/jackcartersmith/orbsat/common/block/BlockOS.java rename to src/main/java/fr/jackcartersmith/orbsat/common/blocks/BlockOS.java index d60468e..f6a626b 100644 --- a/src/main/java/fr/jackcartersmith/orbsat/common/block/BlockOS.java +++ b/src/main/java/fr/jackcartersmith/orbsat/common/blocks/BlockOS.java @@ -1,4 +1,4 @@ -package fr.jackcartersmith.orbsat.common.block; +package fr.jackcartersmith.orbsat.common.blocks; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/fr/jackcartersmith/orbsat/common/handler/FMLEventHandler.java b/src/main/java/fr/jackcartersmith/orbsat/common/handler/FMLEventHandler.java index 625ad6b..c76c954 100644 --- a/src/main/java/fr/jackcartersmith/orbsat/common/handler/FMLEventHandler.java +++ b/src/main/java/fr/jackcartersmith/orbsat/common/handler/FMLEventHandler.java @@ -14,7 +14,7 @@ public class FMLEventHandler { 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))); + //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 new file mode 100644 index 0000000..06082da --- /dev/null +++ b/src/main/java/fr/jackcartersmith/orbsat/common/items/AdvancedExtrapolCircuit.java @@ -0,0 +1,13 @@ +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 new file mode 100644 index 0000000..40659f1 --- /dev/null +++ b/src/main/java/fr/jackcartersmith/orbsat/common/items/AdvancedTargetDevice.java @@ -0,0 +1,13 @@ +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 new file mode 100644 index 0000000..343bfe7 --- /dev/null +++ b/src/main/java/fr/jackcartersmith/orbsat/common/items/BasicExtrapolCircuit.java @@ -0,0 +1,13 @@ +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 new file mode 100644 index 0000000..3470f04 --- /dev/null +++ b/src/main/java/fr/jackcartersmith/orbsat/common/items/BasicTargetDevice.java @@ -0,0 +1,13 @@ +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 new file mode 100644 index 0000000..504b1fe --- /dev/null +++ b/src/main/java/fr/jackcartersmith/orbsat/common/items/InvolvedExtrapolCircuit.java @@ -0,0 +1,13 @@ +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 new file mode 100644 index 0000000..9351211 --- /dev/null +++ b/src/main/java/fr/jackcartersmith/orbsat/common/items/InvolvedTargetDevice.java @@ -0,0 +1,13 @@ +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 new file mode 100644 index 0000000..ae800c9 --- /dev/null +++ b/src/main/java/fr/jackcartersmith/orbsat/common/items/ItemOS.java @@ -0,0 +1,35 @@ +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 new file mode 100644 index 0000000..b588126 --- /dev/null +++ b/src/main/java/fr/jackcartersmith/orbsat/common/items/PhotonCapacitor.java @@ -0,0 +1,13 @@ +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 new file mode 100644 index 0000000..01cfcdd --- /dev/null +++ b/src/main/java/fr/jackcartersmith/orbsat/common/items/PhotonCondenser.java @@ -0,0 +1,13 @@ +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 new file mode 100644 index 0000000..062c69c --- /dev/null +++ b/src/main/java/fr/jackcartersmith/orbsat/common/items/PhotonLense.java @@ -0,0 +1,13 @@ +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/OSStrings.java b/src/main/java/fr/jackcartersmith/orbsat/common/lib/OSStrings.java new file mode 100644 index 0000000..7e96f23 --- /dev/null +++ b/src/main/java/fr/jackcartersmith/orbsat/common/lib/OSStrings.java @@ -0,0 +1,13 @@ +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"; +} diff --git a/src/main/resources/assets/ob/lang/en_US.lang b/src/main/resources/assets/ob/lang/en_US.lang deleted file mode 100644 index ce805f1..0000000 --- a/src/main/resources/assets/ob/lang/en_US.lang +++ /dev/null @@ -1,19 +0,0 @@ -#CreativeTabs -itemGroup.ob_creative_tabs=Orbital Bombardment -item.item_ob_lense.name=Laser Lens -item.item_ob_condenser.name=Photon Condenser -item.item_ob_capacitor.name=Photon Capacitor -item.item_ob_designatorLow.name=Low Power Designator -item.item_ob_designatorMed.name=Medium Power Designator -item.item_ob_designatorHigh.name=High Power Designator -item.item_ob_laserGunLow.name=Low Power Laser Gun -item.item_ob_laserGunMed.name=Medium Power Laser Gun -item.item_ob_laserGunHigh.name=High Power Laser Gun -tile.obOverrider.name=Laser Satelite Overrider -tile.obExtender.name=Extender -tile.obSatelite.name=Laser Satelite Prototype LX-I -tile.obDefender.name=Laser Strike Defender -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/ob/lang/fr_FR.lang b/src/main/resources/assets/ob/lang/fr_FR.lang deleted file mode 100644 index 8682021..0000000 --- a/src/main/resources/assets/ob/lang/fr_FR.lang +++ /dev/null @@ -1,19 +0,0 @@ -#CreativeTabs -itemGroup.ob_creative_tabs=Bombardement Orbital -item.item_ob_lense.name=Lentille -item.item_ob_condenser.name=Condensateur Photonique -item.item_ob_capacitor.name=Capaciteur Photonique -item.item_ob_designatorLow.name=Designateur Faible Puissance -item.item_ob_designatorMed.name=Designateur Moyenne Puissance -item.item_ob_designatorHigh.name=Designateur Haute Puissance -item.item_ob_laserGunLow.name=Pointeur Laser Faible Puissance -item.item_ob_laserGunMed.name=Pointeur Laser Moyenne Puissance -item.item_ob_laserGunHigh.name=Pointeur Laser Haute Puissance -tile.obOverrider.name=Chargeur de Satellite Laser -tile.obExtender.name=Extendeur -tile.obSatelite.name=Prototype de Satellite Laser LX-I -tile.obDefender.name=Defenseur Laser -tile.obAccelerator.name=Accelerateur de photon -tile.obDecelerator.name=Decelerateur de photon -tile.obInverterAdv.name=Convertisseur photonique avancé -tile.obInverter.name=Convertisseur photonique \ No newline at end of file diff --git a/src/main/resources/assets/orbsat/lang/en_US.lang b/src/main/resources/assets/orbsat/lang/en_US.lang new file mode 100644 index 0000000..f4b29ab --- /dev/null +++ b/src/main/resources/assets/orbsat/lang/en_US.lang @@ -0,0 +1,23 @@ +// 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.obOverrider.name=Laser Satelite Overrider +tile.obExtender.name=Extender +tile.obSatelite.name=Laser Satelite Prototype LX-I +tile.obDefender.name=Laser Strike Defender +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/ob/sounds.json b/src/main/resources/assets/orbsat/sounds.json similarity index 100% rename from src/main/resources/assets/ob/sounds.json rename to src/main/resources/assets/orbsat/sounds.json diff --git a/src/main/resources/assets/ob/sounds/booming.ogg b/src/main/resources/assets/orbsat/sounds/booming.ogg similarity index 100% rename from src/main/resources/assets/ob/sounds/booming.ogg rename to src/main/resources/assets/orbsat/sounds/booming.ogg diff --git a/src/main/resources/assets/ob/sounds/defenderLock.ogg b/src/main/resources/assets/orbsat/sounds/defenderLock.ogg similarity index 100% rename from src/main/resources/assets/ob/sounds/defenderLock.ogg rename to src/main/resources/assets/orbsat/sounds/defenderLock.ogg diff --git a/src/main/resources/assets/ob/sounds/digging.ogg b/src/main/resources/assets/orbsat/sounds/digging.ogg similarity index 100% rename from src/main/resources/assets/ob/sounds/digging.ogg rename to src/main/resources/assets/orbsat/sounds/digging.ogg diff --git a/src/main/resources/assets/ob/sounds/explode.ogg b/src/main/resources/assets/orbsat/sounds/explode.ogg similarity index 100% rename from src/main/resources/assets/ob/sounds/explode.ogg rename to src/main/resources/assets/orbsat/sounds/explode.ogg diff --git a/src/main/resources/assets/ob/sounds/helios.ogg b/src/main/resources/assets/orbsat/sounds/helios.ogg similarity index 100% rename from src/main/resources/assets/ob/sounds/helios.ogg rename to src/main/resources/assets/orbsat/sounds/helios.ogg diff --git a/src/main/resources/assets/ob/sounds/middle.ogg b/src/main/resources/assets/orbsat/sounds/middle.ogg similarity index 100% rename from src/main/resources/assets/ob/sounds/middle.ogg rename to src/main/resources/assets/orbsat/sounds/middle.ogg diff --git a/src/main/resources/assets/ob/sounds/reentry.ogg b/src/main/resources/assets/orbsat/sounds/reentry.ogg similarity index 100% rename from src/main/resources/assets/ob/sounds/reentry.ogg rename to src/main/resources/assets/orbsat/sounds/reentry.ogg diff --git a/src/main/resources/assets/ob/sounds/satelliteLaunch.ogg b/src/main/resources/assets/orbsat/sounds/satelliteLaunch.ogg similarity index 100% rename from src/main/resources/assets/ob/sounds/satelliteLaunch.ogg rename to src/main/resources/assets/orbsat/sounds/satelliteLaunch.ogg diff --git a/src/main/resources/assets/ob/sounds/start.ogg b/src/main/resources/assets/orbsat/sounds/start.ogg similarity index 100% rename from src/main/resources/assets/ob/sounds/start.ogg rename to src/main/resources/assets/orbsat/sounds/start.ogg diff --git a/src/main/resources/assets/ob/sounds/startCharging.ogg b/src/main/resources/assets/orbsat/sounds/startCharging.ogg similarity index 100% rename from src/main/resources/assets/ob/sounds/startCharging.ogg rename to src/main/resources/assets/orbsat/sounds/startCharging.ogg diff --git a/src/main/resources/assets/ob/textures/blocks/defender.png b/src/main/resources/assets/orbsat/textures/blocks/defender.png similarity index 100% rename from src/main/resources/assets/ob/textures/blocks/defender.png rename to src/main/resources/assets/orbsat/textures/blocks/defender.png diff --git a/src/main/resources/assets/ob/textures/blocks/defenderLaserEvo.png b/src/main/resources/assets/orbsat/textures/blocks/defenderLaserEvo.png similarity index 100% rename from src/main/resources/assets/ob/textures/blocks/defenderLaserEvo.png rename to src/main/resources/assets/orbsat/textures/blocks/defenderLaserEvo.png diff --git a/src/main/resources/assets/ob/textures/blocks/extender.png b/src/main/resources/assets/orbsat/textures/blocks/extender.png similarity index 100% rename from src/main/resources/assets/ob/textures/blocks/extender.png rename to src/main/resources/assets/orbsat/textures/blocks/extender.png diff --git a/src/main/resources/assets/ob/textures/blocks/laserLow.png b/src/main/resources/assets/orbsat/textures/blocks/laserLow.png similarity index 100% rename from src/main/resources/assets/ob/textures/blocks/laserLow.png rename to src/main/resources/assets/orbsat/textures/blocks/laserLow.png diff --git a/src/main/resources/assets/ob/textures/blocks/overrider.png b/src/main/resources/assets/orbsat/textures/blocks/overrider.png similarity index 100% rename from src/main/resources/assets/ob/textures/blocks/overrider.png rename to src/main/resources/assets/orbsat/textures/blocks/overrider.png diff --git a/src/main/resources/assets/ob/textures/blocks/photonAccelerator.png b/src/main/resources/assets/orbsat/textures/blocks/photonAccelerator.png similarity index 100% rename from src/main/resources/assets/ob/textures/blocks/photonAccelerator.png rename to src/main/resources/assets/orbsat/textures/blocks/photonAccelerator.png diff --git a/src/main/resources/assets/ob/textures/blocks/photonDecelerator.png b/src/main/resources/assets/orbsat/textures/blocks/photonDecelerator.png similarity index 100% rename from src/main/resources/assets/ob/textures/blocks/photonDecelerator.png rename to src/main/resources/assets/orbsat/textures/blocks/photonDecelerator.png diff --git a/src/main/resources/assets/ob/textures/blocks/satelite.png b/src/main/resources/assets/orbsat/textures/blocks/satelite.png similarity index 100% rename from src/main/resources/assets/ob/textures/blocks/satelite.png rename to src/main/resources/assets/orbsat/textures/blocks/satelite.png diff --git a/src/main/resources/assets/ob/textures/blocks/solarPanel.png b/src/main/resources/assets/orbsat/textures/blocks/solarPanel.png similarity index 100% rename from src/main/resources/assets/ob/textures/blocks/solarPanel.png rename to src/main/resources/assets/orbsat/textures/blocks/solarPanel.png diff --git a/src/main/resources/assets/ob/textures/blocks/solarPanelAdvSides.png b/src/main/resources/assets/orbsat/textures/blocks/solarPanelAdvSides.png similarity index 100% rename from src/main/resources/assets/ob/textures/blocks/solarPanelAdvSides.png rename to src/main/resources/assets/orbsat/textures/blocks/solarPanelAdvSides.png diff --git a/src/main/resources/assets/ob/textures/blocks/solarPanelAdvTop.png b/src/main/resources/assets/orbsat/textures/blocks/solarPanelAdvTop.png similarity index 100% rename from src/main/resources/assets/ob/textures/blocks/solarPanelAdvTop.png rename to src/main/resources/assets/orbsat/textures/blocks/solarPanelAdvTop.png diff --git a/src/main/resources/assets/ob/textures/blocks/solarPanelSides.png b/src/main/resources/assets/orbsat/textures/blocks/solarPanelSides.png similarity index 100% rename from src/main/resources/assets/ob/textures/blocks/solarPanelSides.png rename to src/main/resources/assets/orbsat/textures/blocks/solarPanelSides.png diff --git a/src/main/resources/assets/ob/textures/blocks/solarPanelTop.png b/src/main/resources/assets/orbsat/textures/blocks/solarPanelTop.png similarity index 100% rename from src/main/resources/assets/ob/textures/blocks/solarPanelTop.png rename to src/main/resources/assets/orbsat/textures/blocks/solarPanelTop.png diff --git a/src/main/resources/assets/ob/textures/entity/laserLight.png b/src/main/resources/assets/orbsat/textures/entity/laserLight.png similarity index 100% rename from src/main/resources/assets/ob/textures/entity/laserLight.png rename to src/main/resources/assets/orbsat/textures/entity/laserLight.png diff --git a/src/main/resources/assets/ob/textures/entity/meteor.png b/src/main/resources/assets/orbsat/textures/entity/meteor.png similarity index 100% rename from src/main/resources/assets/ob/textures/entity/meteor.png rename to src/main/resources/assets/orbsat/textures/entity/meteor.png diff --git a/src/main/resources/assets/ob/textures/gui/extender.png b/src/main/resources/assets/orbsat/textures/gui/extender.png similarity index 100% rename from src/main/resources/assets/ob/textures/gui/extender.png rename to src/main/resources/assets/orbsat/textures/gui/extender.png diff --git a/src/main/resources/assets/ob/textures/gui/gui.png b/src/main/resources/assets/orbsat/textures/gui/gui.png similarity index 100% rename from src/main/resources/assets/ob/textures/gui/gui.png rename to src/main/resources/assets/orbsat/textures/gui/gui.png diff --git a/src/main/resources/assets/ob/textures/gui/photonAccelerator.png b/src/main/resources/assets/orbsat/textures/gui/photonAccelerator.png similarity index 100% rename from src/main/resources/assets/ob/textures/gui/photonAccelerator.png rename to src/main/resources/assets/orbsat/textures/gui/photonAccelerator.png diff --git a/src/main/resources/assets/ob/textures/gui/photonDecelerator.png b/src/main/resources/assets/orbsat/textures/gui/photonDecelerator.png similarity index 100% rename from src/main/resources/assets/ob/textures/gui/photonDecelerator.png rename to src/main/resources/assets/orbsat/textures/gui/photonDecelerator.png diff --git a/src/main/resources/assets/ob/textures/gui/photonInverter.png b/src/main/resources/assets/orbsat/textures/gui/photonInverter.png similarity index 100% rename from src/main/resources/assets/ob/textures/gui/photonInverter.png rename to src/main/resources/assets/orbsat/textures/gui/photonInverter.png diff --git a/src/main/resources/assets/ob/textures/gui/photonInverterAdv.png b/src/main/resources/assets/orbsat/textures/gui/photonInverterAdv.png similarity index 100% rename from src/main/resources/assets/ob/textures/gui/photonInverterAdv.png rename to src/main/resources/assets/orbsat/textures/gui/photonInverterAdv.png diff --git a/src/main/resources/assets/ob/textures/items/item_ob_designatorMed.png b/src/main/resources/assets/orbsat/textures/items/advancedExtrapolCircuit.png similarity index 100% rename from src/main/resources/assets/ob/textures/items/item_ob_designatorMed.png rename to src/main/resources/assets/orbsat/textures/items/advancedExtrapolCircuit.png diff --git a/src/main/resources/assets/ob/textures/items/item_ob_laserGunMed.png b/src/main/resources/assets/orbsat/textures/items/advancedTargetDevice.png similarity index 100% rename from src/main/resources/assets/ob/textures/items/item_ob_laserGunMed.png rename to src/main/resources/assets/orbsat/textures/items/advancedTargetDevice.png diff --git a/src/main/resources/assets/ob/textures/items/item_ob_designatorLow.png b/src/main/resources/assets/orbsat/textures/items/basicExtrapolCircuit.png similarity index 100% rename from src/main/resources/assets/ob/textures/items/item_ob_designatorLow.png rename to src/main/resources/assets/orbsat/textures/items/basicExtrapolCircuit.png diff --git a/src/main/resources/assets/ob/textures/items/item_ob_laserGunLow.png b/src/main/resources/assets/orbsat/textures/items/basicTargetDevice.png similarity index 100% rename from src/main/resources/assets/ob/textures/items/item_ob_laserGunLow.png rename to src/main/resources/assets/orbsat/textures/items/basicTargetDevice.png diff --git a/src/main/resources/assets/ob/textures/items/item_ob_designatorHigh.png b/src/main/resources/assets/orbsat/textures/items/involvedExtrapolCircuit.png similarity index 100% rename from src/main/resources/assets/ob/textures/items/item_ob_designatorHigh.png rename to src/main/resources/assets/orbsat/textures/items/involvedExtrapolCircuit.png diff --git a/src/main/resources/assets/ob/textures/items/item_ob_laserGunHigh.png b/src/main/resources/assets/orbsat/textures/items/involvedTargetDevice.png similarity index 100% rename from src/main/resources/assets/ob/textures/items/item_ob_laserGunHigh.png rename to src/main/resources/assets/orbsat/textures/items/involvedTargetDevice.png diff --git a/src/main/resources/assets/ob/textures/items/item_ob_capacitor.png b/src/main/resources/assets/orbsat/textures/items/photonCapacitor.png similarity index 100% rename from src/main/resources/assets/ob/textures/items/item_ob_capacitor.png rename to src/main/resources/assets/orbsat/textures/items/photonCapacitor.png diff --git a/src/main/resources/assets/ob/textures/items/item_ob_condenser.png b/src/main/resources/assets/orbsat/textures/items/photonCondenser.png similarity index 100% rename from src/main/resources/assets/ob/textures/items/item_ob_condenser.png rename to src/main/resources/assets/orbsat/textures/items/photonCondenser.png diff --git a/src/main/resources/assets/ob/textures/items/item_ob_lense.png b/src/main/resources/assets/orbsat/textures/items/photonLense.png similarity index 100% rename from src/main/resources/assets/ob/textures/items/item_ob_lense.png rename to src/main/resources/assets/orbsat/textures/items/photonLense.png diff --git a/src/main/resources/mcmod.info b/src/main/resources/mcmod.info index ca7bc97..a561862 100644 --- a/src/main/resources/mcmod.info +++ b/src/main/resources/mcmod.info @@ -1,9 +1,9 @@ [ { - "modid": "ob", - "version": "2.0", + "modid": "orbsat", + "version": "0.1", "name": "Orbital Bombardment", - "description": "Simple portage sur la 1.7.10", + "description": "TO DO ...", "mcversion": "${mcversion}", "url": "", "updateUrl": "",