From 09b800a3d328f987c82c854c8f6e940ddca55145 Mon Sep 17 00:00:00 2001 From: Kiran Hart Date: Sat, 27 Feb 2021 16:00:22 -0500 Subject: [PATCH] utf-8 encoding --- .github/workflows/maven.yml | 28 +++++++++++++++---- pom.xml | 5 ++++ .../auctionhouse/guis/ActiveAuctionsGUI.java | 3 -- .../auctionhouse/guis/AuctionHouseGUI.java | 1 - .../auctionhouse/guis/ExpiredItemsGUI.java | 14 +++++++++- .../managers/AuctionItemManager.java | 1 + 6 files changed, 41 insertions(+), 11 deletions(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index a4fc45b..571b652 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -2,26 +2,37 @@ name: Auction House Build on: push: - branches: [ main ] + paths: + - 'src/**' + - 'pom.xml' + - '.github/workflows/maven.yml' jobs: build: runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 + - name: Checkout the repository + uses: actions/checkout@v2 + - name: Set up JDK 1.8 uses: actions/setup-java@v1 with: + java-package: jdk java-version: 1.8 + - name: Cache Maven Packages + uses: actions/cache@v2 + with: + path: ~/.m2 + key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }} + restore-keys: ${{ runner.os }}-m2 + - name: Build with Maven - run: mvn package + run: mvn verify -B --file pom.xml transfer: needs: build runs-on: ubuntu-latest - steps: - name: Transfer main branch to Tweetzy uses: andstor/copycat-action@v3 @@ -34,4 +45,9 @@ jobs: src_branch: main dst_branch: main commit_message: ${{ github.event.head_commit.message }} - exclude: .github/* \ No newline at end of file + exclude: .github/* + + jitpack: + runs-on: ubuntu-latest + steps: + - uses: badasintended/autojitpack@v0 \ No newline at end of file diff --git a/pom.xml b/pom.xml index 6a6cf9e..61f8d69 100644 --- a/pom.xml +++ b/pom.xml @@ -8,6 +8,11 @@ AuctionHouse 2.0.0 + + UTF-8 + UTF-8 + + clean install Auction House-${project.version} diff --git a/src/main/java/ca/tweetzy/auctionhouse/guis/ActiveAuctionsGUI.java b/src/main/java/ca/tweetzy/auctionhouse/guis/ActiveAuctionsGUI.java index 74b8730..4694e8b 100644 --- a/src/main/java/ca/tweetzy/auctionhouse/guis/ActiveAuctionsGUI.java +++ b/src/main/java/ca/tweetzy/auctionhouse/guis/ActiveAuctionsGUI.java @@ -1,7 +1,6 @@ package ca.tweetzy.auctionhouse.guis; import ca.tweetzy.auctionhouse.AuctionHouse; -import ca.tweetzy.auctionhouse.api.events.AuctionEndEvent; import ca.tweetzy.auctionhouse.auction.AuctionItem; import ca.tweetzy.auctionhouse.auction.AuctionStackType; import ca.tweetzy.auctionhouse.helpers.ConfigurationItemHelper; @@ -9,14 +8,12 @@ import ca.tweetzy.auctionhouse.managers.SoundManager; import ca.tweetzy.auctionhouse.settings.Settings; import ca.tweetzy.core.compatibility.XMaterial; import ca.tweetzy.core.inventory.TInventory; -import ca.tweetzy.core.utils.TextUtils; import ca.tweetzy.core.utils.nms.NBTEditor; import com.google.common.collect.Lists; import org.bukkit.Bukkit; import org.bukkit.entity.Player; import org.bukkit.event.inventory.InventoryClickEvent; import org.bukkit.inventory.Inventory; -import org.jetbrains.annotations.NotNull; import java.util.List; import java.util.UUID; diff --git a/src/main/java/ca/tweetzy/auctionhouse/guis/AuctionHouseGUI.java b/src/main/java/ca/tweetzy/auctionhouse/guis/AuctionHouseGUI.java index a0d0d22..7197d89 100644 --- a/src/main/java/ca/tweetzy/auctionhouse/guis/AuctionHouseGUI.java +++ b/src/main/java/ca/tweetzy/auctionhouse/guis/AuctionHouseGUI.java @@ -12,7 +12,6 @@ import com.google.common.collect.Lists; import org.bukkit.Bukkit; import org.bukkit.event.inventory.InventoryClickEvent; import org.bukkit.inventory.Inventory; -import org.jetbrains.annotations.NotNull; import java.util.HashMap; import java.util.List; diff --git a/src/main/java/ca/tweetzy/auctionhouse/guis/ExpiredItemsGUI.java b/src/main/java/ca/tweetzy/auctionhouse/guis/ExpiredItemsGUI.java index 4ad6fb7..bc36d1b 100644 --- a/src/main/java/ca/tweetzy/auctionhouse/guis/ExpiredItemsGUI.java +++ b/src/main/java/ca/tweetzy/auctionhouse/guis/ExpiredItemsGUI.java @@ -1,10 +1,22 @@ package ca.tweetzy.auctionhouse.guis; +import ca.tweetzy.core.inventory.TInventory; +import org.bukkit.inventory.Inventory; + /** * The current file has been created by Kiran Hart * Date Created: February 18 2021 * Time Created: 10:07 p.m. * Usage of any code found within this class is prohibited unless given explicit permission otherwise */ -public class ExpiredItemsGUI { +public class ExpiredItemsGUI extends TInventory { + + public ExpiredItemsGUI() { + + } + + @Override + public Inventory getInventory() { + return null; + } } diff --git a/src/main/java/ca/tweetzy/auctionhouse/managers/AuctionItemManager.java b/src/main/java/ca/tweetzy/auctionhouse/managers/AuctionItemManager.java index 4596a7e..7683957 100644 --- a/src/main/java/ca/tweetzy/auctionhouse/managers/AuctionItemManager.java +++ b/src/main/java/ca/tweetzy/auctionhouse/managers/AuctionItemManager.java @@ -21,6 +21,7 @@ import java.util.stream.Collectors; * Usage of any code found within this class is prohibited unless given explicit permission otherwise */ + public class AuctionItemManager { @Getter