Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fuck you mr cheeze (fixed refinery recipe book categories / added fabric asm) #99

Merged
merged 10 commits into from
Jun 8, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
57 changes: 28 additions & 29 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,21 +1,29 @@
plugins {
id 'java-library'
id 'idea'
id 'fabric-loom' version '1.0-SNAPSHOT'
id 'fabric-loom' version '1.2-SNAPSHOT'
id "maven-publish"
id 'io.github.juuxel.loom-quiltflower' version '1.8.0'
id "com.modrinth.minotaur" version "1.1.0"
}

/* Setup */
def ENV = System.getenv()
/* Data Generation */
def dataOutput = 'src/main/generated'
loom {
accessWidenerPath = file("src/main/resources/jineric.accesswidener")
runs {
datagenClient {
inherit client
name "Data Generation"
vmArg "-Dfabric-api.datagen"
vmArg "-Dfabric-api.datagen.output-dir=${file(dataOutput)}"

sourceCompatibility = targetCompatibility = JavaVersion.VERSION_17
tasks.withType(JavaCompile).configureEach { it.options.release = 17 }
runDir "build/datagen"
}
}
}

group = project.maven_group
archivesBaseName = project.mod_id
version = project.version
sourceSets { main { resources { srcDirs += dataOutput } } }

/* Dependencies */
repositories {
Expand All @@ -29,6 +37,13 @@ repositories {
}
}

tasks.withType(JavaCompile).configureEach { it.options.release = 17 }
sourceCompatibility = targetCompatibility = JavaVersion.VERSION_17

group = project.maven_group
archivesBaseName = project.archives_base_name
version = project.version

dependencies {
minecraft "com.mojang:minecraft:${project.minecraft_version}"
mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2"
Expand All @@ -43,6 +58,8 @@ dependencies {
implementation("com.github.LlamaLad7:MixinExtras:0.1.1")
include "com.github.LlamaLad7:MixinExtras:0.1.1"
annotationProcessor("com.github.LlamaLad7:MixinExtras:0.1.1")

include implementation ('com.github.Chocohead:Fabric-ASM:v2.3')
}

/* Resource Processing */
Expand All @@ -56,9 +73,9 @@ processResources {

filesMatching("fabric.mod.json") {
expand(
"version": project.version,
"mod_id": project.mod_id,
"mod_name": project.name,
"version": project.version,
"mod_id": project.mod_id,
"mod_name": project.name,
// "mod_description": project.description,
// "main_class": project.main_class
)
Expand All @@ -71,24 +88,6 @@ jar {
}
}

/* Data Generation */
def dataOutput = 'src/main/generated'
loom {
runs {
datagenClient {
inherit client
name "Data Generation"
vmArg "-Dfabric-api.datagen"
vmArg "-Dfabric-api.datagen.output-dir=${file(dataOutput)}"

runDir "build/datagen"
}
}
accessWidenerPath = file("src/main/resources/jineric.accesswidener")
}

sourceSets { main { resources { srcDirs += dataOutput } } }

/* Publishing */
java { withSourcesJar() }

Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
3 changes: 2 additions & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
networkTimeout=10000
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
25 changes: 18 additions & 7 deletions gradlew
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
# Darwin, MinGW, and NonStop.
#
# (3) This script is generated from the Groovy template
# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
# within the Gradle project.
#
# You can find Gradle at https://github.com/gradle/gradle/.
Expand All @@ -80,13 +80,10 @@ do
esac
done

APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit

APP_NAME="Gradle"
# This is normally unused
# shellcheck disable=SC2034
APP_BASE_NAME=${0##*/}

# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit

# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD=maximum
Expand Down Expand Up @@ -143,12 +140,16 @@ fi
if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
case $MAX_FD in #(
max*)
# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
# shellcheck disable=SC3045
MAX_FD=$( ulimit -H -n ) ||
warn "Could not query maximum file descriptor limit"
esac
case $MAX_FD in #(
'' | soft) :;; #(
*)
# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
# shellcheck disable=SC3045
ulimit -n "$MAX_FD" ||
warn "Could not set maximum file descriptor limit to $MAX_FD"
esac
Expand Down Expand Up @@ -193,6 +194,10 @@ if "$cygwin" || "$msys" ; then
done
fi


# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'

# Collect all arguments for the java command;
# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
# shell script including quotes and variable substitutions, so put them in
Expand All @@ -205,6 +210,12 @@ set -- \
org.gradle.wrapper.GradleWrapperMain \
"$@"

# Stop when "xargs" is not available.
if ! command -v xargs >/dev/null 2>&1
then
die "xargs is not available"
fi

# Use "xargs" to parse quoted args.
#
# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
Expand Down
5 changes: 1 addition & 4 deletions settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,7 @@ pluginManagement {
name = 'Fabric'
url = 'https://maven.fabricmc.net/'
}
maven {
name = 'Cotton'
url = 'https://server.bbkr.space/artifactory/libs-release/'
}
mavenCentral()
gradlePluginPortal()
}
}
Expand Down
13 changes: 13 additions & 0 deletions src/main/generated/assets/jineric/blockstates/snow_brick_slab.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{
"variants": {
"type=bottom": {
"model": "jineric:block/snow_brick_slab"
},
"type=double": {
"model": "jineric:block/snow_brick_slab_double"
},
"type=top": {
"model": "jineric:block/snow_brick_slab_top"
}
}
}
Loading