Skip to content

Commit

Permalink
Merge pull request #73 from Bunnui/origin_1.20.X
Browse files Browse the repository at this point in the history
Update version to 1.20.1
  • Loading branch information
LXYan2333 authored Aug 17, 2023
2 parents b567a4d + 741c9d0 commit c2939f7
Show file tree
Hide file tree
Showing 4 changed files with 24 additions and 25 deletions.
13 changes: 10 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id 'fabric-loom' version '0.12-SNAPSHOT'
id 'fabric-loom' version '1.2-SNAPSHOT'
id 'maven-publish'
}

Expand Down Expand Up @@ -52,10 +52,17 @@ dependencies {
}

processResources {
inputs.property "version", project.version
inputs.property("version", project.version)
inputs.property("minecraft_version", project.property("minecraft_version"))
inputs.property("loader_version", project.property("loader_version"))

filteringCharset "UTF-8"
filesMatching("fabric.mod.json") {
expand "version": project.version
expand([
"version" : project.version,
"minecraft_version": project.property("minecraft_version"),
"loader_version" : project.property("loader_version")
])
}
}

Expand Down
22 changes: 9 additions & 13 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -2,24 +2,20 @@
org.gradle.jvmargs=-Xmx1G

# # Fabric Properties
# # check these on https://fabricmc.net/versions.html
# minecraft_version=1.17.1
# yarn_mappings=1.17.1+build.39
# loader_version=0.11.6
# # check these on https://fabricmc.net/develop/

# Mod Properties
mod_version = 1.0.1
maven_group = yan.lx.bedrockMiner
archives_base_name = bedrock-miner
mod_version=1.0.1
maven_group=yan.lx.bedrockMiner
archives_base_name=bedrock-miner

# # Dependencies

minecraft_version=1.20
yarn_mappings=1.20+build.1
loader_version=0.14.21
# Dependencies
minecraft_version=1.20.1
yarn_mappings=1.20.1+build.10
loader_version=0.14.22

#Fabric api
fabric_version=0.83.0+1.20
fabric_version=0.86.1+1.20.1

## 代理
#systemProp.http.proxyHost=127.0.0.1
Expand Down
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
zipStorePath=wrapper/dists
10 changes: 3 additions & 7 deletions src/main/resources/fabric.mod.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
{
"schemaVersion": 1,
"id": "bedrockminer",
"version": "1.0.0",

"version": "${version}",
"name": "Bedrock Miner",
"description": "Client mod to mine bedrock!",
"authors": [
Expand All @@ -12,10 +11,8 @@
"homepage": "https://github.com/LXYan2333/Fabric-Bedrock-Miner",
"sources": "https://github.com/LXYan2333/Fabric-Bedrock-Miner"
},

"license": "",
"icon": "assets/bedrockminer/icon.png",

"environment": "*",
"entrypoints": {
"main": [
Expand All @@ -24,10 +21,9 @@
"mixins": [
"bedrock-miner.mixins.json"
],

"depends": {
"fabricloader": ">=0.14.21",
"minecraft": "1.20.x",
"fabricloader": ">=${loader_version}",
"minecraft": ">=${minecraft_version}",
"java": ">=17"
},
"suggests": {
Expand Down

0 comments on commit c2939f7

Please sign in to comment.