Merge branch 'master' into 1.15

This commit is contained in:
gnembon committed 2019-11-18 01:17:37 -04:00
commit 12408cac75
17 files changed
+362 -220

No files matched your search

@@ -2,7 +2,7 @@ package carpet.fakes;
import carpet.script.CarpetContext;
import carpet.script.CarpetEventServer;
import carpet.script.ScriptHost;
import carpet.script.value.FunctionValue;
import carpet.script.value.Value;
import net.minecraft.entity.damage.DamageSource;
@@ -13,10 +13,10 @@ public interface EntityInterface
float getMainYaw(float partialTicks);
//scarpet part
void onDeathCallback(String reason);
void setDeathCallback(CarpetContext cc, String function, List<Value> extraArgs);
void setDeathCallback(CarpetContext cc, FunctionValue function, List<Value> extraArgs);
void onDamageCallback(float amount, DamageSource source);
void setDamageCallback(CarpetContext cc, String function, List<Value> extraArgs);
void setRemovedCallback(CarpetContext cc, String function, List<Value> extraArgs);
void setTickCallback(CarpetContext cc, String function, List<Value> extraArgs);
void setDamageCallback(CarpetContext cc, FunctionValue function, List<Value> extraArgs);
void setRemovedCallback(CarpetContext cc, FunctionValue function, List<Value> extraArgs);
void setTickCallback(CarpetContext cc, FunctionValue function, List<Value> extraArgs);
CarpetEventServer.ScheduledCall getTickCallback();
}