diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..823aca8 --- /dev/null +++ b/.gitignore @@ -0,0 +1,25 @@ +# gradle + +.gradle/ +out/ +classes/ +build/ + +# idea + +.idea/ +*.iml +*.ipr +*.iws + +# vscode + +.settings/ +.vscode/ +bin/ +.classpath +.project + +# fabric + +run/ \ No newline at end of file diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..ea9ed68 --- /dev/null +++ b/LICENSE @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) 2020 MidnightDust + +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. diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..6a0e08b --- /dev/null +++ b/build.gradle @@ -0,0 +1,80 @@ +plugins { + id 'fabric-loom' version '0.2.7-SNAPSHOT' + id 'maven-publish' +} + +sourceCompatibility = JavaVersion.VERSION_1_8 +targetCompatibility = JavaVersion.VERSION_1_8 + +archivesBaseName = project.archives_base_name +version = project.mod_version +group = project.maven_group + +minecraft { +} + +repositories { + maven { url "https://jitpack.io" } +} + +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" + modCompile "net.fabricmc:fabric-loader:${project.loader_version}" + + modCompile "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}" +} + +processResources { + inputs.property "version", project.version + + from(sourceSets.main.resources.srcDirs) { + include "fabric.mod.json" + expand "version": project.version + } + + 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 +} + +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 + } + artifact(sourcesJar) { + builtBy remapSourcesJar + } + } + } + + // select the repositories you want to publish to + repositories { + // uncomment to publish to the local maven + // mavenLocal() + } +} diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 0000000..36bf876 --- /dev/null +++ b/gradle.properties @@ -0,0 +1,17 @@ +# Done to increase the memory available to gradle. +org.gradle.jvmargs=-Xmx1G + +# Fabric Properties + # check these on https://fabricmc.net/use + minecraft_version=1.16.2 + yarn_mappings=1.16.2+build.6 + loader_version=0.9.1+build.205 + +# Mod Properties + mod_version = 1.0.2 + maven_group = eu.midnightdust + archives_base_name = midnight-hats + +# Dependencies + # currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric-api/fabric-api + fabric_version=0.17.2+build.396-1.16 \ 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..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..4b7e1f3 --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,5 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-5.5.1-bin.zip +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100644 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/logs/latest.log b/logs/latest.log new file mode 100644 index 0000000..e69de29 diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 0000000..5b60df3 --- /dev/null +++ b/settings.gradle @@ -0,0 +1,10 @@ +pluginManagement { + repositories { + jcenter() + maven { + name = 'Fabric' + url = 'https://maven.fabricmc.net/' + } + gradlePluginPortal() + } +} diff --git a/src/main/java/eu/midnightdust/hats/HatsClient.java b/src/main/java/eu/midnightdust/hats/HatsClient.java new file mode 100644 index 0000000..534c889 --- /dev/null +++ b/src/main/java/eu/midnightdust/hats/HatsClient.java @@ -0,0 +1,12 @@ +package eu.midnightdust.hats; + +import eu.midnightdust.hats.web.HatLoader; +import net.fabricmc.api.ClientModInitializer; + +public class HatsClient implements ClientModInitializer { + + @Override + public void onInitializeClient() { + HatLoader.init(); + } +} diff --git a/src/main/java/eu/midnightdust/hats/bunny/BunnyEarsFeatureRenderer.java b/src/main/java/eu/midnightdust/hats/bunny/BunnyEarsFeatureRenderer.java new file mode 100644 index 0000000..ac1ba19 --- /dev/null +++ b/src/main/java/eu/midnightdust/hats/bunny/BunnyEarsFeatureRenderer.java @@ -0,0 +1,62 @@ +package eu.midnightdust.hats.bunny; + +import eu.midnightdust.hats.christmas.ChristmasHatModel; +import eu.midnightdust.hats.web.HatLoader; +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; +import net.minecraft.client.network.AbstractClientPlayerEntity; +import net.minecraft.client.render.OverlayTexture; +import net.minecraft.client.render.RenderLayer; +import net.minecraft.client.render.VertexConsumer; +import net.minecraft.client.render.VertexConsumerProvider; +import net.minecraft.client.render.entity.LivingEntityRenderer; +import net.minecraft.client.render.entity.feature.FeatureRenderer; +import net.minecraft.client.render.entity.model.EntityModel; +import net.minecraft.client.render.entity.model.ModelWithHead; +import net.minecraft.client.render.item.ItemRenderer; +import net.minecraft.client.util.math.MatrixStack; +import net.minecraft.entity.LivingEntity; +import net.minecraft.util.Identifier; + +import java.util.Calendar; +import java.util.UUID; + +@Environment(EnvType.CLIENT) +public class BunnyEarsFeatureRenderer> extends FeatureRenderer { + private static final UUID MOTSCHEN = UUID.fromString("a44c2660-630f-478f-946a-e518669fcf0c"); + + private static final Identifier DEACTIVATED = new Identifier("midnight-hats:textures/hats/empty.png"); + private static final Identifier RABBIT = new Identifier("textures/entity/rabbit/brown.png"); + private final BunnyEarsModel bunnyEars = new BunnyEarsModel<>(); + + public BunnyEarsFeatureRenderer(LivingEntityRenderer livingEntityRenderer) { + super(livingEntityRenderer); + } + + public void render(MatrixStack matrixStack, VertexConsumerProvider vertexConsumerProvider, int i, T livingEntity, float f, float g, float h, float j, float k, float l) { + { + AbstractClientPlayerEntity abstractClientPlayerEntity = (AbstractClientPlayerEntity)livingEntity; + Identifier hat_type; + if (livingEntity instanceof AbstractClientPlayerEntity) { + + if (Calendar.getInstance().get(Calendar.MONTH) == Calendar.APRIL && Calendar.getInstance().get(Calendar.DAY_OF_MONTH) <= 4) { + hat_type = RABBIT; + }else { + hat_type = DEACTIVATED; + } + } else { + hat_type = DEACTIVATED; + } + + if (!(hat_type == DEACTIVATED) && !HatLoader.PLAYER_HATS.containsKey(abstractClientPlayerEntity.getUuid()) && !abstractClientPlayerEntity.getUuid().equals(MOTSCHEN)) { + matrixStack.push(); + + ((ModelWithHead) this.getContextModel()).getHead().rotate(matrixStack); + VertexConsumer vertexConsumer = ItemRenderer.getArmorVertexConsumer(vertexConsumerProvider, RenderLayer.getEntityCutoutNoCull(hat_type), false, false); + this.bunnyEars.render(matrixStack, vertexConsumer, i, OverlayTexture.DEFAULT_UV, 1.0F, 1.0F, 1.0F, 1.0F); + + matrixStack.pop(); + } + } + } +} diff --git a/src/main/java/eu/midnightdust/hats/bunny/BunnyEarsModel.java b/src/main/java/eu/midnightdust/hats/bunny/BunnyEarsModel.java new file mode 100644 index 0000000..6d6e847 --- /dev/null +++ b/src/main/java/eu/midnightdust/hats/bunny/BunnyEarsModel.java @@ -0,0 +1,55 @@ +// Made with Blockbench 3.6.6 + // Exported for Minecraft version 1.15 + // Paste this class into your mod and generate all required imports + + package eu.midnightdust.hats.bunny; + +import net.minecraft.client.model.ModelPart; +import net.minecraft.client.render.VertexConsumer; +import net.minecraft.client.render.entity.model.AnimalModel; +import net.minecraft.client.util.math.MatrixStack; +import net.minecraft.entity.LivingEntity; + +public class BunnyEarsModel extends AnimalModel { + private final ModelPart right_ear; + private final ModelPart left_ear; + + public BunnyEarsModel() { + textureWidth = 64; + textureHeight = 32; + right_ear = new ModelPart(this); + right_ear.setPivot(0.0F, -3.0F, -1.0F); + right_ear.setTextureOffset(52, 0).addCuboid(-2.5F, -9.0F, -1.0F, 2.0F, 5.0F, 1.0F, 0.0F, false); + + left_ear = new ModelPart(this); + left_ear.setPivot(0.0F, -3.0F, -1.0F); + left_ear.setTextureOffset(58, 0).addCuboid(0.5F, -9.0F, -1.0F, 2.0F, 5.0F, 1.0F, 0.0F, false); +} + + @Override + public void setAngles(T entity, float limbAngle, float limbDistance, float animationProgress, float headYaw, float headPitch) { + + } + + @Override + protected Iterable getHeadParts() { + return null; + } + + @Override + protected Iterable getBodyParts() { + return null; + } + + @Override + public void render(MatrixStack matrixStack, VertexConsumer buffer, int packedLight, int packedOverlay, float red, float green, float blue, float alpha){ + right_ear.render(matrixStack, buffer, packedLight, packedOverlay); + left_ear.render(matrixStack, buffer, packedLight, packedOverlay); + } + + public void setRotationAngle(ModelPart bone, float x, float y, float z) { + bone.pitch = x; + bone.yaw = y; + bone.roll = z; + } +} \ No newline at end of file diff --git a/src/main/java/eu/midnightdust/hats/christmas/ChristmasHatFeatureRenderer.java b/src/main/java/eu/midnightdust/hats/christmas/ChristmasHatFeatureRenderer.java new file mode 100644 index 0000000..5ea6df2 --- /dev/null +++ b/src/main/java/eu/midnightdust/hats/christmas/ChristmasHatFeatureRenderer.java @@ -0,0 +1,63 @@ +package eu.midnightdust.hats.christmas; + +import eu.midnightdust.hats.web.HatLoader; +import eu.midnightdust.hats.witch.WitchHatFeatureRenderer; +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; +import net.minecraft.client.network.AbstractClientPlayerEntity; +import net.minecraft.client.render.OverlayTexture; +import net.minecraft.client.render.RenderLayer; +import net.minecraft.client.render.VertexConsumer; +import net.minecraft.client.render.VertexConsumerProvider; +import net.minecraft.client.render.entity.LivingEntityRenderer; +import net.minecraft.client.render.entity.feature.FeatureRenderer; +import net.minecraft.client.render.entity.model.EntityModel; +import net.minecraft.client.render.entity.model.ModelWithHead; +import net.minecraft.client.render.item.ItemRenderer; +import net.minecraft.client.util.math.MatrixStack; +import net.minecraft.entity.LivingEntity; +import net.minecraft.util.Identifier; + +import java.util.Calendar; +import java.util.UUID; + +@Environment(EnvType.CLIENT) +public class ChristmasHatFeatureRenderer> extends FeatureRenderer { + private static final UUID MOTSCHEN = UUID.fromString("a44c2660-630f-478f-946a-e518669fcf0c"); + + private static final Identifier DEACTIVATED = new Identifier("midnight-hats:textures/hats/empty.png"); + private static final Identifier CHRISTMAS = new Identifier("midnight-hats:textures/hats/christmas.png"); + private final ChristmasHatModel christmasHat = new ChristmasHatModel<>(); + + public ChristmasHatFeatureRenderer(LivingEntityRenderer livingEntityRenderer) { + super(livingEntityRenderer); + } + + public void render(MatrixStack matrixStack, VertexConsumerProvider vertexConsumerProvider, int i, T livingEntity, float f, float g, float h, float j, float k, float l) { + { + AbstractClientPlayerEntity abstractClientPlayerEntity = (AbstractClientPlayerEntity)livingEntity; + Identifier hat_type; + if (livingEntity instanceof AbstractClientPlayerEntity) { + + + if (Calendar.getInstance().get(Calendar.MONTH) == Calendar.DECEMBER && Calendar.getInstance().get(Calendar.DAY_OF_MONTH) >= 23 && Calendar.getInstance().get(Calendar.DAY_OF_MONTH) <= 26) { + hat_type = CHRISTMAS; + }else { + hat_type = DEACTIVATED; + } + } else { + hat_type = DEACTIVATED; + } + + if (!(hat_type == DEACTIVATED) && !HatLoader.PLAYER_HATS.containsKey(abstractClientPlayerEntity.getUuid()) && !abstractClientPlayerEntity.getUuid().equals(MOTSCHEN)) { + matrixStack.push(); + + ((ModelWithHead) this.getContextModel()).getHead().rotate(matrixStack); + VertexConsumer vertexConsumer = ItemRenderer.getArmorVertexConsumer(vertexConsumerProvider, RenderLayer.getEntityCutoutNoCull(hat_type), false, false); + this.christmasHat.render(matrixStack, vertexConsumer, i, OverlayTexture.DEFAULT_UV, 1.0F, 1.0F, 1.0F, 1.0F); + + matrixStack.pop(); + } + } + } +} diff --git a/src/main/java/eu/midnightdust/hats/christmas/ChristmasHatModel.java b/src/main/java/eu/midnightdust/hats/christmas/ChristmasHatModel.java new file mode 100644 index 0000000..fc1f1ca --- /dev/null +++ b/src/main/java/eu/midnightdust/hats/christmas/ChristmasHatModel.java @@ -0,0 +1,65 @@ +package eu.midnightdust.hats.christmas; + +import net.minecraft.client.model.ModelPart; +import net.minecraft.client.render.VertexConsumer; +import net.minecraft.client.render.entity.model.AnimalModel; +import net.minecraft.client.util.math.MatrixStack; +import net.minecraft.entity.LivingEntity; + +public class ChristmasHatModel extends AnimalModel { + private final ModelPart headwear; + private final ModelPart bone; + private final ModelPart bone2; + private final ModelPart bone3; + + public ChristmasHatModel() { + textureWidth = 64; + textureHeight = 64; + headwear = new ModelPart(this); + headwear.setPivot(5.0F, -9.0F, -5.0F); + headwear.setTextureOffset(0, 0).addCuboid(-10.0F, -0.1F, 0.0F, 10.0F, 2.0F, 10.0F, 0.0F, false); + + bone = new ModelPart(this); + bone.setPivot(-8.5F, -0.1F, 1.5F); + headwear.addChild(bone); + setRotationAngle(bone, -0.0524F, 0.0F, 0.0349F); + bone.setTextureOffset(0, 12).addCuboid(0.0F, -4.0F, 0.0F, 7.0F, 4.0F, 7.0F, 0.0F, false); + + bone2 = new ModelPart(this); + bone2.setPivot(1.5F, -4.0F, 1.5F); + bone.addChild(bone2); + setRotationAngle(bone2, -0.1222F, 0.0F, 0.0698F); + bone2.setTextureOffset(0, 23).addCuboid(0.0F, -4.0F, 0.0F, 4.0F, 4.0F, 4.0F, 0.0F, false); + + bone3 = new ModelPart(this); + bone3.setPivot(1.5F, -4.0F, 1.5F); + bone2.addChild(bone3); + setRotationAngle(bone3, -0.2618F, 0.0F, 0.1047F); + bone3.setTextureOffset(21, 12).addCuboid(0.0F, -3.0F, 0.0F, 3.0F, 3.0F, 3.0F, 0.0F, false); + } + + @Override + public void setAngles(T entity, float limbAngle, float limbDistance, float animationProgress, float headYaw, float headPitch) { + } + + @Override + public void render(MatrixStack matrixStack, VertexConsumer buffer, int packedLight, int packedOverlay, float red, float green, float blue, float alpha){ + headwear.render(matrixStack, buffer, packedLight, packedOverlay); + } + + @Override + protected Iterable getHeadParts() { + return null; + } + + @Override + protected Iterable getBodyParts() { + return null; + } + + public void setRotationAngle(ModelPart bone, float x, float y, float z) { + bone.pitch = x; + bone.yaw = y; + bone.roll = z; + } +} \ No newline at end of file diff --git a/src/main/java/eu/midnightdust/hats/mixin/PlayerEntityRendererMixin.java b/src/main/java/eu/midnightdust/hats/mixin/PlayerEntityRendererMixin.java new file mode 100644 index 0000000..00e059f --- /dev/null +++ b/src/main/java/eu/midnightdust/hats/mixin/PlayerEntityRendererMixin.java @@ -0,0 +1,28 @@ +package eu.midnightdust.hats.mixin; + +import eu.midnightdust.hats.bunny.BunnyEarsFeatureRenderer; +import eu.midnightdust.hats.christmas.ChristmasHatFeatureRenderer; +import eu.midnightdust.hats.witch.WitchHatFeatureRenderer; +import net.minecraft.client.network.AbstractClientPlayerEntity; +import net.minecraft.client.render.entity.EntityRenderDispatcher; +import net.minecraft.client.render.entity.LivingEntityRenderer; +import net.minecraft.client.render.entity.PlayerEntityRenderer; +import net.minecraft.client.render.entity.model.PlayerEntityModel; +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(PlayerEntityRenderer.class) +public abstract class PlayerEntityRendererMixin extends LivingEntityRenderer> { + public PlayerEntityRendererMixin(EntityRenderDispatcher dispatcher, PlayerEntityModel model, float shadowSize) { + super(dispatcher, model, shadowSize); + } + + @Inject(at = @At("TAIL"), method = "(Lnet/minecraft/client/render/entity/EntityRenderDispatcher;Z)V") + public void addFeatures(EntityRenderDispatcher entityRenderDispatcher, boolean bl, CallbackInfo ci) { + this.addFeature(new WitchHatFeatureRenderer(this)); + this.addFeature(new ChristmasHatFeatureRenderer(this)); + this.addFeature(new BunnyEarsFeatureRenderer(this)); + } +} diff --git a/src/main/java/eu/midnightdust/hats/web/HatLoader.java b/src/main/java/eu/midnightdust/hats/web/HatLoader.java new file mode 100644 index 0000000..4c1ccdb --- /dev/null +++ b/src/main/java/eu/midnightdust/hats/web/HatLoader.java @@ -0,0 +1,48 @@ +package eu.midnightdust.hats.web; + +import com.google.common.reflect.TypeToken; +import net.minecraft.client.MinecraftClient; +import org.apache.logging.log4j.Level; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + +import java.io.IOException; +import java.io.InputStreamReader; +import java.io.Reader; +import java.lang.reflect.Type; +import java.net.MalformedURLException; +import java.net.URL; +import java.util.*; +import java.util.concurrent.CompletableFuture; + +import static net.minecraft.datafixer.fix.BlockEntitySignTextStrictJsonFix.GSON; + +public class HatLoader { + public static final Logger logger = LogManager.getLogger("MidnightHats"); + private final static String HATS_URL = "https://raw.githubusercontent.com/TeamMidnightDust/MidnightHats/master/hats.json"; + public static final Type HAT_TYPE = new TypeToken>(){}.getType(); + public static Map PLAYER_HATS; + + public static void init() { + CompletableFuture.supplyAsync(() -> { + try (Reader reader = new InputStreamReader(new URL(HATS_URL).openStream())) { + Map playerData = GSON.fromJson(reader, HAT_TYPE); + return playerData; + } catch (MalformedURLException error) { + logger.log(Level.ERROR, "Unable to load player hats because of connection problems: " + error.getMessage()); + } catch (IOException error) { + logger.log(Level.ERROR, "Unable to load player hats because of an I/O Exception: " + error.getMessage()); + } + + return null; + }).thenAcceptAsync(playerData -> { + if (playerData != null) { + PLAYER_HATS = playerData; + logger.log(Level.INFO, "Player hats successfully loaded!"); + } else { + PLAYER_HATS = Collections.emptyMap(); + logger.log(Level.WARN, "A problem with the database occured, the hats could not be initialized."); + } + }, MinecraftClient.getInstance()); + } +} diff --git a/src/main/java/eu/midnightdust/hats/web/PlayerHatData.java b/src/main/java/eu/midnightdust/hats/web/PlayerHatData.java new file mode 100644 index 0000000..7b67176 --- /dev/null +++ b/src/main/java/eu/midnightdust/hats/web/PlayerHatData.java @@ -0,0 +1,13 @@ +package eu.midnightdust.hats.web; + +public class PlayerHatData { + private final String hat; + + public PlayerHatData(String hat) { + this.hat = hat; + } + + public String getHatType() { + return hat; + } +} diff --git a/src/main/java/eu/midnightdust/hats/witch/WitchHatFeatureRenderer.java b/src/main/java/eu/midnightdust/hats/witch/WitchHatFeatureRenderer.java new file mode 100644 index 0000000..6186947 --- /dev/null +++ b/src/main/java/eu/midnightdust/hats/witch/WitchHatFeatureRenderer.java @@ -0,0 +1,81 @@ +package eu.midnightdust.hats.witch; + +import eu.midnightdust.hats.web.HatLoader; +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; +import net.minecraft.client.network.AbstractClientPlayerEntity; +import net.minecraft.client.render.OverlayTexture; +import net.minecraft.client.render.RenderLayer; +import net.minecraft.client.render.VertexConsumer; +import net.minecraft.client.render.VertexConsumerProvider; +import net.minecraft.client.render.entity.LivingEntityRenderer; +import net.minecraft.client.render.entity.feature.FeatureRenderer; +import net.minecraft.client.render.entity.model.EntityModel; +import net.minecraft.client.render.entity.model.ModelWithHead; +import net.minecraft.client.render.item.ItemRenderer; +import net.minecraft.client.util.math.MatrixStack; +import net.minecraft.entity.LivingEntity; +import net.minecraft.util.Identifier; + +import java.util.Calendar; +import java.util.UUID; + +@Environment(EnvType.CLIENT) +public class WitchHatFeatureRenderer> extends FeatureRenderer { + private static final UUID MOTSCHEN = UUID.fromString("a44c2660-630f-478f-946a-e518669fcf0c"); + + private static final Identifier DEACTIVATED = new Identifier("midnight-hats:textures/hats/empty.png"); + private static final Identifier WITCH = new Identifier("textures/entity/witch.png"); + private static final Identifier MOTSCHEN_SKIN = new Identifier("midnight-hats:textures/hats/motschen.png"); + private static final Identifier CONTRIBUTER_SKIN = new Identifier("midnight-hats:textures/hats/contributer.png"); + private static final Identifier FRIEND_SKIN = new Identifier("midnight-hats:textures/hats/friend.png"); + private static final Identifier DONATOR_SKIN = new Identifier("midnight-hats:textures/hats/donator.png"); + private static final Identifier SOCIAL_SKIN = new Identifier("midnight-hats:textures/hats/social.png"); + private static final Identifier PRIDE_SKIN = new Identifier("midnight-hats:textures/hats/pride.png"); + private final WitchHatModel witchHat = new WitchHatModel<>(); + + + + public WitchHatFeatureRenderer(LivingEntityRenderer livingEntityRenderer) { + super(livingEntityRenderer); + } + + public void render(MatrixStack matrixStack, VertexConsumerProvider vertexConsumerProvider, int i, T livingEntity, float f, float g, float h, float j, float k, float l) { + { + Identifier hat_type; + if (livingEntity instanceof AbstractClientPlayerEntity) { + AbstractClientPlayerEntity abstractClientPlayerEntity = (AbstractClientPlayerEntity)livingEntity; + + if (abstractClientPlayerEntity.getUuid().equals(MOTSCHEN)) { + hat_type = MOTSCHEN_SKIN; + }else if (HatLoader.PLAYER_HATS.containsKey(abstractClientPlayerEntity.getUuid()) && HatLoader.PLAYER_HATS.get(abstractClientPlayerEntity.getUuid()).getHatType().contains("contributer")) { + hat_type = CONTRIBUTER_SKIN; + }else if (HatLoader.PLAYER_HATS.containsKey(abstractClientPlayerEntity.getUuid()) && HatLoader.PLAYER_HATS.get(abstractClientPlayerEntity.getUuid()).getHatType().contains("friend")) { + hat_type = FRIEND_SKIN; + }else if (HatLoader.PLAYER_HATS.containsKey(abstractClientPlayerEntity.getUuid()) && HatLoader.PLAYER_HATS.get(abstractClientPlayerEntity.getUuid()).getHatType().contains("donator")) { + hat_type = DONATOR_SKIN; + }else if (HatLoader.PLAYER_HATS.containsKey(abstractClientPlayerEntity.getUuid()) && HatLoader.PLAYER_HATS.get(abstractClientPlayerEntity.getUuid()).getHatType().contains("social")) { + hat_type = SOCIAL_SKIN; + }else if (HatLoader.PLAYER_HATS.containsKey(abstractClientPlayerEntity.getUuid()) && HatLoader.PLAYER_HATS.get(abstractClientPlayerEntity.getUuid()).getHatType().contains("pride")) { + hat_type = PRIDE_SKIN; + }else if (Calendar.getInstance().get(Calendar.MONTH) == Calendar.OCTOBER && Calendar.getInstance().get(Calendar.DAY_OF_MONTH) >= 30) { + hat_type = WITCH; + }else { + hat_type = DEACTIVATED; + } + } else { + hat_type = DEACTIVATED; + } + + if (!(hat_type == DEACTIVATED)) { + matrixStack.push(); + + ((ModelWithHead) this.getContextModel()).getHead().rotate(matrixStack); + VertexConsumer vertexConsumer = ItemRenderer.getArmorVertexConsumer(vertexConsumerProvider, RenderLayer.getEntityCutoutNoCull(hat_type), false, false); + this.witchHat.render(matrixStack, vertexConsumer, i, OverlayTexture.DEFAULT_UV, 1.0F, 1.0F, 1.0F, 1.0F); + + matrixStack.pop(); + } + } + } +} diff --git a/src/main/java/eu/midnightdust/hats/witch/WitchHatModel.java b/src/main/java/eu/midnightdust/hats/witch/WitchHatModel.java new file mode 100644 index 0000000..3d5511e --- /dev/null +++ b/src/main/java/eu/midnightdust/hats/witch/WitchHatModel.java @@ -0,0 +1,68 @@ +package eu.midnightdust.hats.witch; + +import net.minecraft.client.model.ModelPart; +import net.minecraft.client.render.VertexConsumer; +import net.minecraft.client.render.entity.model.AnimalModel; +import net.minecraft.client.util.math.MatrixStack; +import net.minecraft.entity.LivingEntity; + +public class WitchHatModel extends AnimalModel { + private final ModelPart headwear; + private final ModelPart bone; + private final ModelPart bone2; + private final ModelPart bone3; + public WitchHatModel() { + + textureWidth = 64; + textureHeight = 128; + headwear = new ModelPart(this); + headwear.setPivot(5.0F, -9.0F, -5.0F); + headwear.setTextureOffset(0, 64).addCuboid(-10.0F, -0.1F, 0.0F, 10.0F, 2.0F, 10.0F, 0.0F, false); + + bone = new ModelPart(this); + bone.setPivot(-8.5F, -0.1F, 1.5F); + headwear.addChild(bone); + setRotationAngle(bone, -0.0524F, 0.0F, 0.0349F); + bone.setTextureOffset(0, 76).addCuboid(0.0F, -4.0F, 0.0F, 7.0F, 4.0F, 7.0F, 0.0F, false); + + bone2 = new ModelPart(this); + bone2.setPivot(1.5F, -4.0F, 1.5F); + bone.addChild(bone2); + setRotationAngle(bone2, -0.1222F, 0.0F, 0.0698F); + bone2.setTextureOffset(0, 87).addCuboid(0.0F, -4.0F, 0.0F, 4.0F, 4.0F, 4.0F, 0.0F, false); + + bone3 = new ModelPart(this); + bone3.setPivot(1.5F, -4.0F, 1.5F); + bone2.addChild(bone3); + setRotationAngle(bone3, -0.2618F, 0.0F, 0.1047F); + bone3.setTextureOffset(0, 95).addCuboid(0.0F, -2.0F, 0.0F, 1.0F, 2.0F, 1.0F, 0.0F, false); +} + + @Override + public void setAngles(T entity, float limbAngle, float limbDistance, float animationProgress, float headYaw, float headPitch) { + + } + + @Override + public void render(MatrixStack matrixStack, VertexConsumer buffer, int packedLight, int packedOverlay, float red, float green, float blue, float alpha){ + + headwear.render(matrixStack, buffer, packedLight, packedOverlay); +} + + @Override + protected Iterable getHeadParts() { + return null; + } + + @Override + protected Iterable getBodyParts() { + return null; + } + + public void setRotationAngle(ModelPart bone, float x, float y, float z) { + bone.pitch = x; + bone.yaw = y; + bone.roll = z; +} + + } \ No newline at end of file diff --git a/src/main/resources/assets/midnight-hats/icon.png b/src/main/resources/assets/midnight-hats/icon.png new file mode 100644 index 0000000..5670888 Binary files /dev/null and b/src/main/resources/assets/midnight-hats/icon.png differ diff --git a/src/main/resources/assets/midnight-hats/textures/hats/christmas.png b/src/main/resources/assets/midnight-hats/textures/hats/christmas.png new file mode 100644 index 0000000..07ac65d Binary files /dev/null and b/src/main/resources/assets/midnight-hats/textures/hats/christmas.png differ diff --git a/src/main/resources/assets/midnight-hats/textures/hats/contributer.png b/src/main/resources/assets/midnight-hats/textures/hats/contributer.png new file mode 100644 index 0000000..e4c0dcd Binary files /dev/null and b/src/main/resources/assets/midnight-hats/textures/hats/contributer.png differ diff --git a/src/main/resources/assets/midnight-hats/textures/hats/donator.png b/src/main/resources/assets/midnight-hats/textures/hats/donator.png new file mode 100644 index 0000000..6498afc Binary files /dev/null and b/src/main/resources/assets/midnight-hats/textures/hats/donator.png differ diff --git a/src/main/resources/assets/midnight-hats/textures/hats/empty.png b/src/main/resources/assets/midnight-hats/textures/hats/empty.png new file mode 100644 index 0000000..fcc9887 Binary files /dev/null and b/src/main/resources/assets/midnight-hats/textures/hats/empty.png differ diff --git a/src/main/resources/assets/midnight-hats/textures/hats/friend.png b/src/main/resources/assets/midnight-hats/textures/hats/friend.png new file mode 100644 index 0000000..5e6686a Binary files /dev/null and b/src/main/resources/assets/midnight-hats/textures/hats/friend.png differ diff --git a/src/main/resources/assets/midnight-hats/textures/hats/motschen.png b/src/main/resources/assets/midnight-hats/textures/hats/motschen.png new file mode 100644 index 0000000..cf60fd0 Binary files /dev/null and b/src/main/resources/assets/midnight-hats/textures/hats/motschen.png differ diff --git a/src/main/resources/assets/midnight-hats/textures/hats/pride.png b/src/main/resources/assets/midnight-hats/textures/hats/pride.png new file mode 100644 index 0000000..42df88c Binary files /dev/null and b/src/main/resources/assets/midnight-hats/textures/hats/pride.png differ diff --git a/src/main/resources/assets/midnight-hats/textures/hats/social.png b/src/main/resources/assets/midnight-hats/textures/hats/social.png new file mode 100644 index 0000000..9bd9e66 Binary files /dev/null and b/src/main/resources/assets/midnight-hats/textures/hats/social.png differ diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json new file mode 100644 index 0000000..00ef57d --- /dev/null +++ b/src/main/resources/fabric.mod.json @@ -0,0 +1,35 @@ +{ + "schemaVersion": 1, + "id": "midnight-hats", + "version": "${version}", + + "name": "Midnight Hats", + "description": "Adds hats for contributers, friends and donators of MidnightDust and for special events!", + "authors": [ + "Motschen", + "TeamMidnightDust" + ], + "contact": { + "homepage": "https://www.midnightdust.eu/", + "sources": "https://github.com/TeamMidnightDust/MidnightHats", + "issues": "https://github.com/TeamMidnightDust/MidnightHats/issues" + }, + + "license": "MIT", + "icon": "assets/midnight-hats/icon.png", + + "environment": "client", + "entrypoints": { + "client": [ + "eu.midnightdust.hats.HatsClient" + ] + }, + + "mixins": [ + "midnight-hats.mixins.json" + ], + + "depends": { + "fabric": "*" + } +} diff --git a/src/main/resources/midnight-hats.mixins.json b/src/main/resources/midnight-hats.mixins.json new file mode 100644 index 0000000..f23fa33 --- /dev/null +++ b/src/main/resources/midnight-hats.mixins.json @@ -0,0 +1,11 @@ +{ + "required": true, + "package": "eu.midnightdust.hats.mixin", + "compatibilityLevel": "JAVA_8", + "mixins": [ + "PlayerEntityRendererMixin" + ], + "injectors": { + "defaultRequire": 1 + } +} \ No newline at end of file