Prepare For MCPI-Reborn 2.0

CHANGELOG.md

@@ -1,40 +1,4 @@
 # Changelog
 
-**0.3.0 (Release Candidate 1)**
-- Java Rewrite Proof-Of-Concept
-
-**0.2.0 (Release Candidate 1)**
-- Add Splash Text
-- Use Dark Theme
-- Add Option To Hide Launcher While Game Is Running
-- Add "Optimized MCPE" Profile
-
-**0.1.9**
-* Update Proxy
-
-**0.1.8**
-* Add Render Distance Options
-
-**0.1.7**
-* Pre-Populate Server
-
-**0.1.6**
-* Fix Typo
-
-**0.1.5**
-* Drop The ``-R``
-
-**0.1.4**
-* Update To Reflect MCPI-Reborn Name Change
-
-**0.1.3**
-* New Logo
-
-**0.1.2**
-* Fix Multiplayer Proxy Not Starting/Stopping Correctly
-
-**0.1.1**
-* Update Multiplayer Proxy
-
-**0.1.0**
-* Initial Release
+**0.1.0 (Release Candidate 1)**
+- Java Rewrite Proof-Of-Concept

README.md

@@ -3,7 +3,7 @@
 </p>
 
 # jMCPIL
-Proof-Of-Concept MCPIL Rewrite In Java
+MCPIL Rewrite In Java
 
 ## Packaging
 ```sh

build.gradle

@@ -10,7 +10,7 @@ repositories {
 }
 
 application {
-    mainClass = 'com.thebrokenrail.mcpil.Main'
+    mainClass = 'com.thebrokenrail.jmcpil.Main'
 }
 
 java {

debian/common/DEBIAN/control

@@ -4,4 +4,4 @@ Maintainer: TheBrokenRail <connor24nolan@live.com>
 Description: Minecraft Pi: Reborn Launcher written in Java
 Homepage: https://mcpirevival.tk
 Architecture: all
-Depends: openjdk-11-jre, minecraft-pi-reborn-virgl | minecraft-pi-reborn-native | mcpirdl
+Depends: openjdk-11-jre, minecraft-pi-reborn-client

debian/common/usr/bin/jmcpil

@@ -0,0 +1,5 @@
+#!/bin/sh
+
+set -e
+
+exec /usr/lib/jvm/java-11-openjdk-*/bin/java -jar /opt/jmcpil/jmcpil.jar

debian/common/usr/share/applications/mcpil.desktop → debian/common/usr/share/applications/jmcpil.desktop

@@ -1,10 +1,10 @@
 [Desktop Entry]
-Name=MCPIL
+Name=jMCPIL
 Comment=Minecraft Pi Launcher
-Icon=/usr/share/pixmaps/mcpil.png
+Icon=/usr/share/pixmaps/jmcpil.png
 StartupNotify=false
-StartupWMClass=com-thebrokenrail-mcpil-Main
-Exec=/usr/bin/mcpil
+StartupWMClass=com-thebrokenrail-jmcpil-Main
+Exec=/usr/bin/jmcpil
 Terminal=false
 Type=Application
 Categories=Application;Game;

scripts/package.sh

@@ -12,17 +12,17 @@ rm -rf out
 mkdir -p out
 
 # Copy Debian Files
-mkdir -p debian/tmp/opt/mcpil
+mkdir -p debian/tmp/opt/jmcpil
 rsync -r debian/common/ debian/tmp
 # Copy JAR
-cp build/libs/*-fat.jar debian/tmp/opt/mcpil/mcpil.jar
+cp build/libs/*-fat.jar debian/tmp/opt/jmcpil/jmcpil.jar
 # Set Version
-(git describe --tags --dirty || echo '0.1.0') > debian/tmp/opt/mcpil/VERSION
+(git describe --tags --dirty || echo '0.1.0') > debian/tmp/opt/jmcpil/VERSION
 # Add Changelog
-pandoc --from gfm --to html --output debian/tmp/opt/mcpil/CHANGELOG CHANGELOG.md
+pandoc --from gfm --to html --output debian/tmp/opt/jmcpil/CHANGELOG CHANGELOG.md
 
 # Substitute
-sed -i 's/${VERSION}/'"$(cat debian/tmp/opt/mcpil/VERSION)"'/g' debian/tmp/DEBIAN/control
+sed -i 's/${VERSION}/'"$(cat debian/tmp/opt/jmcpil/VERSION)"'/g' debian/tmp/DEBIAN/control
 
 # Build DEB
 dpkg-deb -b --root-owner-group debian/tmp out

settings.gradle

@@ -1,2 +1,2 @@
-rootProject.name = 'MCPIL'
+rootProject.name = 'jMCPIL'
 

src/main/java/com/thebrokenrail/mcpil/Main.java → src/main/java/com/thebrokenrail/jmcpil/Main.java

@@ -1,9 +1,9 @@
-package com.thebrokenrail.mcpil;
+package com.thebrokenrail.jmcpil;
 
 import com.formdev.flatlaf.FlatDarculaLaf;
-import com.thebrokenrail.mcpil.config.ConfigHandler;
-import com.thebrokenrail.mcpil.gui.control.MainButtons;
-import com.thebrokenrail.mcpil.gui.tab.MainTabs;
+import com.thebrokenrail.jmcpil.config.ConfigHandler;
+import com.thebrokenrail.jmcpil.gui.control.MainButtons;
+import com.thebrokenrail.jmcpil.gui.tab.MainTabs;
 
 import javax.swing.JFrame;
 import javax.swing.JPanel;
@@ -19,7 +19,7 @@ private static void run() {
         FlatDarculaLaf.install();
 
         // Show GUI
-        JFrame frame = new JFrame("MCPIL");
+        JFrame frame = new JFrame("jMCPIL");
         frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
         Dimension size = new Dimension(480, 360);
         frame.setMinimumSize(size);

src/main/java/com/thebrokenrail/mcpil/config/Config.java → src/main/java/com/thebrokenrail/jmcpil/config/Config.java

@@ -1,7 +1,7 @@
-package com.thebrokenrail.mcpil.config;
+package com.thebrokenrail.jmcpil.config;
 
-import com.thebrokenrail.mcpil.util.RenderDistance;
-import com.thebrokenrail.mcpil.util.Launcher;
+import com.thebrokenrail.jmcpil.util.RenderDistance;
+import com.thebrokenrail.jmcpil.util.Launcher;
 
 import java.util.ArrayList;
 import java.util.HashMap;

src/main/java/com/thebrokenrail/mcpil/config/ConfigHandler.java → src/main/java/com/thebrokenrail/jmcpil/config/ConfigHandler.java

@@ -1,4 +1,4 @@
-package com.thebrokenrail.mcpil.config;
+package com.thebrokenrail.jmcpil.config;
 
 import com.google.gson.Gson;
 

src/main/java/com/thebrokenrail/mcpil/gui/control/MainButtons.java → src/main/java/com/thebrokenrail/jmcpil/gui/control/MainButtons.java

@@ -1,7 +1,7 @@
-package com.thebrokenrail.mcpil.gui.control;
+package com.thebrokenrail.jmcpil.gui.control;
 
-import com.thebrokenrail.mcpil.config.ConfigHandler;
-import com.thebrokenrail.mcpil.util.Util;
+import com.thebrokenrail.jmcpil.config.ConfigHandler;
+import com.thebrokenrail.jmcpil.util.Util;
 
 import javax.swing.JButton;
 import javax.swing.JPanel;

src/main/java/com/thebrokenrail/mcpil/gui/control/PlayButton.java → src/main/java/com/thebrokenrail/jmcpil/gui/control/PlayButton.java

@@ -1,10 +1,10 @@
-package com.thebrokenrail.mcpil.gui.control;
+package com.thebrokenrail.jmcpil.gui.control;
 
-import com.thebrokenrail.mcpil.config.Config;
-import com.thebrokenrail.mcpil.config.ConfigHandler;
-import com.thebrokenrail.mcpil.util.Launcher;
-import com.thebrokenrail.mcpil.util.Profile;
-import com.thebrokenrail.mcpil.util.Util;
+import com.thebrokenrail.jmcpil.config.Config;
+import com.thebrokenrail.jmcpil.config.ConfigHandler;
+import com.thebrokenrail.jmcpil.util.Launcher;
+import com.thebrokenrail.jmcpil.util.Profile;
+import com.thebrokenrail.jmcpil.util.Util;
 
 import javax.swing.JButton;
 import javax.swing.SwingUtilities;

src/main/java/com/thebrokenrail/mcpil/gui/tab/AboutTab.java → src/main/java/com/thebrokenrail/jmcpil/gui/tab/AboutTab.java

@@ -1,6 +1,6 @@
-package com.thebrokenrail.mcpil.gui.tab;
+package com.thebrokenrail.jmcpil.gui.tab;
 
-import com.thebrokenrail.mcpil.util.Util;
+import com.thebrokenrail.jmcpil.util.Util;
 
 import javax.swing.JLabel;
 import javax.swing.JPanel;
@@ -34,7 +34,7 @@ public class AboutTab extends JPanel {
         add(title, layoutRestrictions);
 
         // Get Version
-        String versionStr = Util.readFile("/opt/mcpil/VERSION");
+        String versionStr = Util.readFile("/opt/jmcpil/VERSION");
         if (versionStr.length() > 0 && Character.isDigit(versionStr.charAt(0))) {
             versionStr = 'v' + versionStr;
         }
@@ -49,7 +49,7 @@ public class AboutTab extends JPanel {
 
         // Add URL
         JLabel url = new JLabel();
-        url.setText("https://github.com/MCPI-Revival/MCPIL");
+        url.setText("https://github.com/MCPI-Revival/jMCPIL");
         url.setForeground(new Color(30, 144, 255));
         url.setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
         url.addMouseListener(new MouseListener() {

src/main/java/com/thebrokenrail/mcpil/gui/tab/BaseSettingsTab.java → src/main/java/com/thebrokenrail/jmcpil/gui/tab/BaseSettingsTab.java

@@ -1,6 +1,6 @@
-package com.thebrokenrail.mcpil.gui.tab;
+package com.thebrokenrail.jmcpil.gui.tab;
 
-import com.thebrokenrail.mcpil.util.Util;
+import com.thebrokenrail.jmcpil.util.Util;
 
 import javax.swing.Box;
 import javax.swing.JComponent;

src/main/java/com/thebrokenrail/mcpil/gui/tab/FeaturesTab.java → src/main/java/com/thebrokenrail/jmcpil/gui/tab/FeaturesTab.java

@@ -1,7 +1,7 @@
-package com.thebrokenrail.mcpil.gui.tab;
+package com.thebrokenrail.jmcpil.gui.tab;
 
-import com.thebrokenrail.mcpil.config.Config;
-import com.thebrokenrail.mcpil.util.Launcher;
+import com.thebrokenrail.jmcpil.config.Config;
+import com.thebrokenrail.jmcpil.util.Launcher;
 
 import javax.swing.JCheckBox;
 import javax.swing.JComponent;

src/main/java/com/thebrokenrail/mcpil/gui/tab/MainTabs.java → src/main/java/com/thebrokenrail/jmcpil/gui/tab/MainTabs.java

@@ -1,4 +1,4 @@
-package com.thebrokenrail.mcpil.gui.tab;
+package com.thebrokenrail.jmcpil.gui.tab;
 
 import javax.swing.JTabbedPane;
 

src/main/java/com/thebrokenrail/mcpil/gui/tab/MultiplayerTab.java → src/main/java/com/thebrokenrail/jmcpil/gui/tab/MultiplayerTab.java

@@ -1,8 +1,8 @@
-package com.thebrokenrail.mcpil.gui.tab;
+package com.thebrokenrail.jmcpil.gui.tab;
 
-import com.thebrokenrail.mcpil.config.Config;
-import com.thebrokenrail.mcpil.proxy.GlobalProxy;
-import com.thebrokenrail.mcpil.util.Util;
+import com.thebrokenrail.jmcpil.config.Config;
+import com.thebrokenrail.jmcpil.proxy.GlobalProxy;
+import com.thebrokenrail.jmcpil.util.Util;
 
 import javax.swing.JComponent;
 import javax.swing.JTextField;

src/main/java/com/thebrokenrail/mcpil/gui/tab/PlayTab.java → src/main/java/com/thebrokenrail/jmcpil/gui/tab/PlayTab.java

@@ -1,8 +1,8 @@
-package com.thebrokenrail.mcpil.gui.tab;
+package com.thebrokenrail.jmcpil.gui.tab;
 
-import com.thebrokenrail.mcpil.util.Profile;
-import com.thebrokenrail.mcpil.util.Splash;
-import com.thebrokenrail.mcpil.util.Util;
+import com.thebrokenrail.jmcpil.util.Profile;
+import com.thebrokenrail.jmcpil.util.Splash;
+import com.thebrokenrail.jmcpil.util.Util;
 
 import javax.swing.JComboBox;
 import javax.swing.JLabel;
@@ -40,7 +40,7 @@ public class PlayTab extends JPanel implements ActionListener {
         JTextPane changelog = new JTextPane();
         changelog.setEditable(false);
         changelog.setContentType("text/html");
-        changelog.setText(Util.readFile("/opt/mcpil/CHANGELOG"));
+        changelog.setText(Util.readFile("/opt/jmcpil/CHANGELOG"));
         changelog.setCaretPosition(0);
         JScrollPane scroll = new JScrollPane(changelog);
         scroll.setVerticalScrollBarPolicy(ScrollPaneConstants.VERTICAL_SCROLLBAR_ALWAYS);

src/main/java/com/thebrokenrail/mcpil/gui/tab/SettingsTab.java → src/main/java/com/thebrokenrail/jmcpil/gui/tab/SettingsTab.java

@@ -1,8 +1,8 @@
-package com.thebrokenrail.mcpil.gui.tab;
+package com.thebrokenrail.jmcpil.gui.tab;
 
-import com.thebrokenrail.mcpil.config.Config;
-import com.thebrokenrail.mcpil.util.RenderDistance;
-import com.thebrokenrail.mcpil.util.Util;
+import com.thebrokenrail.jmcpil.config.Config;
+import com.thebrokenrail.jmcpil.util.RenderDistance;
+import com.thebrokenrail.jmcpil.util.Util;
 
 import javax.swing.JCheckBox;
 import javax.swing.JComboBox;

src/main/java/com/thebrokenrail/mcpil/proxy/GlobalProxy.java → src/main/java/com/thebrokenrail/jmcpil/proxy/GlobalProxy.java

@@ -1,4 +1,4 @@
-package com.thebrokenrail.mcpil.proxy;
+package com.thebrokenrail.jmcpil.proxy;
 
 /**
  * Global Proxy Instance

src/main/java/com/thebrokenrail/mcpil/proxy/Proxy.java → src/main/java/com/thebrokenrail/jmcpil/proxy/Proxy.java

@@ -1,4 +1,4 @@
-package com.thebrokenrail.mcpil.proxy;
+package com.thebrokenrail.jmcpil.proxy;
 
 import java.io.IOException;
 import java.net.DatagramPacket;