Skip to content

Commit

Permalink
Add feature of zombie converting to villager
Browse files Browse the repository at this point in the history
JimenezLi committed Mar 28, 2023
1 parent fc15d87 commit 426176b
Showing 13 changed files with 369 additions and 114 deletions.
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# 0.2.0
- Zombie now can be cured into villager, using potion of weakness and enchanted golden apple.
- Add hidden challenge "Real Zombie Doctor" advancement after "Zombie Veterinarian".

# 0.1.0
- Zombiefied piglin and zoglin can be cured into piglin and hoglin, using potion of weakness and golden apple.
- Add "Zombie Veterinarian" advancement after "Zombie Doctor" of minecraft.
4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -12,8 +12,8 @@ apply plugin: 'net.minecraftforge.gradle'
apply plugin: 'eclipse'
apply plugin: 'maven-publish'

version = '0.1.0-1.16.5'
group = 'com.yourname.modid' // http://maven.apache.org/guides/mini/guide-naming-conventions.html
version = '0.2.0-1.16.5'
group = 'jimenezli.zombieveterinarian' // http://maven.apache.org/guides/mini/guide-naming-conventions.html
archivesBaseName = 'zombieveterinarian'

java.toolchain.languageVersion = JavaLanguageVersion.of(8) // Mojang ships Java 8 to end users, so your mod should target Java 8.
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
257 changes: 153 additions & 104 deletions gradlew
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/usr/bin/env sh
#!/bin/sh

#
# Copyright 2015 the original author or authors.
# 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.
@@ -17,67 +17,101 @@
#

##############################################################################
##
## Gradle start up script for UN*X
##
#
# 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/master/subprojects/plugins/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
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
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
SAVED="`pwd`"
cd "`dirname \"$PRG\"`/" >/dev/null
APP_HOME="`pwd -P`"
cd "$SAVED" >/dev/null

APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit

APP_NAME="Gradle"
APP_BASE_NAME=`basename "$0"`
APP_BASE_NAME=${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"
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
;;
MINGW* )
msys=true
;;
NONSTOP* )
nonstop=true
;;
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
@@ -87,9 +121,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
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"
JAVACMD=$JAVA_HOME/jre/sh/java
else
JAVACMD="$JAVA_HOME/bin/java"
JAVACMD=$JAVA_HOME/bin/java
fi
if [ ! -x "$JAVACMD" ] ; then
die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
@@ -98,88 +132,103 @@ Please set the JAVA_HOME variable in your environment to match the
location of your Java installation."
fi
else
JAVACMD="java"
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
if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
case $MAX_FD in #(
max*)
MAX_FD=$( ulimit -H -n ) ||
warn "Could not query maximum file descriptor limit"
esac
case $MAX_FD in #(
'' | soft) :;; #(
*)
ulimit -n "$MAX_FD" ||
warn "Could not set maximum file descriptor limit to $MAX_FD"
esac
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
# 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" = "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
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
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\""
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
i=`expr $i + 1`
# 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
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;
# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
# shell script including quotes and variable substitutions, so put them in
# double quotes to make sure that they get re-expanded; and
# * put everything else in single quotes, so that it's not re-expanded.

set -- \
"-Dorg.gradle.appname=$APP_BASE_NAME" \
-classpath "$CLASSPATH" \
org.gradle.wrapper.GradleWrapperMain \
"$@"

# 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.
#

# 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"
eval "set -- $(
printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
xargs -n1 |
sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
tr '\n' ' '
)" '"$@"'

exec "$JAVACMD" "$@"
Original file line number Diff line number Diff line change
@@ -4,6 +4,7 @@

public class Advancements {
public static final CuredZombiePigTrigger CURED_ZOMBIE_PIG = CriteriaTriggers.register(new CuredZombiePigTrigger());
public static final CuredZombieTrigger CURED_ZOMBIE = CriteriaTriggers.register(new CuredZombieTrigger());

public static void init() {}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
package jimenezli.ZombieVeterinarian.advancements;

import com.google.gson.JsonObject;
import jimenezli.ZombieVeterinarian.ZombieVeterinarianMod;
import net.minecraft.advancements.criterion.AbstractCriterionTrigger;
import net.minecraft.advancements.criterion.CriterionInstance;
import net.minecraft.advancements.criterion.EntityPredicate;
import net.minecraft.entity.player.ServerPlayerEntity;
import net.minecraft.loot.ConditionArrayParser;
import net.minecraft.loot.ConditionArraySerializer;
import net.minecraft.util.ResourceLocation;

public class CuredZombieTrigger extends AbstractCriterionTrigger<CuredZombieTrigger.Instance> {
private static final ResourceLocation ID = ZombieVeterinarianMod.prefix("cured_zombie");
@Override
public ResourceLocation getId() {
return ID;
}

public CuredZombieTrigger.Instance createInstance(JsonObject p_230241_1_, EntityPredicate.AndPredicate p_230241_2_, ConditionArrayParser p_230241_3_) {
EntityPredicate.AndPredicate entitypredicate$andpredicate = EntityPredicate.AndPredicate.fromJson(p_230241_1_, "zombie", p_230241_3_);
EntityPredicate.AndPredicate entitypredicate$andpredicate1 = EntityPredicate.AndPredicate.fromJson(p_230241_1_, "villager", p_230241_3_);
return new CuredZombieTrigger.Instance(p_230241_2_, entitypredicate$andpredicate, entitypredicate$andpredicate1);
}
public void trigger(ServerPlayerEntity p_192183_1_) {
this.trigger(p_192183_1_, m -> true);
}

public static class Instance extends CriterionInstance {
private final EntityPredicate.AndPredicate zombiepig;
private final EntityPredicate.AndPredicate pig;

public Instance(EntityPredicate.AndPredicate p_i231535_1_, EntityPredicate.AndPredicate p_i231535_2_, EntityPredicate.AndPredicate p_i231535_3_) {
super(CuredZombieTrigger.ID, p_i231535_1_);
this.zombiepig = p_i231535_2_;
this.pig = p_i231535_3_;
}

public JsonObject serializeToJson(ConditionArraySerializer p_230240_1_) {
JsonObject jsonobject = super.serializeToJson(p_230240_1_);
jsonobject.add("zombie", this.zombiepig.toJson(p_230240_1_));
jsonobject.add("villager", this.pig.toJson(p_230240_1_));
return jsonobject;
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,95 @@
package jimenezli.ZombieVeterinarian.entity;

import jimenezli.ZombieVeterinarian.advancements.Advancements;
import jimenezli.ZombieVeterinarian.util.IConverting;
import net.minecraft.entity.EntityType;
import net.minecraft.entity.ILivingEntityData;
import net.minecraft.entity.SpawnReason;
import net.minecraft.entity.merchant.villager.VillagerEntity;
import net.minecraft.entity.monster.ZombieEntity;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.entity.player.ServerPlayerEntity;
import net.minecraft.nbt.CompoundNBT;
import net.minecraft.potion.EffectInstance;
import net.minecraft.potion.Effects;
import net.minecraft.util.SoundEvents;
import net.minecraft.world.World;
import net.minecraft.world.server.ServerWorld;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.api.distmarker.OnlyIn;

import java.util.UUID;

public class ConvertingZombieEntity extends ZombieEntity implements IConverting {
private int conversionTime;
private UUID conversionStarter;

@Override
public EntityType<?> getType() {
return EntityType.ZOMBIE;
}

public void addAdditionalSaveData(CompoundNBT compoundNBT) {
super.addAdditionalSaveData(compoundNBT);
compoundNBT.putInt("ConversionTime", this.conversionTime);
}

public void readAdditionalSaveData(CompoundNBT compoundNBT) {
super.readAdditionalSaveData(compoundNBT);
if (compoundNBT.contains("ConversionTime")) {
this.conversionTime = compoundNBT.getInt("ConversionTime");
this.conversionStarter = (compoundNBT.hasUUID("ConversionPlayer") ? compoundNBT.getUUID("ConversionPlayer") : null);
}
}

public void setConversionStarter(UUID playerUUID) {
this.conversionStarter = playerUUID;
}

public ConvertingZombieEntity(EntityType<? extends ZombieEntity> entityType, World world) {
super(entityType, world);
conversionTime = getTotalConversionTime();
conversionStarter = null;
}

public void tick() {
if (!this.level.isClientSide && this.isAlive()) {
int i = this.getConversionProgress();
this.conversionTime -= i;
if (this.conversionTime <= 0 && net.minecraftforge.event.ForgeEventFactory.canLivingConvert(this, EntityType.VILLAGER, (timer) -> this.conversionTime = timer)) {
this.finishConversion((ServerWorld)this.level);
}
}

super.tick();
}

@OnlyIn(Dist.CLIENT)
public void handleEntityEvent(byte b) {
if (b == 16) {
if (!this.isSilent()) {
this.level.playLocalSound(this.getX(), this.getEyeY(), this.getZ(), SoundEvents.ZOMBIE_VILLAGER_CURE, this.getSoundSource(), 1.0F + this.random.nextFloat(), this.random.nextFloat() * 0.7F + 0.3F, false);
}

} else {
super.handleEntityEvent(b);
}
}

@Override
public void finishConversion(ServerWorld world) {
VillagerEntity villagerEntity = this.convertTo(EntityType.VILLAGER, true);
if (villagerEntity != null) {
villagerEntity.finalizeSpawn(world, world.getCurrentDifficultyAt(villagerEntity.blockPosition()), SpawnReason.CONVERSION, (ILivingEntityData) null, (CompoundNBT) null);
villagerEntity.addEffect(new EffectInstance(Effects.CONFUSION, 200, 0));
net.minecraftforge.event.ForgeEventFactory.onLivingConvert(this, villagerEntity);
}

if (this.conversionStarter != null) {
PlayerEntity playerEntity = world.getPlayerByUUID(this.conversionStarter);
if (playerEntity instanceof ServerPlayerEntity) {
Advancements.CURED_ZOMBIE.trigger((ServerPlayerEntity) playerEntity);
}
}
}
}
Original file line number Diff line number Diff line change
@@ -2,13 +2,16 @@

import jimenezli.ZombieVeterinarian.ZombieVeterinarianMod;
import jimenezli.ZombieVeterinarian.entity.ConvertingZoglinEntity;
import jimenezli.ZombieVeterinarian.entity.ConvertingZombieEntity;
import jimenezli.ZombieVeterinarian.entity.ConvertingZombifiedPiglinEntity;
import jimenezli.ZombieVeterinarian.util.EntityNames;
import net.minecraft.client.renderer.entity.PiglinRenderer;
import net.minecraft.client.renderer.entity.ZoglinRenderer;
import net.minecraft.client.renderer.entity.ZombieRenderer;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityClassification;
import net.minecraft.entity.EntityType;
import net.minecraft.entity.monster.ZombieEntity;
import net.minecraft.util.ResourceLocation;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.api.distmarker.OnlyIn;
@@ -26,6 +29,7 @@ public class EntityRegistry {
private static final List<EntityType<?>> ALL = new ArrayList<>();
public static final EntityType<ConvertingZombifiedPiglinEntity> convertingZombifiedPiglin = build(EntityNames.CONVERTING_ZOMBIFIED_PIGLIN, makeCastedBuilder(ConvertingZombifiedPiglinEntity.class, ConvertingZombifiedPiglinEntity::new, EntityClassification.MONSTER).fireImmune().sized(0.6F, 1.95F).clientTrackingRange(8));
public static final EntityType<ConvertingZoglinEntity> convertingZoglin = build(EntityNames.CONVERTING_ZOGLIN, makeCastedBuilder(ConvertingZoglinEntity.class, ConvertingZoglinEntity::new, EntityClassification.MONSTER).fireImmune().sized(1.3964844F, 1.4F).clientTrackingRange(8));
public static final EntityType<ConvertingZombieEntity> convertingZombie = build(EntityNames.CONVERTING_ZOMBIE, makeCastedBuilder(ConvertingZombieEntity.class, ConvertingZombieEntity::new, EntityClassification.MONSTER).sized(0.6F, 1.95F).clientTrackingRange(8));

@SuppressWarnings("unchecked")
private static <E extends Entity> EntityType<E> build(ResourceLocation id, EntityType.Builder<E> builder) {
@@ -54,11 +58,13 @@ public static void registerEntities(RegistryEvent.Register<EntityType<?>> evt) {
public static void addEntityAttributes(EntityAttributeCreationEvent event) {
event.put(convertingZombifiedPiglin, ConvertingZombifiedPiglinEntity.createAttributes().build());
event.put(convertingZoglin, ConvertingZoglinEntity.createAttributes().build());
event.put(convertingZombie, ConvertingZombieEntity.createAttributes().build());
}

@OnlyIn(Dist.CLIENT)
public static void registerEntityRenderer() {
RenderingRegistry.registerEntityRenderingHandler(convertingZombifiedPiglin, m -> new PiglinRenderer(m, true));
RenderingRegistry.registerEntityRenderingHandler(convertingZoglin, ZoglinRenderer::new);
RenderingRegistry.registerEntityRenderingHandler(convertingZombie, ZombieRenderer::new);
}
}
Original file line number Diff line number Diff line change
@@ -1,14 +1,12 @@
package jimenezli.ZombieVeterinarian.handler;

import jimenezli.ZombieVeterinarian.entity.ConvertingZoglinEntity;
import jimenezli.ZombieVeterinarian.entity.ConvertingZombieEntity;
import jimenezli.ZombieVeterinarian.entity.ConvertingZombifiedPiglinEntity;
import jimenezli.ZombieVeterinarian.advancements.Advancements;
import net.minecraft.entity.*;
import net.minecraft.entity.monster.ZoglinEntity;
import net.minecraft.entity.monster.ZombieEntity;
import net.minecraft.entity.monster.ZombifiedPiglinEntity;
import net.minecraft.entity.monster.piglin.PiglinEntity;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.entity.player.ServerPlayerEntity;
import net.minecraft.item.ItemStack;
import net.minecraft.item.Items;
import net.minecraft.potion.EffectInstance;
@@ -17,14 +15,12 @@
import net.minecraft.world.World;
import net.minecraft.world.server.ServerWorld;
import net.minecraftforge.event.entity.EntityJoinWorldEvent;
import net.minecraftforge.event.entity.living.LivingConversionEvent;
import net.minecraftforge.event.entity.player.PlayerInteractEvent;
import net.minecraftforge.eventbus.api.SubscribeEvent;
import net.minecraftforge.fml.common.Mod;

import javax.annotation.Nonnull;
import java.util.Random;
import java.util.UUID;

@Mod.EventBusSubscriber
public class EventHandler {
@@ -59,6 +55,21 @@ public static void onZombiePigGivenCure(PlayerInteractEvent.EntityInteract evt)
}
}
}
} else if (itemStack.getItem() == Items.ENCHANTED_GOLDEN_APPLE) {
Entity target = evt.getTarget();
World world = evt.getWorld();
if (!world.isClientSide()) {
if (target.getClass() == ZombieEntity.class) {
if (((ZombieEntity) target).hasEffect(Effects.WEAKNESS)) {
ConvertingZombieEntity convertingZombie = ((ZombieEntity) target).convertTo(EntityRegistry.convertingZombie, true);
if (convertingZombie != null) {
convertingZombie.setConversionStarter(evt.getPlayer().getUUID());
ConvertMob((MobEntity) target, convertingZombie, (ServerWorld) world);
actionSuccessful = true;
}
}
}
}
}
if (actionSuccessful && !evt.getPlayer().isCreative()) {
itemStack.shrink(1);
@@ -69,7 +80,8 @@ public static void onZombiePigGivenCure(PlayerInteractEvent.EntityInteract evt)
public static void onEntityJoinWorld(EntityJoinWorldEvent evt) {
Entity entity = evt.getEntity();
if (entity.getClass() == ConvertingZombifiedPiglinEntity.class
|| entity.getClass() == ConvertingZoglinEntity.class) {
|| entity.getClass() == ConvertingZoglinEntity.class
|| entity.getClass() == ConvertingZombieEntity.class) {
entity.level.playSound(null, entity.blockPosition(), SoundEvents.ZOMBIE_VILLAGER_CURE, entity.getSoundSource(), 1.0F + random.nextFloat(), random.nextFloat() * 0.7F + 0.3F);
}
}
Original file line number Diff line number Diff line change
@@ -7,4 +7,5 @@
public class EntityNames {
public static final ResourceLocation CONVERTING_ZOMBIFIED_PIGLIN = prefix("converting_zombified_piglin");
public static final ResourceLocation CONVERTING_ZOGLIN = prefix("converting_zoglin");
public static final ResourceLocation CONVERTING_ZOMBIE = prefix("converting_zombie");
}
3 changes: 3 additions & 0 deletions src/main/resources/assets/zombieveterinarian/lang/en_us.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
{
"entity.zombieveterinarian.converting_zombified_piglin": "Converting Zombified Piglin",
"entity.zombieveterinarian.converting_zoglin": "Converting Zoglin",
"entity.zombieveterinarian.converting_zombie": "Converting Zombie",

"advancements.zombieveterinarian.cure_zombie.title": "Real Zombie Doctor",
"advancements.zombieveterinarian.cure_zombie.description": "Weaken and then cure a Zombie",
"advancements.zombieveterinarian.cure_zombie_pig.title": "Zombie Veterinarian",
"advancements.zombieveterinarian.cure_zombie_pig.description": "Weaken and then cure a Zombiefied Piglin or Zoglin"
}
5 changes: 4 additions & 1 deletion src/main/resources/assets/zombieveterinarian/lang/zh_cn.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
{
"entity.zombieveterinarian.converting_zombified_piglin": "转变中的僵尸猪灵",
"entity.zombieveterinarian.converting_zoglin": "转变中的僵尸疣猪兽",
"entity.zombieveterinarian.converting_zombie": "转变中的僵尸",

"advancements.zombieveterinarian.cure_zombie_pig.title": "僵尸科兽医",
"advancements.zombieveterinarian.cure_zombie_pig.description": "弱化并治疗一只僵尸猪灵或僵尸疣猪兽"
"advancements.zombieveterinarian.cure_zombie_pig.description": "弱化并治疗一只僵尸猪灵或僵尸疣猪兽",
"advancements.zombieveterinarian.cure_zombie.title": "真·僵尸科医生",
"advancements.zombieveterinarian.cure_zombie.description": "弱化并治疗一只僵尸"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
{
"display": {
"icon": {
"item": "minecraft:enchanted_golden_apple"
},
"title": {
"translate": "advancements.zombieveterinarian.cure_zombie.title"
},
"description": {
"translate": "advancements.zombieveterinarian.cure_zombie.description"
},
"frame": "challenge",
"show_toast": true,
"announce_to_chat": true,
"hidden": true
},
"rewards": {
"experience": 100
},
"parent": "zombieveterinarian:cure_zombie_pig",
"criteria": {
"cured_zombie_pig": {
"trigger": "zombieveterinarian:cured_zombie",
"conditions": {}
}
},
"requirements": [
[
"cured_zombie_pig"
]
]
}

0 comments on commit 426176b

Please sign in to comment.