Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
package io.mymetavese.metaapi.api.actions.p2e;

import io.mymetavese.metaapi.api.RestAction;
import io.mymetavese.metaapi.requests.entities.P2EPointsImpl;

public interface AddP2EPointsAction extends RestAction<P2EPointsImpl> {

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
package io.mymetavese.metaapi.api.actions.p2e;

import io.mymetavese.metaapi.api.RestAction;
import io.mymetavese.metaapi.api.entities.P2EPoints;

public interface GetP2EPointsAction extends RestAction<P2EPoints> {

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
package io.mymetavese.metaapi.api.entities;

public interface P2EPoints {
int getPoints();
}
6 changes: 0 additions & 6 deletions src/main/java/io/mymetavese/metaapi/api/entities/Points.java

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

import io.mymetavese.metaapi.api.ApiEntity;
import io.mymetavese.metaapi.api.actions.*;
import io.mymetavese.metaapi.api.actions.p2e.AddP2EPointsAction;
import io.mymetavese.metaapi.api.actions.p2e.GetP2EPointsAction;
import io.mymetavese.metaapi.api.actions.v2.GetTransferableItems;
import io.mymetavese.metaapi.api.entities.Item;

Expand Down Expand Up @@ -69,11 +71,11 @@ public interface GameEntity extends ApiEntity {
/*
* Get the P&E points for the player.
*/
GetPointsAction getPoints();
GetP2EPointsAction getP2EPoints();

/*
* Add P&E points to the player.
*/
AddPointsAction addPoints(int points);
AddP2EPointsAction addP2EPoints(int points);

}
32 changes: 0 additions & 32 deletions src/main/java/io/mymetavese/metaapi/requests/Route.java
Original file line number Diff line number Diff line change
Expand Up @@ -8,38 +8,6 @@

public class Route {

// public static class LiveWallet {
// public static final Route LINK_PLAYER = new Route(POST, "/LiveWallet/LinkPlayer");
// public static final Route DEPOSIT = new Route(POST, "/LiveWallet/Deposit");
// public static final Route GET_TRADEABLE_ITEMS = new Route(GET, "/LiveWallet/Trade/GetTradeableItems/{InitiatorPlayerID}&{ReceiverPlayerID}");
// public static final Route SEND_TRADE_REQUEST = new Route(POST, "/LiveWallet/Trade/SendTradeRequest");
// public static final Route GET_ETH_ADDRESS = new Route(GET, "/LiveWallet/GetEthAddress/{PlayerID}");
// public static final Route GET_ITEMS = new Route(GET, "/LiveWallet/GetItems/{PlayerID}");
// public static final Route CREATE_LINKING_LINK = new Route(POST, "/playerBehavior/createLinkingLink");
// }
//
// public static class MetaData {
// public static final Route EDIT_TOKEN = new Route(POST, "/api/Metadata/EditToken/{id}/{index}");
// public static final Route UPDATE_TOKEN_ACHIEVEMENTS = new Route(POST, "/api/Metadata/UpdateTokenAchievementsAction/{id}/{index}");
// }
//
// public static class MyMetaverse {
// public static final Route CREATE_LIVEWALLET = new Route(POST, "/MyMetaverse/CreateLiveWallet");
// public static final Route GET_GAMES_LINKING_CODES = new Route(GET, "/MyMetaverse/GetGamesLinkingCodes/{MyMetaverseID}");
// public static final Route UNLINK_LIVEWALLET_GAME = new Route(POST, "/MyMetaverse/UnlinkLiveWalletGame");
// public static final Route GET_LIVE_WALLET_STATUS = new Route(GET, "/MyMetaverse/GetLiveWalletStatus/{MyMetaverseID}");
// public static final Route UNLINK_ENJIN_WALLET = new Route(POST, "/MyMetaverse/UnlinkEnjinWallet");
// public static final Route SEND_ALLOWANCE_REQUEST = new Route(GET, "/MyMetaverse/SendAllowanceRequest/{MyMetaverseID}");
// public static final Route GET_ITEMS = new Route(GET, "/MyMetaverse/GetItems/{MyMetaverseID}");
// public static final Route GET_TRADE_REQUEST_INFO = new Route(GET, "/MyMetaverse/Trade/Requests/{TradeRequestID}&{MyMetaverseID}");
// public static final Route GET_TRADE_REQUESTS = new Route(GET, "/MyMetaverse/Trade/Requests/{MyMetaverseID}");
// public static final Route DECIDE_TRADE_REQUEST = new Route(POST, "/MyMetaverse/Trade/Requests/{TradeRequestID}&{MyMetaverseID}/Decide");
// public static final Route SEND_TRADE_REQUEST = new Route(POST, "/MyMetaverse/Trade/SendTradeRequest");
// public static final Route LINK_LIVEWALLET_TO_MOD = new Route(POST, "/MyMetaverse/LinkLiveWalletToModAccount/{MyMetaverseID}");
// public static final Route SYNC_ENJIN_WALLET_ITEMS = new Route(POST, "/MyMetaverse/SyncEnjinWalletItems");
// public static final Route REMOVE_DEV = new Route(DELETE, "/MyMetaverse/RemoveDev/{UserID}");
// }

@Getter
private final Method method;

Expand Down

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
package io.mymetavese.metaapi.requests.actions.p2e;

import io.mymetavese.metaapi.api.MetaAPI;
import io.mymetavese.metaapi.api.actions.p2e.AddP2EPointsAction;
import io.mymetavese.metaapi.api.entities.v2.GameEntity;
import io.mymetavese.metaapi.requests.JsonObject;
import io.mymetavese.metaapi.requests.RestActionImpl;
import io.mymetavese.metaapi.requests.entities.P2EPointsImpl;
import io.mymetavese.metaapi.requests.routes.Routes;

public class AddP2EPointsActionImpl extends RestActionImpl<P2EPointsImpl> implements AddP2EPointsAction {

private final String playerID;
private final int points;

public AddP2EPointsActionImpl(MetaAPI api, GameEntity gameEntity, int points) {
super(api, Routes.ADD_P2E_POINTS, P2EPointsImpl.class);
this.playerID = gameEntity.getPlayerID();
this.points = points;
}

@Override
protected String compileRoute() {
return route.compileRoute(playerID);
}

@Override
protected JsonObject buildBody() {
JsonObject body = JsonObject.JsonObjectBuilder.newBuilder().create();
body.append("amount", points);
return body;
}

}
Original file line number Diff line number Diff line change
@@ -1,23 +1,25 @@
package io.mymetavese.metaapi.requests.actions;
package io.mymetavese.metaapi.requests.actions.p2e;

import com.google.gson.Gson;
import io.mymetavese.metaapi.api.MetaAPI;
import io.mymetavese.metaapi.api.actions.GetPointsAction;
import io.mymetavese.metaapi.api.actions.p2e.GetP2EPointsAction;
import io.mymetavese.metaapi.api.entities.P2EPoints;
import io.mymetavese.metaapi.api.entities.v2.GameEntity;
import io.mymetavese.metaapi.requests.RestActionImpl;
import io.mymetavese.metaapi.requests.entities.P2EPointsImpl;
import io.mymetavese.metaapi.requests.routes.Routes;
import okhttp3.Response;

import java.io.IOException;
import java.io.Reader;
import java.util.Objects;

public class GetPointsActionImpl extends RestActionImpl<String> implements GetPointsAction {
public class GetP2EPointsActionImpl extends RestActionImpl<P2EPoints> implements GetP2EPointsAction {

private final String playerID;

public GetPointsActionImpl(MetaAPI api, GameEntity gameEntity) {
super(api, Routes.GET_POINTS);
public GetP2EPointsActionImpl(MetaAPI api, GameEntity gameEntity) {
super(api, Routes.GET_P2E_POINTS);
this.playerID = gameEntity.getPlayerID();
}

Expand All @@ -27,24 +29,26 @@ protected String compileRoute() {
}

@Override
public String transform(Response response) {
public P2EPoints transform(Response response) {

if (response == null || response.body() == null) {
throw new NullPointerException("Response cannot be null");
}

Gson gson = new Gson();
try (Reader reader = Objects.requireNonNull(response.body()).charStream()) {
return gson.fromJson(reader, PointsWrapper.class).balance;
return new P2EPointsImpl(gson.fromJson(reader, PointsWrapper.class).balance);
} catch (IOException ex) {
// Ignored
ex.printStackTrace();
}

return "0";
return null;

}

private static class PointsWrapper {
private String balance;
private int profileId;
private int balance;
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,14 @@

import io.mymetavese.metaapi.api.MetaAPI;
import io.mymetavese.metaapi.api.actions.*;
import io.mymetavese.metaapi.api.actions.p2e.AddP2EPointsAction;
import io.mymetavese.metaapi.api.actions.p2e.GetP2EPointsAction;
import io.mymetavese.metaapi.api.actions.v2.GetTransferableItems;
import io.mymetavese.metaapi.api.entities.Item;
import io.mymetavese.metaapi.api.entities.v2.GameEntity;
import io.mymetavese.metaapi.requests.actions.*;
import io.mymetavese.metaapi.requests.actions.p2e.AddP2EPointsActionImpl;
import io.mymetavese.metaapi.requests.actions.p2e.GetP2EPointsActionImpl;
import io.mymetavese.metaapi.requests.actions.v2.GetTransferableItemsImpl;
import lombok.Getter;

Expand Down Expand Up @@ -59,13 +63,13 @@ public GetMetaCitizenAction getActiveMetaCitizen() {
}

@Override
public GetPointsAction getPoints() {
return new GetPointsActionImpl(metaAPI, this);
public GetP2EPointsAction getP2EPoints() {
return new GetP2EPointsActionImpl(metaAPI, this);
}

@Override
public AddPointsAction addPoints(int points) {
return new AddPointsActionImpl(metaAPI, this, points);
public AddP2EPointsAction addP2EPoints(int points) {
return new AddP2EPointsActionImpl(metaAPI, this, points);
}

}
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
package io.mymetavese.metaapi.requests.entities;

import io.mymetavese.metaapi.api.entities.Points;
import io.mymetavese.metaapi.api.entities.P2EPoints;
import lombok.Getter;
import lombok.RequiredArgsConstructor;

@RequiredArgsConstructor
public class PointsImpl implements Points {
public class P2EPointsImpl implements P2EPoints {

@Getter
private final String points;
private final int points;

@Override
public String toString() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ public enum Routes {

GIVE_WHITELISTED_TOKEN,

GET_POINTS,
ADD_POINTS
GET_P2E_POINTS,
ADD_P2E_POINTS

}
6 changes: 4 additions & 2 deletions src/main/java/io/mymetavese/metaapi/requests/routes/V2.java
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ public class V2 extends RouteAdapter {


public V2() {

super("https://cloud.mymetaverse.io/adopters", new HashMap<>());

this.routes.put("GET_WALLET", new Route(GET, "/users/{userId}/wallet"));
Expand All @@ -32,8 +33,9 @@ public V2() {

this.routes.put("GIVE_WHITELISTED_TOKEN", new Route(POST, "/tokens/{tokenId}/give"));

this.routes.put("GET_POINTS", new Route(GET, "/users/{userId}/p2e/points"));
this.routes.put("POST_POINTS", new Route(POST, "/users/{userId}/p2e/points"));
this.routes.put("GET_P2E_POINTS", new Route(GET, "/users/{userId}/p2e/points"));
this.routes.put("ADD_P2E_POINTS", new Route(POST, "/users/{userId}/p2e/points"));

}

}