Skip to content

Commit

Permalink
Merge pull request #126 from Picono435/development
Browse files Browse the repository at this point in the history
Update to 1.0-beta-4
  • Loading branch information
Picono435 authored Nov 12, 2021
2 parents 040e1f1 + e0227a5 commit d67f4cc
Show file tree
Hide file tree
Showing 217 changed files with 9,720 additions and 845 deletions.
4 changes: 4 additions & 0 deletions .github/workflows/dev-builds.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,10 @@ jobs:
distribution: 'adopt'
- name: Grant execute permission for gradlew
run: chmod +x gradlew
- name: Publish slimJar to maven local
run: |
cd slimjar
../gradlew publishToMavenLocal
- name: Tests with Gradle
run: ./gradlew test
- name: Build with Gradle
Expand Down
695 changes: 21 additions & 674 deletions LICENSE

Large diffs are not rendered by default.

22 changes: 15 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,13 +1,21 @@
[licenseImg]: https://img.shields.io/github/license/Picono435/PicoJobs.svg
[license]: https://github.com/Picono435/PicoJobs/blob/master/LICENSE
[releaseImg]: https://img.shields.io/github/release/Picono435/PicoJobs.svg?label=github%20release
[release]: https://github.com/Picono435/PicoJobs/releases/latest

[statistics]: https://bstats.org/plugin/bukkit/PicoJobs
[releases]: https://github.com/Picono435/PicoJobs/releases
[bukkitdev]: https://dev.bukkit.org/projects/picojobs
[spigotmc]: https://spigotmc.org/resources/picojobs.82784/

<div align="center">

# PicoJobs

The best RandomTP mod ever!

# PicoJobs | A Jobs Plugin
[![Release](https://img.shields.io/github/v/release/Picono435/PicoJobs?style=for-the-badge&include_prereleases&sort=semver)][releases]
[![Available For](https://img.shields.io/static/v1?label=Available%20For&style=for-the-badge&color=34aa2f&message=1.17.x-1.18.x)][bukkitdev]

[![licenseImg]][license] [![Crowdin](https://badges.crowdin.net/e/70dc05a5077d0b2311673de39156f7fa/localized.svg)](https://picodev.crowdin.com/picojobs)
[![BukkitDev Downloads](https://img.shields.io/badge/dynamic/json?color=f16436&style=for-the-badge&label=BukkitDev&query=downloadCount&url=https://addons-ecs.forgesvc.net/api/v2/addon/385252&logo=CurseForge)][bukkitdev]
[![SpigotMC Downloads](https://img.shields.io/badge/dynamic/json?color=f16436&style=for-the-badge&label=SpigotMC&query=stats.downloads&url=https%3A%2F%2Fapi.spigotmc.org%2Fsimple%2F0.2%2Findex.php%3Faction%3DgetResource%26id%3D82784&logo=SpigotMC)][spigotmc]
[![GitHub Downloads (all releases)](https://img.shields.io/github/downloads/Picono435/PicoJobs/total?style=for-the-badge&amp;label=GitHub&amp;prefix=downloads%20&amp;color=4078c0&amp;logo=github)][releases]
</div>

PicoJobs is a jobs plugin 100% configurable that allow you to join in a job and earn more money! You can setup this plugin in almost all the server minigames, like Factions, RankUP, FullPvP, and SkyWars too!. Unfornatly the plugin is still in devolpment but there are already some BETA and ALPHA versions that you can download [here](https://dev.bukkit.org/projects/picojobs).

Expand Down
30 changes: 15 additions & 15 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ buildscript {
}

plugins {
id 'com.github.johnrengelman.shadow' version '7.0.0'
id 'com.github.johnrengelman.shadow' version '7.1.0'
id 'io.github.slimjar' version '1.3.0'
id 'java'
id 'maven-publish'
Expand All @@ -22,7 +22,7 @@ targetCompatibility = '1.8'

versioning {
releaseMode = { nextTag, lastTag, currentTag, extension ->
"1.0-beta-3d"
"1.0-beta-4"
} as Object
}

Expand All @@ -33,7 +33,7 @@ if (System.getenv("STABLE_BUILD") != null) {
version versioning.info.display
}
} else {
version versioning.info.build + "-DEV"
version versioning.info.display
}

repositories {
Expand Down Expand Up @@ -71,20 +71,20 @@ repositories {
url = 'https://repo.rosewooddev.io/repository/public/'
}

mavenLocal();

maven {
url = 'https://repo.vshnv.tech/'
}

mavenLocal()
}

dependencies {
// Slimjar
implementation slimjar("1.2.5")
implementation slimjar("1.2.6")
// Spigot
compileOnly 'org.spigotmc:spigot-api:1.17.1-R0.1-SNAPSHOT'
// Storage Methods
slim 'org.mongodb:mongodb-driver-sync:4.3.2'
slim 'org.mongodb:mongodb-driver-sync:4.3.3'
slim 'com.zaxxer:HikariCP:4.0.3'
slim 'com.h2database:h2:1.4.200'
slim 'org.xerial:sqlite-jdbc:3.36.0.3'
Expand All @@ -97,18 +97,18 @@ dependencies {
// Plugins API
compileOnly('me.clip:placeholderapi:2.10.10') { transitive = false }
compileOnly('com.github.MilkBowl:VaultAPI:1.7.1') { transitive = false }
compileOnly('org.black_ixx:playerpoints:3.0.3') { transitive = false }
compileOnly('org.black_ixx:playerpoints:3.1.0') { transitive = false }
compileOnly('com.github.Realizedd:TokenManager:3.2.4') { transitive = false }
// Other libraries
implementation 'com.github.mkremins:fanciful:18dc039f5b'
slim 'com.fasterxml.jackson.core:jackson-databind:2.12.5'
slim 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.12.5'
implementation 'org.apache.maven:maven-artifact:3.8.2'
slim 'com.fasterxml.jackson.core:jackson-databind:2.13.0'
slim 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.13.0'
implementation 'org.apache.maven:maven-artifact:3.8.3'
implementation 'org.bstats:bstats-bukkit:2.2.1'
slim 'org.slf4j:slf4j-simple:1.7.32'
slim 'org.slf4j:slf4j-api:1.7.32'
testImplementation 'com.github.seeseemelk:MockBukkit-v1.16:1.5.0'
testImplementation 'org.junit.jupiter:junit-jupiter-engine:5.8.0'
testImplementation 'com.github.seeseemelk:MockBukkit-v1.16:1.0.0'
testImplementation 'org.junit.jupiter:junit-jupiter-engine:5.8.1'
testCompileOnly 'org.spigotmc:spigot-api:1.17.1-R0.1-SNAPSHOT'
testCompileOnly('me.clip:placeholderapi:2.10.10') { transitive = false }
testCompileOnly('com.github.MilkBowl:VaultAPI:1.7') { transitive = false }
Expand All @@ -122,7 +122,7 @@ slimJar {
relocate 'com.h2database', 'com.gmail.picono435.picojobs.libs.h2database'
relocate 'org.xerial', 'com.gmail.picono435.picojobs.libs.xerial'
relocate 'org.mariadb.jbdc', 'com.gmail.picono435.picojobs.libs.mariadb'
relocate 'mysql', 'com.gmail.picono435.picojobs.libs.mysql'
relocate 'com.mysql', 'com.gmail.picono435.picojobs.libs.mysql'
relocate 'com.fasterxml.jackson', 'com.gmail.picono435.picojobs.libs.jackson'
relocate 'org.slf4j', 'com.gmail.picono435.picojobs.libs.slf4j'
}
Expand Down Expand Up @@ -176,4 +176,4 @@ publishing {
repositories {
mavenLocal()
}
}
}
10 changes: 10 additions & 0 deletions slimjar/.deepsource.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
version = 1

test_patterns = ["**/test**"]

[[analyzers]]
name = "java"
enabled = true

[analyzers.meta]
runtime_version = "11"
44 changes: 44 additions & 0 deletions slimjar/.github/workflows/gradle.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
# This workflow will build a Java project with Gradle
# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-gradle

name: Java CI with Gradle

on:
push:
branches: [ master ]
pull_request:
branches: [ master ]

jobs:
build-8:

runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- name: Set up JDK 1.8
uses: actions/setup-java@v1
with:
java-version: 1.8
- name: Grant execute permission for gradlew
run: chmod +x gradlew
- name: Build with Gradle
run: ./gradlew slimjar:build
- name: Run tests
run: ./gradlew test
build-11:

runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- name: Set up JDK 1.11
uses: actions/setup-java@v1
with:
java-version: 1.11
- name: Grant execute permission for gradlew
run: chmod +x gradlew
- name: Build with Gradle
run: ./gradlew slimjar:build
- name: Run tests
run: ./gradlew test
13 changes: 13 additions & 0 deletions slimjar/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
# Project exclude paths
/.gradle/
.idea/

build/

gradle-plugin/build/

slimjar/build/

loader-agent/build/

gradle.properties
21 changes: 21 additions & 0 deletions slimjar/LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
MIT License

Copyright (c) 2021 Vaishnav Anil

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
87 changes: 87 additions & 0 deletions slimjar/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,87 @@
<h1 align="center">Slim Jar</h1>
<h3 align="center">Runtime Dependency Management</h3>
<div align="center">
<a href="https://github.com/SlimJar/slimjar/">
<img src="https://img.shields.io/github/license/SlimJar/slimjar">
</a>
<a href="https://github.com/SlimJar/slimjar/actions/workflows/gradle.yml">
<img src="https://github.com/SlimJar/slimjar/actions/workflows/gradle.yml/badge.svg">
</a>
<a href="https://plugins.gradle.org/plugin/io.github.slimjar">
<img src="https://img.shields.io/maven-metadata/v.svg?label=gradle-plugin&metadataUrl=https%3A%2F%2Fplugins.gradle.org%2Fm2%2Fio%2Fgithub%2Fslimjar%2Fio.github.slimjar.gradle.plugin%2Fmaven-metadata.xml">
</a>
<a href="https://repo.vshnv.tech/releases/io/github/slimjar/slimjar">
<img src="https://img.shields.io/maven-metadata/v.svg?label=maven&metadataUrl=https%3A%2F%2Frepo.vshnv.tech%2Fio%2Fgithub%2Fslimjar%2Fslimjar%2Fmaven-metadata.xml">
</a>
</div>

<hr>

<h4>What is SlimJar?</h4>

SlimJar allows you to download and load up dependencies at runtime as an alternative to shading your dependencies. This helps you reduce build output size and share downloaded dependencies between projects at client side. It is built mainly with the gradle eco-system in mind and is easily configurable being an almost a drop-in replacement/add-on to gradle projects.

<h4>Why use SlimJar?</h4>

SlimJar makes the process of switching out jars easier by providing jars that are much lesser in size, all "slimmed" dependencies are already available and do not need to be explicitly moved back to your working directory during an update or change. This can be extremely useful for users who have lower bandwidth connections to push large updates to production or testing environments. It also provides vital features such as package relocation, module isolation, auto configuration generation...etc with the simplicity of minor tweaks in your build file.

<hr>

<h2 align="center">Usage Example</h2>
<h4 align="center">Note: Use the shadowJar task to compile your project</h4>
<br><br>


```java
// this needs to be ran before you reference your dependencies
ApplicationBuilder.appending("MyApplicationName").build()
```
(NOTE: If you have specified relocations and are running in a IDE or any environment that does not use the shadowjar-ed build file, use the `ignoreRelocation` flag while running by using `-DignoreRelocation` in your runner arguments)
*build.gradle* GROOVY DSL
```groovy
plugins {
id 'com.github.johnrengelman.shadow' version '6.0.0'
id 'io.github.slimjar' version '1.3.0'
}
dependencies {
implementation slimjar("1.2.6")
slim 'group.id:artifact.id:version'
}
slimJar {
relocate 'a.b.c', 'm.n.o'
}
```

(For Kotlin DSL, to use the `slimjar` extension in dependencies block, you will need the following import - `import io.github.slimjar.func.slimjar`)

<br>
<br>
<h2 align="center">Development setup</h2>


```sh
git clone https://github.com/SlimJar/slimjar.git
gradlew test
```
<br>
<br>
<h2 align="center">Releases</h2>

* https://plugins.gradle.org/plugin/io.github.slimjar
* https://repo.vshnv.tech/releases/io/github/slimjar/slimjar/1.2.1

Distributed under the MIT license. See ``LICENSE`` for more information.

<br>
<br>
<h2 align="center">Contributing</h2>



1. Fork it (<https://github.com/SlimJar/slimjar/fork>)
2. Create your feature branch (`git checkout -b feature/abcd`)
3. Commit your changes (`git commit -am 'Added some feature abcd'`)
4. Push to the branch (`git push origin feature/fooBar`)
5. Create a new Pull Request

30 changes: 30 additions & 0 deletions slimjar/build.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
plugins {
id 'java'
id 'com.github.hierynomus.license-base' version '0.15.0'
}

allprojects {
group 'io.github.slimjar'

apply plugin: 'com.github.hierynomus.license-base'

repositories {
mavenCentral()
}

license {
header rootProject.file('LICENSE')
includes(['**/*.java', '**/*.kt'])
mapping 'kt': 'DOUBLESLASH_STYLE',
'java': 'DOUBLESLASH_STYLE'
}
}

dependencies {
testImplementation 'org.junit.jupiter:junit-jupiter-api:5.6.0'
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine'
}

test {
useJUnitPlatform()
}
Loading

0 comments on commit d67f4cc

Please sign in to comment.