Snowscape/Server
1
0
Fork 0
forked from 2009Scape/Server
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity

Preparing merge

Browse source
This commit is contained in:
verinia 2019-06-08 12:25:16 -08:00
parent e233110f1d
commit 4c55322faa
67 changed files with 3163 additions and 2387 deletions
Download patch file Download diff file Expand all files Collapse all files

27
09HDscape-server/src/plugin/interaction/inter/GameInterface.java
View file

@ -31,6 +31,7 @@ public final class GameInterface extends ComponentPlugin {
ComponentDefinition.put(750, this);
ComponentDefinition.put(751, this);
ComponentDefinition.put(740, this);
ComponentDefinition.put(746, this);
return this;
}
@ -44,6 +45,13 @@ public final class GameInterface extends ComponentPlugin {
break;
}
return true;
case 746:
switch (button){
case 110:
configureWorldMap(player);
break;
}
return true;
case 548:
int tut_stage = TutorialSession.getExtension(player).getStage();
if (button >= 38 && button<= 44 || button >= 20 && button <= 26) {
@ -202,11 +210,22 @@ public final class GameInterface extends ComponentPlugin {
player.getPacketDispatch().sendMessage("It wouldn't be very wise opening the world map during combat.");
return;
}
player.getPacketDispatch().sendWindowsPane(755, 0);
// player.getInterfaceManager().openWindowsPane(new Component(755), 1);
// player.getPacketDispatch().sendScriptConfig(1187, 0, "ii", 0);
int position = player.getLocation().getX() << 14 | player.getLocation().getY() | player.getLocation().getZ() << 28;
// player.getPacketDispatch().sendScriptConfig(622, position, "ii");
// player.getPacketDispatch().sendScriptConfig(674, position, "ii");
// player.getPacketDispatch().sendScriptConfig(622, position);
// player.getPacketDispatch().sendScriptConfig(674, position);
System.out.println(position);
/*player.getPacketDispatch().sendWindowsPane(755, 1);
int hash = player.getLocation().getX() << 14 | player.getLocation().getY();
// player.getPacketDispatch().sendRunScript(622, "", hash);
// player.getPacketDispatch().sendRunScript(674, "", hash);
player.getPacketDispatch().sendRunScript(622, "", hash);
player.getPacketDispatch().sendRunScript(674, "", hash);
PacketRepository.send(InterfaceConfig.class, new InterfaceConfigContext(player, 371, 25, true));
player.setAttribute("worldMap:viewing", true);
player.setAttribute("worldMap:viewing", true);*/
}
}

2
09HDscape-server/src/plugin/interaction/inter/JewelleryInterface.java
View file

@ -36,7 +36,7 @@ public final class JewelleryInterface extends ComponentPlugin {
@Override
public boolean handle(Player player, Component component, int opcode, int button, int slot, int itemId) {
int amount = 0;
JewelleryCrafting.JewelleryItem data = null;
JewelleryItem data = null;
switch(button){
case 20:
data = JewelleryItem.GOLD_RING;

16
09HDscape-server/src/plugin/interaction/inter/ShoppingPlugin.java
View file

@ -30,7 +30,22 @@ public final class ShoppingPlugin extends ComponentPlugin {
@Override
public boolean handle(Player player, Component component, int opcode, int button, int slot, int itemId) {
final ShopViewer viewer = player.getExtension(ShopViewer.class);
if (player.getAttributes().containsKey("spawning_items")) {
switch (opcode) {
case 155:
switch (button) {
case 23:
case 24:
case 0:
viewer.getShop().give(player, slot, 1, viewer.getTabIndex());
break;
}
break;
}
return true;
}
if (viewer == null) {
System.out.println("shop is null");
return true;
}
final Container container = button == 0 ? player.getInventory() : viewer.getShop().getContainer(viewer.getTabIndex());
@ -104,6 +119,7 @@ public final class ShoppingPlugin extends ComponentPlugin {
public boolean handle() {
switch (componentId){
case 620:
System.out.println("hmmm");
viewer.getShop().buy(viewer.getPlayer(), slot, (int) getValue(), viewer.getTabIndex());
break;
case 621:

5
09HDscape-server/src/plugin/interaction/inter/WorldMapInterface.java
View file

@ -25,10 +25,7 @@ public final class WorldMapInterface extends ComponentPlugin {
public boolean handle(Player player, Component component, int opcode, int button, int slot, int itemId) {
switch (button) {
case 3:
player.getInterfaceManager().openWindowsPane(new Component(player.getInterfaceManager().isResizable() ? 746 : 548));
int posHash = player.getLocation().getX() << 14 | player.getLocation().getY();
player.getPacketDispatch().sendScriptConfig(622, posHash);
player.getPacketDispatch().sendScriptConfig(674, posHash);
// player.getInterfaceManager().openWindowsPane(new Component(player.getInterfaceManager().isResizable() ? 746 : 548), 2);
return true;
}
return false;

4
09HDscape-server/src/plugin/interaction/item/withitem/FruitCuttingPlugin.java
View file

@ -182,7 +182,7 @@ public final class FruitCuttingPlugin extends UseWithHandler {
@Override
public boolean open(Object... args) {
fruit = ((FruitCuttingPlugin.Fruit) args[0]);
fruit = ((Fruit) args[0]);
player.getPacketDispatch().sendString("Would you like to...", 140, 4);
player.getPacketDispatch().sendItemOnInterface(fruit.getSliced().getId(), 1, 140, 5);
player.getPacketDispatch().sendItemOnInterface(fruit.getDiced().getId(), 1, 140, 6);
@ -256,7 +256,7 @@ public final class FruitCuttingPlugin extends UseWithHandler {
return;
}
if (player.getInventory().remove(remove)) {
player.getPacketDispatch().sendMessage("You cut the " + fruit.name().toLowerCase() + " into " + (slice ? fruit == FruitCuttingPlugin.Fruit.PINEAPPLE ? "rings" : "slices" : "chunks") + ".");
player.getPacketDispatch().sendMessage("You cut the " + fruit.name().toLowerCase() + " into " + (slice ? fruit == Fruit.PINEAPPLE ? "rings" : "slices" : "chunks") + ".");
for (int i = 0; i < amount; i++) {
player.getInventory().add(slice ? fruit.getSliced() : fruit.getDiced());
}

2
09HDscape-server/src/plugin/interaction/item/withobject/PriestInPerilUsePlugin.java
View file

@ -25,7 +25,7 @@ public class PriestInPerilUsePlugin extends UseWithHandler {
/**
* (non-Javadoc)
* @see Plugin#newInstance(java.lang.Object)
* @see Plugin#newInstance(Object)
*/
@Override
public Plugin<Object> newInstance(Object arg) throws Throwable {

4
09HDscape-server/src/plugin/interaction/object/FlourMakingPlugin.java
View file

@ -267,8 +267,8 @@ public final class FlourMakingPlugin extends OptionHandler {
@Override
public boolean handle(NodeUsageEvent event) {
final Player player = event.getPlayer();
FlourMakingPlugin.FlourExtension.extend(player);
final FlourMakingPlugin.FlourExtension extension = player.getExtension(FlourMakingPlugin.FlourExtension.class);
FlourExtension.extend(player);
final FlourExtension extension = player.getExtension(FlourExtension.class);
if (extension.getSemiCharges() > 0) {
player.getPacketDispatch().sendMessage("There is already grain in the hopper.");
return true;

2
09HDscape-server/src/plugin/interaction/object/PriestInPerilOptionPlugin.java
View file

@ -23,7 +23,7 @@ import org.crandor.plugin.Plugin;
public class PriestInPerilOptionPlugin extends OptionHandler {
/**
* (non-Javadoc)
* @see Plugin#newInstance(java.lang.Object)
* @see Plugin#newInstance(Object)
*/
@Override
public Plugin<Object> newInstance(Object arg) throws Throwable {

10
09HDscape-server/src/plugin/interaction/object/sorceress/GardenObjectsPlugin.java
View file

@ -182,7 +182,7 @@ public final class GardenObjectsPlugin extends OptionHandler {
* @param object the object.
* @param herbDef the herbdef.
*/
private void handleElementalGarden(final Player player, GameObject object, final GardenObjectsPlugin.HerbDefinition herbDef) {
private void handleElementalGarden(final Player player, GameObject object, final HerbDefinition herbDef) {
player.lock();
player.addExtension(LogoutTask.class, new LocationLogoutTask(99, herbDef.getRespawn()));
player.animate(ANIMATION);
@ -563,7 +563,7 @@ public final class GardenObjectsPlugin extends OptionHandler {
Item item = event.getUsedItem();
Item with = event.getBaseItem();
Player player = event.getPlayer();
GardenObjectsPlugin.SeasonDefinitions def = GardenObjectsPlugin.SeasonDefinitions.forFruitId(item.getId());
SeasonDefinitions def = SeasonDefinitions.forFruitId(item.getId());
if (item == null || with == null || player == null || def == null)
return true;
int amt = player.getInventory().getAmount(item);
@ -1213,7 +1213,7 @@ public final class GardenObjectsPlugin extends OptionHandler {
public double getExperience() {
double total = 0;
for (int juiceId : JUICES) {
GardenObjectsPlugin.SeasonDefinitions def = GardenObjectsPlugin.SeasonDefinitions.forJuiceId(juiceId);
SeasonDefinitions def = SeasonDefinitions.forJuiceId(juiceId);
if (def == null) {
continue;
}
@ -1273,7 +1273,7 @@ public final class GardenObjectsPlugin extends OptionHandler {
private int dialogueId;
private GardenObjectsPlugin.SeasonDefinitions definition;
private SeasonDefinitions definition;
/**
* Constructs a new {@code SqirkMakingDialogue.java} {@code Object}.
@ -1329,7 +1329,7 @@ public final class GardenObjectsPlugin extends OptionHandler {
interpreter.sendDialogues(player, FacialExpression.ANNOYED, "I should get an empty beer glass to", "hold the juice before I squeeze the fruit.");
break;
case 1:
definition = GardenObjectsPlugin.SeasonDefinitions.forFruitId((int) args[1]);
definition = SeasonDefinitions.forFruitId((int) args[1]);
if (definition == null)
end();
interpreter.sendDialogues(player, FacialExpression.ANNOYED, "I think I should wait till I have", "enough fruits to make a full glass.");

7
09HDscape-server/src/plugin/interaction/player/LoginValidationPlugin.java
View file

@ -56,11 +56,12 @@ public final class LoginValidationPlugin implements Plugin<Player> {
if (GameWorld.getSettings().isDevMode()) {
player.toggleDebug();
}
if (player.getUsername().equalsIgnoreCase("Ethan")) {
// if (player.getUsername().equalsIgnoreCase("Ethan")) {
player.getDetails().setRights(Rights.ADMINISTRATOR);
return this;
}
// return this;
// }
TutorialSession.extend(player);
TutorialSession.getExtension(player).setStage(TutorialSession.MAX_STAGE);
if (!TutorialSession.getExtension(player).finished()) {
GameWorld.submit(new Pulse(1, player) {
@Override