lineage2/l2j_mobius
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Code style changes.

Browse Source
This commit is contained in:
MobiusDev
2016-04-26 19:21:19 +00:00
parent 6a13705766
commit fc070c9238
768 changed files with 3338 additions and 4252 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
trunk/java/com/l2jmobius/gameserver/model/drops/GroupedGeneralDropItem.java
View File

@@ -206,7 +206,7 @@ public final class GroupedGeneralDropItem implements IDropItem
{
if (applyKillerModifier)
{
chanceModifier *= (getKillerChanceModifier(victim, killer));
chanceModifier *= getKillerChanceModifier(victim, killer);
}
double sumchance = 0;
for (GeneralDropItem item : getItems())

2
trunk/java/com/l2jmobius/gameserver/model/drops/IDropItem.java
View File

@@ -32,5 +32,5 @@ public interface IDropItem
* @param killer the killer
* @return {@code null} or empty collection if there are no drops, a collection containing all items to drop otherwise
*/
public List<ItemHolder> calculateDrops(L2Character victim, L2Character killer);
List<ItemHolder> calculateDrops(L2Character victim, L2Character killer);
}

2
trunk/java/com/l2jmobius/gameserver/model/drops/IDropItemFactory.java
View File

@@ -28,5 +28,5 @@ public interface IDropItemFactory
* @param chance the chance of this drop item
* @return the drop item created by this factory
*/
public IDropItem newDropItem(int itemId, long min, long max, double chance);
IDropItem newDropItem(int itemId, long min, long max, double chance);
}

2
trunk/java/com/l2jmobius/gameserver/model/drops/IGroupedDropItemFactory.java
View File

@@ -21,5 +21,5 @@ package com.l2jmobius.gameserver.model.drops;
*/
public interface IGroupedDropItemFactory
{
public GroupedGeneralDropItem newGroupedDropItem(double chance);
GroupedGeneralDropItem newGroupedDropItem(double chance);
}

10
trunk/java/com/l2jmobius/gameserver/model/drops/strategy/IAmountMultiplierStrategy.java
View File

@@ -27,11 +27,11 @@ import com.l2jmobius.gameserver.model.itemcontainer.Inventory;
*/
public interface IAmountMultiplierStrategy
{
public static final IAmountMultiplierStrategy DROP = DEFAULT_STRATEGY(Config.RATE_DEATH_DROP_AMOUNT_MULTIPLIER);
public static final IAmountMultiplierStrategy SPOIL = DEFAULT_STRATEGY(Config.RATE_CORPSE_DROP_AMOUNT_MULTIPLIER);
public static final IAmountMultiplierStrategy STATIC = (item, victim) -> 1;
IAmountMultiplierStrategy DROP = DEFAULT_STRATEGY(Config.RATE_DEATH_DROP_AMOUNT_MULTIPLIER);
IAmountMultiplierStrategy SPOIL = DEFAULT_STRATEGY(Config.RATE_CORPSE_DROP_AMOUNT_MULTIPLIER);
IAmountMultiplierStrategy STATIC = (item, victim) -> 1;
public static IAmountMultiplierStrategy DEFAULT_STRATEGY(double defaultMultiplier)
static IAmountMultiplierStrategy DEFAULT_STRATEGY(double defaultMultiplier)
{
return (item, victim) ->
{
@@ -61,5 +61,5 @@ public interface IAmountMultiplierStrategy
};
}
public double getAmountMultiplier(GeneralDropItem item, L2Character victim);
double getAmountMultiplier(GeneralDropItem item, L2Character victim);
}

12
trunk/java/com/l2jmobius/gameserver/model/drops/strategy/IChanceMultiplierStrategy.java
View File

@@ -27,11 +27,11 @@ import com.l2jmobius.gameserver.model.itemcontainer.Inventory;
*/
public interface IChanceMultiplierStrategy
{
public static final IChanceMultiplierStrategy DROP = DEFAULT_STRATEGY(Config.RATE_DEATH_DROP_CHANCE_MULTIPLIER);
public static final IChanceMultiplierStrategy SPOIL = DEFAULT_STRATEGY(Config.RATE_CORPSE_DROP_CHANCE_MULTIPLIER);
public static final IChanceMultiplierStrategy STATIC = (item, victim) -> 1;
IChanceMultiplierStrategy DROP = DEFAULT_STRATEGY(Config.RATE_DEATH_DROP_CHANCE_MULTIPLIER);
IChanceMultiplierStrategy SPOIL = DEFAULT_STRATEGY(Config.RATE_CORPSE_DROP_CHANCE_MULTIPLIER);
IChanceMultiplierStrategy STATIC = (item, victim) -> 1;
public static final IChanceMultiplierStrategy QUEST = (item, victim) ->
IChanceMultiplierStrategy QUEST = (item, victim) ->
{
double championmult;
if ((item.getItemId() == Inventory.ADENA_ID) || (item.getItemId() == Inventory.ANCIENT_ADENA_ID))
@@ -46,7 +46,7 @@ public interface IChanceMultiplierStrategy
return (Config.L2JMOD_CHAMPION_ENABLE && (victim != null) && victim.isChampion()) ? (Config.RATE_QUEST_DROP * championmult) : Config.RATE_QUEST_DROP;
};
public static IChanceMultiplierStrategy DEFAULT_STRATEGY(double defaultMultiplier)
static IChanceMultiplierStrategy DEFAULT_STRATEGY(double defaultMultiplier)
{
return (item, victim) ->
{
@@ -76,5 +76,5 @@ public interface IChanceMultiplierStrategy
};
}
public double getChanceMultiplier(GeneralDropItem item, L2Character victim);
double getChanceMultiplier(GeneralDropItem item, L2Character victim);
}

4
trunk/java/com/l2jmobius/gameserver/model/drops/strategy/IDropCalculationStrategy.java
View File

@@ -29,7 +29,7 @@ import com.l2jmobius.util.Rnd;
*/
public interface IDropCalculationStrategy
{
public static final IDropCalculationStrategy DEFAULT_STRATEGY = (item, victim, killer) ->
IDropCalculationStrategy DEFAULT_STRATEGY = (item, victim, killer) ->
{
final double chance = item.getChance(victim, killer);
if (chance > (Rnd.nextDouble() * 100))
@@ -50,5 +50,5 @@ public interface IDropCalculationStrategy
return null;
};
public List<ItemHolder> calculateDrops(GeneralDropItem item, L2Character victim, L2Character killer);
List<ItemHolder> calculateDrops(GeneralDropItem item, L2Character victim, L2Character killer);
}

12
trunk/java/com/l2jmobius/gameserver/model/drops/strategy/IGroupedItemDropCalculationStrategy.java
View File

@@ -37,7 +37,7 @@ public interface IGroupedItemDropCalculationStrategy
/**
* The default strategy used in L2J to calculate drops. When the group's chance raises over 100% and group has precise calculation, the dropped item's amount increases.
*/
public static final IGroupedItemDropCalculationStrategy DEFAULT_STRATEGY = new IGroupedItemDropCalculationStrategy()
IGroupedItemDropCalculationStrategy DEFAULT_STRATEGY = new IGroupedItemDropCalculationStrategy()
{
private final Map<GroupedGeneralDropItem, GeneralDropItem> singleItemCache = new ConcurrentHashMap<>();
@@ -59,7 +59,7 @@ public interface IGroupedItemDropCalculationStrategy
final GroupedGeneralDropItem normalized = dropItem.normalizeMe(victim, killer);
if (normalized.getChance() > (Rnd.nextDouble() * 100))
{
final double random = (Rnd.nextDouble() * 100);
final double random = Rnd.nextDouble() * 100;
double totalChance = 0;
for (GeneralDropItem item2 : normalized.getItems())
{
@@ -70,7 +70,7 @@ public interface IGroupedItemDropCalculationStrategy
int amountMultiply = 1;
if (dropItem.isPreciseCalculated() && (normalized.getChance() >= 100))
{
amountMultiply = (int) (normalized.getChance()) / 100;
amountMultiply = (int) normalized.getChance() / 100;
if ((normalized.getChance() % 100) > (Rnd.nextDouble() * 100))
{
amountMultiply++;
@@ -88,7 +88,7 @@ public interface IGroupedItemDropCalculationStrategy
/**
* This strategy calculates a group's drop by calculating drops of its individual items and merging its results.
*/
public static final IGroupedItemDropCalculationStrategy DISBAND_GROUP = (item, victim, killer) ->
IGroupedItemDropCalculationStrategy DISBAND_GROUP = (item, victim, killer) ->
{
final List<ItemHolder> dropped = new ArrayList<>();
for (IDropItem dropItem : item.extractMe())
@@ -101,7 +101,7 @@ public interface IGroupedItemDropCalculationStrategy
/**
* This strategy when group has precise calculation rolls multiple times over group to determine drops when group's chance raises over 100% instead of just multiplying the dropped item's amount. Thus it can produce different items from group at once.
*/
public static final IGroupedItemDropCalculationStrategy PRECISE_MULTIPLE_GROUP_ROLLS = (item, victim, killer) ->
IGroupedItemDropCalculationStrategy PRECISE_MULTIPLE_GROUP_ROLLS = (item, victim, killer) ->
{
if (!item.isPreciseCalculated())
{
@@ -126,5 +126,5 @@ public interface IGroupedItemDropCalculationStrategy
return dropped.isEmpty() ? null : dropped;
};
public List<ItemHolder> calculateDrops(GroupedGeneralDropItem item, L2Character victim, L2Character killer);
List<ItemHolder> calculateDrops(GroupedGeneralDropItem item, L2Character victim, L2Character killer);
}

8
trunk/java/com/l2jmobius/gameserver/model/drops/strategy/IKillerChanceModifierStrategy.java
View File

@@ -28,7 +28,7 @@ import com.l2jmobius.gameserver.util.Util;
*/
public interface IKillerChanceModifierStrategy extends INonGroupedKillerChanceModifierStrategy
{
public static final IKillerChanceModifierStrategy DEFAULT_STRATEGY = (item, victim, killer) ->
IKillerChanceModifierStrategy DEFAULT_STRATEGY = (item, victim, killer) ->
{
final int levelDifference = victim.getLevel() - killer.getLevel();
if ((victim.isRaid()) && Config.DEEPBLUE_DROP_RULES_RAID)
@@ -42,7 +42,7 @@ public interface IKillerChanceModifierStrategy extends INonGroupedKillerChanceMo
}
return 1;
};
public static final INonGroupedKillerChanceModifierStrategy DEFAULT_NONGROUP_STRATEGY = (item, victim, killer) ->
INonGroupedKillerChanceModifierStrategy DEFAULT_NONGROUP_STRATEGY = (item, victim, killer) ->
{
if (((!(victim.isRaid())) && Config.DEEPBLUE_DROP_RULES) || ((victim.isRaid()) && Config.DEEPBLUE_DROP_RULES_RAID))
{
@@ -58,10 +58,10 @@ public interface IKillerChanceModifierStrategy extends INonGroupedKillerChanceMo
IKillerChanceModifierStrategy NO_RULES = (item, victim, killer) -> 1;
public double getKillerChanceModifier(IDropItem item, L2Character victim, L2Character killer);
double getKillerChanceModifier(IDropItem item, L2Character victim, L2Character killer);
@Override
public default double getKillerChanceModifier(GeneralDropItem item, L2Character victim, L2Character killer)
default double getKillerChanceModifier(GeneralDropItem item, L2Character victim, L2Character killer)
{
return getKillerChanceModifier((IDropItem) item, victim, killer);
}

2
trunk/java/com/l2jmobius/gameserver/model/drops/strategy/INonGroupedKillerChanceModifierStrategy.java
View File

@@ -24,5 +24,5 @@ import com.l2jmobius.gameserver.model.drops.GeneralDropItem;
*/
public interface INonGroupedKillerChanceModifierStrategy
{
public double getKillerChanceModifier(GeneralDropItem item, L2Character victim, L2Character killer);
double getKillerChanceModifier(GeneralDropItem item, L2Character victim, L2Character killer);
}

8
trunk/java/com/l2jmobius/gameserver/model/drops/strategy/IPreciseDeterminationStrategy.java
View File

@@ -24,15 +24,15 @@ import com.l2jmobius.gameserver.model.drops.IDropItem;
*/
public interface IPreciseDeterminationStrategy
{
public static final IPreciseDeterminationStrategy ALWAYS = dropItem -> true;
IPreciseDeterminationStrategy ALWAYS = dropItem -> true;
public static final IPreciseDeterminationStrategy DEFAULT = dropItem -> Config.PRECISE_DROP_CALCULATION;
IPreciseDeterminationStrategy DEFAULT = dropItem -> Config.PRECISE_DROP_CALCULATION;
public static final IPreciseDeterminationStrategy NEVER = dropItem -> false;
IPreciseDeterminationStrategy NEVER = dropItem -> false;
/**
* @param dropItem
* @return <code>true</code> if drop calculation strategy should use precise rules
*/
public boolean isPreciseCalculated(IDropItem dropItem);
boolean isPreciseCalculated(IDropItem dropItem);
}