Skip to content
Snippets Groups Projects
Commit caf68237 authored by Luca Nittscher's avatar Luca Nittscher :speech_balloon:
Browse files

extended Inventoryclosebutton to work for map

parent 210c1546
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 184 additions and 4 deletions
core/src/com/galaxytrucker/galaxytruckerreloaded/View/Buttons/InGameButtons/InventoryCloseButton.java
+ 14
− 1
View file @ caf68237
......@@ -11,6 +11,7 @@ import com.galaxytrucker.galaxytruckerreloaded.View.Buttons.Button;
import com.galaxytrucker.galaxytruckerreloaded.View.Buttons.ImButton;
import com.galaxytrucker.galaxytruckerreloaded.View.UI.Events.ShopUI;
import com.galaxytrucker.galaxytruckerreloaded.View.UI.Inventory.InventoryUI;
import com.galaxytrucker.galaxytruckerreloaded.View.UI.Map.MapUI;
/**
* used to close the inventory
......@@ -28,6 +29,12 @@ public class InventoryCloseButton extends ImButton {
*/
private ShopUI shop;
/**
* map ui, if Button on map
* otherwise null
*/
private MapUI map;
/**
* the inventory ui, if button on inventory
* otherwise null
......@@ -45,17 +52,23 @@ public class InventoryCloseButton extends ImButton {
else if(inventory != null) {
inventory.disposeInventoryUI();
}
else if (map != null) {
map.disposeMapUI();
}
}
/**
* constructor
* @param ui the shop ui this is on, or null
* @param inventory the inventory ui this is on, or null
* @param map the map ui this is on, or null
*/
public InventoryCloseButton(float x, float y, float width, float height, ShopUI ui, InventoryUI inventory) {
public InventoryCloseButton(float x, float y, float width, float height, ShopUI ui, InventoryUI inventory, MapUI map) {
super(new Texture("close_on.png"), x, y, width, height);
shop = ui;
this.inventory = inventory;
this.map = map;
this.addListener(new ClickListener() {
public void clicked(InputEvent event, float x, float y) {
leftClick();
......
core/src/com/galaxytrucker/galaxytruckerreloaded/View/UI/Events/ShopUI.java
+ 1
− 1
View file @ caf68237
......@@ -97,7 +97,7 @@ public class ShopUI {
sellElements.add(new ShopSellElement(main, stage, new Texture("laser.png"), 0, 0, this, w, 0));
}
closeButton = new InventoryCloseButton(0, 0, 10, 10, this, null);
closeButton = new InventoryCloseButton(0, 0, 10, 10, this, null, null);
stage.addActor(closeButton);
background = new Texture("shop/storeback.png");
......
core/src/com/galaxytrucker/galaxytruckerreloaded/View/UI/Inventory/InventoryUI.java
+ 1
− 1
View file @ caf68237
......@@ -55,7 +55,7 @@ public class InventoryUI {
x = main.WIDTH/2 - inventoryBackground.getWidth()/2;
y = main.HEIGHT/2 - inventoryBackground.getHeight()/2;
closeButton = new InventoryCloseButton(x+700, y+15, 248, 50, null, this);
closeButton = new InventoryCloseButton(x+700, y+15, 248, 50, null, this, null);
stage.addActor(closeButton);
slots = new LinkedList<>();
......
core/src/com/galaxytrucker/galaxytruckerreloaded/View/UI/Map/MapUI.java
+ 8
− 1
View file @ caf68237
......@@ -5,6 +5,7 @@ import com.badlogic.gdx.scenes.scene2d.Stage;
import com.galaxytrucker.galaxytruckerreloaded.Main;
import com.galaxytrucker.galaxytruckerreloaded.Model.Map.Overworld;
import com.galaxytrucker.galaxytruckerreloaded.Model.Map.Planet;
import com.galaxytrucker.galaxytruckerreloaded.View.Buttons.InGameButtons.InventoryCloseButton;
import com.galaxytrucker.galaxytruckerreloaded.View.Buttons.InGameButtons.MapButton;
import com.galaxytrucker.galaxytruckerreloaded.View.UI.Ship.ShipView;
......@@ -20,6 +21,8 @@ public class MapUI {
private List<MapButton> locations;
private InventoryCloseButton closeButton;
private Main main;
private Stage stage;
......@@ -45,6 +48,9 @@ public class MapUI {
x = main.WIDTH/2 - mapTexture.getWidth()/2;
y = main.HEIGHT/2 - mapTexture.getHeight()/2;
closeButton = new InventoryCloseButton(x+700, y+15, 248, 50, null, null, this);
stage.addActor(closeButton);
locations = new LinkedList<>();
//TODO
for(Planet f : map.getPlanetMap()) {
......@@ -75,7 +81,7 @@ public class MapUI {
m.remove();
}
shipView.deleteMap();
closeButton.remove();
}
/**
......@@ -87,6 +93,7 @@ public class MapUI {
boolean success = shipView.travel(planet);
if(success) {
disposeMapUI();
closeButton.remove();
}
}
......
database.mv.db
+ 0
− 0
View file @ caf68237
No preview for this file type
database.trace.db 0 → 100644
+ 160
− 0
View file @ caf68237
2020-07-13 18:48:28 database: flush
org.h2.message.DbException: Allgemeiner Fehler: "java.lang.IllegalStateException: The file is locked: nio:/Users/lnittsch/Documents/UniMaterial/ReSWP2/galaxytrucker/database.mv.db [1.4.199/7]"
General error: "java.lang.IllegalStateException: The file is locked: nio:/Users/lnittsch/Documents/UniMaterial/ReSWP2/galaxytrucker/database.mv.db [1.4.199/7]" [50000-199]
at org.h2.message.DbException.get(DbException.java:194)
at org.h2.message.DbException.convert(DbException.java:347)
at org.h2.mvstore.db.MVTableEngine$1.uncaughtException(MVTableEngine.java:90)
at org.h2.mvstore.MVStore.handleException(MVStore.java:2787)
at org.h2.mvstore.MVStore.panic(MVStore.java:441)
at org.h2.mvstore.MVStore.<init>(MVStore.java:404)
at org.h2.mvstore.MVStore$Builder.open(MVStore.java:3343)
at org.h2.mvstore.db.MVTableEngine$Store.open(MVTableEngine.java:162)
at org.h2.mvstore.db.MVTableEngine.init(MVTableEngine.java:95)
at org.h2.engine.Database.getPageStore(Database.java:2739)
at org.h2.engine.Database.open(Database.java:769)
at org.h2.engine.Database.openDatabase(Database.java:319)
at org.h2.engine.Database.<init>(Database.java:313)
at org.h2.engine.Engine.openSession(Engine.java:69)
at org.h2.engine.Engine.openSession(Engine.java:201)
at org.h2.engine.Engine.createSessionAndValidate(Engine.java:178)
at org.h2.engine.Engine.createSession(Engine.java:161)
at org.h2.engine.Engine.createSession(Engine.java:31)
at org.h2.engine.SessionRemote.connectEmbeddedOrServer(SessionRemote.java:336)
at org.h2.jdbc.JdbcConnection.<init>(JdbcConnection.java:169)
at org.h2.jdbc.JdbcConnection.<init>(JdbcConnection.java:148)
at org.h2.Driver.connect(Driver.java:69)
at org.hibernate.engine.jdbc.connections.internal.DriverConnectionCreator.makeConnection(DriverConnectionCreator.java:38)
at org.hibernate.engine.jdbc.connections.internal.BasicConnectionCreator.createConnection(BasicConnectionCreator.java:58)
at org.hibernate.engine.jdbc.connections.internal.DriverManagerConnectionProviderImpl$PooledConnections.addConnections(DriverManagerConnectionProviderImpl.java:331)
at org.hibernate.engine.jdbc.connections.internal.DriverManagerConnectionProviderImpl$PooledConnections.<init>(DriverManagerConnectionProviderImpl.java:250)
at org.hibernate.engine.jdbc.connections.internal.DriverManagerConnectionProviderImpl$PooledConnections.<init>(DriverManagerConnectionProviderImpl.java:228)
at org.hibernate.engine.jdbc.connections.internal.DriverManagerConnectionProviderImpl$PooledConnections$Builder.build(DriverManagerConnectionProviderImpl.java:369)
at org.hibernate.engine.jdbc.connections.internal.DriverManagerConnectionProviderImpl.buildPool(DriverManagerConnectionProviderImpl.java:98)
at org.hibernate.engine.jdbc.connections.internal.DriverManagerConnectionProviderImpl.configure(DriverManagerConnectionProviderImpl.java:73)
at org.hibernate.boot.registry.internal.StandardServiceRegistryImpl.configureService(StandardServiceRegistryImpl.java:107)
at org.hibernate.service.internal.AbstractServiceRegistryImpl.initializeService(AbstractServiceRegistryImpl.java:246)
at org.hibernate.service.internal.AbstractServiceRegistryImpl.getService(AbstractServiceRegistryImpl.java:214)
at org.hibernate.engine.jdbc.env.internal.JdbcEnvironmentInitiator.buildJdbcConnectionAccess(JdbcEnvironmentInitiator.java:145)
at org.hibernate.engine.jdbc.env.internal.JdbcEnvironmentInitiator.initiateService(JdbcEnvironmentInitiator.java:66)
at org.hibernate.engine.jdbc.env.internal.JdbcEnvironmentInitiator.initiateService(JdbcEnvironmentInitiator.java:35)
at org.hibernate.boot.registry.internal.StandardServiceRegistryImpl.initiateService(StandardServiceRegistryImpl.java:101)
at org.hibernate.service.internal.AbstractServiceRegistryImpl.createService(AbstractServiceRegistryImpl.java:263)
at org.hibernate.service.internal.AbstractServiceRegistryImpl.initializeService(AbstractServiceRegistryImpl.java:237)
at org.hibernate.service.internal.AbstractServiceRegistryImpl.getService(AbstractServiceRegistryImpl.java:214)
at org.hibernate.id.factory.internal.DefaultIdentifierGeneratorFactory.injectServices(DefaultIdentifierGeneratorFactory.java:152)
at org.hibernate.service.internal.AbstractServiceRegistryImpl.injectDependencies(AbstractServiceRegistryImpl.java:286)
at org.hibernate.service.internal.AbstractServiceRegistryImpl.initializeService(AbstractServiceRegistryImpl.java:243)
at org.hibernate.service.internal.AbstractServiceRegistryImpl.getService(AbstractServiceRegistryImpl.java:214)
at org.hibernate.boot.internal.InFlightMetadataCollectorImpl.<init>(InFlightMetadataCollectorImpl.java:176)
at org.hibernate.boot.model.process.spi.MetadataBuildingProcess.complete(MetadataBuildingProcess.java:118)
at org.hibernate.jpa.boot.internal.EntityManagerFactoryBuilderImpl.metadata(EntityManagerFactoryBuilderImpl.java:1224)
at org.hibernate.jpa.boot.internal.EntityManagerFactoryBuilderImpl.build(EntityManagerFactoryBuilderImpl.java:1255)
at org.hibernate.jpa.HibernatePersistenceProvider.createEntityManagerFactory(HibernatePersistenceProvider.java:56)
at javax.persistence.Persistence.createEntityManagerFactory(Persistence.java:79)
at javax.persistence.Persistence.createEntityManagerFactory(Persistence.java:54)
at com.galaxytrucker.galaxytruckerreloaded.Server.Database.Database.<clinit>(Database.java:28)
at com.galaxytrucker.galaxytruckerreloaded.Server.Persistence.ObjectDAO.<init>(ObjectDAO.java:13)
at com.galaxytrucker.galaxytruckerreloaded.Server.Persistence.UserDAO.<init>(UserDAO.java:8)
at com.galaxytrucker.galaxytruckerreloaded.Server.Services.UserService.<init>(UserService.java:15)
at com.galaxytrucker.galaxytruckerreloaded.Server.ServerServiceCommunicator.<init>(ServerServiceCommunicator.java:27)
at com.galaxytrucker.galaxytruckerreloaded.Server.Server.runServer(Server.java:38)
at com.galaxytrucker.galaxytruckerreloaded.Main.startServer(Main.java:46)
at com.galaxytrucker.galaxytruckerreloaded.View.Screen.ShipSelector.startGame(ShipSelector.java:265)
at com.galaxytrucker.galaxytruckerreloaded.View.Buttons.MenuButtons.CreateGameButton.leftClick(CreateGameButton.java:18)
at com.galaxytrucker.galaxytruckerreloaded.View.Buttons.MenuButtons.CreateGameButton$1.clicked(CreateGameButton.java:26)
at com.badlogic.gdx.scenes.scene2d.utils.ClickListener.touchUp(ClickListener.java:88)
at com.badlogic.gdx.scenes.scene2d.InputListener.handle(InputListener.java:59)
at com.badlogic.gdx.scenes.scene2d.Stage.touchUp(Stage.java:351)
at com.badlogic.gdx.backends.lwjgl.LwjglInput.processEvents(LwjglInput.java:360)
at com.badlogic.gdx.backends.lwjgl.LwjglApplication.mainLoop(LwjglApplication.java:221)
at com.badlogic.gdx.backends.lwjgl.LwjglApplication$1.run(LwjglApplication.java:128)
Caused by: org.h2.jdbc.JdbcSQLNonTransientException: Allgemeiner Fehler: "java.lang.IllegalStateException: The file is locked: nio:/Users/lnittsch/Documents/UniMaterial/ReSWP2/galaxytrucker/database.mv.db [1.4.199/7]"
General error: "java.lang.IllegalStateException: The file is locked: nio:/Users/lnittsch/Documents/UniMaterial/ReSWP2/galaxytrucker/database.mv.db [1.4.199/7]" [50000-199]
at org.h2.message.DbException.getJdbcSQLException(DbException.java:502)
at org.h2.message.DbException.getJdbcSQLException(DbException.java:427)
... 67 more
Caused by: java.lang.IllegalStateException: The file is locked: nio:/Users/lnittsch/Documents/UniMaterial/ReSWP2/galaxytrucker/database.mv.db [1.4.199/7]
at org.h2.mvstore.DataUtils.newIllegalStateException(DataUtils.java:883)
at org.h2.mvstore.FileStore.open(FileStore.java:172)
at org.h2.mvstore.MVStore.<init>(MVStore.java:390)
... 61 more
2020-07-13 18:49:57 database: flush
org.h2.message.DbException: Allgemeiner Fehler: "java.lang.IllegalStateException: The file is locked: nio:/Users/lnittsch/Documents/UniMaterial/ReSWP2/galaxytrucker/database.mv.db [1.4.199/7]"
General error: "java.lang.IllegalStateException: The file is locked: nio:/Users/lnittsch/Documents/UniMaterial/ReSWP2/galaxytrucker/database.mv.db [1.4.199/7]" [50000-199]
at org.h2.message.DbException.get(DbException.java:194)
at org.h2.message.DbException.convert(DbException.java:347)
at org.h2.mvstore.db.MVTableEngine$1.uncaughtException(MVTableEngine.java:90)
at org.h2.mvstore.MVStore.handleException(MVStore.java:2787)
at org.h2.mvstore.MVStore.panic(MVStore.java:441)
at org.h2.mvstore.MVStore.<init>(MVStore.java:404)
at org.h2.mvstore.MVStore$Builder.open(MVStore.java:3343)
at org.h2.mvstore.db.MVTableEngine$Store.open(MVTableEngine.java:162)
at org.h2.mvstore.db.MVTableEngine.init(MVTableEngine.java:95)
at org.h2.engine.Database.getPageStore(Database.java:2739)
at org.h2.engine.Database.open(Database.java:769)
at org.h2.engine.Database.openDatabase(Database.java:319)
at org.h2.engine.Database.<init>(Database.java:313)
at org.h2.engine.Engine.openSession(Engine.java:69)
at org.h2.engine.Engine.openSession(Engine.java:201)
at org.h2.engine.Engine.createSessionAndValidate(Engine.java:178)
at org.h2.engine.Engine.createSession(Engine.java:161)
at org.h2.engine.Engine.createSession(Engine.java:31)
at org.h2.engine.SessionRemote.connectEmbeddedOrServer(SessionRemote.java:336)
at org.h2.jdbc.JdbcConnection.<init>(JdbcConnection.java:169)
at org.h2.jdbc.JdbcConnection.<init>(JdbcConnection.java:148)
at org.h2.Driver.connect(Driver.java:69)
at org.hibernate.engine.jdbc.connections.internal.DriverConnectionCreator.makeConnection(DriverConnectionCreator.java:38)
at org.hibernate.engine.jdbc.connections.internal.BasicConnectionCreator.createConnection(BasicConnectionCreator.java:58)
at org.hibernate.engine.jdbc.connections.internal.DriverManagerConnectionProviderImpl$PooledConnections.addConnections(DriverManagerConnectionProviderImpl.java:331)
at org.hibernate.engine.jdbc.connections.internal.DriverManagerConnectionProviderImpl$PooledConnections.<init>(DriverManagerConnectionProviderImpl.java:250)
at org.hibernate.engine.jdbc.connections.internal.DriverManagerConnectionProviderImpl$PooledConnections.<init>(DriverManagerConnectionProviderImpl.java:228)
at org.hibernate.engine.jdbc.connections.internal.DriverManagerConnectionProviderImpl$PooledConnections$Builder.build(DriverManagerConnectionProviderImpl.java:369)
at org.hibernate.engine.jdbc.connections.internal.DriverManagerConnectionProviderImpl.buildPool(DriverManagerConnectionProviderImpl.java:98)
at org.hibernate.engine.jdbc.connections.internal.DriverManagerConnectionProviderImpl.configure(DriverManagerConnectionProviderImpl.java:73)
at org.hibernate.boot.registry.internal.StandardServiceRegistryImpl.configureService(StandardServiceRegistryImpl.java:107)
at org.hibernate.service.internal.AbstractServiceRegistryImpl.initializeService(AbstractServiceRegistryImpl.java:246)
at org.hibernate.service.internal.AbstractServiceRegistryImpl.getService(AbstractServiceRegistryImpl.java:214)
at org.hibernate.engine.jdbc.env.internal.JdbcEnvironmentInitiator.buildJdbcConnectionAccess(JdbcEnvironmentInitiator.java:145)
at org.hibernate.engine.jdbc.env.internal.JdbcEnvironmentInitiator.initiateService(JdbcEnvironmentInitiator.java:66)
at org.hibernate.engine.jdbc.env.internal.JdbcEnvironmentInitiator.initiateService(JdbcEnvironmentInitiator.java:35)
at org.hibernate.boot.registry.internal.StandardServiceRegistryImpl.initiateService(StandardServiceRegistryImpl.java:101)
at org.hibernate.service.internal.AbstractServiceRegistryImpl.createService(AbstractServiceRegistryImpl.java:263)
at org.hibernate.service.internal.AbstractServiceRegistryImpl.initializeService(AbstractServiceRegistryImpl.java:237)
at org.hibernate.service.internal.AbstractServiceRegistryImpl.getService(AbstractServiceRegistryImpl.java:214)
at org.hibernate.id.factory.internal.DefaultIdentifierGeneratorFactory.injectServices(DefaultIdentifierGeneratorFactory.java:152)
at org.hibernate.service.internal.AbstractServiceRegistryImpl.injectDependencies(AbstractServiceRegistryImpl.java:286)
at org.hibernate.service.internal.AbstractServiceRegistryImpl.initializeService(AbstractServiceRegistryImpl.java:243)
at org.hibernate.service.internal.AbstractServiceRegistryImpl.getService(AbstractServiceRegistryImpl.java:214)
at org.hibernate.boot.internal.InFlightMetadataCollectorImpl.<init>(InFlightMetadataCollectorImpl.java:176)
at org.hibernate.boot.model.process.spi.MetadataBuildingProcess.complete(MetadataBuildingProcess.java:118)
at org.hibernate.jpa.boot.internal.EntityManagerFactoryBuilderImpl.metadata(EntityManagerFactoryBuilderImpl.java:1224)
at org.hibernate.jpa.boot.internal.EntityManagerFactoryBuilderImpl.build(EntityManagerFactoryBuilderImpl.java:1255)
at org.hibernate.jpa.HibernatePersistenceProvider.createEntityManagerFactory(HibernatePersistenceProvider.java:56)
at javax.persistence.Persistence.createEntityManagerFactory(Persistence.java:79)
at javax.persistence.Persistence.createEntityManagerFactory(Persistence.java:54)
at com.galaxytrucker.galaxytruckerreloaded.Server.Database.Database.<clinit>(Database.java:28)
at com.galaxytrucker.galaxytruckerreloaded.Server.Persistence.ObjectDAO.<init>(ObjectDAO.java:13)
at com.galaxytrucker.galaxytruckerreloaded.Server.Persistence.UserDAO.<init>(UserDAO.java:8)
at com.galaxytrucker.galaxytruckerreloaded.Server.Services.UserService.<init>(UserService.java:15)
at com.galaxytrucker.galaxytruckerreloaded.Server.ServerServiceCommunicator.<init>(ServerServiceCommunicator.java:27)
at com.galaxytrucker.galaxytruckerreloaded.Server.Server.runServer(Server.java:38)
at com.galaxytrucker.galaxytruckerreloaded.Main.startServer(Main.java:46)
at com.galaxytrucker.galaxytruckerreloaded.View.Screen.ShipSelector.startGame(ShipSelector.java:265)
at com.galaxytrucker.galaxytruckerreloaded.View.Buttons.MenuButtons.CreateGameButton.leftClick(CreateGameButton.java:18)
at com.galaxytrucker.galaxytruckerreloaded.View.Buttons.MenuButtons.CreateGameButton$1.clicked(CreateGameButton.java:26)
at com.badlogic.gdx.scenes.scene2d.utils.ClickListener.touchUp(ClickListener.java:88)
at com.badlogic.gdx.scenes.scene2d.InputListener.handle(InputListener.java:59)
at com.badlogic.gdx.scenes.scene2d.Stage.touchUp(Stage.java:351)
at com.badlogic.gdx.backends.lwjgl.LwjglInput.processEvents(LwjglInput.java:360)
at com.badlogic.gdx.backends.lwjgl.LwjglApplication.mainLoop(LwjglApplication.java:221)
at com.badlogic.gdx.backends.lwjgl.LwjglApplication$1.run(LwjglApplication.java:128)
Caused by: org.h2.jdbc.JdbcSQLNonTransientException: Allgemeiner Fehler: "java.lang.IllegalStateException: The file is locked: nio:/Users/lnittsch/Documents/UniMaterial/ReSWP2/galaxytrucker/database.mv.db [1.4.199/7]"
General error: "java.lang.IllegalStateException: The file is locked: nio:/Users/lnittsch/Documents/UniMaterial/ReSWP2/galaxytrucker/database.mv.db [1.4.199/7]" [50000-199]
at org.h2.message.DbException.getJdbcSQLException(DbException.java:502)
at org.h2.message.DbException.getJdbcSQLException(DbException.java:427)
... 67 more
Caused by: java.lang.IllegalStateException: The file is locked: nio:/Users/lnittsch/Documents/UniMaterial/ReSWP2/galaxytrucker/database.mv.db [1.4.199/7]
at org.h2.mvstore.DataUtils.newIllegalStateException(DataUtils.java:883)
at org.h2.mvstore.FileStore.open(FileStore.java:172)
at org.h2.mvstore.MVStore.<init>(MVStore.java:390)
... 61 more
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment