use i2p.plugins.firefox as a plugin instead of as a library

.github/workflows/ant.yml

@@ -27,10 +27,10 @@ jobs:
           distribution: 'temurin'
       - name: build with script
         run: bash -c "./buildscripts/unsigned.sh; ls *.exe"
-      - name: Upload I2P-Easy-Install-Bundle-${{ github.sha }}-unsigned.exe
+      - name: Upload I2P-Easy-Install-Bundle-unsigned.exe
         uses: actions/upload-artifact@v4
         with:
-          name: I2P-Easy-Install-Bundle-${{ github.sha }}-unsigned.exe
+          name: I2P-Easy-Install-Bundle-unsigned.exe
           path: I2P-Easy-Install-Bundle-2.4.0.exe
 
   buildjpackagexe:
@@ -44,10 +44,10 @@ jobs:
           distribution: 'temurin'
       - name: build with script
         run: bash -c "./buildscripts/exe.sh; ls *.exe"
-      - name: Upload I2P-Easy-Install-Bundle-${{ github.sha }}-unsigned.exe
+      - name: Upload I2P-Easy-Install-Bundle-unsigned.exe
         uses: actions/upload-artifact@v4
         with:
-          name: I2P-EXE-${{ github.sha }}-unsigned.exe
+          name: I2P-EXE-unsigned.exe
           path: I2P-EXE-2.4.0.exe
 
   buildjpackagmsi:
@@ -61,10 +61,10 @@ jobs:
           distribution: 'temurin'
       - name: build with script
         run: bash -c "./buildscripts/msi.sh; ls *.msi"
-      - name: Upload I2P-Easy-Install-Bundle-${{ github.sha }}-unsigned.msi
+      - name: Upload I2P-Easy-Install-Bundle-unsigned.msi
         uses: actions/upload-artifact@v4
         with:
-          name: I2P-MSI-${{ github.sha }}-unsigned.msi
+          name: I2P-MSI-unsigned.msi
           path: I2P-MSI-2.4.0.msi
 
   buildzip:
@@ -90,10 +90,10 @@ jobs:
           distribution: 'temurin'
       - name: build with script
         run: bash -c "./buildscripts/zip.sh; ls *.zip"
-      - name: Upload I2P-windows-portable-${{ github.sha }}.zip
+      - name: Upload I2P-windows-portable.zip
         uses: actions/upload-artifact@v4
         with:
-          name: I2P-windows-portable-${{ github.sha }}.zip
+          name: I2P-windows-portable.zip
           path: I2P-windows-portable.zip
         
   buildtgz:
@@ -110,8 +110,8 @@ jobs:
           sudo apt-get install -y nsis nsis-common nsis-pluginapi wget dos2unix curl jq gpg gettext
       - name: build with script
         run: ./buildscripts/targz.sh; ls *.tar.gz
-      - name: Upload I2P-${{ github.sha }}.tar.gz
+      - name: Upload I2P.tar.gz
         uses: actions/upload-artifact@v4
         with:
-          name: I2P-${{ github.sha }}.tar.gz
+          name: I2P.tar.gz
           path: I2P.tar.gz

.github/workflows/release.yml

@@ -60,7 +60,7 @@ jobs:
           workflow: ant.yml
           if_no_artifact_found: fail
       # remove .zip file extension
-      - run: for f in *.zip; do mv "$f" "${f%.zip}"; done
+      - run: for f in *.zip; do unzip "$f"; rm "$f"; done
       - run: echo "" | tee -a changelog.txt
       - run: echo "## Checksums" | tee -a changelog.txt
       - run: echo "" | tee -a changelog.txt
@@ -68,6 +68,10 @@ jobs:
       - run: sha256sum * | tee -a changelog.txt
       - run: echo '```' | tee -a changelog.txt
       - run: echo "" | tee -a changelog.txt
+      - run: echo '```' | tee -a changelog.txt
+      - run: file * | tee -a changelog.txt
+      - run: echo '```' | tee -a changelog.txt
+      - run: echo "" | tee -a changelog.txt
       - name: Upload artifacts
         uses: ncipollo/release-action@v1
         with:

buildscripts/launcher.sh

@@ -104,9 +104,15 @@ if [ ! -f "$SCRIPT_DIR/build/jna-platform.jar" ]; then
   wget_download "https://repo1.maven.org/maven2/net/java/dev/jna/jna-platform/$JNA_VERSION/jna-platform-$JNA_VERSION.jar" -O "$SCRIPT_DIR/build/jna-platform.jar"
 fi
 
-if [ ! -f "$SCRIPT_DIR/build/i2pfirefox.jar" ]; then
+if [ ! -f "$SCRIPT_DIR/build/i2pfirefox.zip" ]; then
   echo "downloading i2pfirefox jars"
-  wget_download "https://github.com/eyedeekay/i2p.plugins.firefox/releases/download/$I2PFIREFOX_VERSION/i2pfirefox.jar" -O "$SCRIPT_DIR/build/i2pfirefox.jar"
+  wget_download "https://github.com/eyedeekay/i2p.plugins.firefox/releases/download/$I2PFIREFOX_VERSION/plugin.zip" -O "$SCRIPT_DIR/build/i2pfirefox.zip"
+fi
+
+if [ ! -d "$SCRIPT_DIR/build/I2P/config/plugins/i2pfirefox" ]; then
+  mkdir -p "$SCRIPT_DIR/build/I2P/config/plugins/"
+  unzip "$SCRIPT_DIR/build/i2pfirefox.zip" -d "$SCRIPT_DIR/build/I2P/config/plugins/plugin"
+  mv "$SCRIPT_DIR/build/I2P/config/plugins/plugin" "$SCRIPT_DIR/build/I2P/config/plugins/i2pfirefox"
 fi
 
 for dll in "$I2P_JBIGI/"*windows*.dll; do

i2pversion

@@ -2,8 +2,8 @@
 
 JNA_VERSION=5.12.1
 export JNA_VERSION=5.12.1
-I2PFIREFOX_VERSION=1.0.9
-export I2PFIREFOX_VERSION=1.0.9
+I2PFIREFOX_VERSION=1.4.7
+export I2PFIREFOX_VERSION=1.4.7
 # Comment this out to build from an alternate branch or
 # the tip of the master branch.
 VERSIONMAJOR=2