commit 819c1a05775ea5dab7e62b8cc53c971e62b48a28 Author: TheBrokenRail Date: Thu Mar 19 15:45:46 2020 -0400 1.0 Initial Release diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..9563893 --- /dev/null +++ b/.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/CHANGELOG.md b/CHANGELOG.md new file mode 100644 index 0000000..141f1e4 --- /dev/null +++ b/CHANGELOG.md @@ -0,0 +1,4 @@ +# Changelog + +**1.0** +* Initial Release diff --git a/Jenkinsfile b/Jenkinsfile new file mode 100644 index 0000000..1673e44 --- /dev/null +++ b/Jenkinsfile @@ -0,0 +1,19 @@ +pipeline { + agent { + docker { + image 'openjdk:8-jdk' + } + } + stages { + stage('Build') { + steps { + sh './gradlew build' + } + post { + success { + archiveArtifacts artifacts: 'build/libs/*', fingerprint: true + } + } + } + } +} diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..886b254 --- /dev/null +++ b/LICENSE @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) 2020 TheBrokenRail + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. \ No newline at end of file diff --git a/README.md b/README.md new file mode 100644 index 0000000..81b9d39 --- /dev/null +++ b/README.md @@ -0,0 +1,13 @@ +# SlightlyVanilla +A Collection of Tweaks for Vanilla Minecraft + +All tweaks can be enabled/disabled individually. +Suggest more tweaks in the issue tracker! + +## Tweaks +* Use Respawn Anchor in Any Dimension +* Instantly Kill In Creative Mode +* Throwable Slimeballs + +## Changelog +[View Changelog](CHANGELOG.md) diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..f100ff0 --- /dev/null +++ b/build.gradle @@ -0,0 +1,104 @@ +plugins { + id 'fabric-loom' version '0.2.7-SNAPSHOT' + id 'com.matthewprenger.cursegradle' version '1.4.0' +} + +compileJava { + sourceCompatibility = JavaVersion.VERSION_1_8 + targetCompatibility = JavaVersion.VERSION_1_8 +} + +archivesBaseName = project.archives_base_name +version = project.mod_version as Object +group = project.maven_group as Object + +minecraft { +} + +repositories { + jcenter() + maven { + url "https://dl.bintray.com/shedaniel/autoconfig1u/" + } +} + +dependencies { + minecraft "com.mojang:minecraft:${project.minecraft_version}" + mappings "net.fabricmc:yarn:${project.minecraft_version}+build.${project.yarn_build}:v2" + modImplementation "net.fabricmc:fabric-loader:${project.fabric_loader_version}" + modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_api_version}" + + modImplementation "me.shedaniel.cloth:config-2:${project.cloth_config_version}" + include "me.shedaniel.cloth:config-2:${project.cloth_config_version}" + modImplementation "me.sargunvohra.mcmods:autoconfig1u:${project.auto_config_version}" + include "me.sargunvohra.mcmods:autoconfig1u:${project.auto_config_version}" + modImplementation "io.github.prospector:modmenu:${project.mod_menu_version}" +} + +processResources { + inputs.property 'version', version + inputs.property 'name', rootProject.name + + from(sourceSets.main.resources.srcDirs) { + include 'fabric.mod.json' + expand 'version': version, 'name': rootProject.name + } + + from(sourceSets.main.resources.srcDirs) { + exclude 'fabric.mod.json' + } +} + +// 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) { + options.encoding = 'UTF-8' +} + +// Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task +// if it is present. +// If you remove this task, sources will not be generated. +task sourcesJar(type: Jar, dependsOn: classes) { + classifier 'sources' + from sourceSets.main.allSource +} + +task javadocJar(type: Jar, dependsOn: javadoc) { + classifier 'javadoc' + from javadoc.destinationDir +} + +artifacts { + archives sourcesJar + archives javadocJar +} + +jar { + from "LICENSE" +} + +if (project.hasProperty('curseforge.api_key')) { + curseforge { + apiKey = project.getProperty('curseforge.api_key') + project { + id = project.curseforge_id + changelog = 'A changelog can be found at https://gitea.thebrokenrail.com/TheBrokenRail/SlightlyVanilla/src/branch/master/CHANGELOG.md' + releaseType = 'release' + addGameVersion project.simple_minecraft_version + addGameVersion 'Fabric' + mainArtifact(remapJar) { + displayName = "SlightlyVanilla v${version} for ${project.minecraft_version}" + } + afterEvaluate { + uploadTask.dependsOn('remapJar') + } + relations { + requiredDependency 'fabric-api' + } + } + options { + forgeGradleIntegration = false + } + } +} \ No newline at end of file diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 0000000..946c3bd --- /dev/null +++ b/gradle.properties @@ -0,0 +1,22 @@ +# Done to increase the memory available to gradle. +org.gradle.jvmargs = -Xmx1G + +# Fabric Properties + # check these on https://fabricmc.net/use + minecraft_version = 20w12a + curseforge_id = 368420 + simple_minecraft_version = 1.16-Snapshot + yarn_build = 12 + fabric_loader_version = 0.7.8+build.187 + +# Mod Properties + mod_version = 1.0.0 + maven_group = com.thebrokenrail + archives_base_name = slightlyvanilla + +# Dependencies + # currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric-api/fabric-api + fabric_api_version = 0.5.5+build.311-1.16 + cloth_config_version = 3.1.0-unstable + auto_config_version = 1.2.4 + mod_menu_version = 1.10.2+build.1 diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..5c2d1cf 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..5baddfb --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,6 @@ +#Sat Feb 29 21:58:32 EST 2020 +distributionUrl=https\://services.gradle.org/distributions/gradle-6.2.2-all.zip +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +zipStorePath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew new file mode 100755 index 0000000..8e25e6c --- /dev/null +++ b/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/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..9618d8d --- /dev/null +++ b/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/settings.gradle b/settings.gradle new file mode 100644 index 0000000..0c14f75 --- /dev/null +++ b/settings.gradle @@ -0,0 +1,12 @@ +pluginManagement { + repositories { + jcenter() + maven { + name = 'Fabric' + url = 'https://maven.fabricmc.net/' + } + gradlePluginPortal() + } +} + +rootProject.name = 'SlightlyVanilla' diff --git a/src/main/java/com/thebrokenrail/slightlyvanilla/ModConfig.java b/src/main/java/com/thebrokenrail/slightlyvanilla/ModConfig.java new file mode 100644 index 0000000..c9798ee --- /dev/null +++ b/src/main/java/com/thebrokenrail/slightlyvanilla/ModConfig.java @@ -0,0 +1,11 @@ +package com.thebrokenrail.slightlyvanilla; + +import me.sargunvohra.mcmods.autoconfig1u.ConfigData; +import me.sargunvohra.mcmods.autoconfig1u.annotation.Config; + +@Config(name = SlightlyVanilla.NAMESPACE) +public class ModConfig implements ConfigData { + public boolean useRespawnAnchorInAnyDimension = true; + public boolean instantlyKillInCreative = true; + public boolean throwableSlimeballs = true; +} diff --git a/src/main/java/com/thebrokenrail/slightlyvanilla/SlightlyVanilla.java b/src/main/java/com/thebrokenrail/slightlyvanilla/SlightlyVanilla.java new file mode 100644 index 0000000..13f89de --- /dev/null +++ b/src/main/java/com/thebrokenrail/slightlyvanilla/SlightlyVanilla.java @@ -0,0 +1,27 @@ +package com.thebrokenrail.slightlyvanilla; + +import com.thebrokenrail.slightlyvanilla.entity.SlimeballEntity; +import me.sargunvohra.mcmods.autoconfig1u.AutoConfig; +import me.sargunvohra.mcmods.autoconfig1u.serializer.GsonConfigSerializer; +import net.fabricmc.api.ModInitializer; +import net.fabricmc.fabric.api.entity.FabricEntityTypeBuilder; +import net.minecraft.entity.EntityCategory; +import net.minecraft.entity.EntityDimensions; +import net.minecraft.entity.EntityType; + +public class SlightlyVanilla implements ModInitializer { + public static final String NAMESPACE = "slightlyvanilla"; + + public static EntityType SLIMEBALL_ENTITY; + + public static ModConfig getConfig() { + return AutoConfig.getConfigHolder(ModConfig.class).getConfig(); + } + + @Override + public void onInitialize() { + AutoConfig.register(ModConfig.class, GsonConfigSerializer::new); + + SLIMEBALL_ENTITY = FabricEntityTypeBuilder.create(EntityCategory.MISC, (EntityType.EntityFactory) SlimeballEntity::new).size(EntityDimensions.fixed(0.25f, 0.25f)).build(); + } +} diff --git a/src/main/java/com/thebrokenrail/slightlyvanilla/client/SlightlyVanillaClient.java b/src/main/java/com/thebrokenrail/slightlyvanilla/client/SlightlyVanillaClient.java new file mode 100644 index 0000000..666daf6 --- /dev/null +++ b/src/main/java/com/thebrokenrail/slightlyvanilla/client/SlightlyVanillaClient.java @@ -0,0 +1,29 @@ +package com.thebrokenrail.slightlyvanilla.client; + +import com.thebrokenrail.slightlyvanilla.SlightlyVanilla; +import com.thebrokenrail.slightlyvanilla.ModConfig; +import com.thebrokenrail.slightlyvanilla.entity.SlimeballEntity; +import io.github.prospector.modmenu.api.ConfigScreenFactory; +import io.github.prospector.modmenu.api.ModMenuApi; +import me.sargunvohra.mcmods.autoconfig1u.AutoConfig; +import net.fabricmc.api.ClientModInitializer; +import net.fabricmc.fabric.api.client.rendereregistry.v1.EntityRendererRegistry; +import net.minecraft.client.gui.screen.Screen; +import net.minecraft.client.render.entity.FlyingItemEntityRenderer; + +public class SlightlyVanillaClient implements ClientModInitializer, ModMenuApi { + @Override + public void onInitializeClient() { + EntityRendererRegistry.INSTANCE.register(SlightlyVanilla.SLIMEBALL_ENTITY, (entityRenderDispatcher, context) -> new FlyingItemEntityRenderer(entityRenderDispatcher, context.getItemRenderer())); + } + + @Override + public String getModId() { + return SlightlyVanilla.NAMESPACE; + } + + @Override + public ConfigScreenFactory getModConfigScreenFactory() { + return (ConfigScreenFactory) screen -> AutoConfig.getConfigScreen(ModConfig.class, screen).get(); + } +} diff --git a/src/main/java/com/thebrokenrail/slightlyvanilla/entity/SlimeballEntity.java b/src/main/java/com/thebrokenrail/slightlyvanilla/entity/SlimeballEntity.java new file mode 100644 index 0000000..aa9a44f --- /dev/null +++ b/src/main/java/com/thebrokenrail/slightlyvanilla/entity/SlimeballEntity.java @@ -0,0 +1,66 @@ +package com.thebrokenrail.slightlyvanilla.entity; + +import com.thebrokenrail.slightlyvanilla.SlightlyVanilla; +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; +import net.minecraft.entity.EntityType; +import net.minecraft.entity.LivingEntity; +import net.minecraft.entity.projectile.thrown.ThrownItemEntity; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.item.Items; +import net.minecraft.network.Packet; +import net.minecraft.network.packet.s2c.play.EntitySpawnS2CPacket; +import net.minecraft.particle.ItemStackParticleEffect; +import net.minecraft.particle.ParticleEffect; +import net.minecraft.particle.ParticleTypes; +import net.minecraft.util.hit.HitResult; +import net.minecraft.world.World; + +public class SlimeballEntity extends ThrownItemEntity { + public SlimeballEntity(EntityType entityType, World world) { + super(entityType, world); + } + + public SlimeballEntity(World world, LivingEntity owner) { + super(SlightlyVanilla.SLIMEBALL_ENTITY, owner, world); + } + + public SlimeballEntity(World world, double x, double y, double z) { + super(SlightlyVanilla.SLIMEBALL_ENTITY, x, y, z, world); + } + + protected Item getDefaultItem() { + return Items.SLIME_BALL; + } + + @Environment(EnvType.CLIENT) + private ParticleEffect getParticleParameters() { + ItemStack itemStack = getItem(); + return itemStack.isEmpty() ? ParticleTypes.ITEM_SLIME : new ItemStackParticleEffect(ParticleTypes.ITEM, itemStack); + } + + @Environment(EnvType.CLIENT) + public void handleStatus(byte status) { + if (status == 3) { + ParticleEffect particleEffect = getParticleParameters(); + + for (int i = 0; i < 8; ++i) { + world.addParticle(particleEffect, getX(), getY(), getZ(), 0.0D, 0.0D, 0.0D); + } + } + } + + protected void onCollision(HitResult hitResult) { + super.onCollision(hitResult); + if (!world.isClient()) { + world.sendEntityStatus(this, (byte) 3); + remove(); + } + } + + @Override + public Packet createSpawnPacket() { + return new EntitySpawnS2CPacket(this); + } +} diff --git a/src/main/java/com/thebrokenrail/slightlyvanilla/mixin/MixinClientPlayNetworkHandler.java b/src/main/java/com/thebrokenrail/slightlyvanilla/mixin/MixinClientPlayNetworkHandler.java new file mode 100644 index 0000000..e8516d4 --- /dev/null +++ b/src/main/java/com/thebrokenrail/slightlyvanilla/mixin/MixinClientPlayNetworkHandler.java @@ -0,0 +1,43 @@ +package com.thebrokenrail.slightlyvanilla.mixin; + +import com.thebrokenrail.slightlyvanilla.SlightlyVanilla; +import com.thebrokenrail.slightlyvanilla.entity.SlimeballEntity; +import net.minecraft.client.network.ClientPlayNetworkHandler; +import net.minecraft.client.world.ClientWorld; +import net.minecraft.entity.Entity; +import net.minecraft.entity.EntityType; +import net.minecraft.network.packet.s2c.play.EntitySpawnS2CPacket; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Shadow; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; + +@SuppressWarnings("unused") +@Mixin(ClientPlayNetworkHandler.class) +public class MixinClientPlayNetworkHandler { + @Shadow + private ClientWorld world; + + @Inject(method = "onEntitySpawn", at = @At(value = "TAIL")) + public void onEntitySpawn(EntitySpawnS2CPacket packet, CallbackInfo info) { + EntityType entityType = packet.getEntityTypeId(); + Entity entity = null; + + if (entityType == SlightlyVanilla.SLIMEBALL_ENTITY) { + entity = new SlimeballEntity(world, packet.getX(), packet.getY(), packet.getZ()); + } + + if (entity != null) { + double x = packet.getX(); + double y = packet.getY(); + double z = packet.getZ(); + entity.updateTrackedPosition(x, y, z); + entity.pitch = (float) (packet.getPitch() * 360) / 250F; + entity.yaw = (float) (packet.getYaw() * 360) / 250F; + entity.setEntityId(packet.getId()); + entity.setUuid(packet.getUuid()); + world.addEntity(packet.getId(), entity); + } + } +} diff --git a/src/main/java/com/thebrokenrail/slightlyvanilla/mixin/MixinItem.java b/src/main/java/com/thebrokenrail/slightlyvanilla/mixin/MixinItem.java new file mode 100644 index 0000000..072dff2 --- /dev/null +++ b/src/main/java/com/thebrokenrail/slightlyvanilla/mixin/MixinItem.java @@ -0,0 +1,36 @@ +package com.thebrokenrail.slightlyvanilla.mixin; + +import com.thebrokenrail.slightlyvanilla.SlightlyVanilla; +import com.thebrokenrail.slightlyvanilla.entity.SlimeballEntity; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.item.Items; +import net.minecraft.util.ActionResult; +import net.minecraft.util.Hand; +import net.minecraft.util.TypedActionResult; +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.CallbackInfoReturnable; + +@Mixin(Item.class) +public class MixinItem { + @Inject(at = @At("HEAD"), method = "use", cancellable = true) + public void use(World world, PlayerEntity playerEntity, Hand hand, CallbackInfoReturnable> info) { + ItemStack stack = playerEntity.getStackInHand(hand); + if (stack.getItem() == Items.SLIME_BALL && SlightlyVanilla.getConfig().throwableSlimeballs) { + if (!world.isClient()) { + SlimeballEntity entity = new SlimeballEntity(world, playerEntity); + entity.setItem(stack); + entity.setProperties(playerEntity, playerEntity.pitch, playerEntity.yaw, 0.0f, 1.5f, 1.0f); + world.spawnEntity(entity); + } + if (!playerEntity.isCreative()) { + stack.decrement(1); + } + info.setReturnValue(new TypedActionResult<>(ActionResult.SUCCESS, stack)); + } + } +} diff --git a/src/main/java/com/thebrokenrail/slightlyvanilla/mixin/MixinPlayerEntity.java b/src/main/java/com/thebrokenrail/slightlyvanilla/mixin/MixinPlayerEntity.java new file mode 100644 index 0000000..8a1809e --- /dev/null +++ b/src/main/java/com/thebrokenrail/slightlyvanilla/mixin/MixinPlayerEntity.java @@ -0,0 +1,25 @@ +package com.thebrokenrail.slightlyvanilla.mixin; + +import com.thebrokenrail.slightlyvanilla.SlightlyVanilla; +import net.minecraft.entity.Entity; +import net.minecraft.entity.boss.dragon.EnderDragonPart; +import net.minecraft.entity.damage.DamageSource; +import net.minecraft.entity.player.PlayerEntity; +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(PlayerEntity.class) +public class MixinPlayerEntity { + @Inject(at = @At("HEAD"), method = "attack", cancellable = true) + public void attack(Entity target, CallbackInfo info) { + if (SlightlyVanilla.getConfig().instantlyKillInCreative && target.isAttackable()) { + if (target instanceof EnderDragonPart) { + target = ((EnderDragonPart)target).owner; + } + //noinspection ConstantConditions + target.damage(DamageSource.player((PlayerEntity) (Object) this), Float.MAX_VALUE); + } + } +} diff --git a/src/main/java/com/thebrokenrail/slightlyvanilla/mixin/MixinRespawnAnchorBlock.java b/src/main/java/com/thebrokenrail/slightlyvanilla/mixin/MixinRespawnAnchorBlock.java new file mode 100644 index 0000000..4cf2283 --- /dev/null +++ b/src/main/java/com/thebrokenrail/slightlyvanilla/mixin/MixinRespawnAnchorBlock.java @@ -0,0 +1,21 @@ +package com.thebrokenrail.slightlyvanilla.mixin; + +import com.thebrokenrail.slightlyvanilla.SlightlyVanilla; +import net.minecraft.block.RespawnAnchorBlock; +import net.minecraft.world.dimension.Dimension; +import net.minecraft.world.dimension.DimensionType; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Redirect; + +@Mixin(RespawnAnchorBlock.class) +public class MixinRespawnAnchorBlock { + @Redirect(at = @At(value = "INVOKE", target = "Lnet/minecraft/world/dimension/Dimension;getType()Lnet/minecraft/world/dimension/DimensionType;", ordinal = 0), method = "onUse") + public DimensionType getDimension(Dimension dimension) { + if (SlightlyVanilla.getConfig().useRespawnAnchorInAnyDimension) { + return DimensionType.THE_NETHER; + } else { + return dimension.getType(); + } + } +} diff --git a/src/main/resources/assets/slightlyvanilla/icon.png b/src/main/resources/assets/slightlyvanilla/icon.png new file mode 100644 index 0000000..1ec4b2c Binary files /dev/null and b/src/main/resources/assets/slightlyvanilla/icon.png differ diff --git a/src/main/resources/assets/slightlyvanilla/lang/en_us.json b/src/main/resources/assets/slightlyvanilla/lang/en_us.json new file mode 100644 index 0000000..4fcf05c --- /dev/null +++ b/src/main/resources/assets/slightlyvanilla/lang/en_us.json @@ -0,0 +1,6 @@ +{ + "text.autoconfig.slightlyvanilla.title": "SlightlyVanilla Tweaks", + "text.autoconfig.slightlyvanilla.option.useRespawnAnchorInAnyDimension": "Use Respawn Anchor In Any Dimension", + "text.autoconfig.slightlyvanilla.option.instantlyKillInCreative": "Instantly Kill In Creative Mode", + "text.autoconfig.slightlyvanilla.option.throwableSlimeballs": "Throwable Slimeballs" +} \ 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..af2c28d --- /dev/null +++ b/src/main/resources/fabric.mod.json @@ -0,0 +1,37 @@ +{ + "schemaVersion": 1, + "id": "slightlyvanilla", + "version": "${version}", + "name": "${name}", + "description": "A Collection of Tweaks for Vanilla Minecraft", + "authors": [ + "TheBrokenRail" + ], + "contact": { + "homepage": "https://thebrokenrail.com/", + "sources": "https://gitea.thebrokenrail.com/TheBrokenRail/SlightlyVanilla.git", + "issues": "https://gitea.thebrokenrail.com/TheBrokenRail/SlightlyVanilla/issues" + }, + "license": "MIT", + "icon": "assets/slightlyvanilla/icon.png", + "environment": "*", + "entrypoints": { + "main": [ + "com.thebrokenrail.slightlyvanilla.SlightlyVanilla" + ], + "client": [ + "com.thebrokenrail.slightlyvanilla.client.SlightlyVanillaClient" + ], + "modmenu": [ + "com.thebrokenrail.slightlyvanilla.client.SlightlyVanillaClient" + ] + }, + "mixins": [ + "slightlyvanilla.mixins.json" + ], + "depends": { + "fabricloader": ">=0.7.4", + "fabric": "*", + "minecraft": "1.16.x" + } +} diff --git a/src/main/resources/slightlyvanilla.mixins.json b/src/main/resources/slightlyvanilla.mixins.json new file mode 100644 index 0000000..10aff57 --- /dev/null +++ b/src/main/resources/slightlyvanilla.mixins.json @@ -0,0 +1,16 @@ +{ + "required": true, + "package": "com.thebrokenrail.slightlyvanilla.mixin", + "compatibilityLevel": "JAVA_8", + "client": [ + "MixinClientPlayNetworkHandler" + ], + "mixins": [ + "MixinRespawnAnchorBlock", + "MixinPlayerEntity", + "MixinItem" + ], + "injectors": { + "defaultRequire": 1 + } +}