2006-Scape/apollo
1
0
Fork 0
mirror of https://github.com/2006-Scape/apollo.git synced 2026-07-04 00:38:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move 'org.apollo.game.model.setting' to 'org.apollo.game.model.entity.setting'.

Browse Source
This commit is contained in:
Major-
2015-03-01 08:46:55 +00:00
parent 785e3a82aa
commit 8968786c01
24 changed files with 32 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/plugins/bootstrap.rb
+1 -1
View File
@@ -20,7 +20,7 @@ java_import 'org.apollo.game.model.World'
java_import 'org.apollo.game.model.entity.Player'
java_import 'org.apollo.game.model.event.EventListener'
java_import 'org.apollo.game.model.event.PlayerEvent'
java_import 'org.apollo.game.model.setting.PrivilegeLevel'
java_import 'org.apollo.game.model.entity.setting.PrivilegeLevel'
java_import 'org.apollo.game.scheduling.ScheduledTask'
java_import 'org.apollo.util.plugin.PluginContext'
data/plugins/chat/privacy/privacy.rb
+1 -1
View File
@@ -1,6 +1,6 @@
require 'java'
java_import 'org.apollo.game.model.setting.PrivacyState'
java_import 'org.apollo.game.model.entity.setting.PrivacyState'
java_import 'org.apollo.game.message.impl.SendFriendMessage'
on :message, :privacy_option do |ctx, player, message|
data/plugins/chat/private-messaging/friend.rb
+2 -2
View File
@@ -4,8 +4,8 @@ java_import 'org.apollo.game.message.impl.FriendServerStatusMessage'
java_import 'org.apollo.game.message.impl.IgnoreListMessage'
java_import 'org.apollo.game.message.impl.SendFriendMessage'
java_import 'org.apollo.game.model.World'
java_import 'org.apollo.game.model.setting.ServerStatus'
java_import 'org.apollo.game.model.setting.PrivacyState'
java_import 'org.apollo.game.model.entity.setting.ServerStatus'
java_import 'org.apollo.game.model.entity.setting.PrivacyState'
java_import 'org.apollo.game.model.entity.Player'
data/plugins/chat/private-messaging/messaging.rb
+3 -3
View File
@@ -2,7 +2,7 @@ require 'java'
java_import 'org.apollo.game.message.impl.ForwardPrivateChatMessage'
java_import 'org.apollo.game.model.World'
java_import 'org.apollo.game.model.setting.PrivacyState'
java_import 'org.apollo.game.model.entity.setting.PrivacyState'
on :message, :private_chat do |ctx, player, message|
friend = $world.get_player(message.username)
@@ -11,9 +11,9 @@ end
# Checks if the sender is permitted to interact with the friend they have added:
def interaction_permitted(sender, friend)
if friend == nil || friend.has_ignored(sender.username)
if friend.nil? || friend.has_ignored(sender.username)
return false
end
return friend.friends_with(sender.username) ? friend.friend_privacy != PrivacyState::OFF : friend.friend_privacy == PrivacyState::ON
return friend.friends_with(sender.username) ? (friend.friend_privacy != PrivacyState::OFF) : (friend.friend_privacy == PrivacyState::ON)
end
src/org/apollo/game/command/CommandListener.java
+1 -1
View File
@@ -1,7 +1,7 @@
package org.apollo.game.command;
import org.apollo.game.model.entity.Player;
import org.apollo.game.model.setting.PrivilegeLevel;
import org.apollo.game.model.entity.setting.PrivilegeLevel;
/**
* An interface which should be implemented to listen to {@link Command}s.
src/org/apollo/game/message/handler/impl/PlayerDesignVerificationHandler.java
+1 -1
View File
@@ -5,7 +5,7 @@ import org.apollo.game.message.handler.MessageHandlerContext;
import org.apollo.game.message.impl.PlayerDesignMessage;
import org.apollo.game.model.Appearance;
import org.apollo.game.model.entity.Player;
import org.apollo.game.model.setting.Gender;
import org.apollo.game.model.entity.setting.Gender;
/**
* A {@link MessageHandler} that verifies {@link PlayerDesignMessage}s.
src/org/apollo/game/message/impl/ForwardPrivateChatMessage.java
+1 -1
View File
@@ -1,7 +1,7 @@
package org.apollo.game.message.impl;
import org.apollo.game.message.Message;
import org.apollo.game.model.setting.PrivilegeLevel;
import org.apollo.game.model.entity.setting.PrivilegeLevel;
/**
* A {@link Message} sent to the client that forwards a private chat.
src/org/apollo/game/message/impl/FriendServerStatusMessage.java
+1 -1
View File
@@ -1,7 +1,7 @@
package org.apollo.game.message.impl;
import org.apollo.game.message.Message;
import org.apollo.game.model.setting.ServerStatus;
import org.apollo.game.model.entity.setting.ServerStatus;
/**
* A {@link Message} sent to the client to update the friend server status.
src/org/apollo/game/message/impl/PrivacyOptionMessage.java
+1 -1
View File
@@ -1,7 +1,7 @@
package org.apollo.game.message.impl;
import org.apollo.game.message.Message;
import org.apollo.game.model.setting.PrivacyState;
import org.apollo.game.model.entity.setting.PrivacyState;
/**
* A {@link Message} sent both by and to the client to update the public chat, private (friend) chat, and trade chat
src/org/apollo/game/model/Appearance.java
+1 -1
View File
@@ -1,6 +1,6 @@
package org.apollo.game.model;
import org.apollo.game.model.setting.Gender;
import org.apollo.game.model.entity.setting.Gender;
import com.google.common.base.Preconditions;
src/org/apollo/game/model/entity/Player.java
+3 -3
View File
@@ -19,6 +19,9 @@ import org.apollo.game.model.Appearance;
import org.apollo.game.model.Position;
import org.apollo.game.model.World;
import org.apollo.game.model.area.Sector;
import org.apollo.game.model.entity.setting.PrivacyState;
import org.apollo.game.model.entity.setting.PrivilegeLevel;
import org.apollo.game.model.entity.setting.ScreenBrightness;
import org.apollo.game.model.event.impl.LoginEvent;
import org.apollo.game.model.event.impl.LogoutEvent;
import org.apollo.game.model.inter.InterfaceConstants;
@@ -33,9 +36,6 @@ import org.apollo.game.model.inv.Inventory.StackMode;
import org.apollo.game.model.inv.InventoryConstants;
import org.apollo.game.model.inv.InventoryListener;
import org.apollo.game.model.inv.SynchronizationInventoryListener;
import org.apollo.game.model.setting.PrivacyState;
import org.apollo.game.model.setting.PrivilegeLevel;
import org.apollo.game.model.setting.ScreenBrightness;
import org.apollo.game.model.skill.LevelUpSkillListener;
import org.apollo.game.model.skill.SynchronizationSkillListener;
import org.apollo.game.sync.block.SynchronizationBlock;
src/org/apollo/game/model/setting/Gender.java → src/org/apollo/game/model/entity/setting/Gender.java
+1 -1
View File
@@ -1,4 +1,4 @@
package org.apollo.game.model.setting;
package org.apollo.game.model.entity.setting;
/**
* An enumeration containing the two genders (male and female). This enumeration relies on the ordering of the elements
src/org/apollo/game/model/setting/PrivacyState.java → src/org/apollo/game/model/entity/setting/PrivacyState.java
+1 -1
View File
@@ -1,4 +1,4 @@
package org.apollo.game.model.setting;
package org.apollo.game.model.entity.setting;
import com.google.common.base.Preconditions;
src/org/apollo/game/model/setting/PrivilegeLevel.java → src/org/apollo/game/model/entity/setting/PrivilegeLevel.java
+1 -1
View File
@@ -1,4 +1,4 @@
package org.apollo.game.model.setting;
package org.apollo.game.model.entity.setting;
import com.google.common.base.Preconditions;
src/org/apollo/game/model/setting/ScreenBrightness.java → src/org/apollo/game/model/entity/setting/ScreenBrightness.java
+1 -1
View File
@@ -1,4 +1,4 @@
package org.apollo.game.model.setting;
package org.apollo.game.model.entity.setting;
import com.google.common.base.Preconditions;
src/org/apollo/game/model/setting/ServerStatus.java → src/org/apollo/game/model/entity/setting/ServerStatus.java
+1 -1
View File
@@ -1,4 +1,4 @@
package org.apollo.game.model.setting;
package org.apollo.game.model.entity.setting;
import com.google.common.base.Preconditions;
src/org/apollo/game/model/setting/package-info.java → src/org/apollo/game/model/entity/setting/package-info.java
+1 -1
View File
@@ -1,4 +1,4 @@
/**
* Contains player setting or customisation-related classes.
*/
package org.apollo.game.model.setting;
package org.apollo.game.model.entity.setting;
src/org/apollo/game/sync/block/ChatBlock.java
+1 -1
View File
@@ -1,7 +1,7 @@
package org.apollo.game.sync.block;
import org.apollo.game.message.impl.ChatMessage;
import org.apollo.game.model.setting.PrivilegeLevel;
import org.apollo.game.model.entity.setting.PrivilegeLevel;
/**
* The chat {@link SynchronizationBlock}. Only players can utilise this block.
src/org/apollo/io/player/impl/BinaryPlayerLoader.java
+4 -4
View File
@@ -20,11 +20,11 @@ import org.apollo.game.model.entity.attr.AttributeType;
import org.apollo.game.model.entity.attr.BooleanAttribute;
import org.apollo.game.model.entity.attr.NumericalAttribute;
import org.apollo.game.model.entity.attr.StringAttribute;
import org.apollo.game.model.entity.setting.Gender;
import org.apollo.game.model.entity.setting.PrivacyState;
import org.apollo.game.model.entity.setting.PrivilegeLevel;
import org.apollo.game.model.entity.setting.ScreenBrightness;
import org.apollo.game.model.inv.Inventory;
import org.apollo.game.model.setting.Gender;
import org.apollo.game.model.setting.PrivacyState;
import org.apollo.game.model.setting.PrivilegeLevel;
import org.apollo.game.model.setting.ScreenBrightness;
import org.apollo.io.player.PlayerLoader;
import org.apollo.io.player.PlayerLoaderResponse;
import org.apollo.net.codec.login.LoginConstants;
src/org/apollo/io/player/impl/DummyPlayerLoader.java
+1 -1
View File
@@ -2,7 +2,7 @@ package org.apollo.io.player.impl;
import org.apollo.game.model.Position;
import org.apollo.game.model.entity.Player;
import org.apollo.game.model.setting.PrivilegeLevel;
import org.apollo.game.model.entity.setting.PrivilegeLevel;
import org.apollo.io.player.PlayerLoader;
import org.apollo.io.player.PlayerLoaderResponse;
import org.apollo.net.codec.login.LoginConstants;
src/org/apollo/net/release/r317/PlayerDesignMessageDecoder.java
+1 -1
View File
@@ -2,7 +2,7 @@ package org.apollo.net.release.r317;
import org.apollo.game.message.impl.PlayerDesignMessage;
import org.apollo.game.model.Appearance;
import org.apollo.game.model.setting.Gender;
import org.apollo.game.model.entity.setting.Gender;
import org.apollo.net.codec.game.DataType;
import org.apollo.net.codec.game.GamePacket;
import org.apollo.net.codec.game.GamePacketReader;
src/org/apollo/net/release/r317/PlayerSynchronizationMessageEncoder.java
+1 -1
View File
@@ -9,8 +9,8 @@ import org.apollo.game.model.Item;
import org.apollo.game.model.Position;
import org.apollo.game.model.def.EquipmentDefinition;
import org.apollo.game.model.entity.EquipmentConstants;
import org.apollo.game.model.entity.setting.Gender;
import org.apollo.game.model.inv.Inventory;
import org.apollo.game.model.setting.Gender;
import org.apollo.game.sync.block.AnimationBlock;
import org.apollo.game.sync.block.AppearanceBlock;
import org.apollo.game.sync.block.ChatBlock;
src/org/apollo/net/release/r377/PlayerDesignMessageDecoder.java
+1 -1
View File
@@ -2,7 +2,7 @@ package org.apollo.net.release.r377;
import org.apollo.game.message.impl.PlayerDesignMessage;
import org.apollo.game.model.Appearance;
import org.apollo.game.model.setting.Gender;
import org.apollo.game.model.entity.setting.Gender;
import org.apollo.net.codec.game.DataType;
import org.apollo.net.codec.game.GamePacket;
import org.apollo.net.codec.game.GamePacketReader;
src/org/apollo/net/release/r377/PlayerSynchronizationMessageEncoder.java
+1 -1
View File
@@ -9,8 +9,8 @@ import org.apollo.game.model.Item;
import org.apollo.game.model.Position;
import org.apollo.game.model.def.EquipmentDefinition;
import org.apollo.game.model.entity.EquipmentConstants;
import org.apollo.game.model.entity.setting.Gender;
import org.apollo.game.model.inv.Inventory;
import org.apollo.game.model.setting.Gender;
import org.apollo.game.sync.block.AnimationBlock;
import org.apollo.game.sync.block.AppearanceBlock;
import org.apollo.game.sync.block.ChatBlock;