Skip to content

Commit

Permalink
Run 'ant cleanwhitespace'
Browse files Browse the repository at this point in the history
  • Loading branch information
AntumDeluge committed Oct 13, 2023
1 parent 3390070 commit 4df6044
Show file tree
Hide file tree
Showing 22 changed files with 39 additions and 42 deletions.
24 changes: 12 additions & 12 deletions data/conf/zones/fado.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1690,7 +1690,7 @@ For example say: 11 if you want the room called Water of Love.
<destination zone="int_sedah_house1" ref="house1_entrance_west"/>
<attribute name="move.continuous"/>
</portal>

<portal x="70" y="92" ref="house1_east_entrance">
<destination zone="int_sedah_house1" ref="house1_entrance_east"/>
<attribute name="move.continuous"/>
Expand All @@ -1715,7 +1715,7 @@ For example say: 11 if you want the room called Water of Love.
<destination zone="int_sedah_house2" ref="house2_entrance_east"/>
<attribute name="move.continuous"/>
</portal>

<portal x="91" y="115" ref="mausoleum_west_entrance">
<destination zone="int_sedah_mausoleum" ref="mausoleum_entrance_west"/>
<attribute name="move.continuous"/>
Expand All @@ -1725,7 +1725,7 @@ For example say: 11 if you want the room called Water of Love.
<destination zone="int_sedah_mausoleum" ref="mausoleum_entrance_east"/>
<attribute name="move.continuous"/>
</portal>

<portal x="121" y="105" ref="house3_west_entrance">
<destination zone="int_sedah_barracks_0" ref="house3_entrance_west"/>
<attribute name="move.continuous"/>
Expand Down Expand Up @@ -1806,7 +1806,7 @@ For example say: 11 if you want the room called Water of Love.
<portal x="14" y="13" ref="house40_stairs_east">
<destination zone="int_sedah_house4_1" ref="house41_stairs_east"/>
</portal>

</zone>

<zone name="int_sedah_house4_1" file="interiors/sedah/house4_1.tmx">
Expand Down Expand Up @@ -1837,7 +1837,7 @@ For example say: 11 if you want the room called Water of Love.
</zone>

<zone name="int_sedah_barracks_0" file="interiors/sedah/house3.tmx">

<portal x="16" y="28" ref="house3_entrance_west">
<destination zone="-1_fado_great_cave_w2" ref="house3_west_entrance"/>
<attribute name="move.continuous"/>
Expand All @@ -1846,7 +1846,7 @@ For example say: 11 if you want the room called Water of Love.
<portal x="17" y="28" ref="house3_entrance_east">
<destination zone="-1_fado_great_cave_w2" ref="house3_east_entrance"/>
<attribute name="move.continuous"/>
</portal>
</portal>

<portal x="4" y="4" ref="house30_stairs1_west">
<destination zone="int_sedah_barracks_1" ref="house31_stairs1_west"/>
Expand All @@ -1855,17 +1855,17 @@ For example say: 11 if you want the room called Water of Love.
<portal x="5" y="4" ref="house30_stairs1_east">
<destination zone="int_sedah_barracks_1" ref="house31_stairs1_east"/>
</portal>

</zone>

<zone name="int_sedah_barracks_1" file="interiors/sedah/house3_1.tmx">
<portal x="4" y="4" ref="house31_stairs1_west">
<destination zone="int_sedah_barracks_0" ref="house30_stairs1_west"/>
</portal>

<portal x="5" y="4" ref="house31_stairs1_east">
<destination zone="int_sedah_barracks_0" ref="house30_stairs1_east"/>
</portal>
</portal>

<portal x="15" y="26" ref="house31_stairs2_west">
<destination zone="int_sedah_barracks_2" ref="house32_stairs2_west"/>
Expand Down Expand Up @@ -1944,8 +1944,8 @@ it back as you got it!
<portal x="18" y="28" ref="storage_entrance_east">
<destination zone="-1_fado_great_cave_w" ref="storage_east_entrance"/>
<attribute name="move.continuous"/>
</portal>
</portal>

</zone>

<zone name="int_sedah_house5" file="interiors/sedah/house5.tmx">
Expand All @@ -1958,7 +1958,7 @@ it back as you got it!
<destination zone="-1_fado_great_cave_w" ref="house5_east_entrance"/>
<attribute name="move.continuous"/>
</portal>

</zone>

<zone name="int_sedah_house6" file="interiors/sedah/house6.tmx">
Expand Down
4 changes: 2 additions & 2 deletions src/games/stendhal/client/UiRenderingMethod.java
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,15 @@

/**
* Enumeration of rendering methods.
*
*
* @see <a href=
* "https://docs.oracle.com/javase/8/docs/technotes/guides/2d/flags.html">JavaSE
* 8 2D Technology</a>
* @see Wayland + Vulkan:
* <a href="https://openjdk.org/projects/wakefield/">Project WakeField</a>
* @see MacOS Metal framework:
* <a href="https://openjdk.org/projects/lanai/">Project Lanai</a>
*
*
*/
public enum UiRenderingMethod {

Expand Down
2 changes: 0 additions & 2 deletions src/games/stendhal/client/actions/AlterQuestAction.java
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,6 @@ public int getMaximumParameters() {
*/
@Override
public int getMinimumParameters() {

return 2;
}

}
4 changes: 2 additions & 2 deletions src/games/stendhal/client/gui/j2d/entity/Item2DView.java
Original file line number Diff line number Diff line change
Expand Up @@ -84,8 +84,8 @@ protected void buildRepresentation(T entity) {
IGameScreen.SIZE_UNIT_PIXELS);

if (width > IGameScreen.SIZE_UNIT_PIXELS) {
sprite = new AnimatedSprite(store.getTiles(sprite, 0, yOffset,
width / IGameScreen.SIZE_UNIT_PIXELS,
sprite = new AnimatedSprite(store.getTiles(sprite, 0, yOffset,
width / IGameScreen.SIZE_UNIT_PIXELS,
IGameScreen.SIZE_UNIT_PIXELS, IGameScreen.SIZE_UNIT_PIXELS),
100, true);
} else if (sprite.getHeight() > IGameScreen.SIZE_UNIT_PIXELS) {
Expand Down
2 changes: 1 addition & 1 deletion src/games/stendhal/client/update/Bootstrap.java
Original file line number Diff line number Diff line change
Expand Up @@ -282,7 +282,7 @@ private boolean isSigned() {
Certificate[] certs = (Certificate[]) objects;
for (Certificate cert : certs) {
byte[] key = cert.getPublicKey().getEncoded();
// Security Note: Since SourceForge has added support for https,
// Security Note: Since SourceForge has added support for https,
// we do not depend on verifying the signature anymore. But we need
// to tell an official and a self-build client apart in order not to
// add incompatible .jar files to the later and break it.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@ private void dump(PreparedStatement stmt, DefaultItem item) throws SQLException
stmt.setString(27, item.getAttributes().get("persistent"));
stmt.setString(28, item.getAttributes().get("slot_name"));
stmt.setString(29, item.getAttributes().get("slot_size"));

stmt.setString(30, item.getAttributes().get("undroppableondeath"));
stmt.setInt(31, MathHelper.parseIntDefault(item.getAttributes().get("autobind"), 0));
stmt.setString(32, item.getAttributes().get("max_quantity"));
Expand Down Expand Up @@ -285,4 +285,3 @@ public Map<String, Integer> getItemInfoIdMap(DBTransaction transaction) throws S
return transaction.queryAsMap("SELECT name, id FROM iteminfo", null);
}
}

2 changes: 1 addition & 1 deletion src/games/stendhal/server/core/rp/group/GroupManager.java
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ public void onLoggedIn(Player player) {
if (group != null) {
// TODO: Workaround because RPEvents might be lost in Perceptions for on objects added to zone in that turn
TurnNotifier.get().notifyInTurns(0, new TurnListener() {

@Override
public void onTurnReached(int currentTurn) {
group.sendGroupChangeEvent(player);
Expand Down
2 changes: 1 addition & 1 deletion src/games/stendhal/server/entity/item/RingOfLife.java
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ public RingOfLife() {
put("amount", 1);
updateState();
}

private void updateState() {
if (isBroken()) {
setState(1);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ public class ConversationPhrases {

public static final List<String> PURCHASE_MESSAGES = Arrays.asList("buy", "purchase");

public static final ImmutableSet<String> KNOWN = ImmutableSet.of("hello", "help", "job",
public static final ImmutableSet<String> KNOWN = ImmutableSet.of("hello", "help", "job",
"task", "done", "another", "offer", "yes", "no", "bye", "buy", "sell");

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ public class DeliverItemOrder {

/** A hint where to find the customer. */
private String npcDescription;


/** The style the customer likes. */
private String flavor;
Expand Down Expand Up @@ -156,4 +156,4 @@ public DeliverItemOrder playerMinLevel(int minLevel) {
}


}
}
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ private class HandOverItemAction implements ChatAction {

public HandOverItemAction(DeliverItemTask deliverItemTask, String questSlot) {
this.deliverItemTask = deliverItemTask;
this.questSlot= questSlot;
this.questSlot= questSlot;
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ public void build(SpeakerNPC npc, String questSlot, QuestTaskBuilder task, ChatC
ConversationStates.QUEST_OFFERED,
respondToRepeatedRequest,
null);

npc.add(ConversationStates.ATTENDING,
ConversationPhrases.QUEST_MESSAGES,
new AndCondition(
Expand Down Expand Up @@ -156,7 +156,7 @@ public void build(SpeakerNPC npc, String questSlot, QuestTaskBuilder task, ChatC
entry.getValue(),
null);
}

((DeliverItemTask) task).prepareBaker();
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ public void build(SpeakerNPC npc, String questSlot, QuestTaskBuilder task, ChatC
ConversationStates.QUEST_OFFERED,
respondToRepeatedRequest,
null);


npc.add(ConversationStates.ATTENDING,
ConversationPhrases.QUEST_MESSAGES,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ ChatCondition buildQuestPreCondition(@SuppressWarnings("unused") String questSlo
}

abstract ChatAction buildStartQuestAction(String questSlot);

ChatAction buildRejectQuestAction(@SuppressWarnings("unused") String questSlot) {
return null;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@
* (at your option) any later version. *
* *
***************************************************************************/
package games.stendhal.server.entity.npc.shop;
package games.stendhal.server.entity.npc.shop;
2 changes: 1 addition & 1 deletion src/games/stendhal/server/events/ChatOptionsEvent.java
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ private static class ChatOption implements Comparable<ChatOption> {
SORT_INDEX.put("Sell ...", 35);
SORT_INDEX.put("Bye", 9999);
}

private String trigger;
private String label;
private String options = "";
Expand Down
2 changes: 1 addition & 1 deletion src/games/stendhal/server/maps/quests/PizzaDelivery.java
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ public DeliverItemQuestBuilder story() {
.customerDescription("Cyk is currently on holiday on Athor Island. You'll easily recognize him by his blue hair. Go South East to find Athor ferry.")
.itemDescription("Pizza Hawaii")
// You need about 6 min to Eliza, up to 12 min to wait for the
// ferry, 5 min for the crossing, and 0.5 min from the docks to
// ferry, 5 min for the crossing, and 0.5 min from the docks to
// the beach, so you need a bit of luck for this one.
.minutesToDeliver(20)
.tipOnFastDelivery(300)
Expand Down
4 changes: 2 additions & 2 deletions src/games/stendhal/server/script/ChangeDaytime.java
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

/**
* Changes the global day time to specified phase. Intended for testing night
* time map coloring. Calling with parameter "reset" restores the normal timed
* time map coloring. Calling with parameter "reset" restores the normal timed
* behavior.
*/
public class ChangeDaytime extends ScriptImpl {
Expand All @@ -32,7 +32,7 @@ public void execute(Player admin, List<String> args) {
usage(admin);
return;
}

if (!setPhase(args.get(0))) {
usage(admin);
}
Expand Down
2 changes: 1 addition & 1 deletion src/games/stendhal/server/script/ExtendedSummonAt.java
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ public void execute(Player admin, List<String> args) {
admin.sendPrivateText(NotificationType.ERROR, "The slot is full.");
return;
}

new GameEvent(admin.getName(), SUMMONAT, changed.getName(), slotName, type, "logid: "+ action.get("logid")).raise();
item.put("logid", action.get("logid"));
SingletonRepository.getRuleProcessor().sendMessageToSupporters(admin.getName() + " summoned "
Expand Down
2 changes: 1 addition & 1 deletion srcjs/stendhal/data/ImageWithDimensions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@
export interface ImageWithDimensions {
height: number;
width: number
}
}
6 changes: 3 additions & 3 deletions srcjs/stendhal/ui/dialog/TradeDialog.ts
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ export class TradeDialog extends DialogContentComponent {
(this.child("#trade-offer") as HTMLButtonElement).disabled = !(myState === "MAKING_OFFERS");
(this.child("#trade-accept") as HTMLButtonElement).disabled
= !(myState === "LOCKED" && (partnerState === "LOCKED" || partnerState === "DEAL_WAITING_FOR_OTHER_DEAL"));

this.otherItemsComponent.setObject(partner ? partner : TradeDialog.empty);
this.myItemsComponent.setObject(me);
if (myState === "TRADE_COMPLETED") {
Expand All @@ -79,7 +79,7 @@ export class TradeDialog extends DialogContentComponent {
}

private createHtml() {

this.child("#trade-partner-items")!.append(this.otherItemsComponent.componentElement);
this.child("#trade-my-items")!.append(this.myItemsComponent.componentElement);
this.child("#trade-accept")!.addEventListener("click", () => {
Expand Down Expand Up @@ -128,5 +128,5 @@ export class TradeDialog extends DialogContentComponent {
};
marauroa.clientFramework.sendAction(action);
}

}
2 changes: 1 addition & 1 deletion srcjs/stendhal/ui/toolkit/FloatingWindow.ts
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ export class FloatingWindow extends Component {
const dialogArea = this.componentElement.getBoundingClientRect();
const clientArea = document.documentElement.getBoundingClientRect();

// clientArea.height is 0, if there are now child elements (e. g. on login / choose character dialogs)
// clientArea.height is 0, if there are now child elements (e. g. on login / choose character dialogs)
let clientAreaHeight = clientArea.height;
if (clientAreaHeight == 0) {
clientAreaHeight = window.visualViewport?.height || 200;
Expand Down

0 comments on commit 4df6044

Please sign in to comment.