Skip to content

Commit

Permalink
fabric 1.17
Browse files Browse the repository at this point in the history
  • Loading branch information
lhns committed Jul 14, 2021
1 parent d91f383 commit 12f96e6
Show file tree
Hide file tree
Showing 56 changed files with 995 additions and 17 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
- uses: actions/setup-java@v2.1.0
with:
distribution: 'adopt'
java-version: '11'
java-version: '16'
- name: Grant execute permission for gradlew
run: chmod +x gradlew
- name: Build with Gradle
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
- uses: actions/setup-java@v2.1.0
with:
distribution: 'adopt'
java-version: '11'
java-version: '16'
- name: Grant execute permission for gradlew
run: chmod +x gradlew
- name: Build with Gradle
Expand Down
2 changes: 1 addition & 1 deletion fabric-1.15.2/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ buildscript {
gradlePluginPortal()
}
dependencies {
classpath group: 'net.fabricmc', name: 'fabric-loom', version: '0.7.33'
classpath group: 'net.fabricmc', name: 'fabric-loom', version: '0.9.26'
}
}
apply plugin: 'scala'
Expand Down
2 changes: 1 addition & 1 deletion fabric-1.16.1/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ buildscript {
gradlePluginPortal()
}
dependencies {
classpath group: 'net.fabricmc', name: 'fabric-loom', version: '0.7.33'
classpath group: 'net.fabricmc', name: 'fabric-loom', version: '0.9.26'
}
}
apply plugin: 'scala'
Expand Down
2 changes: 1 addition & 1 deletion fabric-1.16.2/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ buildscript {
gradlePluginPortal()
}
dependencies {
classpath group: 'net.fabricmc', name: 'fabric-loom', version: '0.7.33'
classpath group: 'net.fabricmc', name: 'fabric-loom', version: '0.9.26'
}
}
apply plugin: 'scala'
Expand Down
2 changes: 1 addition & 1 deletion fabric-1.16.4/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ buildscript {
gradlePluginPortal()
}
dependencies {
classpath group: 'net.fabricmc', name: 'fabric-loom', version: '0.7.33'
classpath group: 'net.fabricmc', name: 'fabric-loom', version: '0.9.26'
}
}
apply plugin: 'scala'
Expand Down
102 changes: 102 additions & 0 deletions fabric-1.17/build.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,102 @@
buildscript {
repositories {
jcenter()
maven {
name = 'Fabric'
url = 'https://maven.fabricmc.net/'
}
gradlePluginPortal()
}
dependencies {
classpath group: 'net.fabricmc', name: 'fabric-loom', version: '0.9.26'
}
}
apply plugin: 'scala'
apply plugin: 'fabric-loom'
apply plugin: 'maven-publish'

sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8

archivesBaseName = parent.project.archives_base_name
version = parent.version + "+fabric-" + project.minecraft_version
group = parent.group

configurations {
shadow
compile.extendsFrom(shadow)
}

dependencies {
//to change the versions see the gradle.properties file
minecraft "com.mojang:minecraft:${project.minecraft_version}"
mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2"
modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"

// Fabric API. This is technically optional, but you probably want it anyway.
modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"

modImplementation "net.fabricmc:fabric-language-scala:1.0.0"

compileOnly group: 'com.google.code.findbugs', name: 'jsr305', version: '3.0.2'

// PSA: Some older mods, compiled on Loom 0.2.1, might have outdated Maven POMs.
// You may need to force-disable transitiveness on them.

}

processResources {
inputs.property "version", project.version

filesMatching("fabric.mod.json") {
expand "version": project.version
}
}

// ensure that the encoding is set to UTF-8, no matter what the system default is
// this fixes some edge cases with special characters not displaying correctly
// see http://yodaconditions.net/blog/fix-for-java-file-encoding-problems-with-gradle.html
tasks.withType(JavaCompile) {
options.encoding = "UTF-8"
}

java {
// Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task
// if it is present.
// If you remove this line, sources will not be generated.
withSourcesJar()
}

jar {
from("LICENSE") {
rename { "${it}_${project.archivesBaseName}"}
}
from {
configurations.shadow.collect { file ->
[
"scala-library",
].any { file.toString().contains(it) } ? null : file.isDirectory() ? file : zipTree(file)
}
}
}

// configure the maven publication
publishing {
publications {
mavenJava(MavenPublication) {
// add all the jars that should be included when publishing to maven
artifact(remapJar) {
builtBy remapJar
}
artifact(sourcesJar) {
builtBy remapSourcesJar
}
}
}

// select the repositories you want to publish to
repositories {
// uncomment to publish to the local maven
// mavenLocal()
}
}
8 changes: 8 additions & 0 deletions fabric-1.17/gradle.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
# Fabric Properties
# check these on https://fabricmc.net/use
minecraft_version=1.17.1
yarn_mappings=1.17.1+build.14
loader_version=0.11.3
# Dependencies
# currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric-api/fabric-api
fabric_version=0.37.0+1.17
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
"variants": {
"state=inactive": {
"model": "gameoflife3d:block/cell_cube_inactive"
},
"state=alive": {
"model": "gameoflife3d:block/cell_cube"
},
"state=scheduled_dead": {
"model": "gameoflife3d:block/cell_cube"
},
"state=scheduled_alive": {
"model": "gameoflife3d:block/cell_cube"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
"variants": {
"state=inactive": {
"model": "gameoflife3d:block/cell_flat_inactive"
},
"state=alive": {
"model": "gameoflife3d:block/cell_flat"
},
"state=scheduled_dead": {
"model": "gameoflife3d:block/cell_flat"
},
"state=scheduled_alive": {
"model": "gameoflife3d:block/cell_flat"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"variants": {
"active=false": {
"model": "gameoflife3d:block/cell_support_inactive"
},
"active=true": {
"model": "gameoflife3d:block/cell_support"
}
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"block.gameoflife3d.cell_conway": "John Conways 2D Zelle",
"item.gameoflife3d.cell_conway": "John Conways 2D Zelle",
"block.gameoflife3d.cell_bays": "Carter Bays 3D Zelle",
"item.gameoflife3d.cell_bays": "Carter Bays 3D Zelle",
"block.gameoflife3d.cell_support": "Zellstütze",
"item.gameoflife3d.cell_support": "Zellstütze"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"block.gameoflife3d.cell_conway": "John Conway's 2D Cell",
"item.gameoflife3d.cell_conway": "John Conway's 2D Cell",
"block.gameoflife3d.cell_bays": "Carter Bays' 3D Cell",
"item.gameoflife3d.cell_bays": "Carter Bays' 3D Cell",
"block.gameoflife3d.cell_support": "Cell Support",
"item.gameoflife3d.cell_support": "Cell Support"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "block/cube_all",
"textures": {
"all": "gameoflife3d:block/cell"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "block/cube_all",
"textures": {
"all": "gameoflife3d:block/cell_dead"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "block/cube_all",
"textures": {
"all": "gameoflife3d:block/cell_inactive"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"parent": "gameoflife3d:block/flat",
"textures": {
"bottom": "gameoflife3d:block/cell",
"top": "gameoflife3d:block/cell",
"side": "gameoflife3d:block/cell"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"parent": "gameoflife3d:block/flat",
"textures": {
"bottom": "gameoflife3d:block/cell_dead",
"top": "gameoflife3d:block/cell_dead",
"side": "gameoflife3d:block/cell_dead"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"parent": "gameoflife3d:block/flat",
"textures": {
"bottom": "gameoflife3d:block/cell_inactive",
"top": "gameoflife3d:block/cell_inactive",
"side": "gameoflife3d:block/cell_inactive"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "gameoflife3d:block/cross",
"textures": {
"texture": "gameoflife3d:block/cell"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "gameoflife3d:block/cross",
"textures": {
"texture": "gameoflife3d:block/cell_inactive"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
{
"parent": "block/block",
"textures": {
"particle": "#texture"
},
"elements": [
{
"from": [ 6, 0, 6 ],
"to": [ 10, 16, 10 ],
"faces": {
"down": { "uv": [ 6, 6, 10, 10 ], "texture": "#texture", "cullface": "down" },
"up": { "uv": [ 6, 6, 10, 10 ], "texture": "#texture", "cullface": "up" },
"north": { "uv": [ 6, 0, 10, 16 ], "texture": "#texture" },
"south": { "uv": [ 6, 0, 10, 16 ], "texture": "#texture" },
"west": { "uv": [ 6, 0, 10, 16 ], "texture": "#texture" },
"east": { "uv": [ 6, 0, 10, 16 ], "texture": "#texture" }
}
},
{
"from": [ 6, 6, 0 ],
"to": [ 10, 10, 16 ],
"faces": {
"down": { "uv": [ 6, 0, 10, 16 ], "texture": "#texture" },
"up": { "uv": [ 6, 0, 10, 16 ], "texture": "#texture" },
"north": { "uv": [ 6, 6, 10, 10 ], "texture": "#texture", "cullface": "north" },
"south": { "uv": [ 6, 6, 10, 10 ], "texture": "#texture", "cullface": "south" },
"west": { "uv": [ 0, 6, 16, 10 ], "texture": "#texture" },
"east": { "uv": [ 0, 6, 16, 10 ], "texture": "#texture" }
}
},
{
"from": [ 0, 6, 6 ],
"to": [ 16, 10, 10 ],
"faces": {
"down": { "uv": [ 0, 6, 16, 10 ], "texture": "#texture" },
"up": { "uv": [ 0, 6, 16, 10 ], "texture": "#texture" },
"north": { "uv": [ 0, 6, 16, 10 ], "texture": "#texture" },
"south": { "uv": [ 0, 6, 16, 10 ], "texture": "#texture" },
"west": { "uv": [ 6, 6, 10, 10 ], "texture": "#texture", "cullface": "west" },
"east": { "uv": [ 6, 6, 10, 10 ], "texture": "#texture", "cullface": "east" }
}
}
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{
"parent": "block/block",
"textures": {
"particle": "#side"
},
"elements": [
{
"from": [ 0, 4, 0 ],
"to": [ 16, 12, 16 ],
"faces": {
"down": { "uv": [ 0, 0, 16, 16 ], "texture": "#bottom" },
"up": { "uv": [ 0, 0, 16, 16 ], "texture": "#top" },
"north": { "uv": [ 0, 4, 16, 12 ], "texture": "#side", "cullface": "north" },
"south": { "uv": [ 0, 4, 16, 12 ], "texture": "#side", "cullface": "south" },
"west": { "uv": [ 0, 4, 16, 12 ], "texture": "#side", "cullface": "west" },
"east": { "uv": [ 0, 4, 16, 12 ], "texture": "#side", "cullface": "east" }
}
}
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"parent": "gameoflife3d:block/cell_cube"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"parent": "gameoflife3d:block/cell_flat"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"parent": "gameoflife3d:block/cell_support"
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"type": "minecraft:block"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"type": "minecraft:block"
}
Loading

0 comments on commit 12f96e6

Please # to comment.