Skip to content
This repository has been archived by the owner on Jul 18, 2024. It is now read-only.

Merge Recent Changes from Upstream Repository #4

Open
wants to merge 164 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
164 commits
Select commit Hold shift + click to select a range
3e7633a
fix convert bugs
Xiao-MoMi Mar 26, 2024
c822441
fix item detection
Xiao-MoMi Mar 29, 2024
504c8be
switch to itemManager's getItemID
Xiao-MoMi Mar 29, 2024
3bde434
update default configs
Xiao-MoMi Mar 30, 2024
024cb47
untested offline growth
Xiao-MoMi Apr 3, 2024
8d8e311
changed config keys
Xiao-MoMi Apr 3, 2024
6303649
fix some chunk bugs
Xiao-MoMi Apr 3, 2024
6887c1a
Fix some warnings
Xiao-MoMi Apr 4, 2024
1e47a49
fix <reset>
Xiao-MoMi Apr 4, 2024
5873af4
small changes
jhqwqmc Apr 7, 2024
6d5a379
Merge pull request #27 from jhqwqmc/patch-1
Xiao-MoMi Apr 7, 2024
c7c6004
fix bugs
Xiao-MoMi Apr 13, 2024
b2d6fab
downgrade AureliumSkills dependency
Xiao-MoMi Apr 13, 2024
769e114
rename language files
Xiao-MoMi Apr 14, 2024
f0bc600
Small tweaks to Spanish translation
Schroddinger Apr 14, 2024
02414a2
3.4.4.2
Xiao-MoMi Apr 15, 2024
704ebf4
Fixed the bug of variation
Xiao-MoMi Apr 15, 2024
7bcd354
update modules
Xiao-MoMi Apr 16, 2024
8d3443f
Fix possible compatibility breaks
Xiao-MoMi Apr 17, 2024
ff3c340
Merge pull request #28 from Schroddinger/main
Xiao-MoMi Apr 17, 2024
c602ba7
[Fix] Tripwire for sprinkler
Xiao-MoMi Apr 20, 2024
cd94311
Merge branch 'main' of https://github.com/Xiao-MoMi/Custom-Crops
Xiao-MoMi Apr 20, 2024
484f4ec
[API] Added some API methods
Xiao-MoMi Apr 21, 2024
6de266a
[API] Add more annotations
Xiao-MoMi Apr 21, 2024
6dd75c6
[API] Improved API
Xiao-MoMi Apr 21, 2024
42dc282
[Library] Updated Zstd to 1.5.6-2
Xiao-MoMi Apr 22, 2024
8a279bf
[Update] Update adventure to 4.16.0
Xiao-MoMi Apr 22, 2024
38d2ede
Fix appearance
Xiao-MoMi Apr 26, 2024
501125c
[Fix] Possible language error
Xiao-MoMi Apr 26, 2024
2521e4b
Fix default configs
Xiao-MoMi Apr 27, 2024
e3b2188
[Compatibility] Readd quest compatibilities
Xiao-MoMi Apr 27, 2024
d42aae2
[Feature] Variation keeps the data
Xiao-MoMi Apr 27, 2024
e750d40
[Relocate] Relocated Adventure and some libs
Xiao-MoMi Apr 27, 2024
9f379ec
[Compatibility] Oraxen 2.0 support
Xiao-MoMi Apr 29, 2024
856efc0
[Small tweaks] Moved packages
Xiao-MoMi Apr 29, 2024
8716b30
[Fix?]
Xiao-MoMi May 4, 2024
28cb268
Update config.yml
Xiao-MoMi May 4, 2024
e390976
3.4.8
Xiao-MoMi May 7, 2024
b2949ce
Added some logs
Xiao-MoMi May 7, 2024
a3c1bae
Update jitpack.yml
Xiao-MoMi May 7, 2024
55ea394
Check point for future big changes
Xiao-MoMi May 12, 2024
30122cb
3.4.9
Xiao-MoMi May 12, 2024
597c71f
Possibly fix entities on 1.18?
Xiao-MoMi May 23, 2024
aeeac0f
Update CommandManager.java
Xiao-MoMi May 26, 2024
22cfc67
3.4.11
Xiao-MoMi Jun 8, 2024
92f4ad4
3.4.12
Xiao-MoMi Jun 14, 2024
f7f2b37
3.5.0
Xiao-MoMi Jun 18, 2024
7e7ce62
3.5.1
Xiao-MoMi Jun 19, 2024
701eb7b
3.5.2
Xiao-MoMi Jun 20, 2024
7089e11
3.5.3
Xiao-MoMi Jun 23, 2024
ddc7fd1
1.21
Xiao-MoMi Jun 26, 2024
154465b
change Zrips:Jobs tag
yuyi2439 Jun 30, 2024
caef3c8
3.5.5
Xiao-MoMi Jun 30, 2024
f79948e
3.5.6
Xiao-MoMi Jul 7, 2024
64e49db
3.5.7
Xiao-MoMi Jul 9, 2024
366b221
return if itemMeta is null
Xiao-MoMi Jul 10, 2024
b087fd6
Merge branch 'main' into dev
Xiao-MoMi Jul 11, 2024
2be377e
Merge pull request #31 from yuyi2439/dev
Xiao-MoMi Jul 11, 2024
6b81f93
3.5.7.2
Xiao-MoMi Jul 14, 2024
3bd7475
Merge branch 'main' of https://github.com/Xiao-MoMi/Custom-Crops
Xiao-MoMi Jul 14, 2024
4b359a3
Fix particle on 1.20.5+
Xiao-MoMi Jul 18, 2024
ca69497
Update plugin.yml
Xiao-MoMi Jul 22, 2024
fed8a22
Update build.gradle.kts
Xiao-MoMi Jul 22, 2024
c74678b
- ItemStack添加.clone()修复ItemsAdder v4
inrhor Jul 31, 2024
207b56a
Merge pull request #34 from inrhor/main
Xiao-MoMi Aug 2, 2024
8aac425
3.5.9
Xiao-MoMi Aug 13, 2024
617c2b1
Code clean up
Xiao-MoMi Aug 13, 2024
a5ebf31
Update README.md
Xiao-MoMi Aug 16, 2024
189efa3
3.5.10
Xiao-MoMi Aug 24, 2024
3cbd1f6
fix issue caused by corrupted event
Xiao-MoMi Aug 29, 2024
bbde4eb
3.6
Xiao-MoMi Aug 31, 2024
694a51e
Delete settings.gradle
Xiao-MoMi Aug 31, 2024
f632b99
3.6
Xiao-MoMi Aug 31, 2024
139cd96
implement watering can
Xiao-MoMi Aug 31, 2024
3768894
Fix some logics
Xiao-MoMi Sep 1, 2024
11a6e80
implement fertilizers
Xiao-MoMi Sep 1, 2024
ab6d852
date season commands
Xiao-MoMi Sep 1, 2024
3f98c11
force tick
Xiao-MoMi Sep 1, 2024
32a4ab1
Try implementing some events
Xiao-MoMi Sep 1, 2024
a21af25
Implement logic for dead crops
Xiao-MoMi Sep 2, 2024
67bbeb5
Fix pot's bug
Xiao-MoMi Sep 2, 2024
3a2b8c9
Fixed dead crop not removed
Xiao-MoMi Sep 2, 2024
31976ac
rearrange api structure
Xiao-MoMi Sep 3, 2024
32f01f1
add comments
Xiao-MoMi Sep 3, 2024
a1885e1
offline ticks
Xiao-MoMi Sep 3, 2024
87ca9cb
implement antigrief
Xiao-MoMi Sep 4, 2024
b8eac47
Update AbstractActionManager.java
Xiao-MoMi Sep 4, 2024
b6dc502
Added insight mode
Xiao-MoMi Sep 4, 2024
017c935
Update DebugInsightCommand.java
Xiao-MoMi Sep 4, 2024
ee9fe05
Update DebugInsightCommand.java
Xiao-MoMi Sep 4, 2024
5a7bb86
fix some bugs
Xiao-MoMi Sep 4, 2024
9998be4
Update PotBlock.java
Xiao-MoMi Sep 4, 2024
8934724
added working-mode: 3
Xiao-MoMi Sep 4, 2024
14c3d0a
implement quests
Xiao-MoMi Sep 4, 2024
33cfd7d
Refactor events
Xiao-MoMi Sep 4, 2024
f65d6ba
Prepare for building
Xiao-MoMi Sep 4, 2024
375c9c5
Remove adventure from api
Xiao-MoMi Sep 4, 2024
956d286
further improve farmlands
Xiao-MoMi Sep 4, 2024
343c12d
improve farmland checks
Xiao-MoMi Sep 4, 2024
db89cd2
check enable state of fertilized pots
Xiao-MoMi Sep 4, 2024
1a6a59a
Provide an option to use vanilla mechanic
Xiao-MoMi Sep 4, 2024
577cd7c
improve vanilla crop interactions
Xiao-MoMi Sep 4, 2024
660e1d2
more blocks should be supported
Xiao-MoMi Sep 4, 2024
3395de1
Added an option to check the other hand
Xiao-MoMi Sep 4, 2024
70478ab
Fix first time saving regions
Xiao-MoMi Sep 4, 2024
e9fd4d6
Update basic pack
Xiao-MoMi Sep 4, 2024
736937a
Update types
Xiao-MoMi Sep 4, 2024
cf948b9
move all built in action impl out of AbstractActionManager
MrXiaoM Sep 5, 2024
4381d8d
Cancel the lambda implementation of the actions
Xiao-MoMi Sep 5, 2024
37cef6b
Reformat actions
Xiao-MoMi Sep 5, 2024
f9a1437
Run grow actions at last
Xiao-MoMi Sep 5, 2024
e399c33
Fix getting water
Xiao-MoMi Sep 5, 2024
ec7d7e4
Added debug for the target block
Xiao-MoMi Sep 5, 2024
417f914
Update config version
Xiao-MoMi Sep 5, 2024
4427609
Improve debug messages
Xiao-MoMi Sep 5, 2024
8cbaba4
Update PlayerActionManager.java
Xiao-MoMi Sep 5, 2024
62bc8f6
Season condition should check the greenhouse
Xiao-MoMi Sep 5, 2024
7fc14df
Improved location context
Xiao-MoMi Sep 5, 2024
bce94b4
trigger death actions
Xiao-MoMi Sep 5, 2024
1d350ce
Update default configs
Xiao-MoMi Sep 5, 2024
e194395
Prepare for 3.6.2
Xiao-MoMi Sep 5, 2024
5632bf8
Fix some bugs
Xiao-MoMi Sep 5, 2024
2fe3866
Update commands.yml
Xiao-MoMi Sep 5, 2024
ab8a773
Update default.yml
Xiao-MoMi Sep 5, 2024
87129f6
Fix limitation
Xiao-MoMi Sep 5, 2024
da10511
Fix quality crops
Xiao-MoMi Sep 5, 2024
6e25b3f
Change method signature
Xiao-MoMi Sep 5, 2024
aac132d
API improvements
Xiao-MoMi Sep 6, 2024
d214f93
Update gradle.properties
Xiao-MoMi Sep 6, 2024
3ee9295
Update ItemsAdderProvider.java
Xiao-MoMi Sep 6, 2024
3a8fb36
Update default configs
Xiao-MoMi Sep 6, 2024
262209e
Fix hashcode
Xiao-MoMi Sep 6, 2024
0397b71
Update CustomCropsBlockStateImpl.java
Xiao-MoMi Sep 6, 2024
1c4790b
Update CustomCrops_3.6_Basic_Pack.zip
Xiao-MoMi Sep 6, 2024
ad06f00
Update README.md
Xiao-MoMi Sep 6, 2024
31e7a26
Update README.md
Xiao-MoMi Sep 6, 2024
eb3cb7b
Fixed double check
Xiao-MoMi Sep 7, 2024
558ced3
Added more vanilla blocks support
Xiao-MoMi Sep 7, 2024
6ca6281
Improved ignored materials
Xiao-MoMi Sep 7, 2024
d4a40f5
WorldEdit support
Xiao-MoMi Sep 7, 2024
6aeb341
additional check
Xiao-MoMi Sep 7, 2024
90b1ce1
Fix working range
Xiao-MoMi Sep 8, 2024
e04f787
deep clone a compound
Xiao-MoMi Sep 8, 2024
884f793
Fix ASP compatibility
Xiao-MoMi Sep 8, 2024
c00df16
Fixed possible error on insight mode
Xiao-MoMi Sep 8, 2024
3e251ed
Fixed some bugs
Xiao-MoMi Sep 10, 2024
60d2525
3.6.8
Xiao-MoMi Sep 13, 2024
0a4946c
Fixed using the wrong plugin instance
Xiao-MoMi Sep 14, 2024
f7f788a
3.6.9
Xiao-MoMi Sep 14, 2024
92face1
Added forced anti-grief support
Xiao-MoMi Sep 14, 2024
530f82c
Update default.yml
Xiao-MoMi Sep 14, 2024
bd23b33
Improve debugger
Xiao-MoMi Sep 15, 2024
ce4c12d
3.6.10
Xiao-MoMi Sep 15, 2024
389fa9e
Added unsafe commands
Xiao-MoMi Sep 15, 2024
9ee2478
Update zh_cn.yml
Xiao-MoMi Sep 15, 2024
d29cbff
Update toString()
Xiao-MoMi Sep 15, 2024
49a755e
Added fix command
Xiao-MoMi Sep 15, 2024
0bf974b
Added minecraft id support
Xiao-MoMi Sep 15, 2024
c65ef9f
Improve debugger
Xiao-MoMi Sep 15, 2024
6966022
更新 README.md
Xiao-MoMi Sep 17, 2024
8c41e26
Fix possible error
Xiao-MoMi Sep 19, 2024
5802976
new API Events
Xiao-MoMi Sep 19, 2024
780ec12
3.6.12
Xiao-MoMi Sep 22, 2024
2ad1965
Fix possible float deviation
Xiao-MoMi Sep 26, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
Binary file not shown.
50 changes: 26 additions & 24 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,46 +1,46 @@
# Custom-Crops
![CodeFactor Grade](https://img.shields.io/codefactor/grade/github/Xiao-MoMi/Custom-Crops)
![bStats Servers](https://img.shields.io/bstats/servers/16593)
![bStats Players](https://img.shields.io/bstats/players/16593)
![GitHub](https://img.shields.io/github/license/Xiao-MoMi/Custom-Crops)
[![](https://jitpack.io/v/Xiao-MoMi/Custom-Crops.svg)](https://jitpack.io/#Xiao-MoMi/Custom-Crops)
<a href="https://mo-mi.gitbook.io/xiaomomi-plugins/plugin-wiki/customcrops" alt="GitBook">
<img src="https://img.shields.io/badge/docs-gitbook-brightgreen" alt="Gitbook"/>
</a>
[![Scc Count Badge](https://sloc.xyz/github/Xiao-MoMi/Custom-Crops/?category=codes)](https://github.com/Xiao-MoMi/Custom-Crops/)
![Code Size](https://img.shields.io/github/languages/code-size/Xiao-MoMi/Custom-Crops)
![bStats Servers](https://img.shields.io/bstats/servers/16593)
![bStats Players](https://img.shields.io/bstats/players/16593)
![GitHub](https://img.shields.io/github/license/Xiao-MoMi/Custom-Crops)

Ultra-customizable planting experience for Minecraft servers

### Support the developer

https://afdian.net/@xiaomomi

https://polymart.org/resource/customcrops.2625
CustomCrops is a Paper plugin crafted to deliver an exceptional planting experience for Minecraft servers, with a strong emphasis on customization and performance. It employs Zstd compression for data serialization, ensuring high efficiency comparable to Minecraft's own serialization techniques. The plugin optimizes server performance by running its tick system across multiple threads, reverting to the main thread only when required. Additionally, CustomCrops offers a comprehensive API that enables developers to create custom block mechanism with specific interaction and tick behaviors, such as a fish trap block that periodically provides players with fish.

## How to build

### Windows

#### Command Line
Install JDK 17 and set the JDK installation path to JAVA_HOME as an environment variable.\
Start powershell and change directory to the project folder.\
Execute ".\gradlew build" and get the jar at /target/CustomCrops-plugin-version.jar.
Install JDK 17 & 21. \
Start terminal and change directory to the project folder.\
Execute ".\gradlew build" and get the artifact under /target folder

#### IDE
Import the project and execute gradle build action.
Import the project and execute gradle build action. \
Get the artifact under /target folder

## Use CustomCrops API
## Support the developer

Polymart: https://polymart.org/resource/customcrops.2625 \
Afdian: https://afdian.com/@xiaomomi

## CustomCrops API

### Maven

```
```html
<repositories>
<repository>
<id>jitpack</id>
<url>https://jitpack.io/</url>
</repository>
</repositories>
```
```
```html
<dependencies>
<dependency>
<groupId>com.github.Xiao-MoMi</groupId>
Expand All @@ -52,25 +52,27 @@ Import the project and execute gradle build action.
```
### Gradle (Groovy)

```
```groovy
repositories {
maven { url 'https://jitpack.io' }
}
```
```
```groovy
dependencies {
compileOnly 'com.github.Xiao-MoMi:Custom-Crops:{LATEST}'
}
```
### Gradle (Kotlin)

```
```kotlin
repositories {
maven("https://jitpack.io/")
}
```
```
```kotlin
dependencies {
compileOnly("com.github.Xiao-MoMi:Custom-Crops:{LATEST}")
}
```
```
#### Fun facts
I misspelled mechanism as mechanic. I should have realized this earlier XD
62 changes: 59 additions & 3 deletions api/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,4 +1,60 @@
plugins {
id("io.github.goooler.shadow") version "8.1.8"
id("maven-publish")
}

repositories {
mavenCentral()
maven("https://jitpack.io/")
maven("https://repo.papermc.io/repository/maven-public/")
maven("https://repo.rapture.pw/repository/maven-releases/") // flow nbt
maven("https://repo.extendedclip.com/content/repositories/placeholderapi/")
}

dependencies {
compileOnly("io.papermc.paper:paper-api:1.20.4-R0.1-SNAPSHOT")
implementation("com.flowpowered:flow-nbt:2.0.2")
}
implementation(project(":common"))
implementation("com.flowpowered:flow-nbt:${rootProject.properties["flow_nbt_version"]}")
implementation(files("libs/boosted-yaml-${rootProject.properties["boosted_yaml_version"]}.jar"))
compileOnly("net.kyori:adventure-api:${rootProject.properties["adventure_bundle_version"]}") {
exclude(module = "adventure-bom")
exclude(module = "checker-qual")
exclude(module = "annotations")
}
compileOnly("dev.folia:folia-api:${rootProject.properties["paper_version"]}-R0.1-SNAPSHOT")
compileOnly("me.clip:placeholderapi:${rootProject.properties["placeholder_api_version"]}")
compileOnly("com.github.Xiao-MoMi:Sparrow-Heart:${rootProject.properties["sparrow_heart_version"]}")
}

java {
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
toolchain {
languageVersion = JavaLanguageVersion.of(17)
}
}

tasks.withType<JavaCompile> {
options.encoding = "UTF-8"
options.release.set(17)
dependsOn(tasks.clean)
}

tasks {
shadowJar {
archiveClassifier = ""
archiveFileName = "CustomCrops-${rootProject.properties["project_version"]}.jar"
relocate("net.kyori", "net.momirealms.customcrops.libraries")
relocate("dev.dejvokep", "net.momirealms.customcrops.libraries")
}
}

publishing {
publications {
create<MavenPublication>("mavenJava") {
groupId = "net.momirealms"
artifactId = "CustomCrops"
version = rootProject.version.toString()
artifact(tasks.shadowJar)
}
}
}
Binary file added api/libs/boosted-yaml-1.3.7.jar
Binary file not shown.
Loading