1.14.2 pre 3

This commit is contained in:
gnembon committed 2019-05-24 12:21:53 -03:00
1 parent 8c8682d2ca
commit fef36783d6
5 files changed
+11 -12

No files matched your search

@@ -4,7 +4,7 @@ import carpet.CarpetSettings;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityType;
import net.minecraft.entity.LivingEntity;
import net.minecraft.entity.PrimedTntEntity;
import net.minecraft.entity.TntEntity;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.util.math.Vec3d;
import net.minecraft.world.World;
@@ -15,18 +15,18 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
import carpet.logging.LoggerRegistry;
import carpet.logging.logHelpers.TNTLogHelper;
@Mixin(PrimedTntEntity.class)
public abstract class PrimedTntEntityMixin extends Entity
@Mixin(TntEntity.class)
public abstract class TntEntityMixin extends Entity
{
private TNTLogHelper logHelper = null;
public PrimedTntEntityMixin(EntityType<?> entityType_1, World world_1)
public TntEntityMixin(EntityType<?> entityType_1, World world_1)
{
super(entityType_1, world_1);
}
@Inject(method = "<init>(Lnet/minecraft/entity/EntityType;Lnet/minecraft/world/World;)V", at = @At("RETURN"))
private void initTNTLoggerPrime(EntityType<? extends PrimedTntEntity> entityType_1, World world_1, CallbackInfo ci)
private void initTNTLoggerPrime(EntityType<? extends TntEntity> entityType_1, World world_1, CallbackInfo ci)
{
if (LoggerRegistry.__tnt && !world_1.isClient)
{
@@ -554,7 +554,7 @@ public class CarpetExpression
});
this.expr.addLazyFunction("solid", -1, (c, t, lv) ->
booleanStateTest(c, "solid", lv, (s, p) -> s.isFullBoundsCubeForCulling()));
genericStateTest(c, "solid", lv, (s, p, w) -> new NumericValue(s.isSimpleFullBlock(w, p))));
this.expr.addLazyFunction("air", -1, (c, t, lv) ->
booleanStateTest(c, "air", lv, (s, p) -> s.isAir()));
@@ -170,7 +170,6 @@ public class BlockInfo
//lst.add(Messenger.s(String.format(" - Full block: %s", block.isShapeFullCube()))); // isFullCube() )));
lst.add(Messenger.s(String.format(" - Normal cube: %s", state.isSimpleFullBlock(world, pos)))); //isNormalCube())));
lst.add(Messenger.s(String.format(" - Is liquid: %s", material.isLiquid())));
lst.add(Messenger.s(String.format(" - Is solid: %s", state.isFullBoundsCubeForCulling())));
lst.add(Messenger.s(""));
lst.add(Messenger.s(String.format(" - Light in: %d, above: %d", world.getLightLevel(pos), world.getLightLevel(pos.up()))));
lst.add(Messenger.s(String.format(" - Brightness in: %.2f, above: %.2f", world.getBrightness(pos), world.getBrightness(pos.up()))));
+1 -1
View File
@@ -60,7 +60,7 @@
"TntBlockMixin",
"ExplosionMixin",
"PrimedTntEntityMixin",
"TntEntityMixin",
"ProjectileEntityMixin",
"FallingBlockEntityMixin",
"ThrownEntityMixin",