summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinnea Gräf <nea@nea.moe>2024-11-09 18:11:18 +0100
committerLinnea Gräf <nea@nea.moe>2024-11-09 18:11:18 +0100
commit94f12b5bc032aac26371bf5c086492436d92878c (patch)
treec940adb066653ed4f1386e8ded60d064375861dd
downloadbeacon-range-extender-94f12b5bc032aac26371bf5c086492436d92878c.tar.gz
beacon-range-extender-94f12b5bc032aac26371bf5c086492436d92878c.tar.bz2
beacon-range-extender-94f12b5bc032aac26371bf5c086492436d92878c.zip
Init
-rw-r--r--.gitattributes9
-rw-r--r--.github/workflows/build.yml37
-rw-r--r--.gitignore40
-rw-r--r--LICENSE121
-rw-r--r--build.gradle76
-rw-r--r--gradle.properties16
-rw-r--r--gradle/wrapper/gradle-wrapper.jarbin0 -> 43583 bytes
-rw-r--r--gradle/wrapper/gradle-wrapper.properties7
-rwxr-xr-xgradlew252
-rw-r--r--gradlew.bat94
-rw-r--r--settings.gradle10
-rw-r--r--src/main/java/moe/nea/beacons/BeaconBeamSectionExtra.java13
-rw-r--r--src/main/java/moe/nea/beacons/BeaconBlockEntityExtra.java17
-rw-r--r--src/main/java/moe/nea/beacons/BeaconRangeExtender.java5
-rw-r--r--src/main/java/moe/nea/beacons/BeaconRangeIncreaser.java16
-rw-r--r--src/main/java/moe/nea/beacons/mixin/BeaconBeamSectionMixin.java22
-rw-r--r--src/main/java/moe/nea/beacons/mixin/BeaconMixin.java94
-rw-r--r--src/main/java/moe/nea/beacons/mixin/SkullBlockRangeExtender.java14
-rw-r--r--src/main/resources/assets/beacon-range-increaser/icon.pngbin0 -> 5789 bytes
-rw-r--r--src/main/resources/beacon-range-increaser.mixins.json13
-rw-r--r--src/main/resources/fabric.mod.json30
21 files changed, 886 insertions, 0 deletions
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..b01da52
--- /dev/null
+++ b/.github/workflows/build.yml
@@ -0,0 +1,37 @@
+# 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:
+ strategy:
+ matrix:
+ # Use these Java versions
+ java: [
+ 21, # Current Java LTS
+ ]
+ runs-on: ubuntu-22.04
+ steps:
+ - name: checkout repository
+ uses: actions/checkout@v4
+ - name: validate gradle wrapper
+ uses: gradle/wrapper-validation-action@v2
+ - name: setup jdk ${{ matrix.java }}
+ uses: actions/setup-java@v4
+ with:
+ java-version: ${{ matrix.java }}
+ distribution: 'microsoft'
+ - name: make gradle wrapper executable
+ run: chmod +x ./gradlew
+ - name: build
+ run: ./gradlew build
+ - name: capture build artifacts
+ if: ${{ matrix.java == '21' }} # Only upload artifacts built from latest java
+ 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/build.gradle b/build.gradle
new file mode 100644
index 0000000..251ce04
--- /dev/null
+++ b/build.gradle
@@ -0,0 +1,76 @@
+plugins {
+ id 'fabric-loom' version '1.8-SNAPSHOT'
+ 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.
+}
+
+dependencies {
+ // To change the versions see the gradle.properties file
+ minecraft "com.mojang:minecraft:${project.minecraft_version}"
+ mappings loom.officialMojangMappings()
+ 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": project.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 {
+ from("LICENSE") {
+ rename { "${it}_${project.base.archivesName.get()}"}
+ }
+}
+
+// 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..7c6175e
--- /dev/null
+++ b/gradle.properties
@@ -0,0 +1,16 @@
+# Done to increase the memory available to gradle.
+org.gradle.jvmargs=-Xmx1G
+org.gradle.parallel=true
+
+# Fabric Properties
+# check these on https://fabricmc.net/develop
+minecraft_version=1.21
+loader_version=0.16.9
+
+# Mod Properties
+mod_version=1.0.0
+maven_group=moe.nea.beacons
+archives_base_name=beacon-range-increaser
+
+# Dependencies
+fabric_version=0.102.0+1.21 \ 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..a4b76b9
--- /dev/null
+++ b/gradle/wrapper/gradle-wrapper.jar
Binary files differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 0000000..df97d72
--- /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-8.10.2-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..f5feea6
--- /dev/null
+++ b/gradlew
@@ -0,0 +1,252 @@
+#!/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.
+#
+# 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
+' "$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
+
+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
+ 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" )
+ 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, 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" \
+ -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..9d21a21
--- /dev/null
+++ b/gradlew.bat
@@ -0,0 +1,94 @@
+@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
+
+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/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/moe/nea/beacons/BeaconBeamSectionExtra.java b/src/main/java/moe/nea/beacons/BeaconBeamSectionExtra.java
new file mode 100644
index 0000000..2f5698a
--- /dev/null
+++ b/src/main/java/moe/nea/beacons/BeaconBeamSectionExtra.java
@@ -0,0 +1,13 @@
+package moe.nea.beacons;
+
+import net.minecraft.world.level.block.entity.BeaconBlockEntity;
+
+public interface BeaconBeamSectionExtra {
+ static BeaconBeamSectionExtra cast(BeaconBlockEntity.BeaconBeamSection beaconBeamSection) {
+ return (BeaconBeamSectionExtra) beaconBeamSection;
+ }
+
+ void setRangeExtenders_nea(int newRangeExtenders);
+
+ int getRangeExtenders_nea();
+}
diff --git a/src/main/java/moe/nea/beacons/BeaconBlockEntityExtra.java b/src/main/java/moe/nea/beacons/BeaconBlockEntityExtra.java
new file mode 100644
index 0000000..46eb2eb
--- /dev/null
+++ b/src/main/java/moe/nea/beacons/BeaconBlockEntityExtra.java
@@ -0,0 +1,17 @@
+package moe.nea.beacons;
+
+import net.minecraft.world.level.block.entity.BeaconBlockEntity;
+
+import java.util.List;
+
+public interface BeaconBlockEntityExtra {
+ static BeaconBlockEntityExtra cast(BeaconBlockEntity beaconBlockEntity) {
+ return (BeaconBlockEntityExtra) beaconBlockEntity;
+ }
+
+ void setRangeExtender_nea(int rangeExtender);
+
+ int getRangeExtender_nea();
+
+ List<BeaconBlockEntity.BeaconBeamSection> getCheckingBeamSections_nea();
+}
diff --git a/src/main/java/moe/nea/beacons/BeaconRangeExtender.java b/src/main/java/moe/nea/beacons/BeaconRangeExtender.java
new file mode 100644
index 0000000..f4fd12e
--- /dev/null
+++ b/src/main/java/moe/nea/beacons/BeaconRangeExtender.java
@@ -0,0 +1,5 @@
+package moe.nea.beacons;
+
+public interface BeaconRangeExtender {
+ int extraBeaconRange_nea();
+}
diff --git a/src/main/java/moe/nea/beacons/BeaconRangeIncreaser.java b/src/main/java/moe/nea/beacons/BeaconRangeIncreaser.java
new file mode 100644
index 0000000..702a4fe
--- /dev/null
+++ b/src/main/java/moe/nea/beacons/BeaconRangeIncreaser.java
@@ -0,0 +1,16 @@
+package moe.nea.beacons;
+
+import net.fabricmc.api.ModInitializer;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class BeaconRangeIncreaser implements ModInitializer {
+ public static final String MOD_ID = "beacon-range-increaser";
+
+ public static final Logger LOGGER = LoggerFactory.getLogger(MOD_ID);
+
+ @Override
+ public void onInitialize() {
+ }
+} \ No newline at end of file
diff --git a/src/main/java/moe/nea/beacons/mixin/BeaconBeamSectionMixin.java b/src/main/java/moe/nea/beacons/mixin/BeaconBeamSectionMixin.java
new file mode 100644
index 0000000..f4fe948
--- /dev/null
+++ b/src/main/java/moe/nea/beacons/mixin/BeaconBeamSectionMixin.java
@@ -0,0 +1,22 @@
+package moe.nea.beacons.mixin;
+
+import moe.nea.beacons.BeaconBeamSectionExtra;
+import net.minecraft.world.level.block.entity.BeaconBlockEntity;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Unique;
+
+@Mixin(BeaconBlockEntity.BeaconBeamSection.class)
+public class BeaconBeamSectionMixin implements BeaconBeamSectionExtra {
+ @Unique
+ private int rangeExtenders;
+
+ @Override
+ public void setRangeExtenders_nea(int newRangeExtenders) {
+ rangeExtenders = newRangeExtenders;
+ }
+
+ @Override
+ public int getRangeExtenders_nea() {
+ return rangeExtenders;
+ }
+}
diff --git a/src/main/java/moe/nea/beacons/mixin/BeaconMixin.java b/src/main/java/moe/nea/beacons/mixin/BeaconMixin.java
new file mode 100644
index 0000000..4602208
--- /dev/null
+++ b/src/main/java/moe/nea/beacons/mixin/BeaconMixin.java
@@ -0,0 +1,94 @@
+package moe.nea.beacons.mixin;
+
+import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
+import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
+import com.llamalad7.mixinextras.sugar.Local;
+import moe.nea.beacons.BeaconBeamSectionExtra;
+import moe.nea.beacons.BeaconBlockEntityExtra;
+import moe.nea.beacons.BeaconRangeExtender;
+import moe.nea.beacons.BeaconRangeIncreaser;
+import net.minecraft.core.BlockPos;
+import net.minecraft.world.level.Level;
+import net.minecraft.world.level.block.entity.BeaconBlockEntity;
+import net.minecraft.world.level.block.state.BlockState;
+import org.objectweb.asm.Opcodes;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.Unique;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.ModifyArg;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+import java.util.List;
+
+@Mixin(BeaconBlockEntity.class)
+public class BeaconMixin implements BeaconBlockEntityExtra {
+
+ @Shadow
+ private List<BeaconBlockEntity.BeaconBeamSection> checkingBeamSections;
+ @Unique
+ private int rangeExtenders;
+
+ @Override
+ public int getRangeExtender_nea() {
+ return rangeExtenders;
+ }
+
+ @Override
+ public void setRangeExtender_nea(int rangeExtender) {
+ this.rangeExtenders = rangeExtender;
+ }
+
+ @Override
+ public List<BeaconBlockEntity.BeaconBeamSection> getCheckingBeamSections_nea() {
+ return this.checkingBeamSections;
+ }
+
+ @Inject(method = "tick", at = @At(value = "FIELD", target = "Lnet/minecraft/world/level/block/entity/BeaconBlockEntity;beamSections:Ljava/util/List;", opcode = Opcodes.ASTORE))
+ private static void saveRangeExtender(Level level, BlockPos blockPos, BlockState blockState, BeaconBlockEntity beaconBlockEntity, CallbackInfo ci) {
+ var extra = BeaconBlockEntityExtra.cast(beaconBlockEntity);
+ var accExtraRange = 0;
+ for (var beaconBeamSection : extra.getCheckingBeamSections_nea()) {
+ var extraSection = BeaconBeamSectionExtra.cast(beaconBeamSection);
+ accExtraRange += extraSection.getRangeExtenders_nea();
+ }
+ extra.setRangeExtender_nea(accExtraRange);
+ }
+
+ @WrapOperation(method = "tick", at = @At(value = "INVOKE", target = "Lnet/minecraft/core/BlockPos;above()Lnet/minecraft/core/BlockPos;"))
+ private static BlockPos checkForRangeExtender(
+ BlockPos oldBlockPos, Operation<BlockPos> original, @Local BeaconBlockEntity.BeaconBeamSection lastSection,
+ @Local(argsOnly = true) Level level) {
+ var newPos = original.call(oldBlockPos);
+ var blockState = level.getBlockState(oldBlockPos);
+ if (blockState.getBlock() instanceof BeaconRangeExtender extender && lastSection != null) {
+ var lastSectionExtra = BeaconBeamSectionExtra.cast(lastSection);
+ lastSectionExtra.setRangeExtenders_nea(
+ extender.extraBeaconRange_nea() + lastSectionExtra.getRangeExtenders_nea()
+ );
+ }
+ return newPos;
+ }
+
+ @Inject(method = "tick", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/level/block/entity/BeaconBlockEntity;applyEffects(Lnet/minecraft/world/level/Level;Lnet/minecraft/core/BlockPos;ILnet/minecraft/core/Holder;Lnet/minecraft/core/Holder;)V"))
+ private static void applyExtraEffects(Level level, BlockPos blockPos, BlockState blockState, BeaconBlockEntity beaconBlockEntity, CallbackInfo ci) {
+ var extra = BeaconBlockEntityExtra.cast(beaconBlockEntity);
+ lastRangeExtend = extra.getRangeExtender_nea();
+ }
+
+ @Unique
+ private static int lastRangeExtend = -1;
+
+ @ModifyArg(method = "applyEffects", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/phys/AABB;inflate(D)Lnet/minecraft/world/phys/AABB;"))
+ private static double increaseRange(double d) {
+ if (lastRangeExtend < 0) {
+ BeaconRangeIncreaser.LOGGER.error("Could not get extended range from beacon range increase mod (which is awesome, btw)");
+ return d;
+ }
+ d += lastRangeExtend;
+ lastRangeExtend = -1;
+ return d;
+ }
+
+}
diff --git a/src/main/java/moe/nea/beacons/mixin/SkullBlockRangeExtender.java b/src/main/java/moe/nea/beacons/mixin/SkullBlockRangeExtender.java
new file mode 100644
index 0000000..90a1fc0
--- /dev/null
+++ b/src/main/java/moe/nea/beacons/mixin/SkullBlockRangeExtender.java
@@ -0,0 +1,14 @@
+package moe.nea.beacons.mixin;
+
+import moe.nea.beacons.BeaconRangeExtender;
+import net.minecraft.world.level.block.SkullBlock;
+import net.minecraft.world.level.block.WitherSkullBlock;
+import org.spongepowered.asm.mixin.Mixin;
+
+@Mixin(SkullBlock.class)
+public class SkullBlockRangeExtender implements BeaconRangeExtender {
+ @Override
+ public int extraBeaconRange_nea() {
+ return ((SkullBlock) (Object) this) instanceof WitherSkullBlock ? 32 : 5;
+ }
+}
diff --git a/src/main/resources/assets/beacon-range-increaser/icon.png b/src/main/resources/assets/beacon-range-increaser/icon.png
new file mode 100644
index 0000000..ec6beca
--- /dev/null
+++ b/src/main/resources/assets/beacon-range-increaser/icon.png
Binary files differ
diff --git a/src/main/resources/beacon-range-increaser.mixins.json b/src/main/resources/beacon-range-increaser.mixins.json
new file mode 100644
index 0000000..c7ca9b6
--- /dev/null
+++ b/src/main/resources/beacon-range-increaser.mixins.json
@@ -0,0 +1,13 @@
+{
+ "required": true,
+ "package": "moe.nea.beacons.mixin",
+ "compatibilityLevel": "JAVA_21",
+ "mixins": [
+ "BeaconBeamSectionMixin",
+ "BeaconMixin",
+ "SkullBlockRangeExtender"
+ ],
+ "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
new file mode 100644
index 0000000..d3aec2d
--- /dev/null
+++ b/src/main/resources/fabric.mod.json
@@ -0,0 +1,30 @@
+{
+ "schemaVersion": 1,
+ "id": "beacon-range-increaser",
+ "version": "${version}",
+ "name": "Beacon Range Increaser",
+ "description": "Increases the range of beacons, if you place skulls in the path of the beam (32 for wither skulls, 5 blocks for other skulls).",
+ "authors": [
+ "Linnea Gräf"
+ ],
+ "contact": {
+ "sources": "https://github.com/nea89o/beacon-range-extender"
+ },
+ "license": "MIT",
+ "icon": "assets/beacon-range-increaser/icon.png",
+ "environment": "*",
+ "entrypoints": {
+ "main": [
+ "moe.nea.beacons.BeaconRangeIncreaser"
+ ]
+ },
+ "mixins": [
+ "beacon-range-increaser.mixins.json"
+ ],
+ "depends": {
+ "fabricloader": ">=0.16.9",
+ "minecraft": "~1.21",
+ "java": ">=21",
+ "fabric-api": "*"
+ }
+} \ No newline at end of file