Bladeren bron

FUCK YOU STUPID module-info.java I WON HAHAHAHHAHAHAHAHHAHAAHHHHAHAHAHHAHAHAHAHHAHAAHHHHAHAHAHHAHAHAHAHHAHAAHHHHAHAHAHHAHAHAHAHHAHAAHHHHAHAHAHHAHAHAHAHHAHAAHHHHAHAHAHHAHAHAHAHHAHAAHHHHAHAHAHHAHAHAHAHHAHAAHHHHAHAHAHHAHAHAHAHHAHAAHHHHAHAHAHHAHAHAHAHHAHAAHHHHAHAHAHHAHAHAHAHHAHAAHHHHAHAHAHHAHAHAHAHHAHAAHHHHAHAHAHHAHAHAHAHHAHAAHHH

tbvns 6 maanden geleden
bovenliggende
commit
f58a552f4e

+ 7 - 5
core/pom.xml

@@ -13,12 +13,14 @@
         <maven.compiler.target>21</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
+
+    <parent>
+        <groupId>xyz.tbvns</groupId>
+        <artifactId>PowerGD</artifactId>
+        <version>1.0-ALPHA</version>
+    </parent>
+
     <dependencies>
-        <dependency>
-            <groupId>xyz.tbvns</groupId>
-            <artifactId>PowerGD</artifactId>
-            <version>1.0-ALPHA</version>
-        </dependency>
         <dependency>
             <groupId>com.github.oshi</groupId>
             <artifactId>oshi-core</artifactId>

+ 0 - 13
core/src/main/java/module-info.java

@@ -1,13 +0,0 @@
-module core {
-    requires com.github.oshi;
-    requires ch.qos.logback.classic;
-    requires org.slf4j;
-    requires java.logging;
-    requires lombok;
-    requires org.apache.commons.io;
-    requires org.apache.commons.codec;
-    requires javafx.controls;
-
-    exports xyz.tbvns.core;
-    exports xyz.tbvns.core.Objects;
-}

+ 17 - 0
engine/engine-core/pom.xml

@@ -14,6 +14,12 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
 
+    <parent>
+        <groupId>xyz.tbvns</groupId>
+        <artifactId>engine</artifactId>
+        <version>1.0-ALPHA</version>
+    </parent>
+
     <dependencies>
         <dependency>
             <groupId>com.badlogicgames.gdx</groupId>
@@ -33,4 +39,15 @@
         </dependency>
     </dependencies>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.8.1</version>
+            </plugin>
+        </plugins>
+    </build>
+
+
 </project>

+ 4 - 0
engine/engine-core/src/main/java/module-info.java

@@ -0,0 +1,4 @@
+module engine.core {
+    exports xyz.tbvns.powerGD;
+    requires gdx;
+}

+ 5 - 7
engine/engine-core/src/main/java/xyz/prismix/MiningGame/Main.java → engine/engine-core/src/main/java/xyz/tbvns/powerGD/Main.java

@@ -1,8 +1,6 @@
-package xyz.prismix.MiningGame;
+package xyz.tbvns.powerGD;
 
 import com.badlogic.gdx.ApplicationAdapter;
-import com.badlogic.gdx.Gdx;
-import com.badlogic.gdx.graphics.GL20;
 import com.badlogic.gdx.graphics.Texture;
 import com.badlogic.gdx.graphics.g2d.SpriteBatch;
 import com.badlogic.gdx.utils.ScreenUtils;
@@ -10,25 +8,25 @@ import com.badlogic.gdx.utils.ScreenUtils;
 /** {@link com.badlogic.gdx.ApplicationListener} implementation shared by all platforms. */
 public class Main extends ApplicationAdapter {
     private SpriteBatch batch;
-    private Texture image;
+    //private Texture image;
 
     @Override
     public void create() {
         batch = new SpriteBatch();
-        image = new Texture("libgdx.png");
+        //image = new Texture();
     }
 
     @Override
     public void render() {
         ScreenUtils.clear(0.15f, 0.15f, 0.2f, 1f);
         batch.begin();
-        batch.draw(image, 140, 210);
+//        batch.draw(image, 140, 210);
         batch.end();
     }
 
     @Override
     public void dispose() {
         batch.dispose();
-        image.dispose();
+//        image.dispose();
     }
 }

BIN
engine/engine-core/src/main/resources/libgdx.png


+ 17 - 0
engine/engine-lwjgl3/pom.xml

@@ -14,6 +14,12 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
 
+    <parent>
+        <groupId>xyz.tbvns</groupId>
+        <artifactId>engine</artifactId>
+        <version>1.0-ALPHA</version>
+    </parent>
+
     <dependencies>
         <dependency>
             <groupId>com.badlogicgames.gdx</groupId>
@@ -39,4 +45,15 @@
         </dependency>
     </dependencies>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.8.1</version>
+            </plugin>
+        </plugins>
+    </build>
+
+
 </project>

+ 3 - 2
engine/engine-lwjgl3/src/main/java/xyz/prismix/MiningGame/lwjgl3/Lwjgl3Launcher.java → engine/engine-lwjgl3/src/main/java/xyz/tbvns/powerGD/lwjgl3/Lwjgl3Launcher.java

@@ -1,8 +1,8 @@
-package xyz.prismix.MiningGame.lwjgl3;
+package xyz.tbvns.powerGD.lwjgl3;
 
 import com.badlogic.gdx.backends.lwjgl3.Lwjgl3Application;
 import com.badlogic.gdx.backends.lwjgl3.Lwjgl3ApplicationConfiguration;
-import xyz.prismix.MiningGame.Main;
+import xyz.tbvns.powerGD.Main;
 
 /** Launches the desktop (LWJGL3) application. */
 public class Lwjgl3Launcher {
@@ -24,6 +24,7 @@ public class Lwjgl3Launcher {
         //// Limits FPS to the refresh rate of the currently active monitor, plus 1 to try to match fractional
         //// refresh rates. The Vsync setting above should limit the actual FPS to match the monitor.
         configuration.setForegroundFPS(Lwjgl3ApplicationConfiguration.getDisplayMode().refreshRate + 1);
+
         //// If you remove the above line and set Vsync to false, you can get unlimited FPS, which can be
         //// useful for testing performance, but can also be very stressful to some hardware.
         //// You may also need to configure GPU drivers to fully disable Vsync; this can cause screen tearing.

+ 1 - 1
engine/engine-lwjgl3/src/main/java/xyz/prismix/MiningGame/lwjgl3/StartupHelper.java → engine/engine-lwjgl3/src/main/java/xyz/tbvns/powerGD/lwjgl3/StartupHelper.java

@@ -14,7 +14,7 @@
  */
 //Note, the above license and copyright applies to this file only.
 
-package xyz.prismix.MiningGame.lwjgl3;
+package xyz.tbvns.powerGD.lwjgl3;
 
 import org.lwjgl.system.macosx.LibC;
 

+ 18 - 1
engine/pom.xml

@@ -19,5 +19,22 @@
         <maven.compiler.target>21</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
-    
+
+    <parent>
+        <groupId>xyz.tbvns</groupId>
+        <artifactId>PowerGD</artifactId>
+        <version>1.0-ALPHA</version>
+    </parent>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.8.1</version>
+            </plugin>
+        </plugins>
+    </build>
+
+
 </project>

+ 2 - 7
pom.xml

@@ -131,11 +131,6 @@
             <artifactId>javafx-controls</artifactId>
             <version>21</version>
         </dependency>
-        <dependency>
-            <groupId>org.openjfx</groupId>
-            <artifactId>javafx-fxml</artifactId>
-            <version>21</version>
-        </dependency>
     </dependencies>
 
 
@@ -164,7 +159,7 @@
                     </execution>
                 </executions>
             </plugin>
-            <plugin>
+            <!-- <plugin>
                 <groupId>com.akathist.maven.plugins.launch4j</groupId>
                 <artifactId>launch4j-maven-plugin</artifactId>
                 <version>2.5.0</version>
@@ -201,7 +196,7 @@
                         </configuration>
                     </execution>
                 </executions>
-            </plugin>
+            </plugin> -->
         </plugins>
     </build>
 </project>

+ 25 - 5
ui/pom.xml

@@ -14,17 +14,18 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
 
+    <parent>
+        <groupId>xyz.tbvns</groupId>
+        <artifactId>PowerGD</artifactId>
+        <version>1.0-ALPHA</version>
+    </parent>
+
     <dependencies>
         <dependency>
             <groupId>xyz.tbvns</groupId>
             <artifactId>core</artifactId>
             <version>1.0-ALPHA</version>
         </dependency>
-        <dependency>
-            <groupId>xyz.tbvns</groupId>
-            <artifactId>PowerGD</artifactId>
-            <version>1.0-ALPHA</version>
-        </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-reload4j</artifactId>
@@ -73,4 +74,23 @@
         </dependency>
     </dependencies>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.openjfx</groupId>
+                <artifactId>javafx-maven-plugin</artifactId>
+                <version>0.0.8</version>
+                <configuration>
+                    <mainClass>xyz.tbvns.ui.Main</mainClass> <!-- Replace this with your fully qualified main class name -->
+                </configuration>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
 </project>

+ 0 - 14
ui/src/main/java/module-info.java

@@ -1,14 +0,0 @@
-module ui {
-    requires core;
-    requires ch.qos.logback.classic;
-    requires org.slf4j;
-    requires java.logging;
-    requires lombok;
-    requires com.github.oshi;
-    requires org.apache.commons.io;
-    requires javafx.controls;
-    requires java.desktop;
-    requires org.reflections;
-
-    exports xyz.tbvns.ui;
-}

+ 3 - 11
ui/src/main/java/xyz/tbvns/ui/Main.java

@@ -1,32 +1,24 @@
 package xyz.tbvns.ui;
 
 import javafx.application.Application;
-import javafx.beans.InvalidationListener;
 import javafx.scene.Node;
 import javafx.scene.Scene;
 import javafx.scene.layout.GridPane;
 import javafx.scene.layout.Pane;
 import javafx.stage.Stage;
 import lombok.Getter;
-import lombok.Lombok;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.io.FileUtils;
 import oshi.SystemInfo;
-import xyz.prismix.MiningGame.lwjgl3.Lwjgl3Launcher;
-import xyz.tbvns.core.DataManager;
-import xyz.tbvns.core.Decoder;
 import xyz.tbvns.core.FilesLocations;
-import xyz.tbvns.core.Objects.Level;
-import xyz.tbvns.core.XmlUtils;
-import xyz.tbvns.ui.LevelEditor.MainWindow;
 
-import java.io.File;
-import java.util.Arrays;
+import xyz.tbvns.powerGD.lwjgl3.Lwjgl3Launcher;
+import xyz.tbvns.ui.LevelEditor.MainWindow;
 
 @Slf4j
 public class Main extends Application {
     public static void main(String[] args) {
         launch(args);
+        Lwjgl3Launcher.main(args);
     }