diff --git a/.gitea/workflows/build.yml b/.gitea/workflows/build.yml new file mode 100644 index 0000000..afdd9e0 --- /dev/null +++ b/.gitea/workflows/build.yml @@ -0,0 +1,38 @@ +name: build +on: [ pull_request, push ] + +jobs: + build: + strategy: + matrix: + java: [ 17 ] + runs-on: ubuntu-latest + steps: + - name: checkout repository + uses: actions/checkout@v2 + + - name: setup jdk ${{ matrix.java }} + uses: actions/setup-java@v1 + with: + java-version: ${{ matrix.java }} + + - uses: actions/cache@v2 + with: + path: | + ~/.gradle/caches + ~/.gradle/loom-cache + ~/.gradle/wrapper + key: ${{ runner.os }}-gradle-${{ hashFiles('**/gradle-wrapper.properties') }} + restore-keys: ${{ runner.os }}-gradle + + - name: make gradle wrapper executable + run: chmod +x ./gradlew + + - name: build + run: ./gradlew build + + - name: capture build artifacts + uses: actions/upload-artifact@v2 + with: + name: Artifacts + path: build/libs/ diff --git a/build.gradle b/build.gradle index 6d6e08b..86fe39d 100644 --- a/build.gradle +++ b/build.gradle @@ -1,63 +1,101 @@ plugins { id 'fabric-loom' version '1.2-SNAPSHOT' + id "io.github.p03w.machete" version "1.+" // automatic jar compressing on build id 'maven-publish' } -version = project.mod_version +sourceCompatibility = JavaVersion.VERSION_17 +targetCompatibility = JavaVersion.VERSION_17 + +archivesBaseName = project.archives_base_name group = project.maven_group +//String buildNumber = System.getenv("GITHUB_RUN_NUMBER") +String buildNumber = 4 +version = "${mod_version}+${minecraft_version}" + (buildNumber != null ? "-${buildNumber}" : "") + repositories { // Add repositories to retrieve artifacts from in here. // You should only use this when depending on other mods because // Loom adds the essential maven repositories to download Minecraft and libraries from automatically. // See https://docs.gradle.org/current/userguide/declaring_repositories.html // for more information about repositories. + maven { url = "https://maven.shedaniel.me/" } // Cloth Config, REI + maven { url = "https://dvs1.progwml6.com/files/maven/" } // JEI + maven { url = "https://maven.parchmentmc.org" } // Parchment mappings + maven { url = "https://maven.quiltmc.org/repository/release" } // Quilt Mappings + maven { url = "https://api.modrinth.com/maven" } // LazyDFU + maven { url = "https://maven.terraformersmc.com/releases/" } // Mod Menu + maven { url = "https://mvn.devos.one/snapshots/" } // Create, Porting Lib, Forge Tags, Milk Lib, Registrate + maven { url = "https://cursemaven.com" } // Forge Config API Port + maven { url = "https://maven.jamieswhiteshirt.com/libs-release" } // Reach Entity Attributes + maven { url = "https://jitpack.io/" } // Mixin Extras, Fabric ASM + maven { url = "https://maven.tterrag.com/" } // Flywheel + + maven { + url 'https://www.cursemaven.com' + content { + includeGroup "curse.maven" + } + } } 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}" + mappings(loom.layered { + it.mappings("org.quiltmc:quilt-mappings:${minecraft_version}+build.${qm_version}:intermediary-v2") + it.parchment("org.parchmentmc.data:parchment-${minecraft_version}:${parchment_version}@zip") + it.officialMojangMappings { nameSyntheticMembers = false } + }) + modImplementation("net.fabricmc:fabric-loader:${fabric_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-api:fabric-api:${fabric_api_version}") + + // Create - dependencies are added transitively + modImplementation("com.simibubi.create:create-fabric-${minecraft_version}:${create_version}") + + // Thin Air + modImplementation("curse.maven:new-thin-air-878379:4611944") + + // Development QOL + modLocalRuntime("maven.modrinth:lazydfu:${lazydfu_version}") + modLocalRuntime("com.terraformersmc:modmenu:${modmenu_version}") + + // Recipe Viewers - Create Fabric supports JEI, REI, and EMI. + // See root gradle.properties to choose which to use at runtime. + switch (recipe_viewer.toLowerCase(Locale.ROOT)) { + case "jei": modLocalRuntime("mezz.jei:jei-${minecraft_version}-fabric:${jei_version}"); break + case "rei": modLocalRuntime("me.shedaniel:RoughlyEnoughItems-fabric:${rei_version}"); break + case "emi": modLocalRuntime("dev.emi:emi:${emi_version}"); break + case "disabled": break + default: println("Unknown recipe viewer specified: ${recipe_viewer}. Must be JEI, REI, EMI, or disabled.") + } } processResources { - inputs.property "version", project.version - inputs.property "minecraft_version", project.minecraft_version - inputs.property "loader_version", project.loader_version - filteringCharset "UTF-8" + // require dependencies to be the version compiled against or newer + Map properties = new HashMap<>() + properties.put("version", version) + properties.put("fabric_loader_version", fabric_loader_version) + properties.put("fabric_api_version", fabric_api_version) + properties.put("create_version", create_version) + properties.put("minecraft_version", minecraft_version) + + properties.forEach((k, v) -> inputs.property(k, v)) filesMatching("fabric.mod.json") { - expand "version": project.version, - "minecraft_version": project.minecraft_version, - "loader_version": project.loader_version + expand properties } } -def targetJavaVersion = 17 tasks.withType(JavaCompile).configureEach { - // 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 - // If Javadoc is generated, this must be specified in that task too. it.options.encoding = "UTF-8" - if (targetJavaVersion >= 10 || JavaVersion.current().isJava10Compatible()) { - it.options.release = targetJavaVersion - } + it.options.release = Integer.parseInt(sourceCompatibility) } java { - def javaVersion = JavaVersion.toVersion(targetJavaVersion) - if (JavaVersion.current() < javaVersion) { - toolchain.languageVersion = JavaLanguageVersion.of(targetJavaVersion) - } - archivesBaseName = project.archives_base_name - // 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() } diff --git a/gradle.properties b/gradle.properties index 6137cce..e2041ec 100644 --- a/gradle.properties +++ b/gradle.properties @@ -5,13 +5,27 @@ org.gradle.jvmargs=-Xmx1G # check these on https://modmuss50.me/fabric.html minecraft_version=1.20.1 yarn_mappings=1.20.1+build.10 - loader_version=0.14.24 + fabric_loader_version=0.14.24 + # check this on https://modmuss50.me/fabric.html + fabric_api_version=0.90.0+1.20.1 + +# Mappings + # https://lambdaurora.dev/tools/import_quilt.html + qm_version = 23 + # https://parchmentmc.org/docs/getting-started + parchment_version = 2023.06.26 # Mod Properties mod_version = 1.0 - maven_group = ru.bitheaven.createairfabric - archives_base_name = CreateAirFabric + maven_group = ru.bitheaven + archives_base_name = createairfabric # Dependencies - # check this on https://modmuss50.me/fabric.html - fabric_version=0.90.0+1.20.1 + # https://modrinth.com/mod/create-fabric/versions + create_version = 0.5.1-d-build.1161+mc1.20.1 + # set to disabled to have none of them. + recipe_viewer = disabled + # Mod Menu - https://modrinth.com/mod/modmenu/versions + modmenu_version = 4.1.2 + # LazyDFU - https://modrinth.com/mod/lazydfu/versions + lazydfu_version = 0.1.3 \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..c1962a7 Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 02f683e..37aef8d 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1 +1,6 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip +networkTimeout=10000 +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100755 index 0000000..aeb74cb --- /dev/null +++ b/gradlew @@ -0,0 +1,245 @@ +#!/bin/sh + +# +# Copyright © 2015-2021 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +############################################################################## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# 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/. +# +############################################################################## + +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +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 +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + 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 +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + 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. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..6689b85 --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,92 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%"=="" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if %ERRORLEVEL% equ 0 goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/src/main/java/ru/bitheaven/createairfabric/CreateAirFabric.java b/src/main/java/ru/bitheaven/createairfabric/CreateAirFabric.java new file mode 100644 index 0000000..493e14d --- /dev/null +++ b/src/main/java/ru/bitheaven/createairfabric/CreateAirFabric.java @@ -0,0 +1,35 @@ +package ru.bitheaven.createairfabric; + +import com.simibubi.create.Create; +import fuzs.thinair.helper.AirHelper; +import fuzs.thinair.helper.AirQualityLevel; +import io.github.fabricators_of_create.porting_lib.util.EnvExecutor; +import net.fabricmc.api.ModInitializer; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.world.entity.LivingEntity; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +public class CreateAirFabric implements ModInitializer { + public static final String ID = "createairfabric"; + public static final String NAME = "Create Air Fabric"; + public static final Logger LOGGER = LoggerFactory.getLogger(NAME); + + @Override + public void onInitialize() { + LOGGER.info("Create addon mod [{}] is loading alongside Create [{}]!", NAME, Create.VERSION); + LOGGER.info(EnvExecutor.unsafeRunForDist( + () -> () -> "{} is accessing Porting Lib from the client!", + () -> () -> "{} is accessing Porting Lib from the server!" + ), NAME); + } + + public static boolean airQualityActivatesHelmet(LivingEntity entity) { + final var air = AirHelper.getO2LevelFromLocation(entity.getEyePosition(), entity.level()).getFirst(); + return air == AirQualityLevel.RED || air == AirQualityLevel.YELLOW; + } + + public static ResourceLocation id(String path) { + return new ResourceLocation(ID, path); + } +} \ No newline at end of file diff --git a/src/main/java/ru/bitheaven/createairfabric/mixin/DivingHelmetItemMixin.java b/src/main/java/ru/bitheaven/createairfabric/mixin/DivingHelmetItemMixin.java new file mode 100644 index 0000000..e962935 --- /dev/null +++ b/src/main/java/ru/bitheaven/createairfabric/mixin/DivingHelmetItemMixin.java @@ -0,0 +1,26 @@ +package ru.bitheaven.createairfabric.mixin; + +import fuzs.thinair.helper.AirHelper; +import fuzs.thinair.helper.AirQualityLevel; +import net.minecraft.tags.TagKey; +import net.minecraft.world.level.material.Fluid; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Redirect; + +import ru.bitheaven.createairfabric.CreateAirFabric; +import com.simibubi.create.content.equipment.armor.DivingHelmetItem; + +import net.minecraft.world.entity.LivingEntity; + +@Mixin(DivingHelmetItem.class) +public abstract class DivingHelmetItemMixin { + /** + * Activate helmet "if in water or lava" -> "if in water or bad air or lava" + */ + @Redirect(at = @At(value = "INVOKE", target = "Lnet/minecraft/world/entity/LivingEntity;isEyeInFluid(Lnet/minecraft/tags/TagKey;)Z"), + method = "breatheUnderwater(Lnet/minecraft/world/entity/LivingEntity;)V") + private static boolean redirectBreatheUnderwater(LivingEntity entity, TagKey fluidTagKey) { + return entity.isEyeInFluid(fluidTagKey) || CreateAirFabric.airQualityActivatesHelmet(entity); + } +} \ No newline at end of file diff --git a/src/main/java/ru/bitheaven/createairfabric/mixin/MinecraftMixin.java b/src/main/java/ru/bitheaven/createairfabric/mixin/MinecraftMixin.java new file mode 100644 index 0000000..7ea766c --- /dev/null +++ b/src/main/java/ru/bitheaven/createairfabric/mixin/MinecraftMixin.java @@ -0,0 +1,20 @@ +package ru.bitheaven.createairfabric.mixin; + +import ru.bitheaven.createairfabric.CreateAirFabric; + +import net.minecraft.client.Minecraft; + +import net.minecraft.client.main.GameConfig; + +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; + +@Mixin(Minecraft.class) +public class MinecraftMixin { + @Inject(method = "", at = @At("TAIL")) + private void example$init(GameConfig gameConfig, CallbackInfo ci) { + CreateAirFabric.LOGGER.info("Hello from {}", CreateAirFabric.NAME); + } +} \ No newline at end of file diff --git a/src/main/resources/assets/createairfabric/icon.png b/src/main/resources/assets/createairfabric/icon.png new file mode 100644 index 0000000..cb8ae32 Binary files /dev/null and b/src/main/resources/assets/createairfabric/icon.png differ diff --git a/src/main/resources/createairfabric.mixins.json b/src/main/resources/createairfabric.mixins.json new file mode 100644 index 0000000..a395171 --- /dev/null +++ b/src/main/resources/createairfabric.mixins.json @@ -0,0 +1,15 @@ +{ + "required": true, + "minVersion": "0.8", + "package": "ru.bitheaven.createairfabric.mixin", + "compatibilityLevel": "JAVA_17", + "mixins": [ + "DivingHelmetItemMixin" + ], + "client": [ + "MinecraftMixin" + ], + "injectors": { + "defaultRequire": 1 + } +} \ No newline at end of file diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 8916cdf..d109b9e 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -4,15 +4,28 @@ "version": "${version}", "name": "Create Air Fabric", "description": "Addon for compatibility Create and Thin Air", - "authors": [], - "contact": {}, + "authors": [ + "BitHeaven" + ], + "contact": { + "website": "https://bitheaven.ru", + "repo": "https://git.bitheaven.ru/bitheaven/create-air-fabric" + }, "license": "GPL-3.0", "icon": "assets/createairfabric/icon.png", "environment": "*", - "entrypoints": {}, + "entrypoints": { + "main": [ + "ru.bitheaven.createairfabric.CreateAirFabric" + ] + }, + "mixins": [ + "createairfabric.mixins.json" + ], "depends": { - "fabricloader": ">=${loader_version}", + "fabricloader": ">=${fabric_loader_version}", "fabric": "*", - "minecraft": "${minecraft_version}" + "minecraft": "${minecraft_version}", + "create": "${create_version}" } }