Changeset 00471966984c56745d2d3b5dc9b5e41a20b2bf4f

Show
Ignore:
Timestamp:
04/05/08 15:49:14 (6 months ago)
Author:
Christopher Jung <bktheg@web.de>
git-committer:
Christopher Jung <bktheg@web.de> 1207403354 +0200
git-parent:

[f216bbae8f0b058e4aecac270f324f5ab5a2ad6c]

git-author:
Christopher Jung <bktheg@web.de> 1207403354 +0200
Message:

Items in neue Pakete verschoben

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • src/net/driftingsouls/ds2/server/AdminCommands.java

    re409332 r0047196  
    4545import net.driftingsouls.ds2.server.cargo.modules.Modules; 
    4646import net.driftingsouls.ds2.server.comm.PM; 
    47 import net.driftingsouls.ds2.server.config.ItemEffect; 
    48 import net.driftingsouls.ds2.server.config.Items; 
     47import net.driftingsouls.ds2.server.config.items.Items; 
     48import net.driftingsouls.ds2.server.config.items.effects.ItemEffect; 
    4949import net.driftingsouls.ds2.server.entities.User; 
    5050import net.driftingsouls.ds2.server.framework.Common; 

  • src/net/driftingsouls/ds2/server/bases/Kommandozentrale.java

    re409332 r0047196  
    3939import net.driftingsouls.ds2.server.comm.PM; 
    4040import net.driftingsouls.ds2.server.config.Faction; 
    41 import net.driftingsouls.ds2.server.config.Item; 
    42 import net.driftingsouls.ds2.server.config.Items; 
     41import net.driftingsouls.ds2.server.config.items.Item; 
     42import net.driftingsouls.ds2.server.config.items.Items; 
    4343import net.driftingsouls.ds2.server.entities.Ally; 
    4444import net.driftingsouls.ds2.server.entities.GtuWarenKurse; 

  • src/net/driftingsouls/ds2/server/bases/Waffenfabrik.java

    re409332 r0047196  
    3838import net.driftingsouls.ds2.server.cargo.ResourceEntry; 
    3939import net.driftingsouls.ds2.server.cargo.ResourceList; 
    40 import net.driftingsouls.ds2.server.config.IEAmmo; 
    41 import net.driftingsouls.ds2.server.config.IEDraftAmmo; 
    42 import net.driftingsouls.ds2.server.config.Item; 
    43 import net.driftingsouls.ds2.server.config.ItemEffect; 
    44 import net.driftingsouls.ds2.server.config.Items; 
     40import net.driftingsouls.ds2.server.config.items.Item; 
     41import net.driftingsouls.ds2.server.config.items.Items; 
     42import net.driftingsouls.ds2.server.config.items.effects.IEAmmo; 
     43import net.driftingsouls.ds2.server.config.items.effects.IEDraftAmmo; 
     44import net.driftingsouls.ds2.server.config.items.effects.ItemEffect; 
    4545import net.driftingsouls.ds2.server.entities.Ammo; 
    4646import net.driftingsouls.ds2.server.entities.User; 

  • src/net/driftingsouls/ds2/server/bbcodes/TagResource.java

    r283e6c7 r0047196  
    2626import net.driftingsouls.ds2.server.cargo.ResourceList; 
    2727import net.driftingsouls.ds2.server.cargo.Resources; 
    28 import net.driftingsouls.ds2.server.config.Item; 
    29 import net.driftingsouls.ds2.server.config.Items; 
     28import net.driftingsouls.ds2.server.config.items.Item; 
     29import net.driftingsouls.ds2.server.config.items.Items; 
    3030import net.driftingsouls.ds2.server.entities.User; 
    3131import net.driftingsouls.ds2.server.framework.Common; 

  • src/net/driftingsouls/ds2/server/cargo/Cargo.java

    r0ec783a r0047196  
    2424import java.util.List; 
    2525 
    26 import net.driftingsouls.ds2.server.config.Item; 
    27 import net.driftingsouls.ds2.server.config.ItemEffect; 
    28 import net.driftingsouls.ds2.server.config.Items; 
    2926import net.driftingsouls.ds2.server.config.ResourceConfig; 
     27import net.driftingsouls.ds2.server.config.items.Item; 
     28import net.driftingsouls.ds2.server.config.items.Items; 
     29import net.driftingsouls.ds2.server.config.items.effects.ItemEffect; 
    3030import net.driftingsouls.ds2.server.framework.BasicUser; 
    3131import net.driftingsouls.ds2.server.framework.Common; 

  • src/net/driftingsouls/ds2/server/cargo/ItemCargoEntry.java

    rae09dfe r0047196  
    1919package net.driftingsouls.ds2.server.cargo; 
    2020 
    21 import net.driftingsouls.ds2.server.config.Item; 
    22 import net.driftingsouls.ds2.server.config.ItemEffect; 
    23 import net.driftingsouls.ds2.server.config.Items; 
     21import net.driftingsouls.ds2.server.config.items.Item; 
     22import net.driftingsouls.ds2.server.config.items.Items; 
     23import net.driftingsouls.ds2.server.config.items.effects.ItemEffect; 
    2424 
    2525// TODO: Readonly-Version anfertigen 

  • src/net/driftingsouls/ds2/server/cargo/Resources.java

    r7375108 r0047196  
    1919package net.driftingsouls.ds2.server.cargo; 
    2020 
    21 import net.driftingsouls.ds2.server.config.Item; 
    22 import net.driftingsouls.ds2.server.config.Items; 
     21import net.driftingsouls.ds2.server.config.items.Item; 
     22import net.driftingsouls.ds2.server.config.items.Items; 
    2323import net.driftingsouls.ds2.server.framework.templates.TemplateEngine; 
    2424 

  • src/net/driftingsouls/ds2/server/cargo/UnmodifiableCargo.java

    r3924571 r0047196  
    2222import java.util.List; 
    2323 
    24 import net.driftingsouls.ds2.server.config.ItemEffect; 
     24import net.driftingsouls.ds2.server.config.items.effects.ItemEffect; 
    2525 
    2626/** 

  • src/net/driftingsouls/ds2/server/cargo/modules/ModuleItemModule.java

    rd499c3e r0047196  
    2424import net.driftingsouls.ds2.server.cargo.ItemID; 
    2525import net.driftingsouls.ds2.server.cargo.ResourceID; 
    26 import net.driftingsouls.ds2.server.config.IEModule; 
    27 import net.driftingsouls.ds2.server.config.IEModuleSetMeta; 
    28 import net.driftingsouls.ds2.server.config.ItemEffect; 
    29 import net.driftingsouls.ds2.server.config.Items; 
     26import net.driftingsouls.ds2.server.config.items.Items; 
     27import net.driftingsouls.ds2.server.config.items.effects.IEModule; 
     28import net.driftingsouls.ds2.server.config.items.effects.IEModuleSetMeta; 
     29import net.driftingsouls.ds2.server.config.items.effects.ItemEffect; 
    3030import net.driftingsouls.ds2.server.framework.ContextMap; 
    3131import net.driftingsouls.ds2.server.framework.Loggable; 

  • src/net/driftingsouls/ds2/server/modules/AngriffController.java

    re409332 r0047196  
    2828import net.driftingsouls.ds2.server.cargo.Cargo; 
    2929import net.driftingsouls.ds2.server.cargo.ItemCargoEntry; 
    30 import net.driftingsouls.ds2.server.config.Item; 
    31 import net.driftingsouls.ds2.server.config.ItemEffect; 
    3230import net.driftingsouls.ds2.server.config.Weapons; 
     31import net.driftingsouls.ds2.server.config.items.Item; 
     32import net.driftingsouls.ds2.server.config.items.effects.ItemEffect; 
    3333import net.driftingsouls.ds2.server.entities.User; 
    3434import net.driftingsouls.ds2.server.framework.Common; 

  • src/net/driftingsouls/ds2/server/modules/GtuZwischenLagerController.java

    re409332 r0047196  
    2727import net.driftingsouls.ds2.server.cargo.Resources; 
    2828import net.driftingsouls.ds2.server.config.Faction; 
    29 import net.driftingsouls.ds2.server.config.Item; 
     29import net.driftingsouls.ds2.server.config.items.Item; 
    3030import net.driftingsouls.ds2.server.entities.GtuZwischenlager; 
    3131import net.driftingsouls.ds2.server.entities.User; 

  • src/net/driftingsouls/ds2/server/modules/HandelController.java

    re409332 r0047196  
    2626import net.driftingsouls.ds2.server.cargo.ResourceList; 
    2727import net.driftingsouls.ds2.server.cargo.Resources; 
    28 import net.driftingsouls.ds2.server.config.Items; 
    2928import net.driftingsouls.ds2.server.config.ResourceConfig; 
     29import net.driftingsouls.ds2.server.config.items.Items; 
    3030import net.driftingsouls.ds2.server.entities.Handel; 
    3131import net.driftingsouls.ds2.server.entities.User; 

  • src/net/driftingsouls/ds2/server/modules/ItemInfoController.java

    re409332 r0047196  
    3232import net.driftingsouls.ds2.server.cargo.ResourceList; 
    3333import net.driftingsouls.ds2.server.cargo.Resources; 
    34 import net.driftingsouls.ds2.server.config.IEAmmo; 
    35 import net.driftingsouls.ds2.server.config.IEDisableShip; 
    36 import net.driftingsouls.ds2.server.config.IEDraftShip; 
    37 import net.driftingsouls.ds2.server.config.IEModule; 
    38 import net.driftingsouls.ds2.server.config.IEModuleSetMeta; 
    39 import net.driftingsouls.ds2.server.config.Item; 
    40 import net.driftingsouls.ds2.server.config.ItemEffect; 
    41 import net.driftingsouls.ds2.server.config.Items; 
    4234import net.driftingsouls.ds2.server.config.ModuleSlots; 
    4335import net.driftingsouls.ds2.server.config.NoSuchSlotException; 
    …… 
    4537import net.driftingsouls.ds2.server.config.Weapon; 
    4638import net.driftingsouls.ds2.server.config.Weapons; 
     39import net.driftingsouls.ds2.server.config.items.Item; 
     40import net.driftingsouls.ds2.server.config.items.Items; 
     41import net.driftingsouls.ds2.server.config.items.effects.IEAmmo; 
     42import net.driftingsouls.ds2.server.config.items.effects.IEDisableShip; 
     43import net.driftingsouls.ds2.server.config.items.effects.IEDraftShip; 
     44import net.driftingsouls.ds2.server.config.items.effects.IEModule; 
     45import net.driftingsouls.ds2.server.config.items.effects.IEModuleSetMeta; 
     46import net.driftingsouls.ds2.server.config.items.effects.ItemEffect; 
    4747import net.driftingsouls.ds2.server.entities.Ammo; 
    4848import net.driftingsouls.ds2.server.entities.Forschung; 

  • src/net/driftingsouls/ds2/server/modules/KapernController.java

    re409332 r0047196  
    2929import net.driftingsouls.ds2.server.cargo.ItemCargoEntry; 
    3030import net.driftingsouls.ds2.server.comm.PM; 
    31 import net.driftingsouls.ds2.server.config.Item; 
    3231import net.driftingsouls.ds2.server.config.Systems; 
     32import net.driftingsouls.ds2.server.config.items.Item; 
    3333import net.driftingsouls.ds2.server.entities.User; 
    3434import net.driftingsouls.ds2.server.entities.UserFlagschiffLocation; 

  • src/net/driftingsouls/ds2/server/modules/PluendernController.java

    r3730ee3 r0047196  
    2323import net.driftingsouls.ds2.server.cargo.ResourceList; 
    2424import net.driftingsouls.ds2.server.comm.PM; 
    25 import net.driftingsouls.ds2.server.config.Items; 
     25import net.driftingsouls.ds2.server.config.items.Items; 
    2626import net.driftingsouls.ds2.server.entities.User; 
    2727import net.driftingsouls.ds2.server.framework.Common; 

  • src/net/driftingsouls/ds2/server/modules/TransportController.java

    re409332 r0047196  
    3131import net.driftingsouls.ds2.server.cargo.ResourceList; 
    3232import net.driftingsouls.ds2.server.comm.PM; 
    33 import net.driftingsouls.ds2.server.config.Items; 
     33import net.driftingsouls.ds2.server.config.items.Items; 
    3434import net.driftingsouls.ds2.server.entities.User; 
    3535import net.driftingsouls.ds2.server.framework.Common; 

  • src/net/driftingsouls/ds2/server/modules/ks/KSAttackAction.java

    r1c48316 r0047196  
    2929import net.driftingsouls.ds2.server.cargo.Cargo; 
    3030import net.driftingsouls.ds2.server.cargo.ItemCargoEntry; 
    31 import net.driftingsouls.ds2.server.config.IEAmmo; 
    32 import net.driftingsouls.ds2.server.config.ItemEffect; 
    3331import net.driftingsouls.ds2.server.config.Weapon; 
    3432import net.driftingsouls.ds2.server.config.Weapons; 
     33import net.driftingsouls.ds2.server.config.items.effects.IEAmmo; 
     34import net.driftingsouls.ds2.server.config.items.effects.ItemEffect; 
    3535import net.driftingsouls.ds2.server.entities.Ally; 
    3636import net.driftingsouls.ds2.server.entities.Ammo; 

  • src/net/driftingsouls/ds2/server/modules/ks/KSKapernAction.java

    re409332 r0047196  
    3030import net.driftingsouls.ds2.server.cargo.ItemCargoEntry; 
    3131import net.driftingsouls.ds2.server.comm.PM; 
    32 import net.driftingsouls.ds2.server.config.Item; 
     32import net.driftingsouls.ds2.server.config.items.Item; 
    3333import net.driftingsouls.ds2.server.entities.User; 
    3434import net.driftingsouls.ds2.server.entities.UserFlagschiffLocation; 

  • src/net/driftingsouls/ds2/server/modules/ks/KSMenuAttackMuniSelectAction.java

    r2cc2a9f r0047196  
    3030import net.driftingsouls.ds2.server.cargo.Cargo; 
    3131import net.driftingsouls.ds2.server.cargo.ItemCargoEntry; 
    32 import net.driftingsouls.ds2.server.config.IEAmmo; 
    33 import net.driftingsouls.ds2.server.config.Item; 
    34 import net.driftingsouls.ds2.server.config.ItemEffect; 
    3532import net.driftingsouls.ds2.server.config.Weapon; 
    3633import net.driftingsouls.ds2.server.config.Weapons; 
     34import net.driftingsouls.ds2.server.config.items.Item; 
     35import net.driftingsouls.ds2.server.config.items.effects.IEAmmo; 
     36import net.driftingsouls.ds2.server.config.items.effects.ItemEffect; 
    3737import net.driftingsouls.ds2.server.entities.Ammo; 
    3838import net.driftingsouls.ds2.server.entities.User; 

  • src/net/driftingsouls/ds2/server/modules/stats/StatWaren.java

    re409332 r0047196  
    2626import net.driftingsouls.ds2.server.cargo.ResourceEntry; 
    2727import net.driftingsouls.ds2.server.cargo.ResourceList; 
    28 import net.driftingsouls.ds2.server.config.Items; 
     28import net.driftingsouls.ds2.server.config.items.Items; 
    2929import net.driftingsouls.ds2.server.entities.User; 
    3030import net.driftingsouls.ds2.server.framework.Common; 

  • src/net/driftingsouls/ds2/server/ships/Ship.java

    rce08f3d r0047196  
    5656import net.driftingsouls.ds2.server.cargo.modules.Module; 
    5757import net.driftingsouls.ds2.server.cargo.modules.Modules; 
    58 import net.driftingsouls.ds2.server.config.Item; 
    59 import net.driftingsouls.ds2.server.config.ItemEffect; 
    6058import net.driftingsouls.ds2.server.config.Rassen; 
    6159import net.driftingsouls.ds2.server.config.StarSystem; 
    6260import net.driftingsouls.ds2.server.config.Systems; 
     61import net.driftingsouls.ds2.server.config.items.Item; 
     62import net.driftingsouls.ds2.server.config.items.effects.ItemEffect; 
    6363import net.driftingsouls.ds2.server.entities.JumpNode; 
    6464import net.driftingsouls.ds2.server.entities.Nebel; 

  • src/net/driftingsouls/ds2/server/tick/rare/RestTick.java

    r8c3eb1a r0047196  
    3434import net.driftingsouls.ds2.server.cargo.modules.ModuleItemModule; 
    3535import net.driftingsouls.ds2.server.cargo.modules.Modules; 
    36 import net.driftingsouls.ds2.server.config.ItemEffect; 
     36import net.driftingsouls.ds2.server.config.items.effects.ItemEffect; 
    3737import net.driftingsouls.ds2.server.entities.GtuZwischenlager; 
    3838import net.driftingsouls.ds2.server.entities.StatCargo; 

  • src/net/driftingsouls/ds2/server/tick/regular/WerftTick.java

    r8c3eb1a r0047196  
    2424import net.driftingsouls.ds2.server.bases.Base; 
    2525import net.driftingsouls.ds2.server.comm.PM; 
    26 import net.driftingsouls.ds2.server.config.Items; 
     26import net.driftingsouls.ds2.server.config.items.Items; 
    2727import net.driftingsouls.ds2.server.entities.User; 
    2828import net.driftingsouls.ds2.server.framework.Common; 

  • src/net/driftingsouls/ds2/server/werften/WerftGUI.java

    r081f5d1 r0047196  
    3434import net.driftingsouls.ds2.server.cargo.modules.Module; 
    3535import net.driftingsouls.ds2.server.cargo.modules.Modules; 
    36 import net.driftingsouls.ds2.server.config.IEModule; 
    37 import net.driftingsouls.ds2.server.config.Item; 
    38 import net.driftingsouls.ds2.server.config.ItemEffect; 
    39 import net.driftingsouls.ds2.server.config.Items; 
    4036import net.driftingsouls.ds2.server.config.ModuleSlots; 
     37import net.driftingsouls.ds2.server.config.items.Item; 
     38import net.driftingsouls.ds2.server.config.items.Items; 
     39import net.driftingsouls.ds2.server.config.items.effects.IEModule; 
     40import net.driftingsouls.ds2.server.config.items.effects.ItemEffect; 
    4141import net.driftingsouls.ds2.server.entities.User; 
    4242import net.driftingsouls.ds2.server.framework.Common; 

  • src/net/driftingsouls/ds2/server/werften/WerftObject.java

    r54492a9 r0047196  
    5353import net.driftingsouls.ds2.server.cargo.modules.ModuleItemModule; 
    5454import net.driftingsouls.ds2.server.cargo.modules.Modules; 
    55 import net.driftingsouls.ds2.server.config.IEDisableShip; 
    56 import net.driftingsouls.ds2.server.config.IEDraftShip; 
    57 import net.driftingsouls.ds2.server.config.IEModule; 
    58 import net.driftingsouls.ds2.server.config.ItemEffect; 
    59 import net.driftingsouls.ds2.server.config.Items; 
    6055import net.driftingsouls.ds2.server.config.ModuleSlots; 
    6156import net.driftingsouls.ds2.server.config.Rassen; 
    6257import net.driftingsouls.ds2.server.config.Systems; 
     58import net.driftingsouls.ds2.server.config.items.Items; 
     59import net.driftingsouls.ds2.server.config.items.effects.IEDisableShip; 
     60import net.driftingsouls.ds2.server.config.items.effects.IEDraftShip; 
     61import net.driftingsouls.ds2.server.config.items.effects.IEModule; 
     62import net.driftingsouls.ds2.server.config.items.effects.ItemEffect; 
    6363import net.driftingsouls.ds2.server.entities.User; 
    6464import net.driftingsouls.ds2.server.framework.Common; 

  • web/WEB-INF/cfg/boot.xml

    rb61580f r0047196  
    2424        <boot class="net.driftingsouls.ds2.server.config.ModuleSlots" type="static" /> 
    2525        <boot class="net.driftingsouls.ds2.server.config.Weapons" type="static" /> 
    26         <boot class="net.driftingsouls.ds2.server.config.Items" type="static" /> 
     26        <boot class="net.driftingsouls.ds2.server.config.items.Items" type="static" /> 
    2727        <boot class="net.driftingsouls.ds2.server.config.Medals" type="static" /> 
    2828        <boot class="net.driftingsouls.ds2.server.config.Faction" type="static" />