commit 6af3422ac335df08a808f1f647d4d4c4b3ba2a3e Author: angel Date: Tue Nov 4 19:21:53 2025 +0000 inital diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..097f9f9 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,9 @@ +# +# https://help.github.com/articles/dealing-with-line-endings/ +# +# Linux start script should use lf +/gradlew text eol=lf + +# These are Windows script files and should use crlf +*.bat text eol=crlf + diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml new file mode 100644 index 0000000..8fc3827 --- /dev/null +++ b/.github/workflows/build.yml @@ -0,0 +1,30 @@ +# Automatically build the project and run any configured tests for every push +# and submitted pull request. This can help catch issues that only occur on +# certain platforms or Java versions, and provides a first line of defence +# against bad commits. + +name: build +on: [pull_request, push] + +jobs: + build: + runs-on: ubuntu-24.04 + steps: + - name: checkout repository + uses: actions/checkout@v4 + - name: validate gradle wrapper + uses: gradle/actions/wrapper-validation@v4 + - name: setup jdk + uses: actions/setup-java@v4 + with: + java-version: '21' + distribution: 'microsoft' + - name: make gradle wrapper executable + run: chmod +x ./gradlew + - name: build + run: ./gradlew build + - name: capture build artifacts + uses: actions/upload-artifact@v4 + with: + name: Artifacts + path: build/libs/ \ No newline at end of file diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..c476faf --- /dev/null +++ b/.gitignore @@ -0,0 +1,40 @@ +# gradle + +.gradle/ +build/ +out/ +classes/ + +# eclipse + +*.launch + +# idea + +.idea/ +*.iml +*.ipr +*.iws + +# vscode + +.settings/ +.vscode/ +bin/ +.classpath +.project + +# macos + +*.DS_Store + +# fabric + +run/ + +# java + +hs_err_*.log +replay_*.log +*.hprof +*.jfr diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..1625c17 --- /dev/null +++ b/LICENSE @@ -0,0 +1,121 @@ +Creative Commons Legal Code + +CC0 1.0 Universal + + CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE + LEGAL SERVICES. DISTRIBUTION OF THIS DOCUMENT DOES NOT CREATE AN + ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS + INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES + REGARDING THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS + PROVIDED HEREUNDER, AND DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM + THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS PROVIDED + HEREUNDER. + +Statement of Purpose + +The laws of most jurisdictions throughout the world automatically confer +exclusive Copyright and Related Rights (defined below) upon the creator +and subsequent owner(s) (each and all, an "owner") of an original work of +authorship and/or a database (each, a "Work"). + +Certain owners wish to permanently relinquish those rights to a Work for +the purpose of contributing to a commons of creative, cultural and +scientific works ("Commons") that the public can reliably and without fear +of later claims of infringement build upon, modify, incorporate in other +works, reuse and redistribute as freely as possible in any form whatsoever +and for any purposes, including without limitation commercial purposes. +These owners may contribute to the Commons to promote the ideal of a free +culture and the further production of creative, cultural and scientific +works, or to gain reputation or greater distribution for their Work in +part through the use and efforts of others. + +For these and/or other purposes and motivations, and without any +expectation of additional consideration or compensation, the person +associating CC0 with a Work (the "Affirmer"), to the extent that he or she +is an owner of Copyright and Related Rights in the Work, voluntarily +elects to apply CC0 to the Work and publicly distribute the Work under its +terms, with knowledge of his or her Copyright and Related Rights in the +Work and the meaning and intended legal effect of CC0 on those rights. + +1. Copyright and Related Rights. A Work made available under CC0 may be +protected by copyright and related or neighboring rights ("Copyright and +Related Rights"). Copyright and Related Rights include, but are not +limited to, the following: + + i. the right to reproduce, adapt, distribute, perform, display, + communicate, and translate a Work; + ii. moral rights retained by the original author(s) and/or performer(s); +iii. publicity and privacy rights pertaining to a person's image or + likeness depicted in a Work; + iv. rights protecting against unfair competition in regards to a Work, + subject to the limitations in paragraph 4(a), below; + v. rights protecting the extraction, dissemination, use and reuse of data + in a Work; + vi. database rights (such as those arising under Directive 96/9/EC of the + European Parliament and of the Council of 11 March 1996 on the legal + protection of databases, and under any national implementation + thereof, including any amended or successor version of such + directive); and +vii. other similar, equivalent or corresponding rights throughout the + world based on applicable law or treaty, and any national + implementations thereof. + +2. Waiver. To the greatest extent permitted by, but not in contravention +of, applicable law, Affirmer hereby overtly, fully, permanently, +irrevocably and unconditionally waives, abandons, and surrenders all of +Affirmer's Copyright and Related Rights and associated claims and causes +of action, whether now known or unknown (including existing as well as +future claims and causes of action), in the Work (i) in all territories +worldwide, (ii) for the maximum duration provided by applicable law or +treaty (including future time extensions), (iii) in any current or future +medium and for any number of copies, and (iv) for any purpose whatsoever, +including without limitation commercial, advertising or promotional +purposes (the "Waiver"). Affirmer makes the Waiver for the benefit of each +member of the public at large and to the detriment of Affirmer's heirs and +successors, fully intending that such Waiver shall not be subject to +revocation, rescission, cancellation, termination, or any other legal or +equitable action to disrupt the quiet enjoyment of the Work by the public +as contemplated by Affirmer's express Statement of Purpose. + +3. Public License Fallback. Should any part of the Waiver for any reason +be judged legally invalid or ineffective under applicable law, then the +Waiver shall be preserved to the maximum extent permitted taking into +account Affirmer's express Statement of Purpose. In addition, to the +extent the Waiver is so judged Affirmer hereby grants to each affected +person a royalty-free, non transferable, non sublicensable, non exclusive, +irrevocable and unconditional license to exercise Affirmer's Copyright and +Related Rights in the Work (i) in all territories worldwide, (ii) for the +maximum duration provided by applicable law or treaty (including future +time extensions), (iii) in any current or future medium and for any number +of copies, and (iv) for any purpose whatsoever, including without +limitation commercial, advertising or promotional purposes (the +"License"). The License shall be deemed effective as of the date CC0 was +applied by Affirmer to the Work. Should any part of the License for any +reason be judged legally invalid or ineffective under applicable law, such +partial invalidity or ineffectiveness shall not invalidate the remainder +of the License, and in such case Affirmer hereby affirms that he or she +will not (i) exercise any of his or her remaining Copyright and Related +Rights in the Work or (ii) assert any associated claims and causes of +action with respect to the Work, in either case contrary to Affirmer's +express Statement of Purpose. + +4. Limitations and Disclaimers. + + a. No trademark or patent rights held by Affirmer are waived, abandoned, + surrendered, licensed or otherwise affected by this document. + b. Affirmer offers the Work as-is and makes no representations or + warranties of any kind concerning the Work, express, implied, + statutory or otherwise, including without limitation warranties of + title, merchantability, fitness for a particular purpose, non + infringement, or the absence of latent or other defects, accuracy, or + the present or absence of errors, whether or not discoverable, all to + the greatest extent permissible under applicable law. + c. Affirmer disclaims responsibility for clearing rights of other persons + that may apply to the Work or any use thereof, including without + limitation any person's Copyright and Related Rights in the Work. + Further, Affirmer disclaims responsibility for obtaining any necessary + consents, permissions or other rights required for any use of the + Work. + d. Affirmer understands and acknowledges that Creative Commons is not a + party to this document and has no duty or obligation with respect to + this CC0 or use of the Work. \ No newline at end of file diff --git a/README.md b/README.md new file mode 100644 index 0000000..b32b88e --- /dev/null +++ b/README.md @@ -0,0 +1,100 @@ +# 🔥 TinyTorch + +A Minecraft Fabric mod that makes lighting more realistic and atmospheric by reducing torch brightness and adding optional flickering effects. + +## Features + +### ✨ Core Features + +- **Reduced Light Radius**: Normal torch brightness reduced from light level 14 to configurable level (default: 8) +- **Works for all torch types**: Both standing and wall torches affected +- **Configurable**: All settings customizable via `tinytorch.json` + +### 🎭 Optional Effects + +- **Flicker Effect**: Light level oscillates randomly ±1 every few ticks to simulate flickering flame +- **Particle Effects**: Small smoke and spark particles appear occasionally around torches +- **Held Light**: Torches emit weak light (level 4-5) when held in main/offhand +- **Smart Updates**: Held light only updates when player moves for performance + +### ⚡ Advanced Features + +- **Light Falloff Curve**: Sharper brightness drop-off after a few blocks (dark corners stay dark) +- **Material-Based Lighting**: + - Stone/Cobblestone/Deepslate absorb light slightly + - Iron/Copper/Gold blocks reflect light slightly +- **Performance Optimized**: Lightweight implementation compatible with OptiFine/Sodium + +## Configuration + +The mod creates a `tinytorch.json` config file in your config directory: + +```json +{ + "torch_light_level": 8, + "held_light_level": 5, + "enable_flicker": true, + "flicker_speed": 5, + "use_falloff_curve": true, + "held_light": true +} +``` + +### Config Options + +- `torch_light_level` (0-15): Light level emitted by placed torches (default: 8) +- `held_light_level` (0-15): Light level when holding a torch (default: 5) +- `enable_flicker` (true/false): Enable flickering flame effect (default: true) +- `flicker_speed` (1+): Ticks between flicker changes, higher = slower (default: 5) +- `use_falloff_curve` (true/false): Use custom sharp light falloff (default: true) +- `held_light` (true/false): Enable dynamic lighting when holding torches (default: true) + +## Gameplay Impact + +- **Caves become darker** even with torches, forcing closer placement +- **Building interiors** have cozy, dim lighting atmosphere +- **Night exploration** feels eerie but natural +- **Torches glow gently** in-hand when walking at night +- **Strategic lighting** becomes more important for visibility + +## Installation + +1. Install [Fabric Loader](https://fabricmc.net/use/) +2. Install [Fabric API](https://modrinth.com/mod/fabric-api) +3. Download TinyTorch jar +4. Place in your `mods` folder + +## Compatibility + +- ✅ **Fabric API**: Required +- ✅ **OptiFine**: Compatible +- ✅ **Sodium**: Compatible +- ✅ **Shaders**: Works with vanilla lighting pipeline +- ✅ **Multiplayer**: Server-side mod, clients benefit from effects + +## Technical Details + +- **Minecraft Version**: 1.21.1 +- **Fabric Loader**: 0.17.3+ +- **Java**: 21+ +- **License**: CC0-1.0 + +## Building + +```bash +./gradlew build +``` + +Built jar will be in `build/libs/` + +## Contributing + +Contributions welcome! Please ensure: +- Code follows existing style +- Features are configurable +- Performance impact is minimal +- Works on both client and server + +--- + +*Made with ❤️ for atmospheric Minecraft lighting* \ No newline at end of file diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..eed1bc0 --- /dev/null +++ b/build.gradle @@ -0,0 +1,84 @@ +plugins { + id 'fabric-loom' version "${loom_version}" + id 'maven-publish' +} + +version = project.mod_version +group = project.maven_group + +base { + archivesName = project.archives_base_name +} + +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. +} + +fabricApi { + configureDataGeneration { + client = true + } +} + +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}" + +} + +processResources { + inputs.property "version", project.version + + filesMatching("fabric.mod.json") { + expand "version": inputs.properties.version + } +} + +tasks.withType(JavaCompile).configureEach { + it.options.release = 21 +} + +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() + + sourceCompatibility = JavaVersion.VERSION_21 + targetCompatibility = JavaVersion.VERSION_21 +} + +jar { + inputs.property "archivesName", project.base.archivesName + + from("LICENSE") { + rename { "${it}_${inputs.properties.archivesName}"} + } +} + +// configure the maven publication +publishing { + publications { + create("mavenJava", MavenPublication) { + artifactId = project.archives_base_name + from components.java + } + } + + // See https://docs.gradle.org/current/userguide/publishing_maven.html for information on how to set up publishing. + repositories { + // Add repositories to publish to here. + // Notice: This block does NOT have the same function as the block in the top level. + // The repositories here will be used for publishing your artifact, not for + // retrieving dependencies. + } +} \ No newline at end of file diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 0000000..52435be --- /dev/null +++ b/gradle.properties @@ -0,0 +1,21 @@ +# Done to increase the memory available to gradle. +org.gradle.jvmargs=-Xmx1G +org.gradle.parallel=true + +# IntelliJ IDEA is not yet fully compatible with configuration cache, see: https://github.com/FabricMC/fabric-loom/issues/1349 +org.gradle.configuration-cache=false + +# Fabric Properties +# check these on https://fabricmc.net/develop +minecraft_version=1.21.1 +yarn_mappings=1.21.1+build.3 +loader_version=0.17.3 +loom_version=1.12-SNAPSHOT + +# Mod Properties +mod_version=1.0.0 +maven_group=dev.sillyangel.tinytorch +archives_base_name=tinytorch + +# Dependencies +fabric_version=0.116.7+1.21.1 \ 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..8bdaf60 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 new file mode 100644 index 0000000..2e11132 --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,7 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip +networkTimeout=10000 +validateDistributionUrl=true +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100755 index 0000000..adff685 --- /dev/null +++ b/gradlew @@ -0,0 +1,248 @@ +#!/bin/sh + +# +# Copyright © 2015 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. +# +# SPDX-License-Identifier: Apache-2.0 +# + +############################################################################## +# +# 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/platforms/jvm/plugins-application/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##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || 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 + + + +# 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 + if ! command -v java >/dev/null 2>&1 + then + 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 +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=SC2039,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=SC2039,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" ) + + 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 optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \ + "$@" + +# 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..c4bdd3a --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,93 @@ +@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 +@rem SPDX-License-Identifier: Apache-2.0 +@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. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:execute +@rem Setup the command line + + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* + +: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/settings.gradle b/settings.gradle new file mode 100644 index 0000000..75c4d72 --- /dev/null +++ b/settings.gradle @@ -0,0 +1,10 @@ +pluginManagement { + repositories { + maven { + name = 'Fabric' + url = 'https://maven.fabricmc.net/' + } + mavenCentral() + gradlePluginPortal() + } +} \ No newline at end of file diff --git a/src/main/java/dev/sillyangel/tinytorch/TinyTorch.java b/src/main/java/dev/sillyangel/tinytorch/TinyTorch.java new file mode 100644 index 0000000..f6c2421 --- /dev/null +++ b/src/main/java/dev/sillyangel/tinytorch/TinyTorch.java @@ -0,0 +1,30 @@ +package dev.sillyangel.tinytorch; + +import dev.sillyangel.tinytorch.config.TinyTorchConfig; +import net.fabricmc.api.ModInitializer; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +public class TinyTorch implements ModInitializer { + public static final String MOD_ID = "tinytorch"; + + // This logger is used to write text to the console and the log file. + // It is considered best practice to use your mod id as the logger's name. + // That way, it's clear which mod wrote info, warnings, and errors. + public static final Logger LOGGER = LoggerFactory.getLogger(MOD_ID); + + @Override + public void onInitialize() { + // This code runs as soon as Minecraft is in a mod-load-ready state. + // However, some things (like resources) may still be uninitialized. + // Proceed with mild caution. + + LOGGER.info("TinyTorch initializing..."); + + // Load configuration + TinyTorchConfig config = TinyTorchConfig.getInstance(); + LOGGER.info("TinyTorch config loaded - torch light level: {}, flicker: {}", + config.getValidTorchLightLevel(), config.enable_flicker); + } +} \ No newline at end of file diff --git a/src/main/java/dev/sillyangel/tinytorch/TinyTorchDataGenerator.java b/src/main/java/dev/sillyangel/tinytorch/TinyTorchDataGenerator.java new file mode 100644 index 0000000..c0c7184 --- /dev/null +++ b/src/main/java/dev/sillyangel/tinytorch/TinyTorchDataGenerator.java @@ -0,0 +1,11 @@ +package dev.sillyangel.tinytorch; + +import net.fabricmc.fabric.api.datagen.v1.DataGeneratorEntrypoint; +import net.fabricmc.fabric.api.datagen.v1.FabricDataGenerator; + +public class TinyTorchDataGenerator implements DataGeneratorEntrypoint { + @Override + public void onInitializeDataGenerator(FabricDataGenerator fabricDataGenerator) { + + } +} diff --git a/src/main/java/dev/sillyangel/tinytorch/config/TinyTorchConfig.java b/src/main/java/dev/sillyangel/tinytorch/config/TinyTorchConfig.java new file mode 100644 index 0000000..e075395 --- /dev/null +++ b/src/main/java/dev/sillyangel/tinytorch/config/TinyTorchConfig.java @@ -0,0 +1,70 @@ +package dev.sillyangel.tinytorch.config; + +import com.google.gson.Gson; +import com.google.gson.GsonBuilder; +import dev.sillyangel.tinytorch.TinyTorch; +import net.fabricmc.loader.api.FabricLoader; + +import java.io.IOException; +import java.nio.file.Files; +import java.nio.file.Path; + +public class TinyTorchConfig { + private static final Gson GSON = new GsonBuilder().setPrettyPrinting().create(); + private static final Path CONFIG_PATH = FabricLoader.getInstance().getConfigDir().resolve("tinytorch.json"); + + private static TinyTorchConfig INSTANCE; + + // Configuration fields + public int torch_light_level = 8; + public int held_light_level = 5; + public boolean enable_flicker = true; + public int flicker_speed = 5; + public boolean use_falloff_curve = true; + public boolean held_light = true; + + public static TinyTorchConfig getInstance() { + if (INSTANCE == null) { + INSTANCE = load(); + } + return INSTANCE; + } + + public static TinyTorchConfig load() { + if (Files.exists(CONFIG_PATH)) { + try { + String jsonString = Files.readString(CONFIG_PATH); + return GSON.fromJson(jsonString, TinyTorchConfig.class); + } catch (IOException e) { + TinyTorch.LOGGER.error("Failed to read config file, using defaults", e); + } + } + + TinyTorchConfig config = new TinyTorchConfig(); + config.save(); + return config; + } + + public void save() { + try { + String jsonString = GSON.toJson(this); + Files.createDirectories(CONFIG_PATH.getParent()); + Files.writeString(CONFIG_PATH, jsonString); + } catch (IOException e) { + TinyTorch.LOGGER.error("Failed to save config file", e); + } + } + + // Validation methods + public int getValidTorchLightLevel() { + return Math.max(0, Math.min(15, torch_light_level)); + } + + public int getValidHeldLightLevel() { + return Math.max(0, Math.min(15, held_light_level)); + } + + public int getValidFlickerSpeed() { + return Math.max(1, flicker_speed); + } +} \ No newline at end of file diff --git a/src/main/java/dev/sillyangel/tinytorch/flicker/FlickerManager.java b/src/main/java/dev/sillyangel/tinytorch/flicker/FlickerManager.java new file mode 100644 index 0000000..f394b8e --- /dev/null +++ b/src/main/java/dev/sillyangel/tinytorch/flicker/FlickerManager.java @@ -0,0 +1,127 @@ +package dev.sillyangel.tinytorch.flicker; + +import dev.sillyangel.tinytorch.config.TinyTorchConfig; +import net.minecraft.block.Block; +import net.minecraft.block.Blocks; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.particle.ParticleTypes; +import net.minecraft.server.world.ServerWorld; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.random.Random; +import net.minecraft.world.World; + +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; + +public class FlickerManager { + private static final Map flickeringTorches = new ConcurrentHashMap<>(); + private static int tickCounter = 0; + + public static class FlickerData { + public int baseLight; + public int currentOffset; + public int nextFlickerTick; + + public FlickerData(int baseLight) { + this.baseLight = baseLight; + this.currentOffset = 0; + this.nextFlickerTick = 0; + } + } + + public static void tick(World world) { + TinyTorchConfig config = TinyTorchConfig.getInstance(); + if (!config.enable_flicker) return; + + tickCounter++; + + // Scan around players for torches (performance optimization) + for (PlayerEntity player : world.getPlayers()) { + BlockPos playerPos = player.getBlockPos(); + scanForTorches(world, playerPos, config); + } + + // Update existing flicker states + flickeringTorches.entrySet().removeIf(entry -> { + BlockPos pos = entry.getKey(); + FlickerData data = entry.getValue(); + + // Check if torch still exists + Block block = world.getBlockState(pos).getBlock(); + if (block != Blocks.TORCH && block != Blocks.WALL_TORCH) { + return true; + } + + // Update flicker + if (tickCounter >= data.nextFlickerTick) { + Random random = world.getRandom(); + data.currentOffset = random.nextBoolean() ? (random.nextBoolean() ? 1 : -1) : 0; + data.nextFlickerTick = tickCounter + config.getValidFlickerSpeed() + random.nextInt(config.getValidFlickerSpeed()); + + // Spawn particles occasionally + if (random.nextFloat() < 0.1f) { + spawnFlickerParticles(world, pos, random); + } + } + + return false; + }); + } + + private static void scanForTorches(World world, BlockPos center, TinyTorchConfig config) { + int radius = 16; // Scan 16 blocks around player + for (int x = -radius; x <= radius; x++) { + for (int y = -radius; y <= radius; y++) { + for (int z = -radius; z <= radius; z++) { + BlockPos pos = center.add(x, y, z); + Block block = world.getBlockState(pos).getBlock(); + + if ((block == Blocks.TORCH || block == Blocks.WALL_TORCH) && !flickeringTorches.containsKey(pos)) { + flickeringTorches.put(pos.toImmutable(), new FlickerData(config.getValidTorchLightLevel())); + } + } + } + } + } + + public static void addTorch(BlockPos pos) { + TinyTorchConfig config = TinyTorchConfig.getInstance(); + if (config.enable_flicker) { + flickeringTorches.put(pos.toImmutable(), new FlickerData(config.getValidTorchLightLevel())); + } + } + + public static void removeTorch(BlockPos pos) { + flickeringTorches.remove(pos); + } + + public static int getFlickeredLightLevel(BlockPos pos) { + FlickerData data = flickeringTorches.get(pos); + if (data == null) { + return TinyTorchConfig.getInstance().getValidTorchLightLevel(); + } + + int flickeredLevel = data.baseLight + data.currentOffset; + return Math.max(0, Math.min(15, flickeredLevel)); + } + + private static void spawnFlickerParticles(World world, BlockPos pos, Random random) { + if (world instanceof ServerWorld serverWorld) { + double x = pos.getX() + 0.5 + (random.nextDouble() - 0.5) * 0.3; + double y = pos.getY() + 0.7 + random.nextDouble() * 0.2; + double z = pos.getZ() + 0.5 + (random.nextDouble() - 0.5) * 0.3; + + // Small smoke particles + serverWorld.spawnParticles(ParticleTypes.SMOKE, x, y, z, 1, 0.01, 0.01, 0.01, 0.01); + + // Occasional small flame particles + if (random.nextFloat() < 0.3f) { + serverWorld.spawnParticles(ParticleTypes.SMALL_FLAME, x, y - 0.1, z, 1, 0.01, 0.01, 0.01, 0.0); + } + } + } + + public static void clear() { + flickeringTorches.clear(); + } +} \ No newline at end of file diff --git a/src/main/java/dev/sillyangel/tinytorch/lighting/DynamicLightingManager.java b/src/main/java/dev/sillyangel/tinytorch/lighting/DynamicLightingManager.java new file mode 100644 index 0000000..c27d57c --- /dev/null +++ b/src/main/java/dev/sillyangel/tinytorch/lighting/DynamicLightingManager.java @@ -0,0 +1,139 @@ +package dev.sillyangel.tinytorch.lighting; + +import dev.sillyangel.tinytorch.config.TinyTorchConfig; +import net.minecraft.block.Blocks; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.item.ItemStack; +import net.minecraft.item.Items; +import net.minecraft.server.network.ServerPlayerEntity; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; + +import java.util.HashMap; +import java.util.Map; +import java.util.UUID; +import java.util.concurrent.ConcurrentHashMap; + +public class DynamicLightingManager { + private static final Map playerLights = new ConcurrentHashMap<>(); + + public static class PlayerLightData { + public BlockPos lastPos; + public boolean wasHoldingTorch; + public int lightLevel; + + public PlayerLightData(BlockPos pos, boolean holdingTorch, int lightLevel) { + this.lastPos = pos; + this.wasHoldingTorch = holdingTorch; + this.lightLevel = lightLevel; + } + } + + public static void tick(World world) { + TinyTorchConfig config = TinyTorchConfig.getInstance(); + if (!config.held_light) return; + + // Only process on server side + if (world.isClient) return; + + for (PlayerEntity player : world.getPlayers()) { + if (player instanceof ServerPlayerEntity serverPlayer) { + updatePlayerLight(serverPlayer, config); + } + } + } + + private static void updatePlayerLight(ServerPlayerEntity player, TinyTorchConfig config) { + UUID playerId = player.getUuid(); + BlockPos currentPos = player.getBlockPos(); + boolean isHoldingTorch = isPlayerHoldingTorch(player); + + PlayerLightData lightData = playerLights.get(playerId); + + if (lightData == null) { + lightData = new PlayerLightData(currentPos, isHoldingTorch, 0); + playerLights.put(playerId, lightData); + } + + // Check if player moved or torch holding status changed + boolean posChanged = !currentPos.equals(lightData.lastPos); + boolean torchStatusChanged = isHoldingTorch != lightData.wasHoldingTorch; + + if (posChanged || torchStatusChanged) { + // Remove old light + if (lightData.wasHoldingTorch && lightData.lightLevel > 0) { + removeLightSource(player.getWorld(), lightData.lastPos); + } + + // Add new light if holding torch + if (isHoldingTorch) { + int lightLevel = config.getValidHeldLightLevel(); + addLightSource(player.getWorld(), currentPos, lightLevel); + lightData.lightLevel = lightLevel; + } else { + lightData.lightLevel = 0; + } + + // Update tracking data + lightData.lastPos = currentPos.toImmutable(); + lightData.wasHoldingTorch = isHoldingTorch; + } + } + + private static boolean isPlayerHoldingTorch(PlayerEntity player) { + ItemStack mainHand = player.getMainHandStack(); + ItemStack offHand = player.getOffHandStack(); + + return mainHand.isOf(Items.TORCH) || offHand.isOf(Items.TORCH); + } + + private static void addLightSource(World world, BlockPos pos, int lightLevel) { + // Check if the position is air or a transparent block + if (world.getBlockState(pos).isAir() || !world.getBlockState(pos).isOpaque()) { + // We'll need to implement a custom light source system here + // For now, we'll schedule a light update + world.updateListeners(pos, world.getBlockState(pos), world.getBlockState(pos), 3); + } + } + + private static void removeLightSource(World world, BlockPos pos) { + // Remove the dynamic light source + world.updateListeners(pos, world.getBlockState(pos), world.getBlockState(pos), 3); + } + + public static void onPlayerDisconnect(UUID playerId) { + PlayerLightData lightData = playerLights.remove(playerId); + if (lightData != null && lightData.wasHoldingTorch && lightData.lightLevel > 0) { + // Clean up light source when player disconnects + // Note: We'd need world reference here for proper cleanup + } + } + + public static void clear() { + playerLights.clear(); + } + + public static int getDynamicLightLevel(World world, BlockPos pos) { + TinyTorchConfig config = TinyTorchConfig.getInstance(); + if (!config.held_light) return 0; + + // Check if any player is near this position with a torch + for (PlayerEntity player : world.getPlayers()) { + if (isPlayerHoldingTorch(player)) { + BlockPos playerPos = player.getBlockPos(); + double distance = Math.sqrt(pos.getSquaredDistance(playerPos)); + + if (distance <= 2.0) { // Light radius of 2 blocks + int lightLevel = config.getValidHeldLightLevel(); + // Decrease light level with distance + if (distance > 1.0) { + lightLevel = Math.max(1, lightLevel - (int)(distance - 1.0)); + } + return lightLevel; + } + } + } + + return 0; + } +} \ No newline at end of file diff --git a/src/main/java/dev/sillyangel/tinytorch/lighting/LightFalloffManager.java b/src/main/java/dev/sillyangel/tinytorch/lighting/LightFalloffManager.java new file mode 100644 index 0000000..26a1478 --- /dev/null +++ b/src/main/java/dev/sillyangel/tinytorch/lighting/LightFalloffManager.java @@ -0,0 +1,86 @@ +package dev.sillyangel.tinytorch.lighting; + +import dev.sillyangel.tinytorch.config.TinyTorchConfig; +import net.minecraft.block.BlockState; +import net.minecraft.block.Blocks; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.LightType; +import net.minecraft.world.World; + +public class LightFalloffManager { + + /** + * Calculates custom light falloff for torch lighting + * This creates a sharper dropoff than vanilla lighting + */ + public static int calculateCustomLightLevel(World world, BlockPos pos, int sourceLevel, int distance) { + TinyTorchConfig config = TinyTorchConfig.getInstance(); + if (!config.use_falloff_curve) { + return Math.max(0, sourceLevel - distance); + } + + // Custom falloff curve - drops sharper than vanilla + if (distance == 0) return sourceLevel; + + // Sharp falloff: light drops by 2-3 levels per block instead of 1 + int falloffRate = 2; + if (distance <= 2) falloffRate = 2; + else if (distance <= 4) falloffRate = 3; + else falloffRate = 4; + + int calculatedLevel = sourceLevel - (distance * falloffRate); + + // Apply material-based absorption + BlockState blockState = world.getBlockState(pos); + if (blockState.isOf(Blocks.STONE) || blockState.isOf(Blocks.COBBLESTONE) || + blockState.isOf(Blocks.DEEPSLATE)) { + calculatedLevel = Math.max(0, calculatedLevel - 1); // Stone absorbs light + } else if (blockState.isOf(Blocks.IRON_BLOCK) || blockState.isOf(Blocks.COPPER_BLOCK) || + blockState.isOf(Blocks.GOLD_BLOCK)) { + calculatedLevel = Math.min(15, calculatedLevel + 1); // Metals reflect light + } + + return Math.max(0, Math.min(15, calculatedLevel)); + } + + /** + * Determines if a torch light source should have custom falloff applied + */ + public static boolean shouldApplyCustomFalloff(World world, BlockPos lightSource) { + BlockState state = world.getBlockState(lightSource); + return state.isOf(Blocks.TORCH) || state.isOf(Blocks.WALL_TORCH); + } + + /** + * Gets the effective light level at a position, considering custom falloff + */ + public static int getEffectiveLightLevel(World world, BlockPos pos) { + TinyTorchConfig config = TinyTorchConfig.getInstance(); + if (!config.use_falloff_curve) { + return world.getLightLevel(LightType.BLOCK, pos); + } + + int maxLight = 0; + int searchRadius = 8; // Search for light sources within 8 blocks + + // Check all nearby positions for torch light sources + for (int x = -searchRadius; x <= searchRadius; x++) { + for (int y = -searchRadius; y <= searchRadius; y++) { + for (int z = -searchRadius; z <= searchRadius; z++) { + BlockPos sourcePos = pos.add(x, y, z); + + if (shouldApplyCustomFalloff(world, sourcePos)) { + int distance = Math.max(Math.abs(x), Math.max(Math.abs(y), Math.abs(z))); + int sourceLevel = config.getValidTorchLightLevel(); + int lightAtPos = calculateCustomLightLevel(world, pos, sourceLevel, distance); + maxLight = Math.max(maxLight, lightAtPos); + } + } + } + } + + // Combine with other light sources (like sun, other blocks) + int vanillaLight = world.getLightLevel(LightType.BLOCK, pos); + return Math.max(maxLight, vanillaLight); + } +} \ No newline at end of file diff --git a/src/main/java/dev/sillyangel/tinytorch/mixin/BlockSettingsMixin.java b/src/main/java/dev/sillyangel/tinytorch/mixin/BlockSettingsMixin.java new file mode 100644 index 0000000..712137b --- /dev/null +++ b/src/main/java/dev/sillyangel/tinytorch/mixin/BlockSettingsMixin.java @@ -0,0 +1,20 @@ +package dev.sillyangel.tinytorch.mixin; + +import dev.sillyangel.tinytorch.config.TinyTorchConfig; +import net.minecraft.block.AbstractBlock; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.ModifyArg; + +@Mixin(AbstractBlock.Settings.class) +public class BlockSettingsMixin { + + @ModifyArg(method = "luminance", at = @At("HEAD"), index = 0) + private int modifyTorchLuminance(int luminance) { + // This will be called when torch blocks set their luminance + if (luminance == 14) { // Default torch light level + return TinyTorchConfig.getInstance().getValidTorchLightLevel(); + } + return luminance; + } +} \ No newline at end of file diff --git a/src/main/java/dev/sillyangel/tinytorch/mixin/ServerWorldMixin.java b/src/main/java/dev/sillyangel/tinytorch/mixin/ServerWorldMixin.java new file mode 100644 index 0000000..9286509 --- /dev/null +++ b/src/main/java/dev/sillyangel/tinytorch/mixin/ServerWorldMixin.java @@ -0,0 +1,24 @@ +package dev.sillyangel.tinytorch.mixin; + +import dev.sillyangel.tinytorch.flicker.FlickerManager; +import dev.sillyangel.tinytorch.lighting.DynamicLightingManager; +import net.minecraft.server.world.ServerWorld; +import net.minecraft.world.World; +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(ServerWorld.class) +public class ServerWorldMixin { + + @Inject(method = "tick", at = @At("HEAD")) + private void onWorldTick(CallbackInfo ci) { + ServerWorld world = (ServerWorld) (Object) this; + if (world.getRegistryKey() == World.OVERWORLD) { + // Only tick managers once per server tick for overworld + FlickerManager.tick(world); + DynamicLightingManager.tick(world); + } + } +} \ No newline at end of file diff --git a/src/main/java/dev/sillyangel/tinytorch/mixin/TorchBlockMixin.java b/src/main/java/dev/sillyangel/tinytorch/mixin/TorchBlockMixin.java new file mode 100644 index 0000000..9e96a7b --- /dev/null +++ b/src/main/java/dev/sillyangel/tinytorch/mixin/TorchBlockMixin.java @@ -0,0 +1,10 @@ +package dev.sillyangel.tinytorch.mixin; + +import net.minecraft.block.TorchBlock; +import org.spongepowered.asm.mixin.Mixin; + +@Mixin(TorchBlock.class) +public class TorchBlockMixin { + // Light level modification is handled by BlockSettingsMixin + // Flicker effects will be handled by world tick events +} \ No newline at end of file diff --git a/src/main/java/dev/sillyangel/tinytorch/mixin/WallTorchBlockMixin.java b/src/main/java/dev/sillyangel/tinytorch/mixin/WallTorchBlockMixin.java new file mode 100644 index 0000000..4bfecb3 --- /dev/null +++ b/src/main/java/dev/sillyangel/tinytorch/mixin/WallTorchBlockMixin.java @@ -0,0 +1,10 @@ +package dev.sillyangel.tinytorch.mixin; + +import net.minecraft.block.WallTorchBlock; +import org.spongepowered.asm.mixin.Mixin; + +@Mixin(WallTorchBlock.class) +public class WallTorchBlockMixin { + // Light level modification is handled by BlockSettingsMixin + // Flicker effects will be handled by world tick events +} \ No newline at end of file diff --git a/src/main/resources/assets/tinytorch/icon.png b/src/main/resources/assets/tinytorch/icon.png new file mode 100644 index 0000000..6719935 Binary files /dev/null and b/src/main/resources/assets/tinytorch/icon.png differ diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json new file mode 100644 index 0000000..cac59bb --- /dev/null +++ b/src/main/resources/fabric.mod.json @@ -0,0 +1,38 @@ +{ + "schemaVersion": 1, + "id": "tinytorch", + "version": "${version}", + "name": "TinyTorch", + "description": "Makes Minecraft lighting more realistic and atmospheric by reducing torch brightness, adding flicker effects, and enabling held torch lighting for darker, moodier environments.", + "authors": [ + "SillyAngel" + ], + "contact": { + "homepage": "https://github.com/sillyangel/tinytorch", + "sources": "https://github.com/sillyangel/tinytorch" + }, + "license": "MIT", + "icon": "assets/tinytorch/icon.png", + "environment": "*", + "entrypoints": { + "main": [ + "dev.sillyangel.tinytorch.TinyTorch" + ], + "fabric-datagen": [ + "dev.sillyangel.tinytorch.TinyTorchDataGenerator" + ] + }, + "mixins": [ + "tinytorch.mixins.json" + ], + "depends": { + "fabricloader": ">=0.17.3", + "minecraft": "~1.21.1", + "java": ">=21", + "fabric-api": "*" + }, + "suggests": { + "sodium": "*", + "optifine": "*" + } +} \ No newline at end of file diff --git a/src/main/resources/tinytorch.mixins.json b/src/main/resources/tinytorch.mixins.json new file mode 100644 index 0000000..ca895dc --- /dev/null +++ b/src/main/resources/tinytorch.mixins.json @@ -0,0 +1,23 @@ +{ + "required": true, + "package": "dev.sillyangel.tinytorch.mixin", + "compatibilityLevel": "JAVA_21", + "mixins": [ + "TorchBlockMixin", + "WallTorchBlockMixin", + "ServerWorldMixin", + "BlockSettingsMixin" + ], + "client": [ + + ], + "server": [ + + ], + "injectors": { + "defaultRequire": 1 + }, + "overwrites": { + "requireAnnotations": true + } +} \ No newline at end of file