Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: ZombieStriker/NPCAuctions
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v1.0.61
Choose a base ref
...
head repository: ZombieStriker/NPCAuctions
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
  • 3 commits
  • 14 files changed
  • 1 contributor

Commits on Jun 14, 2019

  1. 1.0.62

    ZombieStriker committed Jun 14, 2019
    Copy the full SHA
    b68476a View commit details

Commits on Feb 2, 2020

  1. 1.0.63

    ZombieStriker committed Feb 2, 2020
    Copy the full SHA
    0808160 View commit details

Commits on Jul 24, 2020

  1. 1.0.64

    ZombieStriker committed Jul 24, 2020
    Copy the full SHA
    a122d68 View commit details
9 changes: 9 additions & 0 deletions .idea/codeStyles/Project.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions .idea/codeStyles/codeStyleConfig.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 13 additions & 0 deletions .idea/compiler.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

35 changes: 35 additions & 0 deletions .idea/jarRepositories.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 14 additions & 0 deletions .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/vcs.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

191 changes: 191 additions & 0 deletions .idea/workspace.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 7 additions & 4 deletions pom.xml
Original file line number Diff line number Diff line change
@@ -4,13 +4,14 @@
<modelVersion>4.0.0</modelVersion>
<groupId>me.zombie_striker</groupId>
<artifactId>NPCAuctions</artifactId>
<version>1.0.61</version>
<version>1.0.64</version>
<repositories>
<repository>
<id>spigot-repo</id>
<url>https://hub.spigotmc.org/nexus/content/groups/public/</url>
<url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
</repository>


<repository>
<id>citizens-repo</id>
<url>http://repo.citizensnpcs.co</url>
@@ -25,11 +26,13 @@

<dependencies>

<!--Spigot API -->

<!--Spigot API-->
<!--You only need one of the two, don't put both. Spigot is recommended.-->
<dependency>
<groupId>org.spigotmc</groupId>
<artifactId>spigot</artifactId>
<version>1.14.1-R0.1-SNAPSHOT</version>
<version>1.15-R0.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>

11 changes: 11 additions & 0 deletions resources/changelog.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,14 @@
1.0.64
Updated to 1.16
Fixed buy it now increasing amount purchased

1.0.63
Updated to 1.15.2
Cleaned-up code.

1.0.62
Fixed error for CCE

1.0.61
Updated to 1.14.
Updated to Maven
29 changes: 0 additions & 29 deletions src/me/zombie_striker/npcauctions/GithubDependDownloader.java
Original file line number Diff line number Diff line change
@@ -10,35 +10,6 @@

public class GithubDependDownloader {

/*
* public void update(Player p){ String version = Main.version; String
* parsedVersion = version.replace(".", "");
*
* try { URL api = new
* URL("https://api.github.com/repos/greeves12/COD/releases/latest");
* URLConnection con = api.openConnection(); con.setConnectTimeout(15000);
* con.setReadTimeout(15000);
*
* String tagName = null;
*
* try{ JsonObject json = new JsonParser().parse(new
* InputStreamReader(con.getInputStream())).getAsJsonObject(); tagName =
* json.get("tag_name").getAsString();
*
* String finalTagName = tagName.replace(".", ""); int latestVersion =
* Integer.parseInt(finalTagName.substring(1, finalTagName.length()));
*
* if(latestVersion > Integer.parseInt(parsedVersion)) {
*
* p.sendMessage("§8*** [COD] §bThere is a new version available §a" + tagName +
* "§8***"); p.sendMessage("§8*** §dDownload the new build from here §8***");
* p.sendMessage("§8*** §6§6https://github.com/greeves12/COD/releases §8***");
* p.sendMessage("§bOnly Admins can see this message!"); }
*
* }catch(JsonIOException e){ e.printStackTrace(); } } catch (IOException e) {
* e.printStackTrace(); } }
*/

public static boolean autoUpdate(final Plugin main, final File output, String author, String githubProject,
String jarname) {
try {
Loading