From 20b40a071d3ad45d9c8c513ff248f00b954bbabe Mon Sep 17 00:00:00 2001
From: Mitch Weaver <20451170+MitchWeaver@users.noreply.github.com>
Date: Sun, 26 Nov 2017 00:44:25 +0100
Subject: [PATCH] fix error in __example_inventory
---
.classpath | 7 +++++++
.gitignore | 1 +
.project | 17 +++++++++++++++++
.settings/org.eclipse.jdt.core.prefs | 12 ++++++++++++
build/sjgs.jar | 0
.../__example_games/__InventoryExample.java | 9 ++++++---
.../__example_games/__PhysicsDemonstration.java | 4 ++--
src/sjgs/graphics/ui/__engine_inventory.py | 2 +-
8 files changed, 46 insertions(+), 6 deletions(-)
create mode 100644 .classpath
create mode 100644 .gitignore
create mode 100644 .project
create mode 100644 .settings/org.eclipse.jdt.core.prefs
delete mode 100755 build/sjgs.jar
diff --git a/.classpath b/.classpath
new file mode 100644
index 0000000..9d1b9a7
--- /dev/null
+++ b/.classpath
@@ -0,0 +1,7 @@
+
+
+
+
+
+
+
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..ae3c172
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+/bin/
diff --git a/.project b/.project
new file mode 100644
index 0000000..f3f2d8d
--- /dev/null
+++ b/.project
@@ -0,0 +1,17 @@
+
+
+ sjgs
+
+
+
+
+
+ org.eclipse.jdt.core.javabuilder
+
+
+
+
+
+ org.eclipse.jdt.core.javanature
+
+
diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000..a698e59
--- /dev/null
+++ b/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,12 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.8
diff --git a/build/sjgs.jar b/build/sjgs.jar
deleted file mode 100755
index e69de29..0000000
diff --git a/src/sjgs/__example_games/__InventoryExample.java b/src/sjgs/__example_games/__InventoryExample.java
index 483ae56..93f360a 100755
--- a/src/sjgs/__example_games/__InventoryExample.java
+++ b/src/sjgs/__example_games/__InventoryExample.java
@@ -22,6 +22,8 @@ class __InventoryExample extends Engine {
super(WIDTH, HEIGHT, title);
}
+ private static int WIDTH=800;
+ private static int HEIGHT=600;
// Create our engine!
private static __InventoryExample engine;
// Create our inventory!
@@ -29,7 +31,7 @@ class __InventoryExample extends Engine {
// Create the window for our engine, and initialize our engine itself while we're here.
public static void main(final String[] args) {
- engine = new __InventoryExample(800, 600, "Inventory System Demonstration");
+ engine = new __InventoryExample(WIDTH, HEIGHT, "Inventory System Demonstration");
}
// Create our mouse input, which will also add itself to our engine that we're passing in.
@@ -96,8 +98,9 @@ class __InventoryExample extends Engine {
@Override
public void init() {
final int w = 50, h = 50;
- for(int i = 1; i < 6; i++) slots.add(new ExampleInventorySlot(engine.getWidth() * 0.3f, engine.getHeight()*0.1f + i*h, w, h, i - 1));
- for(int i = 1; i < 6; i++) slots.add(new ExampleInventorySlot(engine.getWidth() * 0.6f, engine.getHeight()*0.1f + i*h, w, h, i - 1));
+
+ for(int i = 1; i < 6; i++) slots.add(new ExampleInventorySlot(WIDTH * 0.3f, HEIGHT*0.1f + i*h, w, h, i - 1));
+ for(int i = 1; i < 6; i++) slots.add(new ExampleInventorySlot(WIDTH * 0.6f, HEIGHT*0.1f + i*h, w, h, i - 1));
// And fill them with random items
for(int i = 0; i < 10; i++) addItem(rand.nextInt(4));
diff --git a/src/sjgs/__example_games/__PhysicsDemonstration.java b/src/sjgs/__example_games/__PhysicsDemonstration.java
index 9e9c974..bd9cec4 100755
--- a/src/sjgs/__example_games/__PhysicsDemonstration.java
+++ b/src/sjgs/__example_games/__PhysicsDemonstration.java
@@ -36,8 +36,8 @@ class __PhysicsDemonstration extends Engine {
@Override
protected void init() {
- disableFpsCap();
- setDoubleTickRate();
+ //disableFpsCap();
+ //setDoubleTickRate();
camera = new Camera(this);
new ExampleDevConsole(this);
new ExampleMouseInput(this);
diff --git a/src/sjgs/graphics/ui/__engine_inventory.py b/src/sjgs/graphics/ui/__engine_inventory.py
index 2b517a4..ae021cb 100755
--- a/src/sjgs/graphics/ui/__engine_inventory.py
+++ b/src/sjgs/graphics/ui/__engine_inventory.py
@@ -8,7 +8,7 @@ def __engine_onLeftClick(inventory):
for e in inventory.getSlots():
# IF THE SECOND SLOT CONTAINS THE MOUSE POINTER, SWAP!
if i != e and e.bounds.contains(Mouse.getClickX(), Mouse.getClickY()):
- inventory.swap(i, e)
+ inventory.swapSlots(i, e)
return # NOTE: YOU MUST RETURN HERE OR IT WONT WORK!
# GRAPHICAL SLOT MOVING!