diff --git a/.gitignore b/.gitignore index eaf568b..9eeee79 100644 --- a/.gitignore +++ b/.gitignore @@ -23,3 +23,4 @@ hs_err_pid* replay_pid* +.idea diff --git a/Beem/.gitignore b/Beem/.gitignore new file mode 100644 index 0000000..9563893 --- /dev/null +++ b/Beem/.gitignore @@ -0,0 +1,25 @@ +# gradle + +.gradle/ +build/ +out/ +classes/ + +# idea + +.idea/ +*.iml +*.ipr +*.iws + +# vscode + +.settings/ +.vscode/ +bin/ +.classpath +.project + +# fabric + +run/ \ No newline at end of file diff --git a/Beem/CHANGELOG.md b/Beem/CHANGELOG.md new file mode 100644 index 0000000..647cf15 --- /dev/null +++ b/Beem/CHANGELOG.md @@ -0,0 +1,40 @@ +# Beem - Changelog + +### Beem 1.3.8 - 1.20.5 +- Updated to Minecraft 1.20.5 +- Updated Gradle. +- Updated Java requirement to Java 21. + +### Beem 1.3.7 - 1.20.1 +- Updated to Minecraft 1.20.1 + +### Beem 1.3.6 - 22w18a +- Updated to Minecraft snapshot 22w18a +- Replaced deprecated feature
`net.fabricmc.fabric.api.client.rendereregistry.v1.BlockEntityRendererRegistry`
with
`net.fabricmc.fabric.api.client.rendering.v1.BlockEntityRendererRegistry` + +### Beem 1.3.6 - 22w17a +- Updated to Minecraft snapshot 22w17a (thanks to Yuuki2012!) + +### Beem 1.3.5 - 21w03a +- Updated to Minecraft snapshot 21w03a + +### Beem 1.3.4 - 1.16.3 +- Updated to Minecraft 1.16.3 + +### Beem 1.3.3 - 1.16.2 +- Updated to Minecraft 1.16.2 + +### Beem 1.3.2 - 20w22a +- Updated to Minecraft snapshot 20w22a + +### Beem 1.3.1 - 20w17a +- Updated to Minecraft snapshot 20w17a + +### Beem 1.3 - 20w09a +- Updated to Minecraft snapshot 20w09a (thanks to Yuuki2012!) + +### Beem 1.2 - 20w06a +- Updated to Minecraft snapshot 20w06a + +### Beem 1.1 - 1.15.1 +- Added a keybind to toggle beems; keybind by default is B diff --git a/Beem/build.gradle b/Beem/build.gradle new file mode 100644 index 0000000..d8096fa --- /dev/null +++ b/Beem/build.gradle @@ -0,0 +1,186 @@ +plugins { + id 'fabric-loom' version '1.6-SNAPSHOT' + id 'maven-publish' + id 'com.matthewprenger.cursegradle' version '1.4.0' + id 'org.ajoberstar.grgit' version '3.1.1' + id 'com.github.breadmoirai.github-release' version '2.2.9' + id 'com.wynprice.cursemaven' version '1.2.3' +} + +java { + toolchain { + languageVersion = JavaLanguageVersion.of(21) + } + sourceCompatibility = JavaVersion.VERSION_21 + targetCompatibility = JavaVersion.VERSION_21 +} +// Adds a few utility methods like getProjectProperty +apply from: 'https://raw.githubusercontent.com/NerdHubMC/Gradle-Scripts/master/scripts/utilities.gradle' +apply from: 'https://raw.githubusercontent.com/NerdHubMC/Gradle-Scripts/master/scripts/fabric/publish/changelog.gradle' + +archivesBaseName = project.archives_base_name +version = project.mod_version +group = project.maven_group + +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": project.version + } +} + +// ensure that the encoding is set to UTF-8, no matter what the system default is +// this fixes some edge cases with special characters not displaying correctly +// see http://yodaconditions.net/blog/fix-for-java-file-encoding-problems-with-gradle.html +tasks.withType(JavaCompile).configureEach { + options.encoding = "UTF-8" + it.options.release = 21 +} + +jar { + from "LICENSE" +} + +// configure the maven publication +publishing { + publications { + mavenJava(MavenPublication) { + // add all the jars that should be included when publishing to maven + artifact(remapJar) { + builtBy remapJar + } + } + } + + // select the repositories you want to publish to + repositories { + // uncomment to publish to the local maven + // mavenLocal() + } +} + + +tasks.register('checkGitStatus') { + group = 'publishing' + description = 'Checks that the git repository is in a state suitable for release' + doLast { + if (grgit == null) throw new RuntimeException('No git repository') + if (!grgit.status().isClean()) { + throw new RuntimeException("Git repository not ready for release (${grgit.status()})") + } + def currentBranch = grgit.branch.current().getName() + grgit.fetch() + if (grgit.tag.list().any { it.name == project.version }) { + throw new RuntimeException("A tag already exists for ${project.version}") + } + def status = grgit.branch.status(name: currentBranch) + if (status.aheadCount != 0) { + throw new RuntimeException('Some commits have not been pushed') + } + if (status.behindCount != 0) { + throw new RuntimeException('Some commits have not been pulled') + } + } +} + +githubRelease { + repo "Beem" + token "${getProjectProperty('github_releases_token')}" + // default owner: last component of maven group + // default repo: name of the project + tagName = project.version + targetCommitish = { grgit.branch.current().name } + body = { project.getChangelogText() } + + FilenameFilter filter = { dir, filename -> filename.contains(project.version) && !filename.contains('-dev.jar') } + releaseAssets = { jar.destinationDirectory.asFile.get().listFiles filter } +} +tasks.githubRelease.dependsOn(checkGitStatus) + +curseforge { + + if (project.getProjectProperty('curse_key') != null) { + apiKey = project.getProjectProperty('curse_key') + } + + if (project.hasProperty('curseforge_id')) { + project { + id = findProperty('curseforge_id') + + releaseType = project.release_type + + //usually automatically determined by the CurseGradle plugin, but won't work with fabric + "${project.curseforge_versions}".split('; ').each { + addGameVersion it + } + addGameVersion 'Fabric' + + mainArtifact(remapJar) { + displayName = "${project.name}-${project.version}.jar" + + if (project.hasProperty('cf_requirements') || project.hasProperty('cf_optionals') || project.hasProperty('cf_embeddeds') || project.hasProperty('cf_tools') || project.hasProperty('cf_incompatibles') || project.hasProperty('cf_includes')) { + relations { + if (project.hasProperty('cf_requirements')) { + "${project.cf_requirements}".split('; ').each { + requiredDependency "${it}" + } + } + if (project.hasProperty('cf_optionals')) { + "${project.cf_optionals}".split('; ').each { + optionalDependency "${it}" + } + } + if (project.hasProperty('cf_embeddeds')) { + "${project.cf_embeddeds}".split('; ').each { + embeddedLibrary "${it}" + } + } + if (project.hasProperty('cf_tools')) { + "${project.cf_tools}".split('; ').each { + tool "${it}" + } + } + if (project.hasProperty('cf_incompatibles')) { + "${project.cf_incompatibles}".split('; ').each { + incompatible "${it}" + } + } + if (project.hasProperty('cf_includes')) { + "${project.cf_includes}".split('; ').each { + include "${it}" + } + } + } + } + } + + changelogType = 'markdown' + changelog = project.getChangelogText() + + afterEvaluate { + uploadTask.dependsOn remapSourcesJar + } + } + options { + forgeGradleIntegration = false + } + } +} + +tasks.curseforge.dependsOn(checkGitStatus) + +tasks.register('release') { + group = 'publishing' + description = 'Releases a new version to Github and Curseforge' +} diff --git a/Beem/gradle.properties b/Beem/gradle.properties new file mode 100644 index 0000000..a245e54 --- /dev/null +++ b/Beem/gradle.properties @@ -0,0 +1,24 @@ +# Done to increase the memory available to gradle. +org.gradle.jvmargs=-Xmx1G + +# Fabric Properties +minecraft_version=1.20.5 +yarn_mappings=1.20.5+build.1 +loader_version=0.15.10 + +# Fabric api +fabric_version=0.97.6+1.20.5 + +# Mod Properties +mod_version = 1.3.8 +maven_group = io.github.ladysnake +archives_base_name = beem + +#Publishing +owners = Ladysnake +license_header = CC-BY-NC-SA+4.0 +curseforge_id = 358105 +curseforge_versions = 1.17 +cf_requirements = fabric-api +release_type = release +changelog_url = https://github.com/Yuuki2012/Beem/blob/1.17/CHANGELOG.md diff --git a/Beem/gradle/wrapper/gradle-wrapper.jar b/Beem/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..5c2d1cf Binary files /dev/null and b/Beem/gradle/wrapper/gradle-wrapper.jar differ diff --git a/Beem/gradle/wrapper/gradle-wrapper.properties b/Beem/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..a8382d7 --- /dev/null +++ b/Beem/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,5 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists \ No newline at end of file diff --git a/Beem/gradlew b/Beem/gradlew new file mode 100644 index 0000000..8e25e6c --- /dev/null +++ b/Beem/gradlew @@ -0,0 +1,188 @@ +#!/usr/bin/env sh + +# +# Copyright 2015 the original author or 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 UN*X +## +############################################################################## + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn () { + echo "$*" +} + +die () { + echo + echo "$*" + echo + exit 1 +} + +# 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 + ;; + 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" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin, switch paths to Windows format before running java +if $cygwin ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + JAVACMD=`cygpath --unix "$JAVACMD"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=$((i+1)) + done + case $i in + (0) set -- ;; + (1) set -- "$args0" ;; + (2) set -- "$args0" "$args1" ;; + (3) set -- "$args0" "$args1" "$args2" ;; + (4) set -- "$args0" "$args1" "$args2" "$args3" ;; + (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Escape application args +save () { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " +} +APP_ARGS=$(save "$@") + +# Collect all arguments for the java command, following the shell quoting and substitution rules +eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" + +# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong +if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then + cd "$(dirname "$0")" +fi + +exec "$JAVACMD" "$@" diff --git a/Beem/gradlew.bat b/Beem/gradlew.bat new file mode 100644 index 0000000..9618d8d --- /dev/null +++ b/Beem/gradlew.bat @@ -0,0 +1,100 @@ +@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=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@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%" == "0" goto init + +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 init + +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 + +:init +@rem Get command-line arguments, handling Windows variants + +if not "%OS%" == "Windows_NT" goto win9xME_args + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +if "x%~1" == "x" goto execute + +set CMD_LINE_ARGS=%* + +: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 %CMD_LINE_ARGS% + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="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! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/Beem/settings.gradle b/Beem/settings.gradle new file mode 100644 index 0000000..2875cde --- /dev/null +++ b/Beem/settings.gradle @@ -0,0 +1,9 @@ +pluginManagement { + repositories { + maven { + name = 'Fabric' + url = 'https://maven.fabricmc.net/' + } + gradlePluginPortal() + } +} \ No newline at end of file diff --git a/Beem/src/main/java/ladysnake/beem/BeeNestBlockEntityRenderer.java b/Beem/src/main/java/ladysnake/beem/BeeNestBlockEntityRenderer.java new file mode 100644 index 0000000..df8c768 --- /dev/null +++ b/Beem/src/main/java/ladysnake/beem/BeeNestBlockEntityRenderer.java @@ -0,0 +1,26 @@ +package ladysnake.beem; + +import net.minecraft.block.Blocks; +import net.minecraft.block.entity.BeehiveBlockEntity; +import net.minecraft.client.render.VertexConsumerProvider; +import net.minecraft.client.render.block.entity.BeaconBlockEntityRenderer; +import net.minecraft.client.render.block.entity.BlockEntityRenderer; +import net.minecraft.client.util.math.MatrixStack; +import net.minecraft.util.DyeColor; +import net.minecraft.util.Identifier; + +import java.util.Objects; + +public class BeeNestBlockEntityRenderer implements BlockEntityRenderer { + public static final Identifier BEAM_TEXTURE = new Identifier("beem:textures/entity/beem.png"); + public static final DyeColor BEAM_COLOR = DyeColor.YELLOW; + + public void render(BeehiveBlockEntity blockEntity, float tickDelta, MatrixStack matrices, VertexConsumerProvider vertexConsumers, int light, int overlay) { + if (Objects.requireNonNull(blockEntity.getWorld()).getBlockState(blockEntity.getPos()).getBlock().equals(Blocks.BEE_NEST) && Beem.beem) { + long time = blockEntity.getWorld().getTime(); + + BeaconBlockEntityRenderer.renderBeam(matrices, vertexConsumers, BEAM_TEXTURE, tickDelta, 1.0f, time, 0, 256, BEAM_COLOR.getColorComponents(), 0.25F, 0.35F); + BeaconBlockEntityRenderer.renderBeam(matrices, vertexConsumers, BEAM_TEXTURE, tickDelta, 1.0f, time, 0, -256, BEAM_COLOR.getColorComponents(), 0.25F, 0.35F); + } + } +} diff --git a/Beem/src/main/java/ladysnake/beem/Beem.java b/Beem/src/main/java/ladysnake/beem/Beem.java new file mode 100644 index 0000000..3e6f716 --- /dev/null +++ b/Beem/src/main/java/ladysnake/beem/Beem.java @@ -0,0 +1,40 @@ +package ladysnake.beem; + +import net.fabricmc.api.ClientModInitializer; +import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents; +import net.fabricmc.fabric.api.client.keybinding.v1.KeyBindingHelper; +import net.minecraft.block.entity.BlockEntityType; +import net.minecraft.client.MinecraftClient; +import net.minecraft.client.option.KeyBinding; +import net.minecraft.client.render.block.entity.BlockEntityRendererFactories; +import net.minecraft.client.util.InputUtil; +import net.minecraft.text.Style; +import net.minecraft.text.Text; +import net.minecraft.util.Formatting; +import org.lwjgl.glfw.GLFW; + +public class Beem implements ClientModInitializer { + private static final KeyBinding TOGGLE_BEEM = new KeyBinding( + "beem:toggle_beem", + InputUtil.Type.KEYSYM, + GLFW.GLFW_KEY_B, + "key.categories.misc" + ); + static boolean beem = true; + + @Override + public void onInitializeClient() { + BlockEntityRendererFactories.register(BlockEntityType.BEEHIVE, d -> new BeeNestBlockEntityRenderer()); + KeyBindingHelper.registerKeyBinding(TOGGLE_BEEM); + + ClientTickEvents.START_CLIENT_TICK.register(e -> { + while (TOGGLE_BEEM.wasPressed()) { + beem = !beem; + + if (MinecraftClient.getInstance().player != null) { + MinecraftClient.getInstance().player.sendMessage(Text.translatable("message.beem.toggled." + beem).setStyle(Style.EMPTY.withColor(Formatting.GOLD)), false); + } + } + }); + } +} diff --git a/Beem/src/main/java/ladysnake/beem/mixin/BeehiveBlockEntityMixin.java b/Beem/src/main/java/ladysnake/beem/mixin/BeehiveBlockEntityMixin.java new file mode 100644 index 0000000..da64ac0 --- /dev/null +++ b/Beem/src/main/java/ladysnake/beem/mixin/BeehiveBlockEntityMixin.java @@ -0,0 +1,21 @@ +package ladysnake.beem.mixin; + +import net.minecraft.block.BlockState; +import net.minecraft.block.entity.BeehiveBlockEntity; +import net.minecraft.block.entity.BlockEntity; +import net.minecraft.block.entity.BlockEntityType; +import net.minecraft.util.math.BlockPos; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Unique; + +@Mixin(BeehiveBlockEntity.class) +public abstract class BeehiveBlockEntityMixin extends BlockEntity { + public BeehiveBlockEntityMixin(final BlockEntityType type, final BlockPos pos, final BlockState state) { + super(type, pos, state); + } + + @Unique + public double getSquaredRenderDistance() { + return 65536.0D; + } +} diff --git a/Beem/src/main/resources/assets/beem/icon.png b/Beem/src/main/resources/assets/beem/icon.png new file mode 100644 index 0000000..8bbd1a8 Binary files /dev/null and b/Beem/src/main/resources/assets/beem/icon.png differ diff --git a/Beem/src/main/resources/assets/beem/lang/en_us.json b/Beem/src/main/resources/assets/beem/lang/en_us.json new file mode 100644 index 0000000..eadb853 --- /dev/null +++ b/Beem/src/main/resources/assets/beem/lang/en_us.json @@ -0,0 +1,5 @@ +{ + "key.beem.toggle_beem": "Toggle Beem", + "message.beem.toggled.true": "Beem enabled", + "message.beem.toggled.false": "Beem disabled" +} \ No newline at end of file diff --git a/Beem/src/main/resources/assets/beem/lang/pl_pl.json b/Beem/src/main/resources/assets/beem/lang/pl_pl.json new file mode 100644 index 0000000..8dc6296 --- /dev/null +++ b/Beem/src/main/resources/assets/beem/lang/pl_pl.json @@ -0,0 +1,5 @@ +{ + "key.beem.toggle_beem": "Ukryj pszczelą wiązkę", + "message.beem.toggled.true": "Pszczela wiązka aktywowana", + "message.beem.toggled.false": "Pszczela wiązka dezaktywowana" +} diff --git a/Beem/src/main/resources/assets/beem/textures/entity/beem.png b/Beem/src/main/resources/assets/beem/textures/entity/beem.png new file mode 100644 index 0000000..188442b Binary files /dev/null and b/Beem/src/main/resources/assets/beem/textures/entity/beem.png differ diff --git a/Beem/src/main/resources/beem.mixins.json b/Beem/src/main/resources/beem.mixins.json new file mode 100644 index 0000000..c1d5ce7 --- /dev/null +++ b/Beem/src/main/resources/beem.mixins.json @@ -0,0 +1,13 @@ +{ + "required": true, + "package": "ladysnake.beem.mixin", + "compatibilityLevel": "JAVA_17", + "mixins": [ + ], + "client": [ + "BeehiveBlockEntityMixin" + ], + "injectors": { + "defaultRequire": 1 + } +} \ No newline at end of file diff --git a/Beem/src/main/resources/fabric.mod.json b/Beem/src/main/resources/fabric.mod.json new file mode 100644 index 0000000..96ec6c8 --- /dev/null +++ b/Beem/src/main/resources/fabric.mod.json @@ -0,0 +1,33 @@ +{ + "schemaVersion": 1, + "id": "beem", + "version": "${version}", + + "name": "Beem", + "description": "A mod that displays light beams to help finding bee nests.", + "authors": [ + "doctor4t", + "Yuuki2012" + ], + "contact": { + "sources": "https://github.com/Yuuki2012/Beem", + "issues": "https://github.com/Yuuki2012/Beem/issues", + "discord": "https://raiza.dev/invite" + }, + "license": "CC-BY-NC-SA 4.0", + "icon": "assets/beem/icon.png", + + "environment": "*", + "entrypoints": { + "client": [ + "ladysnake.beem.Beem" + ] + }, + "mixins": [ + "beem.mixins.json" + ], + "depends": { + "fabricloader": ">=0.14.3", + "fabric": "*" + } +} diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..cbe5ad1 --- /dev/null +++ b/LICENSE @@ -0,0 +1,437 @@ +Attribution-NonCommercial-ShareAlike 4.0 International + +======================================================================= + +Creative Commons Corporation ("Creative Commons") is not a law firm and +does not provide legal services or legal advice. Distribution of +Creative Commons public licenses does not create a lawyer-client or +other relationship. Creative Commons makes its licenses and related +information available on an "as-is" basis. Creative Commons gives no +warranties regarding its licenses, any material licensed under their +terms and conditions, or any related information. Creative Commons +disclaims all liability for damages resulting from their use to the +fullest extent possible. + +Using Creative Commons Public Licenses + +Creative Commons public licenses provide a standard set of terms and +conditions that creators and other rights holders may use to share +original works of authorship and other material subject to copyright +and certain other rights specified in the public license below. The +following considerations are for informational purposes only, are not +exhaustive, and do not form part of our licenses. + + Considerations for licensors: Our public licenses are + intended for use by those authorized to give the public + permission to use material in ways otherwise restricted by + copyright and certain other rights. Our licenses are + irrevocable. Licensors should read and understand the terms + and conditions of the license they choose before applying it. + Licensors should also secure all rights necessary before + applying our licenses so that the public can reuse the + material as expected. Licensors should clearly mark any + material not subject to the license. This includes other CC- + licensed material, or material used under an exception or + limitation to copyright. More considerations for licensors: + wiki.creativecommons.org/Considerations_for_licensors + + Considerations for the public: By using one of our public + licenses, a licensor grants the public permission to use the + licensed material under specified terms and conditions. If + the licensor's permission is not necessary for any reason--for + example, because of any applicable exception or limitation to + copyright--then that use is not regulated by the license. Our + licenses grant only permissions under copyright and certain + other rights that a licensor has authority to grant. Use of + the licensed material may still be restricted for other + reasons, including because others have copyright or other + rights in the material. A licensor may make special requests, + such as asking that all changes be marked or described. + Although not required by our licenses, you are encouraged to + respect those requests where reasonable. More considerations + for the public: + wiki.creativecommons.org/Considerations_for_licensees + +======================================================================= + +Creative Commons Attribution-NonCommercial-ShareAlike 4.0 International +Public License + +By exercising the Licensed Rights (defined below), You accept and agree +to be bound by the terms and conditions of this Creative Commons +Attribution-NonCommercial-ShareAlike 4.0 International Public License +("Public License"). To the extent this Public License may be +interpreted as a contract, You are granted the Licensed Rights in +consideration of Your acceptance of these terms and conditions, and the +Licensor grants You such rights in consideration of benefits the +Licensor receives from making the Licensed Material available under +these terms and conditions. + + +Section 1 -- Definitions. + + a. Adapted Material means material subject to Copyright and Similar + Rights that is derived from or based upon the Licensed Material + and in which the Licensed Material is translated, altered, + arranged, transformed, or otherwise modified in a manner requiring + permission under the Copyright and Similar Rights held by the + Licensor. For purposes of this Public License, where the Licensed + Material is a musical work, performance, or sound recording, + Adapted Material is always produced where the Licensed Material is + synched in timed relation with a moving image. + + b. Adapter's License means the license You apply to Your Copyright + and Similar Rights in Your contributions to Adapted Material in + accordance with the terms and conditions of this Public License. + + c. BY-NC-SA Compatible License means a license listed at + creativecommons.org/compatiblelicenses, approved by Creative + Commons as essentially the equivalent of this Public License. + + d. Copyright and Similar Rights means copyright and/or similar rights + closely related to copyright including, without limitation, + performance, broadcast, sound recording, and Sui Generis Database + Rights, without regard to how the rights are labeled or + categorized. For purposes of this Public License, the rights + specified in Section 2(b)(1)-(2) are not Copyright and Similar + Rights. + + e. Effective Technological Measures means those measures that, in the + absence of proper authority, may not be circumvented under laws + fulfilling obligations under Article 11 of the WIPO Copyright + Treaty adopted on December 20, 1996, and/or similar international + agreements. + + f. Exceptions and Limitations means fair use, fair dealing, and/or + any other exception or limitation to Copyright and Similar Rights + that applies to Your use of the Licensed Material. + + g. License Elements means the license attributes listed in the name + of a Creative Commons Public License. The License Elements of this + Public License are Attribution, NonCommercial, and ShareAlike. + + h. Licensed Material means the artistic or literary work, database, + or other material to which the Licensor applied this Public + License. + + i. Licensed Rights means the rights granted to You subject to the + terms and conditions of this Public License, which are limited to + all Copyright and Similar Rights that apply to Your use of the + Licensed Material and that the Licensor has authority to license. + + j. Licensor means the individual(s) or entity(ies) granting rights + under this Public License. + + k. NonCommercial means not primarily intended for or directed towards + commercial advantage or monetary compensation. For purposes of + this Public License, the exchange of the Licensed Material for + other material subject to Copyright and Similar Rights by digital + file-sharing or similar means is NonCommercial provided there is + no payment of monetary compensation in connection with the + exchange. + + l. Share means to provide material to the public by any means or + process that requires permission under the Licensed Rights, such + as reproduction, public display, public performance, distribution, + dissemination, communication, or importation, and to make material + available to the public including in ways that members of the + public may access the material from a place and at a time + individually chosen by them. + + m. Sui Generis Database Rights means rights other than copyright + resulting from Directive 96/9/EC of the European Parliament and of + the Council of 11 March 1996 on the legal protection of databases, + as amended and/or succeeded, as well as other essentially + equivalent rights anywhere in the world. + + n. You means the individual or entity exercising the Licensed Rights + under this Public License. Your has a corresponding meaning. + + +Section 2 -- Scope. + + a. License grant. + + 1. Subject to the terms and conditions of this Public License, + the Licensor hereby grants You a worldwide, royalty-free, + non-sublicensable, non-exclusive, irrevocable license to + exercise the Licensed Rights in the Licensed Material to: + + a. reproduce and Share the Licensed Material, in whole or + in part, for NonCommercial purposes only; and + + b. produce, reproduce, and Share Adapted Material for + NonCommercial purposes only. + + 2. Exceptions and Limitations. For the avoidance of doubt, where + Exceptions and Limitations apply to Your use, this Public + License does not apply, and You do not need to comply with + its terms and conditions. + + 3. Term. The term of this Public License is specified in Section + 6(a). + + 4. Media and formats; technical modifications allowed. The + Licensor authorizes You to exercise the Licensed Rights in + all media and formats whether now known or hereafter created, + and to make technical modifications necessary to do so. The + Licensor waives and/or agrees not to assert any right or + authority to forbid You from making technical modifications + necessary to exercise the Licensed Rights, including + technical modifications necessary to circumvent Effective + Technological Measures. For purposes of this Public License, + simply making modifications authorized by this Section 2(a) + (4) never produces Adapted Material. + + 5. Downstream recipients. + + a. Offer from the Licensor -- Licensed Material. Every + recipient of the Licensed Material automatically + receives an offer from the Licensor to exercise the + Licensed Rights under the terms and conditions of this + Public License. + + b. Additional offer from the Licensor -- Adapted Material. + Every recipient of Adapted Material from You + automatically receives an offer from the Licensor to + exercise the Licensed Rights in the Adapted Material + under the conditions of the Adapter's License You apply. + + c. No downstream restrictions. You may not offer or impose + any additional or different terms or conditions on, or + apply any Effective Technological Measures to, the + Licensed Material if doing so restricts exercise of the + Licensed Rights by any recipient of the Licensed + Material. + + 6. No endorsement. Nothing in this Public License constitutes or + may be construed as permission to assert or imply that You + are, or that Your use of the Licensed Material is, connected + with, or sponsored, endorsed, or granted official status by, + the Licensor or others designated to receive attribution as + provided in Section 3(a)(1)(A)(i). + + b. Other rights. + + 1. Moral rights, such as the right of integrity, are not + licensed under this Public License, nor are publicity, + privacy, and/or other similar personality rights; however, to + the extent possible, the Licensor waives and/or agrees not to + assert any such rights held by the Licensor to the limited + extent necessary to allow You to exercise the Licensed + Rights, but not otherwise. + + 2. Patent and trademark rights are not licensed under this + Public License. + + 3. To the extent possible, the Licensor waives any right to + collect royalties from You for the exercise of the Licensed + Rights, whether directly or through a collecting society + under any voluntary or waivable statutory or compulsory + licensing scheme. In all other cases the Licensor expressly + reserves any right to collect such royalties, including when + the Licensed Material is used other than for NonCommercial + purposes. + + +Section 3 -- License Conditions. + +Your exercise of the Licensed Rights is expressly made subject to the +following conditions. + + a. Attribution. + + 1. If You Share the Licensed Material (including in modified + form), You must: + + a. retain the following if it is supplied by the Licensor + with the Licensed Material: + + i. identification of the creator(s) of the Licensed + Material and any others designated to receive + attribution, in any reasonable manner requested by + the Licensor (including by pseudonym if + designated); + + ii. a copyright notice; + + iii. a notice that refers to this Public License; + + iv. a notice that refers to the disclaimer of + warranties; + + v. a URI or hyperlink to the Licensed Material to the + extent reasonably practicable; + + b. indicate if You modified the Licensed Material and + retain an indication of any previous modifications; and + + c. indicate the Licensed Material is licensed under this + Public License, and include the text of, or the URI or + hyperlink to, this Public License. + + 2. You may satisfy the conditions in Section 3(a)(1) in any + reasonable manner based on the medium, means, and context in + which You Share the Licensed Material. For example, it may be + reasonable to satisfy the conditions by providing a URI or + hyperlink to a resource that includes the required + information. + 3. If requested by the Licensor, You must remove any of the + information required by Section 3(a)(1)(A) to the extent + reasonably practicable. + + b. ShareAlike. + + In addition to the conditions in Section 3(a), if You Share + Adapted Material You produce, the following conditions also apply. + + 1. The Adapter's License You apply must be a Creative Commons + license with the same License Elements, this version or + later, or a BY-NC-SA Compatible License. + + 2. You must include the text of, or the URI or hyperlink to, the + Adapter's License You apply. You may satisfy this condition + in any reasonable manner based on the medium, means, and + context in which You Share Adapted Material. + + 3. You may not offer or impose any additional or different terms + or conditions on, or apply any Effective Technological + Measures to, Adapted Material that restrict exercise of the + rights granted under the Adapter's License You apply. + + +Section 4 -- Sui Generis Database Rights. + +Where the Licensed Rights include Sui Generis Database Rights that +apply to Your use of the Licensed Material: + + a. for the avoidance of doubt, Section 2(a)(1) grants You the right + to extract, reuse, reproduce, and Share all or a substantial + portion of the contents of the database for NonCommercial purposes + only; + + b. if You include all or a substantial portion of the database + contents in a database in which You have Sui Generis Database + Rights, then the database in which You have Sui Generis Database + Rights (but not its individual contents) is Adapted Material, + including for purposes of Section 3(b); and + + c. You must comply with the conditions in Section 3(a) if You Share + all or a substantial portion of the contents of the database. + +For the avoidance of doubt, this Section 4 supplements and does not +replace Your obligations under this Public License where the Licensed +Rights include other Copyright and Similar Rights. + + +Section 5 -- Disclaimer of Warranties and Limitation of Liability. + + a. UNLESS OTHERWISE SEPARATELY UNDERTAKEN BY THE LICENSOR, TO THE + EXTENT POSSIBLE, THE LICENSOR OFFERS THE LICENSED MATERIAL AS-IS + AND AS-AVAILABLE, AND MAKES NO REPRESENTATIONS OR WARRANTIES OF + ANY KIND CONCERNING THE LICENSED MATERIAL, WHETHER EXPRESS, + IMPLIED, STATUTORY, OR OTHER. THIS INCLUDES, WITHOUT LIMITATION, + WARRANTIES OF TITLE, MERCHANTABILITY, FITNESS FOR A PARTICULAR + PURPOSE, NON-INFRINGEMENT, ABSENCE OF LATENT OR OTHER DEFECTS, + ACCURACY, OR THE PRESENCE OR ABSENCE OF ERRORS, WHETHER OR NOT + KNOWN OR DISCOVERABLE. WHERE DISCLAIMERS OF WARRANTIES ARE NOT + ALLOWED IN FULL OR IN PART, THIS DISCLAIMER MAY NOT APPLY TO YOU. + + b. TO THE EXTENT POSSIBLE, IN NO EVENT WILL THE LICENSOR BE LIABLE + TO YOU ON ANY LEGAL THEORY (INCLUDING, WITHOUT LIMITATION, + NEGLIGENCE) OR OTHERWISE FOR ANY DIRECT, SPECIAL, INDIRECT, + INCIDENTAL, CONSEQUENTIAL, PUNITIVE, EXEMPLARY, OR OTHER LOSSES, + COSTS, EXPENSES, OR DAMAGES ARISING OUT OF THIS PUBLIC LICENSE OR + USE OF THE LICENSED MATERIAL, EVEN IF THE LICENSOR HAS BEEN + ADVISED OF THE POSSIBILITY OF SUCH LOSSES, COSTS, EXPENSES, OR + DAMAGES. WHERE A LIMITATION OF LIABILITY IS NOT ALLOWED IN FULL OR + IN PART, THIS LIMITATION MAY NOT APPLY TO YOU. + + c. The disclaimer of warranties and limitation of liability provided + above shall be interpreted in a manner that, to the extent + possible, most closely approximates an absolute disclaimer and + waiver of all liability. + + +Section 6 -- Term and Termination. + + a. This Public License applies for the term of the Copyright and + Similar Rights licensed here. However, if You fail to comply with + this Public License, then Your rights under this Public License + terminate automatically. + + b. Where Your right to use the Licensed Material has terminated under + Section 6(a), it reinstates: + + 1. automatically as of the date the violation is cured, provided + it is cured within 30 days of Your discovery of the + violation; or + + 2. upon express reinstatement by the Licensor. + + For the avoidance of doubt, this Section 6(b) does not affect any + right the Licensor may have to seek remedies for Your violations + of this Public License. + + c. For the avoidance of doubt, the Licensor may also offer the + Licensed Material under separate terms or conditions or stop + distributing the Licensed Material at any time; however, doing so + will not terminate this Public License. + + d. Sections 1, 5, 6, 7, and 8 survive termination of this Public + License. + + +Section 7 -- Other Terms and Conditions. + + a. The Licensor shall not be bound by any additional or different + terms or conditions communicated by You unless expressly agreed. + + b. Any arrangements, understandings, or agreements regarding the + Licensed Material not stated herein are separate from and + independent of the terms and conditions of this Public License. + + +Section 8 -- Interpretation. + + a. For the avoidance of doubt, this Public License does not, and + shall not be interpreted to, reduce, limit, restrict, or impose + conditions on any use of the Licensed Material that could lawfully + be made without permission under this Public License. + + b. To the extent possible, if any provision of this Public License is + deemed unenforceable, it shall be automatically reformed to the + minimum extent necessary to make it enforceable. If the provision + cannot be reformed, it shall be severed from this Public License + without affecting the enforceability of the remaining terms and + conditions. + + c. No term or condition of this Public License will be waived and no + failure to comply consented to unless expressly agreed to by the + Licensor. + + d. Nothing in this Public License constitutes or may be interpreted + as a limitation upon, or waiver of, any privileges and immunities + that apply to the Licensor or You, including from the legal + processes of any jurisdiction or authority. + +======================================================================= + +Creative Commons is not a party to its public +licenses. Notwithstanding, Creative Commons may elect to apply one of +its public licenses to material it publishes and in those instances +will be considered the “Licensor.” The text of the Creative Commons +public licenses is dedicated to the public domain under the CC0 Public +Domain Dedication. Except for the limited purpose of indicating that +material is shared under a Creative Commons public license or as +otherwise permitted by the Creative Commons policies published at +creativecommons.org/policies, Creative Commons does not authorize the +use of the trademark "Creative Commons" or any other trademark or logo +of Creative Commons without its prior written consent including, +without limitation, in connection with any unauthorized modifications +to any of its public licenses or any other arrangements, +understandings, or agreements concerning use of licensed material. For +the avoidance of doubt, this paragraph does not form part of the +public licenses. + +Creative Commons may be contacted at creativecommons.org. diff --git a/README.md b/README.md index e368a76..40a634f 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,9 @@ -# Minecraft-Mods +# [Beem](https://ladysnake.org/wiki/beem) +A Minecraft Fabric mod that displays light beams to help finding bee nests. -Updated versions of abandoned mods and/or mods that are slow updating. \ No newline at end of file +# License +[CC-BY-NC-SA 4.0](./LICENSE) + +# Contributors +Creator: [Ladysnake](https://www.curseforge.com/minecraft/mc-mods/beem) ([src](https://github.com/Ladysnake/Beem)) (outdated)\ +Current maintainer: [Yuuki2012](https://git.raiza.dev/Raiza.dev/Minecraft-Mods/src/branch/Beem) \ No newline at end of file