commit 01d0190abbe48f2b8e0b691f18b59e4a73b7af33 Author: TheClashFruit Date: Sat Jul 27 10:24:37 2024 +0200 feat: add to git diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..a233ec2 --- /dev/null +++ b/.gitignore @@ -0,0 +1,40 @@ +# gradle + +.gradle/ +build/ +out/ +classes/ + +# eclipse + +*.launch + +# idea + +.idea/ +*.iml +*.ipr +*.iws + +# vscode + +.settings/ +.vscode/ +bin/ +.classpath +.project + +# macos + +*.DS_Store + +# fabric + +run/ + +# java + +hs_err_*.log +replay_*.log +*.hprof +*.jfr \ No newline at end of file diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..b94ef57 --- /dev/null +++ b/LICENSE @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) 2024 TheClashFruit + +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..3fb264b --- /dev/null +++ b/README.md @@ -0,0 +1,25 @@ +
+
+ Create: Piss & Shit +
+
+ +

+

+ + Modrinth + + + GitHub + + + Discord + +
+

+ +

+

+ A create add-on that adds piss and shit to the game with interesting mechanics! +
+

\ No newline at end of file diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..b4ad062 --- /dev/null +++ b/build.gradle @@ -0,0 +1,109 @@ +plugins { + id 'fabric-loom' version '1.7-SNAPSHOT' + id 'maven-publish' +} + +version = project.mod_version +group = project.maven_group + +base { + archivesName = project.archives_base_name +} + + +repositories { + // Add repositories to retrieve artifacts from in here. + // You should only use this when depending on other mods because + // Loom adds the essential maven repositories to download Minecraft and libraries from automatically. + // See https://docs.gradle.org/current/userguide/declaring_repositories.html + // for more information about repositories. + + maven { url = "https://maven.shedaniel.me/" } // Cloth Config, REI + maven { url = "https://maven.blamejared.com/" } // JEI + maven { url = "https://maven.parchmentmc.org" } // Parchment mappings + maven { url = "https://maven.quiltmc.org/repository/release" } // Quilt Mappings + maven { url = "https://api.modrinth.com/maven" } // LazyDFU + maven { url = "https://maven.terraformersmc.com/releases/" } // Mod Menu + maven { url = "https://mvn.devos.one/snapshots/" } // Create, Porting Lib, Forge Tags, Milk Lib, Registrate + maven { url = "https://raw.githubusercontent.com/Fuzss/modresources/main/maven/" } // Forge Config API Port + maven { url = "https://maven.jamieswhiteshirt.com/libs-release" } // Reach Entity Attributes + maven { url = "https://jitpack.io/" } // Mixin Extras, Fabric ASM + maven { url = "https://maven.tterrag.com/" } // Flywheel +} + +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}" + + modImplementation("com.simibubi.create:create-fabric-${minecraft_version}:${create_version}") + + modLocalRuntime("maven.modrinth:lazydfu:${lazydfu_version}") + modLocalRuntime("com.terraformersmc:modmenu:${modmenu_version}") + + modLocalRuntime("dev.emi:emi-fabric:${emi_version}") +} + +processResources { + inputs.property "version", project.version + inputs.property "minecraft_version", project.minecraft_version + inputs.property "loader_version", project.loader_version + filteringCharset "UTF-8" + + filesMatching("fabric.mod.json") { + expand "version": project.version, + "minecraft_version": project.minecraft_version, + "loader_version": project.loader_version + } +} + +def targetJavaVersion = 17 +tasks.withType(JavaCompile).configureEach { + // 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 + // If Javadoc is generated, this must be specified in that task too. + it.options.encoding = "UTF-8" + if (targetJavaVersion >= 10 || JavaVersion.current().isJava10Compatible()) { + it.options.release.set(targetJavaVersion) + } +} + +java { + def javaVersion = JavaVersion.toVersion(targetJavaVersion) + if (JavaVersion.current() < javaVersion) { + toolchain.languageVersion = JavaLanguageVersion.of(targetJavaVersion) + } + // Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task + // if it is present. + // If you remove this line, sources will not be generated. + withSourcesJar() +} + +jar { + from("LICENSE") { + rename { "${it}_${project.archivesBaseName}" } + } +} + +// configure the maven publication +publishing { + publications { + create("mavenJava", MavenPublication) { + artifactId = project.archives_base_name + from components.java + } + } + + // See https://docs.gradle.org/current/userguide/publishing_maven.html for information on how to set up publishing. + repositories { + // Add repositories to publish to here. + // Notice: This block does NOT have the same function as the block in the top level. + // The repositories here will be used for publishing your artifact, not for + // retrieving dependencies. + } +} diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 0000000..b46fd1f --- /dev/null +++ b/gradle.properties @@ -0,0 +1,19 @@ +# Done to increase the memory available to gradle. +org.gradle.jvmargs=-Xmx1G +# Fabric Properties +# check these on https://modmuss50.me/fabric.html +minecraft_version=1.20.1 +yarn_mappings=1.20.1+build.10 +loader_version=0.16.0 +# Mod Properties +mod_version=0.1.0-alpha+mc1.20.1 +maven_group=me.theclashfruit +archives_base_name=pissnshit +# Dependencies +# check this on https://modmuss50.me/fabric.html +fabric_version=0.92.2+1.20.1 + +create_version = 0.5.1-f-build.1417+mc1.20.1 +modmenu_version = 7.2.2 +lazydfu_version = 0.1.3 +emi_version = 1.1.10+1.20.1 \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..e644113 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..a441313 --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,7 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip +networkTimeout=10000 +validateDistributionUrl=true +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100644 index 0000000..b740cf1 --- /dev/null +++ b/gradlew @@ -0,0 +1,249 @@ +#!/bin/sh + +# +# Copyright © 2015-2021 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +############################################################################## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# +############################################################################## + +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..25da30d --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,92 @@ +@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=. +@rem This is normally unused +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if %ERRORLEVEL% equ 0 goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 0000000..f91a4fe --- /dev/null +++ b/settings.gradle @@ -0,0 +1,9 @@ +pluginManagement { + repositories { + maven { + name = 'Fabric' + url = 'https://maven.fabricmc.net/' + } + gradlePluginPortal() + } +} diff --git a/src/main/java/me/theclashfruit/pissnshit/ModGroups.java b/src/main/java/me/theclashfruit/pissnshit/ModGroups.java new file mode 100644 index 0000000..f655c8a --- /dev/null +++ b/src/main/java/me/theclashfruit/pissnshit/ModGroups.java @@ -0,0 +1,26 @@ +package me.theclashfruit.pissnshit; + +import me.theclashfruit.pissnshit.items.ModItems; +import net.fabricmc.fabric.api.itemgroup.v1.FabricItemGroup; +import net.minecraft.item.ItemGroup; +import net.minecraft.item.ItemStack; +import net.minecraft.registry.Registries; +import net.minecraft.registry.Registry; +import net.minecraft.text.Text; +import net.minecraft.util.Identifier; + +import static me.theclashfruit.pissnshit.PissAndShit.MOD_ID; + +public class ModGroups { + public static final ItemGroup PISS_N_SHIT = FabricItemGroup.builder() + .icon(() -> new ItemStack(ModItems.PISS_BUCKET)) + .displayName(Text.translatable("itemGroup.pissnshit.creative_tab")) + .entries((context, entries) -> { + entries.add(ModItems.PISS_BUCKET); + }) + .build(); + + public static void register() { + Registry.register(Registries.ITEM_GROUP, new Identifier(MOD_ID, "creative_tab"), PISS_N_SHIT); + } +} diff --git a/src/main/java/me/theclashfruit/pissnshit/PissAndShit.java b/src/main/java/me/theclashfruit/pissnshit/PissAndShit.java new file mode 100644 index 0000000..b99d260 --- /dev/null +++ b/src/main/java/me/theclashfruit/pissnshit/PissAndShit.java @@ -0,0 +1,28 @@ +package me.theclashfruit.pissnshit; + +import me.theclashfruit.pissnshit.blocks.ModBlocks; +import me.theclashfruit.pissnshit.fluid.ModFluids; +import me.theclashfruit.pissnshit.items.ModItems; +import net.fabricmc.api.ModInitializer; +import net.fabricmc.fabric.api.gamerule.v1.GameRuleFactory; +import net.fabricmc.fabric.api.gamerule.v1.GameRuleRegistry; +import net.minecraft.world.GameRules; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +public class PissAndShit implements ModInitializer { + public static final String MOD_ID = "pissnshit"; + public static final Logger LOGGER = LoggerFactory.getLogger("PissAndShit"); + + public static final GameRules.Key PISS_SOURCE_CONVERSION = GameRuleRegistry.register("pissSourceConversion", GameRules.Category.UPDATES, GameRuleFactory.createBooleanRule(false)); + + @Override + public void onInitialize() { + LOGGER.info("I pissed & shat my pants!"); + + ModFluids.register(); + ModItems.register(); + ModBlocks.register(); + ModGroups.register(); + } +} diff --git a/src/main/java/me/theclashfruit/pissnshit/blocks/ModBlocks.java b/src/main/java/me/theclashfruit/pissnshit/blocks/ModBlocks.java new file mode 100644 index 0000000..7f7e17d --- /dev/null +++ b/src/main/java/me/theclashfruit/pissnshit/blocks/ModBlocks.java @@ -0,0 +1,18 @@ +package me.theclashfruit.pissnshit.blocks; + +import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; +import net.minecraft.block.Block; +import net.minecraft.block.Blocks; +import net.minecraft.block.FluidBlock; +import net.minecraft.registry.Registries; +import net.minecraft.registry.Registry; +import net.minecraft.util.Identifier; + +import static me.theclashfruit.pissnshit.PissAndShit.MOD_ID; +import static me.theclashfruit.pissnshit.fluid.ModFluids.STILL_PISS; + +public class ModBlocks { + public static Block PISS = Registry.register(Registries.BLOCK, new Identifier(MOD_ID, "piss"), new FluidBlock(STILL_PISS, FabricBlockSettings.copy(Blocks.WATER)){}); + + public static void register() {} +} diff --git a/src/main/java/me/theclashfruit/pissnshit/client/PissAndShitClient.java b/src/main/java/me/theclashfruit/pissnshit/client/PissAndShitClient.java new file mode 100644 index 0000000..1e94cce --- /dev/null +++ b/src/main/java/me/theclashfruit/pissnshit/client/PissAndShitClient.java @@ -0,0 +1,23 @@ +package me.theclashfruit.pissnshit.client; + +import me.theclashfruit.pissnshit.PissAndShit; +import me.theclashfruit.pissnshit.fluid.ModFluids; +import net.fabricmc.api.ClientModInitializer; +import net.fabricmc.fabric.api.blockrenderlayer.v1.BlockRenderLayerMap; +import net.fabricmc.fabric.api.client.render.fluid.v1.FluidRenderHandlerRegistry; +import net.fabricmc.fabric.api.client.render.fluid.v1.SimpleFluidRenderHandler; +import net.minecraft.client.render.RenderLayer; +import net.minecraft.util.Identifier; + +public class PissAndShitClient implements ClientModInitializer { + @Override + public void onInitializeClient() { + FluidRenderHandlerRegistry.INSTANCE.register(ModFluids.STILL_PISS, ModFluids.FLOWING_PISS, new SimpleFluidRenderHandler( + new Identifier("minecraft:block/water_still"), + new Identifier("minecraft:block/water_flow"), + 0xFCC603 + )); + + BlockRenderLayerMap.INSTANCE.putFluids(RenderLayer.getTranslucent(), ModFluids.STILL_PISS, ModFluids.FLOWING_PISS); + } +} diff --git a/src/main/java/me/theclashfruit/pissnshit/fluid/ModFluids.java b/src/main/java/me/theclashfruit/pissnshit/fluid/ModFluids.java new file mode 100644 index 0000000..bfcc5cc --- /dev/null +++ b/src/main/java/me/theclashfruit/pissnshit/fluid/ModFluids.java @@ -0,0 +1,14 @@ +package me.theclashfruit.pissnshit.fluid; + +import net.minecraft.registry.Registries; +import net.minecraft.registry.Registry; +import net.minecraft.util.Identifier; + +import static me.theclashfruit.pissnshit.PissAndShit.MOD_ID; + +public class ModFluids { + public static PissFluid STILL_PISS = Registry.register(Registries.FLUID, new Identifier(MOD_ID, "piss"), new PissFluid.Still()); + public static PissFluid FLOWING_PISS = Registry.register(Registries.FLUID, new Identifier(MOD_ID, "flowing_piss"), new PissFluid.Flowing()); + + public static void register() {} +} diff --git a/src/main/java/me/theclashfruit/pissnshit/fluid/PissFluid.java b/src/main/java/me/theclashfruit/pissnshit/fluid/PissFluid.java new file mode 100644 index 0000000..d2bd720 --- /dev/null +++ b/src/main/java/me/theclashfruit/pissnshit/fluid/PissFluid.java @@ -0,0 +1,134 @@ +package me.theclashfruit.pissnshit.fluid; + +import me.theclashfruit.pissnshit.PissAndShit; +import me.theclashfruit.pissnshit.blocks.ModBlocks; +import me.theclashfruit.pissnshit.items.ModItems; +import net.minecraft.block.Block; +import net.minecraft.block.BlockState; +import net.minecraft.block.entity.BlockEntity; +import net.minecraft.fluid.FlowableFluid; +import net.minecraft.fluid.Fluid; +import net.minecraft.fluid.FluidState; +import net.minecraft.item.Item; +import net.minecraft.registry.tag.FluidTags; +import net.minecraft.sound.SoundEvent; +import net.minecraft.sound.SoundEvents; +import net.minecraft.state.StateManager; +import net.minecraft.state.property.Properties; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.Direction; +import net.minecraft.world.*; + +import java.util.Optional; + +public class PissFluid extends FlowableFluid { + public PissFluid() {} + + @Override + public Fluid getFlowing() { + return ModFluids.FLOWING_PISS; + } + + @Override + public Fluid getStill() { + return ModFluids.STILL_PISS; + } + + @Override + protected boolean isInfinite(World world) { + return world.getGameRules().getBoolean(PissAndShit.PISS_SOURCE_CONVERSION); + } + + @Override + protected void beforeBreakingBlock(WorldAccess world, BlockPos pos, BlockState state) { + final BlockEntity blockEntity = state.hasBlockEntity() ? world.getBlockEntity(pos) : null; + + Block.dropStacks(state, world, pos, blockEntity); + } + + @Override + protected int getFlowSpeed(WorldView world) { + return 4; + } + + @Override + protected int getLevelDecreasePerBlock(WorldView world) { + return 1; + } + + @Override + public Item getBucketItem() { + return ModItems.PISS_BUCKET; + } + + @Override + protected boolean canBeReplacedWith(FluidState state, BlockView world, BlockPos pos, Fluid fluid, Direction direction) { + return direction == Direction.DOWN && !fluid.isIn(FluidTags.WATER); + } + + @Override + public int getTickRate(WorldView world) { + return 5; + } + + @Override + protected float getBlastResistance() { + return 100f; + } + + @Override + protected BlockState toBlockState(FluidState state) { + return ModBlocks.PISS.getDefaultState().with(Properties.LEVEL_15, getBlockStateLevel(state)); + } + + @Override + public boolean isStill(FluidState fluidState) { + return fluidState.isStill(); + } + + @Override + public boolean matchesType(Fluid fluid) { + return fluid == ModFluids.STILL_PISS || fluid == ModFluids.FLOWING_PISS; + } + + @Override + public Optional getBucketFillSound() { + return Optional.of(SoundEvents.ITEM_BUCKET_FILL); + } + + @Override + public int getLevel(FluidState fluidState) { + return fluidState.get(LEVEL); + } + + public static class Flowing extends PissFluid { + @Override + protected void appendProperties(StateManager.Builder builder) { + super.appendProperties(builder); + + builder.add(LEVEL); + } + + @Override + public int getLevel(FluidState fluidState) { + return fluidState.get(LEVEL); + } + + @Override + public boolean isStill(FluidState fluidState) { + return false; + } + } + + public static class Still extends PissFluid { + @Override + public int getLevel(FluidState fluidState) { + return 8; + } + + @Override + public boolean isStill(FluidState fluidState) { + return true; + } + } +} diff --git a/src/main/java/me/theclashfruit/pissnshit/items/ModItems.java b/src/main/java/me/theclashfruit/pissnshit/items/ModItems.java new file mode 100644 index 0000000..5c583d4 --- /dev/null +++ b/src/main/java/me/theclashfruit/pissnshit/items/ModItems.java @@ -0,0 +1,17 @@ +package me.theclashfruit.pissnshit.items; + +import net.minecraft.item.BucketItem; +import net.minecraft.item.Item; +import net.minecraft.item.Items; +import net.minecraft.registry.Registries; +import net.minecraft.registry.Registry; +import net.minecraft.util.Identifier; + +import static me.theclashfruit.pissnshit.PissAndShit.MOD_ID; +import static me.theclashfruit.pissnshit.fluid.ModFluids.STILL_PISS; + +public class ModItems { + public static Item PISS_BUCKET = Registry.register(Registries.ITEM, new Identifier(MOD_ID, "piss_bucket"), new BucketItem(STILL_PISS, new Item.Settings().recipeRemainder(Items.BUCKET).maxCount(1))); + + public static void register() {} +} diff --git a/src/main/resources/assets/pissnshit/icon.png b/src/main/resources/assets/pissnshit/icon.png new file mode 100644 index 0000000..74bb37a Binary files /dev/null and b/src/main/resources/assets/pissnshit/icon.png differ diff --git a/src/main/resources/assets/pissnshit/lang/en_us.json b/src/main/resources/assets/pissnshit/lang/en_us.json new file mode 100644 index 0000000..a106405 --- /dev/null +++ b/src/main/resources/assets/pissnshit/lang/en_us.json @@ -0,0 +1,6 @@ +{ + "item.pissnshit.piss_bucket": "Piss Bucket", + "block.pissnshit.piss": "Piss", + "gamerule.pissSourceConversion": "Piss converts to source", + "itemGroup.pissnshit.creative_tab": "Create: Piss & Shit" +} \ No newline at end of file diff --git a/src/main/resources/assets/pissnshit/models/item/piss_bucket.json b/src/main/resources/assets/pissnshit/models/item/piss_bucket.json new file mode 100644 index 0000000..3cce425 --- /dev/null +++ b/src/main/resources/assets/pissnshit/models/item/piss_bucket.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "pissnshit:item/piss_bucket" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/pissnshit/textures/item/piss_bucket.png b/src/main/resources/assets/pissnshit/textures/item/piss_bucket.png new file mode 100644 index 0000000..4a22427 Binary files /dev/null and b/src/main/resources/assets/pissnshit/textures/item/piss_bucket.png differ diff --git a/src/main/resources/data/minecraft/tags/fluids/water.json b/src/main/resources/data/minecraft/tags/fluids/water.json new file mode 100644 index 0000000..48e7a5b --- /dev/null +++ b/src/main/resources/data/minecraft/tags/fluids/water.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "pissnshit:piss", + "pissnshit:flowing_piss" + ] +} \ 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..3c61940 --- /dev/null +++ b/src/main/resources/fabric.mod.json @@ -0,0 +1,33 @@ +{ + "schemaVersion": 1, + "id": "pissnshit", + "version": "${version}", + "name": "Create: Piss & Shit", + "description": "A Create mod add-on that adds... you guessed it! Piss and Shit!", + "authors": [ + "TheClashFruit" + ], + "contact": { + "sources": "https://github.com/TheClashFruit/CreatePissAndShit", + "issues": "https://github.com/TheClashFruit/CreatePissAndShit/issues" + }, + "license": "MIT", + "icon": "assets/pissnshit/icon.png", + "environment": "*", + "entrypoints": { + "client": [ + "me.theclashfruit.pissnshit.client.PissAndShitClient" + ], + "main": [ + "me.theclashfruit.pissnshit.PissAndShit" + ] + }, + "mixins": [ + "pissnshit.mixins.json" + ], + "depends": { + "fabricloader": ">=${loader_version}", + "fabric": "*", + "minecraft": "${minecraft_version}" + } +} diff --git a/src/main/resources/pissnshit.mixins.json b/src/main/resources/pissnshit.mixins.json new file mode 100644 index 0000000..1d75af6 --- /dev/null +++ b/src/main/resources/pissnshit.mixins.json @@ -0,0 +1,13 @@ +{ + "required": true, + "minVersion": "0.8", + "package": "me.theclashfruit.pissnshit.mixin", + "compatibilityLevel": "JAVA_17", + "mixins": [ + ], + "client": [ + ], + "injectors": { + "defaultRequire": 1 + } +}