Merge pull request #18 from plajdo/dev

Engine v1.1
plajdo · Nov 7, 2022 · 41120c1 · 41120c1
2 parents b388755 + ce17a91
commit 41120c1
Show file tree

Hide file tree

Showing 55 changed files with 1,505 additions and 269 deletions.
diff --git a/.gitignore b/.gitignore
@@ -84,5 +84,4 @@ fabric.properties
 .idea/misc.xml
 .idea/modules.xml
 .idea/vcs.xml
-img
 .idea/.gitignore
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/aseprite/crosshair.aseprite b/aseprite/crosshair.aseprite
diff --git a/aseprite/logo.aseprite b/aseprite/logo.aseprite
diff --git a/aseprite/portalgun.aseprite b/aseprite/portalgun.aseprite
diff --git a/bludisko_rt.iml b/bludisko_rt.iml
@@ -4,10 +4,9 @@
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/tests" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" />
     </content>
-    <orderEntry type="jdk" jdkName="17" jdkType="JavaSDK" />
+    <orderEntry type="jdk" jdkName="18" jdkType="JavaSDK" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module-library">
       <library>
@@ -34,21 +33,5 @@
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
-      <library>
-        <CLASSES>
-          <root url="jar://$MAVEN_REPOSITORY$/org/junit/jupiter/junit-jupiter/5.7.0/junit-jupiter-5.7.0.jar!/" />
-          <root url="jar://$MAVEN_REPOSITORY$/org/junit/jupiter/junit-jupiter-api/5.7.0/junit-jupiter-api-5.7.0.jar!/" />
-          <root url="jar://$MAVEN_REPOSITORY$/org/apiguardian/apiguardian-api/1.1.0/apiguardian-api-1.1.0.jar!/" />
-          <root url="jar://$MAVEN_REPOSITORY$/org/opentest4j/opentest4j/1.2.0/opentest4j-1.2.0.jar!/" />
-          <root url="jar://$MAVEN_REPOSITORY$/org/junit/platform/junit-platform-commons/1.7.0/junit-platform-commons-1.7.0.jar!/" />
-          <root url="jar://$MAVEN_REPOSITORY$/org/junit/jupiter/junit-jupiter-params/5.7.0/junit-jupiter-params-5.7.0.jar!/" />
-          <root url="jar://$MAVEN_REPOSITORY$/org/junit/jupiter/junit-jupiter-engine/5.7.0/junit-jupiter-engine-5.7.0.jar!/" />
-          <root url="jar://$MAVEN_REPOSITORY$/org/junit/platform/junit-platform-engine/1.7.0/junit-platform-engine-1.7.0.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
   </component>
 </module>
diff --git a/res/maps/chamber1.map b/res/maps/chamber1.map
diff --git a/res/run.sh b/res/run.sh
@@ -1,2 +1,3 @@
-#!/usr/bin/env bash
-java --enable-preview -jar bludisko_rt.jar
+#!/bin/bash
+
+java --enable-preview -jar bludisko_rt.jar
diff --git a/res/textures/items/portalGun.png b/res/textures/items/portalGun.png
diff --git a/res/textures/other/crosshair.png b/res/textures/other/crosshair.png
diff --git a/res/textures/other/logo.png b/res/textures/other/logo.png
diff --git a/src/module-info.java b/src/module-info.java
@@ -0,0 +1,5 @@
+open module bludisko.rt {
+    requires jdk.unsupported;
+    requires java.desktop;
+    requires org.jetbrains.annotations;
+}
diff --git a/src/sk/bytecode/bludisko/rt/desktop/DesktopLauncher.java b/src/sk/bytecode/bludisko/rt/desktop/DesktopLauncher.java
@@ -2,7 +2,7 @@
 
 import sk.bytecode.bludisko.rt.game.graphics.TextureManager;
 import sk.bytecode.bludisko.rt.game.window.Window;
-import sk.bytecode.bludisko.rt.game.window.screens.GameScreen;
+import sk.bytecode.bludisko.rt.game.window.screens.MenuScreen;
 
 public class DesktopLauncher {
 
@@ -13,7 +13,7 @@ public class DesktopLauncher {
     public static void main(String[] args) {
         TextureManager.loadAll();
 
-        Window window = new Window(new GameScreen());
+        Window window = new Window(new MenuScreen());
         window.start();
     }
 

diff --git a/src/sk/bytecode/bludisko/rt/game/blocks/Block.java b/src/sk/bytecode/bludisko/rt/game/blocks/Block.java
@@ -63,7 +63,6 @@ public Side getSide(Vector2 position) {
             } else {
                 return Side.SOUTH;
             }
-
         }
         if(position.y % 1 == 0) {
             // East-West
@@ -73,7 +72,6 @@ public Side getSide(Vector2 position) {
                 return Side.EAST;
             }
         }
-
         return Side.NONE;
     }
 

diff --git a/src/sk/bytecode/bludisko/rt/game/blocks/BlockManager.java b/src/sk/bytecode/bludisko/rt/game/blocks/BlockManager.java
@@ -32,9 +32,6 @@ public static Block createBlock(int id, int x, int y) {
             case 5 -> new GlassPane(Side.NORTH, coordinates);
             case 6 -> new GlassPane(Side.EAST, coordinates);
 
-            case 7 -> new Portal(Side.EAST, Portal.Color.ORANGE, coordinates);
-            case 8 -> new Portal(Side.SOUTH, Portal.Color.BLUE, coordinates);
-
             case 9 -> new WallWindow(coordinates, false);
             case 10 -> new WallWindow(coordinates, true);
             case 11 -> new Board(coordinates, 0);