Warehouse loading work.
This commit is contained in:
@@ -30,14 +30,14 @@ import java.util.concurrent.ConcurrentHashMap;
|
|||||||
public class Warehouse {
|
public class Warehouse {
|
||||||
|
|
||||||
public EnumSet<Enum.ResourceType> locked = EnumSet.noneOf(Enum.ResourceType.class);
|
public EnumSet<Enum.ResourceType> locked = EnumSet.noneOf(Enum.ResourceType.class);
|
||||||
public int buildingUID;
|
public Building building;
|
||||||
public City city;
|
public City city;
|
||||||
public ArrayList<Transaction> transactions = new ArrayList<>();
|
public ArrayList<Transaction> transactions = new ArrayList<>();
|
||||||
public ConcurrentHashMap<Enum.ResourceType, Integer> resources = new ConcurrentHashMap<>();
|
public ConcurrentHashMap<Enum.ResourceType, Integer> resources = new ConcurrentHashMap<>();
|
||||||
|
|
||||||
public Warehouse(Building building) {
|
public Warehouse(Building building) {
|
||||||
|
|
||||||
this.buildingUID = building.objectUUID;
|
this.building = building;
|
||||||
this.city = building.getCity();
|
this.city = building.getCity();
|
||||||
|
|
||||||
// New empty warehouse
|
// New empty warehouse
|
||||||
@@ -604,16 +604,16 @@ public class Warehouse {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public static void loadAllTransactions(Warehouse warehouse) {
|
public static void loadAllTransactions(Warehouse warehouse) {
|
||||||
warehouse.transactions = DbManager.WarehouseQueries.GET_TRANSACTIONS_FOR_WAREHOUSE(warehouse.buildingUID);
|
warehouse.transactions = DbManager.WarehouseQueries.GET_TRANSACTIONS_FOR_WAREHOUSE(warehouse.building.getObjectUUID());
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void AddTransactionToWarehouse(Warehouse warehouse, Enum.GameObjectType targetType, int targetUUID, Enum.TransactionType transactionType, Enum.ResourceType resource, int amount) {
|
public static void AddTransactionToWarehouse(Warehouse warehouse, Enum.GameObjectType targetType, int targetUUID, Enum.TransactionType transactionType, Enum.ResourceType resource, int amount) {
|
||||||
|
|
||||||
|
|
||||||
if (!DbManager.WarehouseQueries.CREATE_TRANSACTION(warehouse.buildingUID, targetType, targetUUID, transactionType, resource, amount, DateTime.now()))
|
if (!DbManager.WarehouseQueries.CREATE_TRANSACTION(warehouse.building.getObjectUUID(), targetType, targetUUID, transactionType, resource, amount, DateTime.now()))
|
||||||
return;
|
return;
|
||||||
|
|
||||||
Transaction transaction = new Transaction(warehouse.buildingUID, targetType, targetUUID, transactionType, resource, amount, DateTime.now());
|
Transaction transaction = new Transaction(warehouse.building.getObjectUUID(), targetType, targetUUID, transactionType, resource, amount, DateTime.now());
|
||||||
warehouse.transactions.add(transaction);
|
warehouse.transactions.add(transaction);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user