Skip to content

Commit eff571f

Browse files
LinkachuGamingLinkachuGaming
authored
Merge pull request #27 from LinkachuGaming/1.21.9
Bringing origin back up to date.
2 parents aaccfef + eb79ffc commit eff571f

File tree

74 files changed

+1844
-595
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

74 files changed

+1844
-595
lines changed

‎.gitattributes‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
* text eol=lf
2+
*.bat text eol=crlf
3+
*.patch text eol=lf
4+
*.java text eol=lf
5+
*.gradle text eol=crlf
6+
*.png binary
7+
*.gif binary
8+
*.exe binary
9+
*.dll binary
10+
*.jar binary
11+
*.lzma binary
12+
*.zip binary
13+
*.pyd binary
14+
*.cfg text eol=lf
15+
*.jks binary

‎.github/workflows/.build_all.yml‎

Lines changed: 91 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,91 @@
1+
# Automatically build the project and run any configured tests for every push
2+
# and submitted pull request. This can help catch issues that only occur on
3+
# certain platforms or Java versions, and provides a first line of defence
4+
# against bad commits.
5+
6+
name: build
7+
on: [workflow_dispatch]
8+
9+
jobs:
10+
build:
11+
runs-on: ubuntu-24.04
12+
steps:
13+
- name: checkout repository
14+
uses: actions/checkout@v4
15+
- name: validate gradle wrapper
16+
uses: gradle/actions/wrapper-validation@v4
17+
18+
- name: Get Stackable Version
19+
uses: madhead/read-java-properties@latest
20+
id: version
21+
with:
22+
file: gradle.properties
23+
property: version
24+
default: 0.0.1
25+
26+
- name: Get Minecraft Version
27+
uses: madhead/read-java-properties@latest
28+
id: mc_version
29+
with:
30+
file: gradle.properties
31+
property: minecraft_version
32+
default: 1.0.0
33+
34+
- name: Get Fabric Version
35+
uses: madhead/read-java-properties@latest
36+
id: fabric_version
37+
with:
38+
file: gradle.properties
39+
property: fabric_version
40+
default: 1.0.0
41+
42+
- name: setup jdk
43+
uses: actions/setup-java@v4
44+
with:
45+
java-version: '21'
46+
distribution: 'microsoft'
47+
- name: make gradle wrapper executable
48+
run: chmod +x ./gradlew
49+
- name: build
50+
run: ./gradlew build
51+
52+
- name: Save Fabric artifacts
53+
uses: actions/upload-artifact@v4
54+
with:
55+
name: Fabric
56+
path: fabric/build/libs/
57+
- name: Save Forge artifacts
58+
uses: actions/upload-artifact@v4
59+
with:
60+
name: Forge
61+
path: forge/build/libs/
62+
- name: Save NeoForge artifacts
63+
uses: actions/upload-artifact@v4
64+
with:
65+
name: Neoforge
66+
path: neoforge/build/libs/
67+
68+
- name: MC-Publish
69+
uses: Kir-Antipov/[email protected]
70+
with:
71+
#Modrinth + Curse
72+
modrinth-id: Bc74RbD1
73+
curseforge-id: 857801
74+
modrinth-token: ${{ secrets.MODRINTH_TOKEN }}
75+
curseforge-token: ${{ secrets.CURSEFORGE_TOKEN }}
76+
github-token: ${{ secrets.GITHUB_TOKEN }}
77+
78+
loaders: |
79+
fabric
80+
forge
81+
neoforge
82+
83+
game-versions: |
84+
[${{ steps.mc_version.outputs.value }})
85+
86+
github-tag: ${{ steps.version.outputs.value }}
87+
88+
dependencies:
89+
fabric@${{ steps.fabric_version }}(required){modrinth:P7dR8mSH}{curseforge:306612}#(ignore:github)
90+
91+
changelog-file: CHANGELOG.md

‎.github/workflows/build.yml‎

Lines changed: 0 additions & 40 deletions
This file was deleted.

‎.gitignore‎

Lines changed: 18 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,27 @@
1-
# gradle
2-
3-
.gradle/
4-
build/
5-
out/
6-
classes/
7-
81
# eclipse
9-
2+
bin
103
*.launch
4+
.settings
5+
.metadata
6+
.classpath
7+
.project
118

129
# idea
13-
14-
.idea/
15-
*.iml
10+
out
1611
*.ipr
1712
*.iws
13+
*.iml
14+
.idea/*
15+
!.idea/scopes
1816

19-
# vscode
20-
21-
.settings/
22-
.vscode/
23-
bin/
24-
.classpath
25-
.project
26-
27-
# macos
28-
29-
*.DS_Store
30-
31-
# fabric
32-
33-
run/
17+
# gradle
18+
build
19+
.gradle
3420

35-
# java
21+
# other
22+
eclipse
23+
run
24+
runs
3625

37-
hs_err_*.log
38-
replay_*.log
39-
*.hprof
40-
*.jfr
26+
#
27+
fabric/logs

‎CHANGELOG.md‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
# Welcome to Stackable 2.0.3!
2+
3+
+ Items stacks over 999 will now display without being rounded.
4+
+ Item stacks will scale down as more digits are added
5+
+ There is an option to return to the old setup via the configuration file.
6+
+ Default stacksize is now 1024!
7+
+ This will not affect existing worlds, but this is being done to hopefully stop people from thinking there is still a hard cap.

‎LICENSE‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,4 +118,4 @@ express Statement of Purpose.
118118
Work.
119119
d. Affirmer understands and acknowledges that Creative Commons is not a
120120
party to this document and has no duty or obligation with respect to
121-
this CC0 or use of the Work.
121+
this CC0 or use of the Work.

‎build.gradle‎

Lines changed: 4 additions & 90 deletions
Original file line numberDiff line numberDiff line change
@@ -1,92 +1,6 @@
11
plugins {
2-
id 'fabric-loom' version '1.6-SNAPSHOT'
3-
id 'maven-publish'
4-
}
5-
6-
version = project.mod_version
7-
group = project.maven_group
8-
9-
base {
10-
archivesName = project.archives_base_name
11-
}
12-
13-
repositories {
14-
// Add repositories to retrieve artifacts from in here.
15-
// You should only use this when depending on other mods because
16-
// Loom adds the essential maven repositories to download Minecraft and libraries from automatically.
17-
// See https://docs.gradle.org/current/userguide/declaring_repositories.html
18-
// for more information about repositories.
19-
}
20-
21-
loom {
22-
splitEnvironmentSourceSets()
23-
24-
mods {
25-
"stackable" {
26-
sourceSet sourceSets.main
27-
sourceSet sourceSets.client
28-
}
29-
}
30-
31-
}
32-
33-
dependencies {
34-
// To change the versions see the gradle.properties file
35-
minecraft "com.mojang:minecraft:${project.minecraft_version}"
36-
mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2"
37-
modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
38-
39-
// Fabric API. This is technically optional, but you probably want it anyway.
40-
modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
41-
implementation 'com.google.code.gson:gson:2.10.1'
42-
43-
// Uncomment the following line to enable the deprecated Fabric API modules.
44-
// These are included in the Fabric API production distribution and allow you to update your mod to the latest modules at a later more convenient time.
45-
46-
// modImplementation "net.fabricmc.fabric-api:fabric-api-deprecated:${project.fabric_version}"
47-
}
48-
49-
processResources {
50-
inputs.property "version", project.version
51-
52-
filesMatching("fabric.mod.json") {
53-
expand "version": project.version
54-
}
55-
}
56-
57-
tasks.withType(JavaCompile).configureEach {
58-
it.options.release = 21
59-
}
60-
61-
java {
62-
// Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task
63-
// if it is present.
64-
// If you remove this line, sources will not be generated.
65-
withSourcesJar()
66-
67-
sourceCompatibility = JavaVersion.VERSION_21
68-
targetCompatibility = JavaVersion.VERSION_21
69-
}
70-
71-
jar {
72-
from("LICENSE") {
73-
rename { "${it}_${project.archivesBaseName}"}
74-
}
75-
}
76-
77-
// configure the maven publication
78-
publishing {
79-
publications {
80-
mavenJava(MavenPublication) {
81-
from components.java
82-
}
83-
}
84-
85-
// See https://docs.gradle.org/current/userguide/publishing_maven.html for information on how to set up publishing.
86-
repositories {
87-
// Add repositories to publish to here.
88-
// Notice: This block does NOT have the same function as the block in the top level.
89-
// The repositories here will be used for publishing your artifact, not for
90-
// retrieving dependencies.
91-
}
2+
// see https://fabricmc.net/develop/ for new versions
3+
id 'fabric-loom' version '1.11-SNAPSHOT' apply false
4+
// see https://projects.neoforged.net/neoforged/moddevgradle for new versions
5+
id 'net.neoforged.moddev' version '2.0.112' apply false
926
}

‎buildSrc/build.gradle‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
plugins {
2+
id 'groovy-gradle-plugin'
3+
}

0 commit comments

Comments
 (0)