diff options
31 files changed, 768 insertions, 0 deletions
diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..00a51af --- /dev/null +++ b/.gitattributes @@ -0,0 +1,6 @@ +# +# https://help.github.com/articles/dealing-with-line-endings/ +# +# These are explicitly windows files and should use crlf +*.bat text eol=crlf + diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..4819f56 --- /dev/null +++ b/.gitignore @@ -0,0 +1,5 @@ +.gradle +build +.idea +*.iml +run diff --git a/build.gradle.kts b/build.gradle.kts new file mode 100644 index 0000000..4d6ceae --- /dev/null +++ b/build.gradle.kts @@ -0,0 +1,20 @@ +plugins { + java + id("dev.architectury.loom") version "0.11.0.+" +} + + +repositories { + maven("https://maven.shedaniel.me/") + maven("https://maven.terraformersmc.com/releases/") + maven("https://pkgs.dev.azure.com/djtheredstoner/DevAuth/_packaging/public/maven/v1") +} + +dependencies { + minecraft("com.mojang:minecraft:1.18.2") + mappings("net.fabricmc:yarn:1.18.2+build.3:v2") + modImplementation("net.fabricmc:fabric-loader:0.14.6") + modImplementation("net.fabricmc.fabric-api:fabric-api:0.55.1+1.18.2") + modRuntimeOnly("com.terraformersmc:modmenu:4.0.0-beta.1") + modRuntimeOnly("me.djtheredstoner:DevAuth-fabric:1.0.0") +} diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 0000000..ab2626a --- /dev/null +++ b/gradle.properties @@ -0,0 +1,3 @@ +org.gradle.jvmargs=-Xmx6G +loom.platform=fabric + diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar Binary files differnew file mode 100644 index 0000000..e708b1c --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.jar diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..e750102 --- /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-7.3-bin.zip +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists @@ -0,0 +1,185 @@ +#!/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 or MSYS, switch paths to Windows format before running java +if [ "$cygwin" = "true" -o "$msys" = "true" ] ; 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=`expr $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" + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..107acd3 --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,89 @@ +@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 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%" == "0" goto execute + +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 execute + +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 + +: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%"=="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.kts b/settings.gradle.kts new file mode 100644 index 0000000..57a9659 --- /dev/null +++ b/settings.gradle.kts @@ -0,0 +1,20 @@ +pluginManagement { + repositories { + maven { + name = "fabricmc" + url = uri("https://maven.fabricmc.net/") + } + maven { + name = "architectury" + url = uri("https://maven.architectury.dev/") + } + maven { + name = "forgemc" + url = uri("https://maven.minecraftforge.net/") + } + gradlePluginPortal() + } +} + + +rootProject.name = "MorbingTimeMinecraft" diff --git a/src/main/java/moe/nea/morbing/BloodFluid.java b/src/main/java/moe/nea/morbing/BloodFluid.java new file mode 100644 index 0000000..bbda497 --- /dev/null +++ b/src/main/java/moe/nea/morbing/BloodFluid.java @@ -0,0 +1,144 @@ +package moe.nea.morbing; + +import net.minecraft.block.BlockState; +import net.minecraft.fluid.FlowableFluid; +import net.minecraft.fluid.Fluid; +import net.minecraft.fluid.FluidState; +import net.minecraft.fluid.Fluids; +import net.minecraft.item.Item; +import net.minecraft.item.Items; +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.util.math.Vec3d; +import net.minecraft.util.shape.VoxelShape; +import net.minecraft.util.shape.VoxelShapes; +import net.minecraft.world.BlockView; +import net.minecraft.world.WorldAccess; +import net.minecraft.world.WorldView; + +public abstract class BloodFluid extends FlowableFluid { + + @Override + public Item getBucketItem() { + return Items.AIR; + } + + @Override + protected boolean canBeReplacedWith(FluidState state, BlockView world, BlockPos pos, Fluid fluid, Direction direction) { + return true; + } + + @Override + public Vec3d getVelocity(BlockView world, BlockPos pos, FluidState state) { + return new Vec3d(0, 0, 0); + } + + @Override + public Fluid getFlowing() { + return Morbing.FLOWING_BLOOD; + } + + @Override + public Fluid getStill() { + return Morbing.STILL_BLOOD; + } + + @Override + protected boolean isInfinite() { + return false; + } + + @Override + protected void beforeBreakingBlock(WorldAccess world, BlockPos pos, BlockState state) { + } + + @Override + public boolean matchesType(Fluid fluid) { + return fluid == getStill() || fluid == getFlowing(); + } + + @Override + protected int getFlowSpeed(WorldView world) { + return 0; + } + + @Override + protected int getLevelDecreasePerBlock(WorldView world) { + return 8; + } + + @Override + protected FluidState getUpdatedState(WorldView world, BlockPos pos, BlockState state) { + BlockPos abovePos = pos.up(); + BlockState aboveState = world.getBlockState(abovePos); + FluidState aboveFluid = aboveState.getFluidState(); + if (state.getFluidState().getFluid() != this && !aboveFluid.isEmpty() && matchesType(aboveFluid.getFluid())) { + return getFlowing(aboveFluid.getLevel(), true); + } + if (state.getFluidState().getFluid() == getFlowing()) { + BlockPos downPos = pos.down(); + BlockState downState = world.getBlockState(downPos); + if (!matchesType(aboveFluid.getFluid())) { + if (downState.getFluidState().getFluid().matchesType(this)) + return Fluids.EMPTY.getDefaultState(); + return getFlowing(1, false); + } + } + return state.getFluidState(); + } + + @Override + public int getTickRate(WorldView world) { + return 5; + } + + @Override + protected float getBlastResistance() { + return 2; + } + + @Override + protected BlockState toBlockState(FluidState state) { + return ModBlocks.INSTANCE.bloodFluidBlock.getDefaultState().with(Properties.LEVEL_15, getBlockStateLevel(state)); + } + + @Override + public VoxelShape getShape(FluidState state, BlockView world, BlockPos pos) { + return VoxelShapes.cuboid(0, 0, 0, 1, getHeight(state), 1); + } + + public static class Flowing extends BloodFluid { + @Override + protected void appendProperties(StateManager.Builder<Fluid, FluidState> builder) { + super.appendProperties(builder); + builder.add(LEVEL); + } + + @Override + public int getLevel(FluidState state) { + return state.get(LEVEL); + } + + @Override + public boolean isStill(FluidState state) { + return false; + } + } + + public static class Still extends BloodFluid { + + @Override + public boolean isStill(FluidState state) { + return true; + } + + @Override + public int getLevel(FluidState state) { + return 8; + } + } + + +} diff --git a/src/main/java/moe/nea/morbing/ModBlocks.java b/src/main/java/moe/nea/morbing/ModBlocks.java new file mode 100644 index 0000000..d8807a6 --- /dev/null +++ b/src/main/java/moe/nea/morbing/ModBlocks.java @@ -0,0 +1,19 @@ +package moe.nea.morbing; + +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.block.MapColor; +import net.minecraft.util.registry.Registry; + +public class ModBlocks extends ModRegistry<Block> { + private ModBlocks() { + super(Registry.BLOCK); + } + + public static ModBlocks INSTANCE = new ModBlocks(); + public FluidBlock bloodFluidBlock = register("bloodfluid", new FluidBlock(Morbing.STILL_BLOOD, FabricBlockSettings.copy(Blocks.WATER).mapColor(MapColor.BRIGHT_RED))); + + +} diff --git a/src/main/java/moe/nea/morbing/ModEntities.java b/src/main/java/moe/nea/morbing/ModEntities.java new file mode 100644 index 0000000..aef52ba --- /dev/null +++ b/src/main/java/moe/nea/morbing/ModEntities.java @@ -0,0 +1,21 @@ +package moe.nea.morbing; + +import net.minecraft.entity.Entity; +import net.minecraft.entity.EntityType; +import net.minecraft.entity.SpawnGroup; +import net.minecraft.util.registry.Registry; + +public class ModEntities extends ModRegistry<EntityType<?>> { + public ModEntities() { + super(Registry.ENTITY_TYPE); + } + + public static ModEntities INSTANCE = new ModEntities(); + + public <U extends Entity> EntityType<U> register(String id, EntityType.Builder<U> builder) { + return register(id, builder.build(id)); + } + + public EntityType<MorbArrowEntity> morbArrowEntityEntityType = register("morbarrow", EntityType.Builder.<MorbArrowEntity>create(MorbArrowEntity::new, SpawnGroup.MISC).setDimensions(0.5F, 0.5F).maxTrackingRange(4).trackingTickInterval(20)); + +} diff --git a/src/main/java/moe/nea/morbing/ModItems.java b/src/main/java/moe/nea/morbing/ModItems.java new file mode 100644 index 0000000..ba7a5c7 --- /dev/null +++ b/src/main/java/moe/nea/morbing/ModItems.java @@ -0,0 +1,18 @@ +package moe.nea.morbing; + + +import net.fabricmc.fabric.api.item.v1.FabricItemSettings; +import net.minecraft.item.Item; +import net.minecraft.util.registry.Registry; + +public class ModItems extends ModRegistry<Item> { + + private ModItems() { + super(Registry.ITEM); + } + + public static ModItems INSTANCE = new ModItems(); + public Item morbItem = register("morbitem", new Item(new FabricItemSettings())); + public Item morbArrow = register("morbarrow", new MorbArrowItem(new FabricItemSettings())); + public Item morbSyringe = register("morbsyringe", new Item(new FabricItemSettings())); +} diff --git a/src/main/java/moe/nea/morbing/ModRegistry.java b/src/main/java/moe/nea/morbing/ModRegistry.java new file mode 100644 index 0000000..fe91b92 --- /dev/null +++ b/src/main/java/moe/nea/morbing/ModRegistry.java @@ -0,0 +1,29 @@ +package moe.nea.morbing; + +import net.minecraft.util.Identifier; +import net.minecraft.util.Pair; +import net.minecraft.util.registry.Registry; + +import java.util.ArrayList; +import java.util.List; + +public class ModRegistry<T> { + private Registry<T> registry; + private List<Pair<Identifier, T>> toRegister = new ArrayList<>(); + + public ModRegistry(Registry<T> registry) { + this.registry = registry; + } + + + protected <U extends T> U register(String id, U item) { + toRegister.add(new Pair<>(new Identifier(Morbing.MODID, id), item)); + return item; + } + + public void registerAll() { + toRegister.forEach(it -> + Registry.register(registry, it.getLeft(), it.getRight()) + ); + } +} diff --git a/src/main/java/moe/nea/morbing/MorbArrowEntity.java b/src/main/java/moe/nea/morbing/MorbArrowEntity.java new file mode 100644 index 0000000..42cdc07 --- /dev/null +++ b/src/main/java/moe/nea/morbing/MorbArrowEntity.java @@ -0,0 +1,38 @@ +package moe.nea.morbing; + +import net.minecraft.entity.Entity; +import net.minecraft.entity.EntityType; +import net.minecraft.entity.LivingEntity; +import net.minecraft.entity.passive.BatEntity; +import net.minecraft.entity.projectile.PersistentProjectileEntity; +import net.minecraft.item.ItemStack; +import net.minecraft.world.World; + +public class MorbArrowEntity extends PersistentProjectileEntity { + public MorbArrowEntity(EntityType<? extends PersistentProjectileEntity> entityType, World world) { + super(entityType, world); + } + + public MorbArrowEntity(double x, double y, double z, World world) { + super(ModEntities.INSTANCE.morbArrowEntityEntityType, x, y, z, world); + } + + public MorbArrowEntity(LivingEntity owner, World world) { + super(ModEntities.INSTANCE.morbArrowEntityEntityType, owner, world); + } + + + + @Override + protected ItemStack asItemStack() { + return new ItemStack(ModItems.INSTANCE.morbArrow); + } + + @Override + protected void onHit(LivingEntity target) { + super.onHit(target); + if (target instanceof BatEntity) { + target.dropItem(ModItems.INSTANCE.morbSyringe); + } + } +} diff --git a/src/main/java/moe/nea/morbing/MorbArrowEntityRenderer.java b/src/main/java/moe/nea/morbing/MorbArrowEntityRenderer.java new file mode 100644 index 0000000..e628b49 --- /dev/null +++ b/src/main/java/moe/nea/morbing/MorbArrowEntityRenderer.java @@ -0,0 +1,16 @@ +package moe.nea.morbing; + +import net.minecraft.client.render.entity.EntityRendererFactory; +import net.minecraft.client.render.entity.ProjectileEntityRenderer; +import net.minecraft.util.Identifier; + +public class MorbArrowEntityRenderer extends ProjectileEntityRenderer<MorbArrowEntity> { + public MorbArrowEntityRenderer(EntityRendererFactory.Context context) { + super(context); + } + + @Override + public Identifier getTexture(MorbArrowEntity entity) { + return Morbing.identifier("textures/entity/projectiles/morb_arrow.png"); + } +} diff --git a/src/main/java/moe/nea/morbing/MorbArrowItem.java b/src/main/java/moe/nea/morbing/MorbArrowItem.java new file mode 100644 index 0000000..1840320 --- /dev/null +++ b/src/main/java/moe/nea/morbing/MorbArrowItem.java @@ -0,0 +1,19 @@ +package moe.nea.morbing; + +import net.minecraft.entity.LivingEntity; +import net.minecraft.entity.projectile.PersistentProjectileEntity; +import net.minecraft.item.ArrowItem; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.world.World; + +public class MorbArrowItem extends ArrowItem { + public MorbArrowItem(Item.Settings settings) { + super(settings); + } + + @Override + public PersistentProjectileEntity createArrow(World world, ItemStack stack, LivingEntity shooter) { + return new MorbArrowEntity(shooter, world); + } +} diff --git a/src/main/java/moe/nea/morbing/Morbing.java b/src/main/java/moe/nea/morbing/Morbing.java new file mode 100644 index 0000000..adf52b0 --- /dev/null +++ b/src/main/java/moe/nea/morbing/Morbing.java @@ -0,0 +1,32 @@ +package moe.nea.morbing; + +import net.fabricmc.api.ModInitializer; +import net.minecraft.entity.effect.StatusEffectInstance; +import net.minecraft.fluid.FlowableFluid; +import net.minecraft.potion.Potion; +import net.minecraft.util.Identifier; +import net.minecraft.util.registry.Registry; + +public class Morbing implements ModInitializer { + + public static String MODID = "morbing"; + + public static Identifier identifier(String path) { + return new Identifier(MODID, path); + } + + public static FlowableFluid STILL_BLOOD = new BloodFluid.Still(); + public static FlowableFluid FLOWING_BLOOD = new BloodFluid.Flowing(); + + @Override + public void onInitialize() { + ModItems.INSTANCE.registerAll(); + ModBlocks.INSTANCE.registerAll(); + ModEntities.INSTANCE.registerAll(); + Registry.register(Registry.FLUID, Morbing.identifier("blood"), STILL_BLOOD); + Registry.register(Registry.FLUID, Morbing.identifier("blood_flowing"), FLOWING_BLOOD); + Registry.register(Registry.STATUS_EFFECT, Morbing.identifier("morbingtime"), new MorbingTimeStatus()); + Registry.register(Registry.POTION, Morbing.identifier("morbingtime"), new Potion(new StatusEffectInstance(new MorbingTimeStatus(), 60))); + System.out.println("It's Morbing time!"); + } +} diff --git a/src/main/java/moe/nea/morbing/MorbingClient.java b/src/main/java/moe/nea/morbing/MorbingClient.java new file mode 100644 index 0000000..fca79e2 --- /dev/null +++ b/src/main/java/moe/nea/morbing/MorbingClient.java @@ -0,0 +1,23 @@ +package moe.nea.morbing; + +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.fabricmc.fabric.api.client.rendering.v1.EntityRendererRegistry; +import net.minecraft.client.render.RenderLayer; +import net.minecraft.util.Identifier; + +public class MorbingClient implements ClientModInitializer { + @Override + public void onInitializeClient() { + FluidRenderHandlerRegistry.INSTANCE.register(Morbing.STILL_BLOOD, Morbing.FLOWING_BLOOD, new SimpleFluidRenderHandler( + new Identifier("minecraft", "block/water_still"), + new Identifier("minecraft", "block/water_flow"), + 0x7f0622 + )); + BlockRenderLayerMap.INSTANCE.putFluids(RenderLayer.getTranslucent(), Morbing.STILL_BLOOD, Morbing.FLOWING_BLOOD); + EntityRendererRegistry.register(ModEntities.INSTANCE.morbArrowEntityEntityType, MorbArrowEntityRenderer::new); + + } +} diff --git a/src/main/java/moe/nea/morbing/MorbingTimeStatus.java b/src/main/java/moe/nea/morbing/MorbingTimeStatus.java new file mode 100644 index 0000000..2ab865a --- /dev/null +++ b/src/main/java/moe/nea/morbing/MorbingTimeStatus.java @@ -0,0 +1,11 @@ +package moe.nea.morbing; + +import net.minecraft.entity.effect.StatusEffect; +import net.minecraft.entity.effect.StatusEffectCategory; + +public class MorbingTimeStatus extends StatusEffect { + public MorbingTimeStatus() { + super(StatusEffectCategory.NEUTRAL, 0x10_10_10); + } + +} diff --git a/src/main/resources/assets/morbing/lang/en_us.json b/src/main/resources/assets/morbing/lang/en_us.json new file mode 100644 index 0000000..a2326b4 --- /dev/null +++ b/src/main/resources/assets/morbing/lang/en_us.json @@ -0,0 +1,3 @@ +{ + "effect.morbing.morbingtime": "Morbing" +} diff --git a/src/main/resources/assets/morbing/textures/block/blood_flow.png b/src/main/resources/assets/morbing/textures/block/blood_flow.png Binary files differnew file mode 100644 index 0000000..a206239 --- /dev/null +++ b/src/main/resources/assets/morbing/textures/block/blood_flow.png diff --git a/src/main/resources/assets/morbing/textures/block/blood_flow.png.mcmeta b/src/main/resources/assets/morbing/textures/block/blood_flow.png.mcmeta new file mode 100644 index 0000000..dd1bedb --- /dev/null +++ b/src/main/resources/assets/morbing/textures/block/blood_flow.png.mcmeta @@ -0,0 +1,3 @@ +{ + "animation": {} +} diff --git a/src/main/resources/assets/morbing/textures/block/blood_still.png b/src/main/resources/assets/morbing/textures/block/blood_still.png Binary files differnew file mode 100644 index 0000000..8085526 --- /dev/null +++ b/src/main/resources/assets/morbing/textures/block/blood_still.png diff --git a/src/main/resources/assets/morbing/textures/block/blood_still.png.mcmeta b/src/main/resources/assets/morbing/textures/block/blood_still.png.mcmeta new file mode 100644 index 0000000..dd1bedb --- /dev/null +++ b/src/main/resources/assets/morbing/textures/block/blood_still.png.mcmeta @@ -0,0 +1,3 @@ +{ + "animation": {} +} diff --git a/src/main/resources/assets/morbing/textures/entity/projectiles/morb_arrow.png b/src/main/resources/assets/morbing/textures/entity/projectiles/morb_arrow.png Binary files differnew file mode 100644 index 0000000..5651e88 --- /dev/null +++ b/src/main/resources/assets/morbing/textures/entity/projectiles/morb_arrow.png diff --git a/src/main/resources/assets/morbing/textures/mob_effect/morbingtime.png b/src/main/resources/assets/morbing/textures/mob_effect/morbingtime.png Binary files differnew file mode 100644 index 0000000..7e6c5fe --- /dev/null +++ b/src/main/resources/assets/morbing/textures/mob_effect/morbingtime.png diff --git a/src/main/resources/data/minecraft/tags/entity_types/arrows.json b/src/main/resources/data/minecraft/tags/entity_types/arrows.json new file mode 100644 index 0000000..c46046e --- /dev/null +++ b/src/main/resources/data/minecraft/tags/entity_types/arrows.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "morbing:morbarrow" + ] +} diff --git a/src/main/resources/data/minecraft/tags/items/arrows.json b/src/main/resources/data/minecraft/tags/items/arrows.json new file mode 100644 index 0000000..c46046e --- /dev/null +++ b/src/main/resources/data/minecraft/tags/items/arrows.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "morbing:morbarrow" + ] +} diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json new file mode 100644 index 0000000..5fdb005 --- /dev/null +++ b/src/main/resources/fabric.mod.json @@ -0,0 +1,32 @@ +{ + "schemaVersion": 1, + "id": "morbing", + "version": "${version}", + "name": "Morbing", + "description": "", + "authors": [ + "nea89" + ], + "contact": { + "homepage": "", + "sources": "" + }, + "license": "LGPL-3.0", + "icon": "assets/morbing/icon.png", + "environment": "client", + "entrypoints": { + "main": [ + "moe.nea.morbing.Morbing" + ], + "client": [ + "moe.nea.morbing.MorbingClient" + ] + }, + "mixins": [ + "morbing.mixins.json" + ], + "depends": { + "fabric": "*", + "minecraft": ">=1.18.2" + } +} diff --git a/src/main/resources/morbing.mixins.json b/src/main/resources/morbing.mixins.json new file mode 100644 index 0000000..cdbc1ea --- /dev/null +++ b/src/main/resources/morbing.mixins.json @@ -0,0 +1,12 @@ +{ + "required": true, + "package": "moe.nea.morbing.mixin", + "compatibilityLevel": "JAVA_16", + "client": [ + ], + "mixins": [ + ], + "injectors": { + "defaultRequire": 1 + } +} |
