Merge pull request #31 from agentdid127/master

v1.6 - 1.7 + Bugfixes

.github/workflows/prerelease.yml

@@ -0,0 +1,57 @@
+# This is a basic workflow to help you get started with Actions
+
+name: CI
+
+# Controls when the action will run. Triggers the workflow on push or pull request
+# events but only for the master branch
+on:
+  push:
+    branches: [prerelease ]
+
+# A workflow run is made up of one or more jobs that can run sequentially or in parallel
+jobs:
+  # This workflow contains a single job called "build"
+  build:
+    # The type of runner that the job will run on
+    runs-on: ubuntu-latest
+
+    # Steps represent a sequence of tasks that will be executed as part of the job
+    steps:
+      # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
+      - name: Checkout code
+        uses: actions/checkout@v2
+      - name: Set up Java
+        uses: actions/setup-java@v1
+        with:
+          java-version: 1.11
+      - name: "Get Information"
+        run: |
+         echo 'VERSION='$(cat pom.xml | grep "^    <version>.*</version>$" | awk -F'[><]' '{print $3}')'-pre' >> $GITHUB_ENV
+         echo 'VERSIONID='$(cat pom.xml | grep "^    <version>.*</version>$" | awk -F'[><]' '{print $3}')'' >> $GITHUB_ENV
+      - name: Create Release
+        id: create_release
+        uses: actions/create-release@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # This token is provided by Actions, you do not need to create your own token
+        with:
+          tag_name: ${{ env.VERSION }}
+          release_name: Prerelease ${{ env.VERSION }}
+          body: |
+            Prerelease Automatically Generated by software... Please change draft to add changelog.
+          draft: true
+          prerelease: true
+      # Runs a single command using the runners shell
+      - name: Build Software
+        run: mvn -B package --file pom.xml
+
+      # Runs a set of commands using the runners shell
+      - name: Upload Release Asset
+        id: upload-release-asset 
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }} # This pulls from the CREATE RELEASE step above, referencing it's ID to get its outputs object, which include a `upload_url`. See this blog post for more info: https://jasonet.co/posts/new-features-of-github-actions/#passing-data-to-future-steps 
+          asset_path: ./target/ResourcePackConverter-${{ env.VERSIONID }}.jar
+          asset_name: ResourcePackConverter.jar
+          asset_content_type: application/zip

.github/workflows/release.yml

@@ -0,0 +1,56 @@
+# This is a basic workflow to help you get started with Actions
+
+name: CI
+
+# Controls when the action will run. Triggers the workflow on push or pull request
+# events but only for the master branch
+on:
+  push:
+    branches: [release ]
+
+# A workflow run is made up of one or more jobs that can run sequentially or in parallel
+jobs:
+  # This workflow contains a single job called "build"
+  build:
+    # The type of runner that the job will run on
+    runs-on: ubuntu-latest
+
+    # Steps represent a sequence of tasks that will be executed as part of the job
+    steps:
+      # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
+      - name: Checkout code
+        uses: actions/checkout@v2
+      - name: Set up Java
+        uses: actions/setup-java@v1
+        with:
+          java-version: 1.11
+      - name: "Get Information"
+        run: |
+         echo 'VERSION='$(cat pom.xml | grep "^    <version>.*</version>$" | awk -F'[><]' '{print $3}') >> $GITHUB_ENV
+      - name: Create Release
+        id: create_release
+        uses: actions/create-release@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # This token is provided by Actions, you do not need to create your own token
+        with:
+          tag_name: ${{ env.VERSION }}
+          release_name: Release ${{ env.VERSION }}
+          body: |
+            Release Automatically Generated by software... Please change draft to add changelog.
+          draft: true
+          prerelease: false
+      # Runs a single command using the runners shell
+      - name: Build Software
+        run: mvn -B package --file pom.xml
+
+      # Runs a set of commands using the runners shell
+      - name: Upload Release Asset
+        id: upload-release-asset 
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }} # This pulls from the CREATE RELEASE step above, referencing it's ID to get its outputs object, which include a `upload_url`. See this blog post for more info: https://jasonet.co/posts/new-features-of-github-actions/#passing-data-to-future-steps 
+          asset_path: ./target/ResourcePackConverter-${{ env.VERSION }}.jar
+          asset_name: ResourcePackConverter.jar
+          asset_content_type: application/zip

README.md

@@ -1,6 +1,7 @@
 # Resource Pack Converter
 
-This is my fork of Hypixel's Resource Pack Converter. It updates to any newer version from 1.9 - 1.16.3
+
+This is my fork of Hypixel's Resource Pack Converter. It updates to any newer version from 1.8.x - 1.17
 
 We know that many use resource packs in nonstandard and quirky ways - but giving this a shot *may* reduce quite a bit of your pain and workload for the 1.13 conversion.
 
@@ -28,3 +29,22 @@ To update to any other version than 1.12-1.13, you can use these parameters.
 	java -jar ResourcePackConverter.jar --from 1.12 --to 1.16.2
 
 We hope this helps out!
+
+
+
+# To be Added
+Of course there will always be some discrepencies and issues when converting that developers won't always notice, so if you find one, feel free to fix it and send a PR or write an issue here on Github.
+
+Known issues:
+ - Particles aren't converting very nicely with larger resource packs.
+
+Things that we want to add/need to be added:
+ - Converting to older versions.
+<<<<<<< HEAD
+
+# Not On the list to add
+
+ - Horse and Zombified Piglin Conversion (the models were changed, which may make that much more difficult to convert)
+=======
+ - Support for 1.17
+>>>>>>> cc57773c767eb55a4c4cbda5cc7bf1ad9f126c2e

docs/CNAME

@@ -1 +1 @@
-rpc.agentdid127.technology
+rpc.agentdid127.com

docs/allclasses-index.html

@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (13) on Sun Sep 27 18:54:28 EDT 2020 -->
+<!-- Generated by javadoc (13) on Tue May 04 20:00:09 EDT 2021 -->
 <title>All Classes</title>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<meta name="dc.created" content="2020-09-27">
+<meta name="dc.created" content="2021-05-04">
 <meta name="description" content="class index">
 <meta name="generator" content="javadoc/AllClassesIndexWriter">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">

docs/allpackages-index.html

@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (13) on Sun Sep 27 18:54:28 EDT 2020 -->
+<!-- Generated by javadoc (13) on Tue May 04 20:00:09 EDT 2021 -->
 <title>All Packages</title>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<meta name="dc.created" content="2020-09-27">
+<meta name="dc.created" content="2021-05-04">
 <meta name="description" content="package index">
 <meta name="generator" content="javadoc/AllPackagesIndexWriter">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">

docs/com/agentdid127/resourcepack/Converter.html

@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (13) on Sun Sep 27 18:54:28 EDT 2020 -->
+<!-- Generated by javadoc (13) on Tue May 04 20:00:09 EDT 2021 -->
 <title>Converter</title>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<meta name="dc.created" content="2020-09-27">
+<meta name="dc.created" content="2021-05-04">
 <meta name="description" content="declaration: package: com.agentdid127.resourcepack, class: Converter">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">

docs/com/agentdid127/resourcepack/Main.html

@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (13) on Sun Sep 27 18:54:28 EDT 2020 -->
+<!-- Generated by javadoc (13) on Tue May 04 20:00:09 EDT 2021 -->
 <title>Main</title>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<meta name="dc.created" content="2020-09-27">
+<meta name="dc.created" content="2021-05-04">
 <meta name="description" content="declaration: package: com.agentdid127.resourcepack, class: Main">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">

docs/com/agentdid127/resourcepack/Options.PathConverter.html

@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (13) on Sun Sep 27 18:54:28 EDT 2020 -->
+<!-- Generated by javadoc (13) on Tue May 04 20:00:09 EDT 2021 -->
 <title>Options.PathConverter</title>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<meta name="dc.created" content="2020-09-27">
+<meta name="dc.created" content="2021-05-04">
 <meta name="description" content="declaration: package: com.agentdid127.resourcepack, class: Options, class: PathConverter">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">

docs/com/agentdid127/resourcepack/Options.html

@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (13) on Sun Sep 27 18:54:28 EDT 2020 -->
+<!-- Generated by javadoc (13) on Tue May 04 20:00:09 EDT 2021 -->
 <title>Options</title>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<meta name="dc.created" content="2020-09-27">
+<meta name="dc.created" content="2021-05-04">
 <meta name="description" content="declaration: package: com.agentdid127.resourcepack, class: Options">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">

docs/com/agentdid127/resourcepack/PackConverter.html

@@ -2,10 +2,10 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (13) on Sun Sep 27 18:54:28 EDT 2020 -->
+<!-- Generated by javadoc (13) on Tue May 04 20:00:09 EDT 2021 -->
 <title>PackConverter</title>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<meta name="dc.created" content="2020-09-27">
+<meta name="dc.created" content="2021-05-04">
 <meta name="description" content="declaration: package: com.agentdid127.resourcepack, class: PackConverter">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
@@ -20,7 +20,7 @@
 <script type="text/javascript" src="../../../script-dir/jquery-ui.js"></script>
 </head>
 <body class="class-declaration">
-<script type="text/javascript">var data = {"i0":10,"i1":10,"i2":10,"i3":10};
+<script type="text/javascript">var data = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10};
 var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
 var altColor = "altColor";
 var rowColor = "rowColor";
@@ -131,11 +131,16 @@ <h2>Field Summary</h2>
 <td class="colLast">&nbsp;</td>
 </tr>
 <tr class="altColor">
+<td class="colFirst"><code>protected boolean</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#doRun">doRun</a></span></code></th>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="rowColor">
 <td class="colFirst"><code>protected com.google.gson.Gson</code></td>
 <th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#gson">gson</a></span></code></th>
 <td class="colLast">&nbsp;</td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code>protected joptsimple.OptionSet</code></td>
 <th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#optionSet">optionSet</a></span></code></th>
 <td class="colLast">&nbsp;</td>
@@ -162,6 +167,13 @@ <h2>Constructor Summary</h2>
 </thead>
 <tbody>
 <tr class="altColor">
+<th class="colConstructorName" scope="row"><code><span class="memberNameLink"><a href="#%3Cinit%3E(java.lang.String,java.lang.String,java.lang.String,boolean)">PackConverter</a></span>&#8203;(java.lang.String&nbsp;from,
+java.lang.String&nbsp;to,
+java.lang.String&nbsp;light,
+boolean&nbsp;minify)</code></th>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="rowColor">
 <th class="colConstructorName" scope="row"><code><span class="memberNameLink"><a href="#%3Cinit%3E(joptsimple.OptionSet)">PackConverter</a></span>&#8203;(joptsimple.OptionSet&nbsp;optionSet)</code></th>
 <td class="colLast">
 <div class="block">Starts New Conversion</div>
@@ -191,25 +203,32 @@ <h2>Method Summary</h2>
 </thead>
 <tbody>
 <tr class="altColor" id="i0">
+<td class="colFirst"><code>protected void</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#converterRunner(java.lang.String,java.lang.String,java.lang.String)">converterRunner</a></span>&#8203;(java.lang.String&nbsp;from,
+java.lang.String&nbsp;to,
+java.lang.String&nbsp;light)</code></th>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="rowColor" id="i1">
 <td class="colFirst"><code>&lt;T extends <a href="Converter.html" title="class in com.agentdid127.resourcepack">Converter</a>&gt;<br>T</code></td>
 <th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#getConverter(java.lang.Class)">getConverter</a></span>&#8203;(java.lang.Class&lt;T&gt;&nbsp;clazz)</code></th>
 <td class="colLast">&nbsp;</td>
 </tr>
-<tr class="rowColor" id="i1">
+<tr class="altColor" id="i2">
 <td class="colFirst"><code>com.google.gson.Gson</code></td>
 <th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#getGson()">getGson</a></span>()</code></th>
 <td class="colLast">
 <div class="block">Gson</div>
 </td>
 </tr>
-<tr class="altColor" id="i2">
+<tr class="rowColor" id="i3">
 <td class="colFirst"><code>void</code></td>
 <th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#registerConverter(com.agentdid127.resourcepack.Converter)">registerConverter</a></span>&#8203;(<a href="Converter.html" title="class in com.agentdid127.resourcepack">Converter</a>&nbsp;converter)</code></th>
 <td class="colLast">
 <div class="block">Registers Converter.</div>
 </td>
 </tr>
-<tr class="rowColor" id="i3">
+<tr class="altColor" id="i4">
 <td class="colFirst"><code>void</code></td>
 <th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#run()">run</a></span>()</code></th>
 <td class="colLast">
@@ -262,6 +281,12 @@ <h3><a id="gson">gson</a></h3>
 </li>
 <li class="blockList">
 <section class="detail">
+<h3><a id="doRun">doRun</a></h3>
+<div class="memberSignature"><span class="modifiers">protected</span>&nbsp;<span class="returnType">boolean</span>&nbsp;<span class="memberName">doRun</span></div>
+</section>
+</li>
+<li class="blockList">
+<section class="detail">
 <h3><a id="converters">converters</a></h3>
 <div class="memberSignature"><span class="modifiers">protected final</span>&nbsp;<span class="returnType">java.util.Map&lt;java.lang.Class&lt;? extends <a href="Converter.html" title="class in com.agentdid127.resourcepack">Converter</a>&gt;,&#8203;<a href="Converter.html" title="class in com.agentdid127.resourcepack">Converter</a>&gt;</span>&nbsp;<span class="memberName">converters</span></div>
 </section>
@@ -283,10 +308,19 @@ <h3><a id="&lt;init&gt;(joptsimple.OptionSet)">PackConverter</a></h3>
 <div class="block">Starts New Conversion</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>optionSet</code> - </dd>
+<dd><code>optionSet</code> - options</dd>
 </dl>
 </section>
 </li>
+<li class="blockList">
+<section class="detail">
+<h3><a id="&lt;init&gt;(java.lang.String,java.lang.String,java.lang.String,boolean)">PackConverter</a></h3>
+<div class="memberSignature"><span class="modifiers">public</span>&nbsp;<span class="memberName">PackConverter</span>&#8203;(<span class="arguments">java.lang.String&nbsp;from,
+java.lang.String&nbsp;to,
+java.lang.String&nbsp;light,
+boolean&nbsp;minify)</span></div>
+</section>
+</li>
 </ul>
 </section>
 </li>
@@ -299,6 +333,14 @@ <h2>Method Details</h2>
 <ul class="blockList">
 <li class="blockList">
 <section class="detail">
+<h3><a id="converterRunner(java.lang.String,java.lang.String,java.lang.String)">converterRunner</a></h3>
+<div class="memberSignature"><span class="modifiers">protected</span>&nbsp;<span class="returnType">void</span>&nbsp;<span class="memberName">converterRunner</span>&#8203;(<span class="arguments">java.lang.String&nbsp;from,
+java.lang.String&nbsp;to,
+java.lang.String&nbsp;light)</span></div>
+</section>
+</li>
+<li class="blockList">
+<section class="detail">
 <h3><a id="registerConverter(com.agentdid127.resourcepack.Converter)">registerConverter</a></h3>
 <div class="memberSignature"><span class="modifiers">public</span>&nbsp;<span class="returnType">void</span>&nbsp;<span class="memberName">registerConverter</span>&#8203;(<span class="arguments"><a href="Converter.html" title="class in com.agentdid127.resourcepack">Converter</a>&nbsp;converter)</span></div>
 <div class="block">Registers Converter.</div>
@@ -340,6 +382,7 @@ <h3><a id="getGson()">getGson</a></h3>
 <div class="block">Gson</div>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
+<dd>Gson Object of PackConverter Class</dd>
 </dl>
 </section>
 </li>