Skip to content

merge #8

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.

Sign up for GitHub

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

Merged
kiranhart merged 21 commits into from
Jan 4, 2025
Merged

merge #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
34bd6c4
4.1.0 - 1.20.6 support
kiranhart May 1, 2024
29a1245
pre-fill command 4.2.0
kiranhart May 13, 2024
3cf89b9
🪙 added option to sell directly in the checkout menu
kiranhart May 21, 2024
a026dc7
4.3.0
kiranhart May 21, 2024
5d9f453
4.4.0
kiranhart Jun 14, 2024
deb0742
4.4.1
kiranhart Jun 22, 2024
0ad2d0f
4.4.2 - fix material picker
kiranhart Jun 25, 2024
686274b
⚡ used updated material picker, added right click option to set shop …
kiranhart Jul 19, 2024
491ad63
✨ added quick sell menu to shop content viewer. Closes #6
kiranhart Jul 19, 2024
f299b3d
4.5.0
kiranhart Jul 19, 2024
60cefb1
quick patch to check isSellAllowed
kiranhart Jul 19, 2024
02bb7cf
4.6.0 - spawners hook
kiranhart Jul 24, 2024
8835e20
4.7.0
kiranhart Aug 14, 2024
f2d169b
🖱️ global click delay
kiranhart Aug 22, 2024
2b4d3f8
💎 ecobits support
kiranhart Sep 6, 2024
4298fb1
4.9.0
kiranhart Sep 6, 2024
dbc0233
4.9.1 - update xseries
kiranhart Sep 19, 2024
e0f956c
flight update
kiranhart Oct 15, 2024
6c0a902
4.10.0 - 1.21.3 support
kiranhart Nov 4, 2024
efd0d3d
4.11.0 - 1.21.4 support
kiranhart Dec 11, 2024
154ecac
jitpack update
kiranhart Jan 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions jitpack.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
jdk:
- openjdk16

before_install:
- sdk install java 16.0.1-open
- sdk use java 16.0.1-open
- sdk install maven
- mvn -v

install:
- mvn install -DskipTests
124 changes: 76 additions & 48 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,15 @@

<name>Shops</name>
<description>Shops is the ultimate solution for server shops</description>
<version>4.0.0</version>
<version>4.11.0</version>
<packaging>jar</packaging>

<properties>
<author>Kiran Hart</author>
<jarName>${project.name}</jarName>
<main.class>${project.groupId}.${project.artifactId}.${project.name}</main.class>
<java.version>16</java.version>
<flight.version>3.18.0</flight.version>
<flight.version>3.30.0</flight.version>
<flight.path>ca.tweetzy</flight.path>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
Expand Down Expand Up @@ -47,6 +47,10 @@
<id>opencollab-snapshot</id>
<url>https://repo.opencollab.dev/maven-snapshots/</url>
</repository>
<repository>
<id>auxilor-plugins</id>
<url>https://repo.auxilor.io/repository/maven-public/</url>
</repository>
</repositories>
<pluginRepositories>
<pluginRepository>
Expand All @@ -59,7 +63,7 @@
<dependency>
<groupId>org.spigotmc</groupId>
<artifactId>spigot</artifactId>
<version>1.20.4-R0.1-SNAPSHOT</version>
<version>1.21.4-R0.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
Expand All @@ -70,14 +74,20 @@
<dependency>
<groupId>${flight.path}</groupId>
<artifactId>funds</artifactId>
<version>1.7.0</version>
<version>1.10.0</version>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.willfp</groupId>
<artifactId>EcoBits</artifactId>
<version>1.8.4</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.github.MilkBowl</groupId>
<artifactId>VaultAPI</artifactId>
Expand Down Expand Up @@ -195,50 +205,68 @@
</relocations>
</configuration>
</plugin>
<!-- <plugin>-->
<!-- <artifactId>maven-resources-plugin</artifactId>-->
<!-- <version>3.0.2</version>-->
<!-- <executions>-->
<!-- <execution>-->
<!-- <id>copy-files-on-build</id>-->
<!-- <phase>package</phase>-->
<!-- <goals>-->
<!-- <goal>copy-resources</goal>-->
<!-- </goals>-->
<!-- <configuration>-->
<!-- <outputDirectory>D:\Development\Spigot Servers\Latest Version\plugins</outputDirectory>-->
<!-- <resources>-->
<!-- <resource>-->
<!-- <directory>${project.build.directory}</directory>-->
<!-- <include>${project.name}.jar</include>-->
<!-- <filtering>false</filtering>-->
<!-- </resource>-->
<!-- </resources>-->
<!-- </configuration>-->
<!-- </execution>-->
<!-- </executions>-->
<!-- </plugin>-->
<!-- <plugin>-->
<!-- <groupId>org.apache.maven.plugins</groupId>-->
<!-- <artifactId>maven-antrun-plugin</artifactId>-->
<!-- <version>1.7</version>-->
<!-- <executions>-->
<!-- <execution>-->
<!-- <phase>test</phase>-->
<!-- <goals>-->
<!-- <goal>run</goal>-->
<!-- </goals>-->
<!-- <configuration>-->
<!-- <tasks>-->
<!-- <delete>-->
<!-- <fileset dir="D:\Development\Spigot Servers\Latest Version\plugins\Shops\locales" includes="*.yml"/>-->
<!-- <fileset dir="D:\Development\Spigot Servers\Latest Version\plugins\Shops\" includes="*.yml"/>-->
<!-- </delete>-->
<!-- </tasks>-->
<!-- </configuration>-->
<!-- </execution>-->
<!-- </executions>-->
<!-- </plugin>-->
<plugin>
<artifactId>maven-resources-plugin</artifactId>
<version>3.0.2</version>
<executions>
<execution>
<id>copy-files-on-build</id>
<phase>package</phase>
<goals>
<goal>copy-resources</goal>
</goals>
<configuration>
<outputDirectory>D:\Development\Spigot Servers\Latest Version\plugins</outputDirectory>
<resources>
<resource>
<directory>${project.build.directory}</directory>
<include>${project.name}.jar</include>
<filtering>false</filtering>
</resource>
</resources>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>com.coderplus.maven.plugins</groupId>
<artifactId>copy-rename-maven-plugin</artifactId>
<version>1.0.1</version>
<executions>
<execution>
<id>copy-named-jar</id>
<phase>package</phase>
<goals>
<goal>copy</goal>
</goals>
<configuration>
<sourceFile>${project.build.directory}/${project.name}.jar</sourceFile>
<destinationFile>D:\Development\Spigot Plugins\Ready Jars\${project.name}\${project.name} - v${project.version}.jar</destinationFile>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<version>1.7</version>
<executions>
<execution>
<phase>test</phase>
<goals>
<goal>run</goal>
</goals>
<configuration>
<tasks>
<delete>
<fileset dir="D:\Development\Spigot Servers\Latest Version\plugins\Shops\locales" includes="*.yml"/>
<fileset dir="D:\Development\Spigot Servers\Latest Version\plugins\Shops\" includes="*.yml"/>
</delete>
</tasks>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
<resources>
<resource>
Expand Down
1 change: 1 addition & 0 deletions src/main/java/ca/tweetzy/shops/Shops.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@ protected void onFlight() {
new DeleteCommand(),
new CartCommand(),
new AdminCommand(),
new PrefillCommand(),
new ReloadCommand()
);
}
Expand Down
1 change: 1 addition & 0 deletions src/main/java/ca/tweetzy/shops/api/cart/CartContent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ default TransactionResult executeSell(@NonNull final Player player) {
if (totalFoundInInventory == 0)
return TransactionResult.PLAYER_DOES_NOT_HAVE_ITEM;


final int amountToSell = Math.min(getQuantity(), totalFoundInInventory);

final double subTotal = getSellSubtotal(amountToSell);
Expand Down
4 changes: 4 additions & 0 deletions src/main/java/ca/tweetzy/shops/api/shop/ShopDisplay.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,10 @@ public interface ShopDisplay extends Jsonable {

void setCartButtonSlot(final int slot);

int getSellButtonSlot();

void setSellButtonSlot(final int slot);

List<Integer> getFillSlots();

void setFillSlots(final List<Integer> slots);
Expand Down
3 changes: 2 additions & 1 deletion src/main/java/ca/tweetzy/shops/api/shop/ShopLayoutControl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,6 @@ public enum ShopLayoutControl {
NEXT_PAGE_BUTTON,
SEARCH_BUTTON,
FILTER_BUTTON,
CART_BUTTON
CART_BUTTON,
SELL_BUTTON
}
Loading
Loading