SpiGot 1.13 API update #149

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed

Pingger wants to merge 50 commits into patrick-layden:master from Pingger:master

Jenkinsfile

-Original file line number
+Diff line change
@@ -0,0 +1,22 @@
+    node {
+        def mvnHome
+        stage('Preparation') {
+            checkout scm
+            // Get the Maven tool.
+            // ** NOTE: This 'M3' Maven tool must be configured
+            // **       in the global configuration.
+            mvnHome = tool 'M3'
+        }
+        stage('Build') {
+            // Run the maven build
+            if (isUnix()) {
+                sh "'${mvnHome}/bin/mvn' -Dmaven.test.failure.ignore clean package"
+            } else {
+                bat(/"${mvnHome}\bin\mvn" -Dmaven.test.failure.ignore clean package/)
+            }
+        }
+        stage('Results') {
+            junit allowEmptyResults: true, testResults: '**/target/surefire-reports/TEST-*.xml'
+            archive 'target/*.jar'
+        }
+    }

README.md

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -6,7 +6,7 @@ HyperConomy is the all in one economy and shop plugin.  It can be a simple chest
  
    Installation

    ---------

    * Download HyperConomy releases from [BukkitDev](http://dev.bukkit.org/bukkit-plugins/hyperconomy/files/) or get the latest [development build](http://regalowl.net:8081/job/HyperConomy/).

    * Download HyperConomy releases from [BukkitDev](http://dev.bukkit.org/projects/hyperconomy/files/) or get the latest [development build](http://regalowl.net:8081/job/HyperConomy/).

    * Place the HyperConomy jar file your plugins folder.

    * Restart your server.

    @@ -49,7 +49,7 @@ Releases
  
    Add-ons

    ---------

    [HyperMerchant](http://dev.bukkit.org/bukkit-plugins/hypermerchant/)

    [HyperMerchant](http://dev.bukkit.org/projects/hypermerchant/)

    HyperMerchant is a graphical user interface for your players to use to interact with HyperConomy shops.  It is also includes the ability to easily create Citizens npc shopkeepers for your HyperConomy shops.

    @@ -76,7 +76,7 @@ Links
  
    [Documentation Wiki](https://github.com/RegalOwl/HyperConomy-Documentation)

    [BukkitDev Page](http://dev.bukkit.org/bukkit-plugins/hyperconomy/)

    [BukkitDev Page](http://dev.bukkit.org/projects/hyperconomy/)

    [Spigot Page](https://www.spigotmc.org/resources/hyperconomy.4602/)

pom.xml

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -7,9 +7,13 @@
  
    	<name>HyperConomy</name>

    	<description>HyperConomy creates a global market that can be accessed via designated shops. Prices follow a hyperbolic curve, and vary based on the stock of the item or enchantment. Everything in the market can be customized, from the items themselves to the names of the shops. HyperConomy supports every item in Minecraft, even the normally impossible to obtain ones. It allows a great deal of control over the economy, allowing you to edit any setting without a server restart.</description>

    	<repositories>

    		<repository>

    			<id>Iskariot-repo</id>

    			<url>https://www.iskariot.info/jenkins/plugin/repository/everything/</url>

    		</repository>

    		<repository>

    			<id>Articdive-repo</id>

    			<url>http://ci.articdive.cf/plugin/repository/everything/</url>

    			<url>https://nexus.articdive.de/repository/maven-snapshots/</url>

    		</repository>

    		<repository>

    			<id>Sonatype-public</id>

    @@ -34,7 +38,7 @@
  
    		<dependency>

              	<groupId>org.spigotmc</groupId>

             	<artifactId>spigot-api</artifactId>

             	<version>1.12.2-R0.1-SNAPSHOT</version>

             	<version>1.13-R0.1-SNAPSHOT</version>

    			<scope>provided</scope>

    		</dependency>

    		<dependency>

    @@ -165,8 +169,8 @@
  
    		        <artifactId>maven-compiler-plugin</artifactId>

    		        <version>3.7.0</version>

    		        <configuration>

    		          <source>1.6</source>

    		          <target>1.6</target>

    		          <source>1.8</source>

    		          <target>1.8</target>

    		        </configuration>

    	      	</plugin>

    		</plugins>

src/main/java/regalowl/hyperconomy/DataManager.java

-Original file line number
+Diff line change
@@ Expand Up / @@ -103,11 +103,7 @@ public void handleHyperEvent(HyperEvent event) { @@
     			if (devent.loadType == DataLoadType.START) {
     				if (loadActive) {return;}
     				loadActive = true;
-    				new Thread(new Runnable() {
-    					public void run() {
-    						loadEconomies();
-    					}
-    				}).start();
+    				new Thread(() -> loadEconomies()).start();
     			} else if (devent.loadType == DataLoadType.CHEST_SHOPS) {
     				loadAllCategories();
     				hc.getHyperEventHandler().fireEventFromAsyncThread(new DataLoadEvent(DataLoadType.COMPLETE));
@@ Expand Down Expand Up / @@ -443,8 +439,8 @@ public HyperEconomy getDefaultEconomy() { @@
     	public boolean economyExists(String economy) {
-    		if (economy.equalsIgnoreCase("base")) return false;
     		if (economy == null || economy == "") {return false;}
+    		if (economy.equalsIgnoreCase("base")) return false;
     		for (Map.Entry<String,HyperEconomy> entry : economies.entrySet()) {
     			HyperEconomy he = entry.getValue();
     			if (he.getName().equalsIgnoreCase(economy)) {
@@ Expand Down @@

src/main/java/regalowl/hyperconomy/HyperAPI.java

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -1,16 +1,6 @@
  
    package regalowl.hyperconomy;

    import java.util.ArrayList;

    import java.util.UUID;

    import regalowl.hyperconomy.account.HyperPlayer;

    @@ -42,40 +32,27 @@ public HyperAPI(HyperConomy hc) {
  
    	public String getPlayerShop(HyperPlayer player) {

    		Shop shop = hc.getHyperShopManager().getShop(player);

    		if (null == shop){

    			return "";

    		} else {

    			return shop.getName();

    		}

    		return shop == null ? "" : shop.getName();

    	}

    	@Override

    	public boolean checkHash(String player, String SHA256Hash) {

    		if (hc.getHyperPlayerManager().hyperPlayerExists(player)) {

    			if (hc.getHyperPlayerManager().getHyperPlayer(player).getHash().equals(SHA256Hash)) {

    				return true;

    			} else {

    				return false;

    			}

    		} else {

    			return false;

    		}

    		return hc.getHyperPlayerManager().hyperPlayerExists(player)

    				&& hc.getHyperPlayerManager().getHyperPlayer(player).getHash().equals(SHA256Hash);

    	}

    	@Override

    	public String getSalt(String player) {

    		if (hc.getHyperPlayerManager().hyperPlayerExists(player)) {

    			return hc.getHyperPlayerManager().getHyperPlayer(player).getSalt();

    		} else {

    			return "";

    		}

    		return hc.getHyperPlayerManager().hyperPlayerExists(player) ? ""

    				: hc.getHyperPlayerManager().getHyperPlayer(player).getSalt();

    	}

    	@Override

    	public String getDefaultServerShopAccountName() {

    		return hc.getConf().getString("shop.default-server-shop-account");

    	}

    	@Override

    	public boolean isItemDisplay(HItem item) {

    		try {

    			if (item == null) {

    @@ -93,10 +70,12 @@ public boolean isItemDisplay(HItem item) {
  
    		}

    	}

    	@Override

    	public Shop getShop(String name) {

    		return hc.getHyperShopManager().getShop(name);

    	}

    	@Override

    	public ServerShop getServerShop(String name) {

    		Shop s = hc.getHyperShopManager().getShop(name);

    		if (s instanceof ServerShop) {

    @@ -105,6 +84,7 @@ public ServerShop getServerShop(String name) {
  
    		return null;

    	}

    	@Override

    	public PlayerShop getPlayerShop(String name) {

    		Shop s = hc.getHyperShopManager().getShop(name);

    		if (s instanceof PlayerShop) {

    @@ -135,52 +115,45 @@ public ArrayList<String> getPlayerShopList() {
  
    		return playerShops;

    	}

    	@Override

    	public EnchantmentClass getEnchantmentClass(HItemStack stack) {

    		return EnchantmentClass.fromString(stack.getMaterial());

    	}

    	@Override

    	public TradeObject getHyperObject(String name, String economy) {

    		HyperEconomy he = hc.getDataManager().getEconomy(economy);

    		return he.getTradeObject(name);

    	}

    	@Override

    	public TradeObject getHyperObject(HItemStack stack, String economy) { 

    		HyperEconomy he = hc.getDataManager().getEconomy(economy);

    		return he.getTradeObject(stack);

    	}

    	@Override

    	public TradeObject getHyperObject(HItemStack stack, String economy, Shop s) {

    		HyperEconomy he = hc.getDataManager().getEconomy(economy);

    		return he.getTradeObject(stack, s);

    	}

    	@Override

    	public TradeObject getHyperObject(String name, String economy, Shop s) {

    		HyperEconomy he = hc.getDataManager().getEconomy(economy);

    		return he.getTradeObject(name, s);

    	}

    	@Override

    	public HyperPlayer getHyperPlayer(String name) {

    		HyperPlayerManager hpm = hc.getHyperPlayerManager();

    		if (hpm.hyperPlayerExists(name)) {

    			return hpm.getHyperPlayer(name);

    		} else {

    			return null;

    		}

    		return hpm.hyperPlayerExists(name) ? hpm.getHyperPlayer(name) : null;

    	}

    	@Override

    	public HyperPlayer getHyperPlayer(UUID uuid) {

    		HyperPlayerManager hpm = hc.getHyperPlayerManager();

    		if (hpm.hyperPlayerExistsWithUUID(uuid)) {

    			return hpm.getHyperPlayer(uuid);

    		} else {

    			return null;

    		}

    		return hpm.hyperPlayerExistsWithUUID(uuid) ? hpm.getHyperPlayer(uuid) : null;

    	}

    	@Override

    	public boolean hyperPlayerExists(String name) {

    @@ -199,10 +172,7 @@ public HyperPlayer createHyperPlayer(String name) {
  
    		return hpm.getHyperPlayer(name);

    	}

    	@Override

    	public ArrayList<TradeObject> getEnchantmentHyperObjects(HItemStack stack, String player) {

    		DataManager dm = hc.getDataManager();

    		ArrayList<TradeObject> objects = new ArrayList<TradeObject>();

    @@ -215,13 +185,15 @@ public ArrayList<TradeObject> getEnchantmentHyperObjects(HItemStack stack, Strin
  
    		return objects;

    	}

    	@Override

    	public TransactionResponse buy(HyperPlayer hp, TradeObject o, int amount) {

    		PlayerTransaction pt = new PlayerTransaction(TransactionType.BUY);

    		pt.setHyperObject(o);

    		pt.setAmount(amount);

    		return hp.processTransaction(pt);

    	}

    	@Override

    	public TransactionResponse buy(HyperPlayer hp, TradeObject o, int amount, Shop shop) {

    		PlayerTransaction pt = new PlayerTransaction(TransactionType.BUY);

    		pt.setHyperObject(o);

    @@ -230,13 +202,15 @@ public TransactionResponse buy(HyperPlayer hp, TradeObject o, int amount, Shop s
  
    		return hp.processTransaction(pt);

    	}

    	@Override

    	public TransactionResponse sell(HyperPlayer hp, TradeObject o, int amount ) {

    		PlayerTransaction pt = new PlayerTransaction(TransactionType.SELL);

    		pt.setHyperObject(o);

    		pt.setAmount(amount);

    		return hp.processTransaction(pt);

    	}

    	@Override

    	public TransactionResponse sell(HyperPlayer hp, TradeObject o, int amount, Shop shop) {

    		PlayerTransaction pt = new PlayerTransaction(TransactionType.SELL);

    		pt.setHyperObject(o);

    @@ -245,11 +219,13 @@ public TransactionResponse sell(HyperPlayer hp, TradeObject o, int amount, Shop
  
    		return hp.processTransaction(pt);

    	}

    	@Override

    	public TransactionResponse sellAll(HyperPlayer hp) {

    		Sellall sa = new Sellall(hc);

    		return sa.sellAll(hp, null);

    	}

    	@Override

    	public ArrayList<TradeObject> getAvailableObjects(HyperPlayer p) {

    		Shop s = hc.getHyperShopManager().getShop(p);

    		if (s != null) {

    @@ -258,6 +234,7 @@ public ArrayList<TradeObject> getAvailableObjects(HyperPlayer p) {
  
    		return new ArrayList<TradeObject>();

    	}

    	@Override

    	public ArrayList<TradeObject> getAvailableObjects(HyperPlayer p, int startingPosition, int limit) {

    		ArrayList<TradeObject> availableObjects = getAvailableObjects(p);

    		ArrayList<TradeObject> availableSubset = new ArrayList<TradeObject>();

    @@ -269,6 +246,7 @@ public ArrayList<TradeObject> getAvailableObjects(HyperPlayer p, int startingPos
  
    		return availableSubset;

    	}

    	@Override

    	public ArrayList<TradeObject> getAvailableObjects(String shopname) {

    		Shop s = hc.getHyperShopManager().getShop(shopname);

    		if (s != null) {

    @@ -277,6 +255,7 @@ public ArrayList<TradeObject> getAvailableObjects(String shopname) {
  
    		return new ArrayList<TradeObject>();

    	}

    	@Override

    	public ArrayList<TradeObject> getAvailableObjects(String shopname, int startingPosition, int limit) {

    		ArrayList<TradeObject> availableObjects = getAvailableObjects(shopname);

    		ArrayList<TradeObject> availableSubset = new ArrayList<TradeObject>();

    @@ -288,8 +267,7 @@ public ArrayList<TradeObject> getAvailableObjects(String shopname, int startingP
  
    		return availableSubset;

    	}

    	@Override

    	public TransactionResponse sellAll(HyperPlayer hp, HInventory inventory) {

    		DataManager em = hc.getDataManager();

    		HyperEconomy he = hp.getHyperEconomy();

    @@ -323,11 +301,4 @@ public boolean addItemToEconomy(HItemStack stack, String economyName, String req
  
    		return true;

    		//return ai.addItem(hobj, economyName);

    	}

    }

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

SpiGot 1.13 API update #149

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!