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

Code format braces.

Browse Source
This commit is contained in:
MobiusDev
2017-08-31 11:54:12 +00:00
parent ce279555a0
commit 3615456155
297 changed files with 6280 additions and 244 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
L2J_Mobius_3.0_Helios/.settings/org.eclipse.jdt.core.prefs
View File

@@ -123,7 +123,7 @@ org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
org.eclipse.jdt.core.compiler.source=1.8
org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=99
org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647
org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=0
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
@@ -137,8 +137,10 @@ org.eclipse.jdt.core.formatter.alignment_for_compact_if=0
org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=0
org.eclipse.jdt.core.formatter.alignment_for_enum_constants=49
org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=49
org.eclipse.jdt.core.formatter.alignment_for_expressions_in_for_loop_header=0
org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
org.eclipse.jdt.core.formatter.alignment_for_parameterized_type_references=0
org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=0
org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=0
org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=85
@@ -148,6 +150,8 @@ org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration
org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=0
org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=0
org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=0
org.eclipse.jdt.core.formatter.alignment_for_type_arguments=0
org.eclipse.jdt.core.formatter.alignment_for_type_parameters=0
org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16
org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
org.eclipse.jdt.core.formatter.blank_lines_after_package=1
@@ -206,6 +210,7 @@ org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=true
org.eclipse.jdt.core.formatter.indentation.size=4
org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_enum_constant=insert
org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
@@ -400,12 +405,24 @@ org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1
org.eclipse.jdt.core.formatter.parentheses_positions_in_annotation=common_lines
org.eclipse.jdt.core.formatter.parentheses_positions_in_catch_clause=common_lines
org.eclipse.jdt.core.formatter.parentheses_positions_in_enum_constant_declaration=common_lines
org.eclipse.jdt.core.formatter.parentheses_positions_in_for_statment=common_lines
org.eclipse.jdt.core.formatter.parentheses_positions_in_if_while_statement=common_lines
org.eclipse.jdt.core.formatter.parentheses_positions_in_lambda_declaration=common_lines
org.eclipse.jdt.core.formatter.parentheses_positions_in_method_delcaration=common_lines
org.eclipse.jdt.core.formatter.parentheses_positions_in_method_invocation=common_lines
org.eclipse.jdt.core.formatter.parentheses_positions_in_switch_statement=common_lines
org.eclipse.jdt.core.formatter.parentheses_positions_in_try_clause=common_lines
org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=false
org.eclipse.jdt.core.formatter.tabulation.char=tab
org.eclipse.jdt.core.formatter.tabulation.size=4
org.eclipse.jdt.core.formatter.use_on_off_tags=true
org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
org.eclipse.jdt.core.formatter.wrap_before_assignment_operator=false
org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
org.eclipse.jdt.core.formatter.wrap_before_conditional_operator=true
org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
org.eclipse.jdt.core.javaFormatter=org.eclipse.jdt.core.defaultJavaFormatter

5
L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10376_BloodyGoodTime/Q10376_BloodyGoodTime.java vendored
View File

@@ -152,6 +152,7 @@ public class Q10376_BloodyGoodTime extends Quest
switch (npc.getId())
{
case ZENYA:
{
switch (qs.getState())
{
case State.CREATED:
@@ -179,7 +180,7 @@ public class Q10376_BloodyGoodTime extends Quest
}
}
break;
}
case CASCA:
{
if (qs.isStarted())
@@ -203,7 +204,6 @@ public class Q10376_BloodyGoodTime extends Quest
}
break;
}
case AGNES:
{
if (qs.isStarted())
@@ -219,7 +219,6 @@ public class Q10376_BloodyGoodTime extends Quest
}
break;
}
case ANDREI:
{
if (qs.isStarted() && qs.isCond(6))

2
L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10383_FergasonsOffer/Q10383_FergasonsOffer.java vendored
View File

@@ -139,7 +139,6 @@ public class Q10383_FergasonsOffer extends Quest
{
htmltext = "maestro_ferguson_q10383_05.html";
}
break;
}
case AKU:
@@ -152,7 +151,6 @@ public class Q10383_FergasonsOffer extends Quest
{
htmltext = "sofa_aku_q10383_02.html";
}
break;
}
}

1
L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10384_AnAudienceWithTauti/Q10384_AnAudienceWithTauti.java vendored
View File

@@ -124,7 +124,6 @@ public class Q10384_AnAudienceWithTauti extends Quest
{
htmltext = "maestro_ferguson_q10384_09.html";
}
}
else if (qs.isCompleted())
{

2
L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10542_SearchingForNewPower/Q10542_SearchingForNewPower.java vendored
View File

@@ -211,7 +211,9 @@ public final class Q10542_SearchingForNewPower extends Quest
break;
}
default:
{
break;
}
}
if (npcStringId != null)
{

6
L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10734_DoOrDie/Q10734_DoOrDie.java vendored
View File

@@ -132,8 +132,10 @@ public final class Q10734_DoOrDie extends Quest
switch (qs.getState())
{
case State.CREATED:
{
htmltext = (meetStartRestrictions(player)) ? "33943-01.htm" : "33943-08.htm";
break;
}
case State.STARTED:
{
switch (qs.getCond())
@@ -182,8 +184,10 @@ public final class Q10734_DoOrDie extends Quest
switch (qs.getState())
{
case State.CREATED:
{
htmltext = (meetStartRestrictions(player)) ? "33942-01.htm" : "33942-08.htm";
break;
}
case State.STARTED:
{
switch (qs.getCond())
@@ -219,8 +223,10 @@ public final class Q10734_DoOrDie extends Quest
break;
}
case State.COMPLETED:
{
htmltext = getAlreadyCompletedMsg(player);
break;
}
}
}
break;

8
L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10735_ASpecialPower/Q10735_ASpecialPower.java vendored
View File

@@ -119,8 +119,10 @@ public final class Q10735_ASpecialPower extends Quest
break;
}
case State.COMPLETED:
{
htmltext = getAlreadyCompletedMsg(player);
break;
}
}
return htmltext;
}
@@ -136,14 +138,20 @@ public final class Q10735_ASpecialPower extends Quest
switch (qs.getCond())
{
case 2:
{
npcId = FLOATO;
break;
}
case 4:
{
npcId = FLOATO2;
break;
}
case 6:
{
npcId = RATEL;
break;
}
}
if (npcId != -1)
{

10
L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10736_ASpecialPower/Q10736_ASpecialPower.java vendored
View File

@@ -83,8 +83,10 @@ public final class Q10736_ASpecialPower extends Quest
switch (qs.getState())
{
case State.CREATED:
{
htmltext = "33943-01.htm";
break;
}
case State.STARTED:
{
switch (qs.getCond())
@@ -116,8 +118,10 @@ public final class Q10736_ASpecialPower extends Quest
break;
}
case State.COMPLETED:
{
htmltext = getAlreadyCompletedMsg(player);
break;
}
}
return htmltext;
}
@@ -133,14 +137,20 @@ public final class Q10736_ASpecialPower extends Quest
switch (qs.getCond())
{
case 2:
{
npcId = FLOATO;
break;
}
case 4:
{
npcId = FLOATO2;
break;
}
case 6:
{
npcId = RATEL;
break;
}
}
if (npcId != -1)
{

2
L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10740_NeverForget/Q10740_NeverForget.java vendored
View File

@@ -152,8 +152,10 @@ public final class Q10740_NeverForget extends Quest
break;
}
case State.COMPLETED:
{
htmltext = getAlreadyCompletedMsg(player);
break;
}
}
break;
}

8
L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10741_ADraughtForTheCold/Q10741_ADraughtForTheCold.java vendored
View File

@@ -70,7 +70,9 @@ public final class Q10741_ADraughtForTheCold extends Quest
switch (event)
{
case "33951-02.htm":
{
break;
}
case "33951-03.htm":
{
qs.startQuest();
@@ -88,7 +90,9 @@ public final class Q10741_ADraughtForTheCold extends Quest
break;
}
default:
{
htmltext = null;
}
}
return htmltext;
}
@@ -106,8 +110,10 @@ public final class Q10741_ADraughtForTheCold extends Quest
switch (qs.getState())
{
case State.CREATED:
{
htmltext = "33951-01.htm";
break;
}
case State.STARTED:
{
if (qs.isCond(1))
@@ -117,8 +123,10 @@ public final class Q10741_ADraughtForTheCold extends Quest
break;
}
case State.COMPLETED:
{
htmltext = getAlreadyCompletedMsg(player);
break;
}
}
break;
}

6
L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10742_AFurryFriend/Q10742_AFurryFriend.java vendored
View File

@@ -74,8 +74,10 @@ public final class Q10742_AFurryFriend extends Quest
{
case "33952-02.htm":
case "33952-05.html":
{
htmltext = event;
break;
}
case "33952-03.htm":
{
qs.startQuest();
@@ -183,8 +185,10 @@ public final class Q10742_AFurryFriend extends Quest
switch (qs.getState())
{
case State.CREATED:
{
htmltext = "33952-01.htm";
break;
}
case State.STARTED:
{
if (qs.isCond(1))
@@ -201,8 +205,10 @@ public final class Q10742_AFurryFriend extends Quest
break;
}
case State.COMPLETED:
{
htmltext = getAlreadyCompletedMsg(player);
break;
}
}
}
return htmltext;

10
L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10743_StrangeFungus/Q10743_StrangeFungus.java vendored
View File

@@ -78,7 +78,9 @@ public final class Q10743_StrangeFungus extends Quest
{
case "33952-02.htm":
case "33953-02.html":
{
break;
}
case "33952-03.htm":
{
qs.startQuest();
@@ -97,7 +99,9 @@ public final class Q10743_StrangeFungus extends Quest
break;
}
default:
{
htmltext = null;
}
}
return htmltext;
}
@@ -115,14 +119,20 @@ public final class Q10743_StrangeFungus extends Quest
switch (qs.getState())
{
case State.CREATED:
{
htmltext = "33952-01.htm";
break;
}
case State.STARTED:
{
htmltext = (qs.isCond(1)) ? "33952-04.html" : "33952-05.html";
break;
}
case State.COMPLETED:
{
htmltext = getAlreadyCompletedMsg(player);
break;
}
}
break;
}

4
L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10744_StrongerThanSteel/Q10744_StrongerThanSteel.java vendored
View File

@@ -67,7 +67,9 @@ public final class Q10744_StrongerThanSteel extends Quest
{
case "33953-02.htm":
case "33954-02.html":
{
break;
}
case "33953-03.htm":
{
qs.startQuest();
@@ -82,7 +84,9 @@ public final class Q10744_StrongerThanSteel extends Quest
break;
}
default:
{
htmltext = null;
}
}
return htmltext;
}

2
L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10745_TheSecretIngredients/Q10745_TheSecretIngredients.java vendored
View File

@@ -114,7 +114,9 @@ public final class Q10745_TheSecretIngredients extends Quest
break;
}
default:
{
htmltext = null;
}
}
return htmltext;
}

6
L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10746_SeeTheWorld/Q10746_SeeTheWorld.java vendored
View File

@@ -83,7 +83,9 @@ public final class Q10746_SeeTheWorld extends Quest
break;
}
default:
{
htmltext = null;
}
}
return htmltext;
}
@@ -101,8 +103,10 @@ public final class Q10746_SeeTheWorld extends Quest
switch (qs.getState())
{
case State.CREATED:
{
htmltext = "33933-01.htm";
break;
}
case State.STARTED:
{
if (qs.isCond(1))
@@ -112,8 +116,10 @@ public final class Q10746_SeeTheWorld extends Quest
break;
}
case State.COMPLETED:
{
htmltext = getAlreadyCompletedMsg(player);
break;
}
}
break;
}

8
L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10790_AMercenaryHelper/Q10790_AMercenaryHelper.java vendored
View File

@@ -88,7 +88,9 @@ public class Q10790_AMercenaryHelper extends Quest
{
case "33847-02.htm":
case "33847-03.htm":
{
break;
}
case "33847-04.htm":
{
qs.startQuest();
@@ -118,14 +120,20 @@ public class Q10790_AMercenaryHelper extends Quest
switch (qs.getState())
{
case State.CREATED:
{
htmltext = "33847-01.htm";
break;
}
case State.STARTED:
{
htmltext = (qs.isCond(1)) ? "33847-05.html" : "33847-06.html";
break;
}
case State.COMPLETED:
{
htmltext = getAlreadyCompletedMsg(player);
break;
}
}
return htmltext;
}

4
L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10796_TheEyeThatDefiedTheGods/Q10796_TheEyeThatDefiedTheGods.java vendored
View File

@@ -60,7 +60,9 @@ public class Q10796_TheEyeThatDefiedTheGods extends Quest
{
case "31616-02.htm":
case "31616-03.htm":
{
break;
}
case "31616-04.htm":
{
qs.startQuest();
@@ -111,8 +113,8 @@ public class Q10796_TheEyeThatDefiedTheGods extends Quest
{
htmltext = getAlreadyCompletedMsg(player);
}
}
break;
}
}
return htmltext;
}

2
L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10797_CrossingFate/Q10797_CrossingFate.java vendored
View File

@@ -65,7 +65,9 @@ public class Q10797_CrossingFate extends Quest
{
case "31683-02.htm":
case "31683-03.htm":
{
break;
}
case "31683-04.htm":
{
qs.startQuest();

6
L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/util/exp4j/Expression.java
View File

@@ -137,9 +137,12 @@ public class Expression
{
case Token.TOKEN_NUMBER:
case Token.TOKEN_VARIABLE:
{
count++;
break;
}
case Token.TOKEN_FUNCTION:
{
final Function func = ((FunctionToken) tok).getFunction();
final int argsNum = func.getNumArguments();
if (argsNum > count)
@@ -156,13 +159,16 @@ public class Expression
count++;
}
break;
}
case Token.TOKEN_OPERATOR:
{
Operator op = ((OperatorToken) tok).getOperator();
if (op.getNumOperands() == 2)
{
count--;
}
break;
}
}
if (count < 1)
{

14
L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/util/exp4j/Operators.java
View File

@@ -109,27 +109,41 @@ public abstract class Operators
switch (symbol)
{
case '+':
{
if (numArguments != 1)
{
return builtinOperators[INDEX_ADDITION];
}
return builtinOperators[INDEX_UNARYPLUS];
}
case '-':
{
if (numArguments != 1)
{
return builtinOperators[INDEX_SUBTRACTION];
}
return builtinOperators[INDEX_UNARYMINUS];
}
case '*':
{
return builtinOperators[INDEX_MUTLIPLICATION];
}
case '/':
{
return builtinOperators[INDEX_DIVISION];
}
case '^':
{
return builtinOperators[INDEX_POWER];
}
case '%':
{
return builtinOperators[INDEX_MODULO];
}
default:
{
return null;
}
}
}
}

14
L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/util/exp4j/ShuntingYard.java
View File

@@ -48,12 +48,17 @@ public class ShuntingYard
{
case Token.TOKEN_NUMBER:
case Token.TOKEN_VARIABLE:
{
output.add(token);
break;
}
case Token.TOKEN_FUNCTION:
{
stack.add(token);
break;
}
case Token.TOKEN_SEPARATOR:
{
while (!stack.empty() && (stack.peek().getType() != Token.TOKEN_PARENTHESES_OPEN))
{
output.add(stack.pop());
@@ -63,7 +68,9 @@ public class ShuntingYard
throw new IllegalArgumentException("Misplaced function separator ',' or mismatched parentheses");
}
break;
}
case Token.TOKEN_OPERATOR:
{
while (!stack.empty() && (stack.peek().getType() == Token.TOKEN_OPERATOR))
{
OperatorToken o1 = (OperatorToken) token;
@@ -83,10 +90,14 @@ public class ShuntingYard
}
stack.push(token);
break;
}
case Token.TOKEN_PARENTHESES_OPEN:
{
stack.push(token);
break;
}
case Token.TOKEN_PARENTHESES_CLOSE:
{
while (stack.peek().getType() != Token.TOKEN_PARENTHESES_OPEN)
{
output.add(stack.pop());
@@ -97,8 +108,11 @@ public class ShuntingYard
output.add(stack.pop());
}
break;
}
default:
{
throw new IllegalArgumentException("Unknown Token type encountered. This should not happen");
}
}
}
while (!stack.empty())

19
L2J_Mobius_3.0_Helios/java/com/l2jmobius/tools/geodataconverter/GeoDataConverter.java
View File

@@ -159,19 +159,24 @@ public final class GeoDataConverter
switch (type)
{
case GeoStructure.TYPE_FLAT_L2J_L2OFF:
{
_blocks[ix][iy] = new BlockFlat(buffer, _format);
break;
}
case GeoStructure.TYPE_COMPLEX_L2J:
{
_blocks[ix][iy] = new BlockComplex(buffer, _format);
break;
}
case GeoStructure.TYPE_MULTILAYER_L2J:
{
_blocks[ix][iy] = new BlockMultilayer(buffer, _format);
break;
}
default:
{
throw new IllegalArgumentException("Unknown block type: " + type);
}
}
}
else
@@ -183,16 +188,20 @@ public final class GeoDataConverter
switch (type)
{
case GeoStructure.TYPE_FLAT_L2J_L2OFF:
{
_blocks[ix][iy] = new BlockFlat(buffer, _format);
break;
}
case GeoStructure.TYPE_COMPLEX_L2OFF:
{
_blocks[ix][iy] = new BlockComplex(buffer, _format);
break;
}
default:
{
_blocks[ix][iy] = new BlockMultilayer(buffer, _format);
break;
}
}
}
}