Merge branch 'master' into 1.15

src/main/java/carpet/mixins/DamageTracker_scarpetEventMixin.java

@@ -0,0 +1,24 @@
+package carpet.mixins;
+
+import carpet.fakes.EntityInterface;
+import net.minecraft.entity.LivingEntity;
+import net.minecraft.entity.damage.DamageSource;
+import net.minecraft.entity.damage.DamageTracker;
+import org.spongepowered.asm.mixin.Final;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+@Mixin(DamageTracker.class)
+public class DamageTracker_scarpetEventMixin
+{
+    @Shadow @Final private LivingEntity entity;
+
+    @Inject(method = "onDamage", at = @At("HEAD"))
+    private void onDamageTaken(DamageSource damageSource_1, float float_1, float float_2, CallbackInfo ci)
+    {
+        ((EntityInterface)entity).onDamageCallback(float_2, damageSource_1);
+    }
+}

src/main/java/carpet/mixins/Entity_scarpetEventsMixin.java

@@ -8,6 +8,7 @@ import carpet.script.ScriptHost;
 import carpet.script.value.Value;
 import carpet.settings.CarpetSettings;
 import net.minecraft.entity.Entity;
+import net.minecraft.entity.damage.DamageSource;
 import org.lwjgl.system.CallbackI;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
@@ -23,16 +24,11 @@ public abstract class Entity_scarpetEventsMixin implements EntityInterface
     @Shadow public boolean removed;
     private CarpetEventServer.ScheduledCall deathCall;
     private CarpetEventServer.ScheduledCall removeCall;
+    private CarpetEventServer.ScheduledCall tickCall;
+    private CarpetEventServer.ScheduledCall damageCall;
+
 
 
-    @Override
-    public void onDeathCallback(String reason)
-    {
-        if (deathCall != null)
-        {
-            CarpetServer.scriptServer.events.onEntityDeath(deathCall, (Entity)(Object)this, reason);
-        }
-    }
 
     @Override
     public void setDeathCallback(CarpetContext cc, String function, List<Value> extraArgs)
@@ -46,6 +42,47 @@ public abstract class Entity_scarpetEventsMixin implements EntityInterface
         removeCall = CarpetServer.scriptServer.events.makeRemovedCall(cc, function, extraArgs);
     }
 
+    @Override
+    public void setTickCallback(CarpetContext cc, String function, List<Value> extraArgs)
+    {
+        tickCall = CarpetServer.scriptServer.events.makeTickCall(cc, function, extraArgs);
+    }
+
+    @Override
+    public void setDamageCallback(CarpetContext cc, String function, List<Value> extraArgs)
+    {
+        damageCall = CarpetServer.scriptServer.events.makeDamageCall(cc, function, extraArgs);
+    }
+
+
+    @Override
+    public void onDeathCallback(String reason)
+    {
+        if (deathCall != null)
+        {
+            CarpetServer.scriptServer.events.onEntityDeath(deathCall, (Entity)(Object)this, reason);
+        }
+    }
+
+    @Override
+    public void onDamageCallback(float amount, DamageSource source)
+    {
+        if (damageCall != null)
+        {
+            CarpetServer.scriptServer.events.onEntityDamage(damageCall, (Entity)(Object)this, amount, source);
+        }
+    }
+
+
+    @Inject(method = "tick", at = @At("HEAD"))
+    private void onTickCall(CallbackInfo ci)
+    {
+        if (tickCall != null)
+        {
+            CarpetServer.scriptServer.events.onEntityTick(tickCall, (Entity) (Object) this);
+        }
+    }
+
 
     @Inject(method = "remove", at = @At("HEAD"))
     private void onRemove(CallbackInfo ci)

src/main/java/carpet/mixins/ItemEntityMixin.java

@@ -2,7 +2,7 @@ package carpet.mixins;
 
 import carpet.settings.CarpetSettings;
 import carpet.helpers.InventoryHelper;
-import carpet.utils.IItemEntity;
+import carpet.fakes.ItemEntityInterface;
 import net.minecraft.block.ShulkerBoxBlock;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityType;
@@ -18,7 +18,8 @@ import org.spongepowered.asm.mixin.injection.Redirect;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 @Mixin(ItemEntity.class)
-public abstract class ItemEntityMixin extends Entity implements IItemEntity {
+public abstract class ItemEntityMixin extends Entity implements ItemEntityInterface
+{
     private static final int SHULKERBOX_MAX_STACK_AMOUNT = 64;
 
     @Shadow private int age;
@@ -89,8 +90,8 @@ public abstract class ItemEntityMixin extends Entity implements IItemEntity {
             selfStack.increment(amount);
             self.setStack(selfStack);
 
-            this.pickupDelay = Math.max(((IItemEntity)other).getPickupDelay(), this.pickupDelay);
-            this.age = Math.min(((IItemEntity)other).getAge(), this.age);
+            this.pickupDelay = Math.max(((ItemEntityInterface)other).getPickupDelay(), this.pickupDelay);
+            this.age = Math.min(((ItemEntityInterface)other).getAge(), this.age);
 
             otherStack.decrement(amount);
             if (otherStack.isEmpty())

src/main/java/carpet/mixins/World_tickMixin.java

@@ -57,11 +57,12 @@ public abstract class World_tickMixin implements WorldInterface
 
     @Redirect(method = "tickBlockEntities", at = @At(
             value = "INVOKE",
-            target = "Lnet/minecraft/block/entity/BlockEntity;hasWorld()Z"
+            target = "Lnet/minecraft/block/entity/BlockEntity;isInvalid()Z",
+            ordinal = 0
     ))
     private boolean checkProcessTEs(BlockEntity blockEntity)
     {
-        return blockEntity.hasWorld() && TickSpeed.process_entities;
+        return blockEntity.isInvalid() || !TickSpeed.process_entities;
     }
 
     @Inject(method = "tickBlockEntities", at = @At(