Skip to content

Commit

Permalink
Merge branch '1.20.4-cobweb' into 1.20.4
Browse files Browse the repository at this point in the history
# Conflicts:
#	CHANGELOG.md
  • Loading branch information
Crystal-Spider committed May 18, 2024
2 parents a1fff9d + 3ba58d3 commit b8a95c4
Show file tree
Hide file tree
Showing 115 changed files with 3,075 additions and 4,787 deletions.
20 changes: 15 additions & 5 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -1,5 +1,15 @@
# Disable autocrlf on generated files, they always generate with LF
# Add any extra files or paths here to make git stop saying they
# are changed when only line endings change.
src/generated/**/.cache/cache text eol=lf
src/generated/**/*.json text eol=lf
* text eol=lf
*.bat text eol=lf
*.patch text eol=lf
*.java text eol=lf
*.gradle text eol=lf
*.png binary
*.gif binary
*.exe binary
*.dll binary
*.jar binary
*.lzma binary
*.zip binary
*.pyd binary
*.cfg text eol=lf
*.jks binary
4 changes: 0 additions & 4 deletions .github/FUNDING.yml

This file was deleted.

23 changes: 0 additions & 23 deletions .github/workflows/CLOSE_WORKFLOW.yml

This file was deleted.

9 changes: 9 additions & 0 deletions .github/workflows/analyze.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
name: Analyze Workflow

on:
workflow_dispatch:

jobs:
call-analyze-workflow:
uses: crystal-nest/.github/.github/workflows/analyze.yml@main
secrets: inherit
13 changes: 13 additions & 0 deletions .github/workflows/close_issue.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
name: Close Inactive Issue

on:
schedule:
- cron: "00 00 * * *"

jobs:
call-analyze-workflow:
permissions:
issues: write
pull-requests: write
uses: crystal-nest/.github/.github/workflows/close_issue.yml@main
secrets: inherit
10 changes: 10 additions & 0 deletions .github/workflows/pull_request.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
name: Pull Request Workflow

on:
pull_request:
types: [opened, reopened, synchronize, ready_for_review, review_requested]

jobs:
call-analyze-workflow:
uses: crystal-nest/.github/.github/workflows/analyze.yml@main
secrets: inherit
54 changes: 54 additions & 0 deletions .github/workflows/single_release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
name: Single Release Workflow

on:
workflow_dispatch:
inputs:
loader_forge:
type: boolean
description: Forge Loader
default: false
loader_fabric:
type: boolean
description: Fabric Loader
default: false
loader_neoforge:
type: boolean
description: NeoForge Loader
default: false
loader_common:
type: boolean
description: Common Loader
default: false
platform_maven:
type: boolean
description: Publish to Maven
default: false
platform_github:
type: boolean
description: Publish to GitHub
default: false
platform_curseforge:
type: boolean
description: Publish to CurseForge
default: false
platform_modrinth:
type: boolean
description: Publish to Modrinth
default: false

jobs:
call-workflow:
permissions:
contents: write
packages: write
uses: crystal-nest/.github/.github/workflows/single_release.yml@main
with:
loader_forge: ${{ github.event.inputs.loader_forge }}
loader_fabric: ${{ github.event.inputs.loader_fabric }}
loader_neoforge: ${{ github.event.inputs.loader_neoforge }}
loader_common: ${{ github.event.inputs.loader_common }}
platform_maven: ${{ github.event.inputs.platform_maven }}
platform_github: ${{ github.event.inputs.platform_github }}
platform_curseforge: ${{ github.event.inputs.platform_curseforge }}
platform_modrinth: ${{ github.event.inputs.platform_modrinth }}
secrets: inherit
17 changes: 2 additions & 15 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -11,27 +11,14 @@ out
*.ipr
*.iws
*.iml
.idea

# vscode
bin/
.classpath
.project
.vscode
.idea/*
!.idea/scopes

# gradle
build
out
classes
.gradle

# other
eclipse
run
runs

# macos
*.DS_Store

# api keys
api-keys.properties
3 changes: 3 additions & 0 deletions .idea/scopes/Fabric_sources.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions .idea/scopes/Forge_sources.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,12 @@ and this project adheres to [Forge Semantic Versioning](https://mcforge.readthed

- Nothing new.

## [1.20.4-9.0.0.1-beta] - 2024/05/18

- Changed publisher plugin.
- Fixed declared related dependencies.
- Updated Cobweb API requirement to v0.0.3.0-beta.

## [1.20.4-9.0.0.0-beta] - 2024/05/15

- Changed mod id from `harvestwithease` to `harvest_with_ease`.
Expand Down
30 changes: 22 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,24 @@
![Issues](https://raw.githubusercontent.com/crystal-nest/mod-fancy-assets/main/github/issues.svg)[![GitHub](https://raw.githubusercontent.com/crystal-nest/mod-fancy-assets/main/github/github.svg)](https://github.com/crystal-nest/harvest-with-ease/issues)

---

## **Description**

Harvesting crops is such a pain, breaking them all to get the drops and then having to replant each one.
Well, not anymore! With this mod you can just right click on your crops to harvest them and leaving a new plant to grow!
Well, not anymore! With this mod you can just right-click on your crops to harvest them and leaving a new plant to grow!
It's also compatible with **any** modded crops, to ease your mind of one more thing!

***Note:***
*Altough it's stated that the mod is required on both sides, it can be safely installed server-side only and still work.*
*However when a client that does not have the mod connects to a server that does, and the player tries to harvest a crop while holding a block, it cause block flashing. The only way to prevent this glitch is to set `require hoe` to `true`.*
*Although it's stated that the mod is required on both sides, it can be safely installed server-side only and still work.*
*However when a client that does not have the mod connects to a server that does, and the player tries to harvest a crop while holding a block, it causes block flashing. The only way to prevent this glitch is to set `require hoe` to `true`.*

***If you're using the 9.0.0.0-beta version, be aware that the mod ID changed from `harvestwithease` to `harvest_with_ease`.***
***Backup your configuration file and update the new one at the first run with the beta version.***
***Furthermore, Harvest with ease now requires Cobweb API to work, so install that too!***
***For any problem that might arise, do not hesitate to open an issue on GitHub or contact us directly on our Discord!***

## **Features**

- Right-click to harvest any crop, works with both Vanilla and modded out of the box!
![Harvesting wheat](https://raw.githubusercontent.com/crystal-nest/mod-fancy-assets/main/harvest-with-ease/wheat.gif)
- Works on nether warts and cocoa beans too!
Expand All @@ -29,6 +37,7 @@ It's also compatible with **any** modded crops, to ease your mind of one more th
- **Highly configurable!** See next section for more details.

## **Configuration**

- **`require hoe`**: whether holding a hoe (either hands) is required to right-click harvest, defaults to `false`.
- **`damage on harvest`**: how much damage the hoe should receive upon use, effective only if `> 0` and **`require hoe`** is enabled.
- **`exp on harvest`**: how many experience points should be granted when right-click harvesting or break-harvesting, effective only if `> 0` (note it's exp _points_ and not exp _levels_).
Expand All @@ -49,19 +58,24 @@ It's also compatible with **any** modded crops, to ease your mind of one more th
This last config option is just a safety measure, so far no crop needs it.

## **Dependencies**
| Mod | Loader | Requirement |
| :-: | :----: | :---------: |
| [Forge Config API Port](https://modrinth.com/mod/forge-config-api-port) | Fabric | Required |

| Mod | Loader | Requirement |
|:-----------------------------------------------------------------------:|:------:|:-----------:|
| [Forge Config API Port](https://modrinth.com/mod/forge-config-api-port) | Fabric | Required |

## **License and right of use**

Feel free to use this mod for any modpack or video, just be sure to give credit and possibly link [here](https://github.com/crystal-nest/harvest-with-ease#readme).
This project is published under the [GNU General Public License v3.0](https://github.com/crystal-nest/harvest-with-ease/blob/master/LICENSE).

## **For developers**

Your modded crops will work with this mod out of the box only if they extend the CropBlock class, which is how it should be.
If, for whatever reason, you can't extend that class the **`crops`** config option is there exactly for you. Just add the in-game ID of your crop(s) to make it work, however note that this will work only if your crops have an Integer Property whose name is set to be `"age"` and represents the age values your crops can have, from `0` to a `max` value.
If, for whatever reason, you can't extend that class the **`crops`** config option is there exactly for you. Just add the in-game ID of your crop(s) to make it work, however note that this will work only if your crops have an Integer Property whose name
is set to be `"age"` and represents the age values your crops can have, from `0` to a `max` value.

Since version 6.0.0.0, an API is available to better integrate your mod with this one. Note however that this should rarely be necessary. To learn how to use the provided API follow the [Wiki](https://github.com/crystal-nest/harvest-with-ease/wiki) on [GitHub](https://github.com/crystal-nest/harvest-with-ease).
Since version 6.0.0.0, an API is available to better integrate your mod with this one. Note however that this should rarely be necessary. To learn how to use the provided API follow the [Wiki](https://github.com/crystal-nest/harvest-with-ease/wiki)
on [GitHub](https://github.com/crystal-nest/harvest-with-ease).

## **Support us**

Expand Down
Loading

0 comments on commit b8a95c4

Please sign in to comment.