icybear/fabric-carpet
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

updated mappings

Browse Source
This commit is contained in:
gnembon committed 2019-10-11 08:43:19 -03:00
1 parent dbf8dfb3c5
commit f0f3d4a60e
14 files changed
+37 -39
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/carpet/helpers/EntityPlayerActionPack.java
+1 -1
View File
@@ -236,7 +236,7 @@ public class EntityPlayerActionPack
player.updateLastActionTime();
EntityHitResult entityHit = (EntityHitResult) hit;
Entity entity = entityHit.getEntity();
Vec3d relativeHitPos = entityHit.getPos().subtract(entity.method_23317(), entity.method_23318(), entity.method_23321());
Vec3d relativeHitPos = entityHit.getPos().subtract(entity.getX(), entity.getY(), entity.getZ());
if (entity.interactAt(player, relativeHitPos, hand) == ActionResult.SUCCESS) return true;
if (player.interact(entity, hand) == ActionResult.SUCCESS) return true;
break;
src/main/java/carpet/helpers/XPcombine.java
+1 -1
View File
@@ -47,7 +47,7 @@ public class XPcombine
if (getTextureByXP(first.getExperienceAmount()) != size)
{
newOrb = new ExperienceOrbEntity(EntityType.EXPERIENCE_ORB, first.world);
newOrb.setPositionAndAngles(first.method_23317(), first.method_23318(), first.method_23321(), first.yaw, first.pitch);
newOrb.setPositionAndAngles(first.getX(), first.getY(), first.getZ(), first.yaw, first.pitch);
((ExperienceOrbInterface)newOrb).setAmount(first.getExperienceAmount());
first.world.spawnEntity(newOrb);
src/main/java/carpet/mixins/FallingBlockEntityMixin.java
+1 -1
View File
@@ -29,7 +29,7 @@ public abstract class FallingBlockEntityMixin extends Entity
private void tickCheck(CallbackInfo ci)
{
if (LoggerRegistry.__fallingBlocks && logHelper != null)
logHelper.onTick(method_23317(), method_23318(), method_23321(), getVelocity());
logHelper.onTick(getX(), getY(), getZ(), getVelocity());
}
@Override
src/main/java/carpet/mixins/GuardianEntityMixin.java
+1 -1
View File
@@ -27,7 +27,7 @@ public abstract class GuardianEntityMixin extends HostileEntity
if (!this.world.isClient && !this.removed && CarpetSettings.renewableSponges)
{
ElderGuardianEntity elderGuardian = new ElderGuardianEntity(EntityType.ELDER_GUARDIAN ,this.world);
elderGuardian.setPositionAndAngles(this.method_23317(), this.method_23318(), this.method_23321(), this.yaw, this.pitch);
elderGuardian.setPositionAndAngles(this.getX(), this.getY(), this.getZ(), this.yaw, this.pitch);
elderGuardian.initialize(this.world ,this.world.getLocalDifficulty(new BlockPos(elderGuardian)), SpawnType.CONVERSION, (EntityData)null, (CompoundTag)null);
elderGuardian.setAiDisabled(this.isAiDisabled());
src/main/java/carpet/mixins/ProjectileEntityMixin.java
+1 -1
View File
@@ -29,7 +29,7 @@ public abstract class ProjectileEntityMixin extends Entity
private void tickCheck(CallbackInfo ci)
{
if (LoggerRegistry.__projectiles && logHelper != null)
logHelper.onTick(method_23317(), method_23318(), method_23321(), getVelocity());
logHelper.onTick(getX(), getY(), getZ(), getVelocity());
}
@Inject(method = "onHit(Lnet/minecraft/util/hit/HitResult;)V", at = @At("RETURN"))
src/main/java/carpet/mixins/ServerPlayNetworkHandler_tickMixin.java
+3 -3
View File
@@ -38,9 +38,9 @@ public class ServerPlayNetworkHandler_tickMixin
))
private void checkMove(PlayerMoveC2SPacket p, CallbackInfo ci)
{
if (Math.abs(p.getX(player.method_23317()) - lastTickX) > 0.0001D
|| Math.abs(p.getY(player.method_23318()) - lastTickY) > 0.0001D
|| Math.abs(p.getY(player.method_23321()) - lastTickZ) > 0.0001D)
if (Math.abs(p.getX(player.getX()) - lastTickX) > 0.0001D
|| Math.abs(p.getY(player.getY()) - lastTickY) > 0.0001D
|| Math.abs(p.getY(player.getZ()) - lastTickZ) > 0.0001D)
{
TickSpeed.reset_player_active_timeout();
}
src/main/java/carpet/mixins/ThrownEntityMixin.java
+1 -1
View File
@@ -29,7 +29,7 @@ public abstract class ThrownEntityMixin extends Entity
private void tickCheck(CallbackInfo ci)
{
if (LoggerRegistry.__projectiles && logHelper != null)
logHelper.onTick(method_23317(), method_23318(), method_23321(), getVelocity());
logHelper.onTick(getX(), getY(), getZ(), getVelocity());
}
@Override
src/main/java/carpet/mixins/TntEntityMixin.java
+2 -2
View File
@@ -38,7 +38,7 @@ public abstract class TntEntityMixin extends Entity
{
if (LoggerRegistry.__tnt && logHelper != null && !logHelper.initialized)
{
logHelper.onPrimed(method_23317(), method_23318(), method_23321(), getVelocity());
logHelper.onPrimed(getX(), getY(), getZ(), getVelocity());
}
}
@@ -56,6 +56,6 @@ public abstract class TntEntityMixin extends Entity
private void onExplode(CallbackInfo ci)
{
if (LoggerRegistry.__tnt && logHelper != null)
logHelper.onExploded(method_23317(), method_23318(), method_23321());
logHelper.onExploded(getX(), getY(), getZ());
}
}
src/main/java/carpet/mixins/VillagerEntity_aiMixin.java
+2 -2
View File
@@ -123,7 +123,7 @@ public abstract class VillagerEntity_aiMixin extends AbstractTraderEntity
if (bedPos == null || bedPos.getDimension() != dimension)
{
sayNo();
((ServerWorld) getEntityWorld()).spawnParticles(ParticleTypes.BARRIER, method_23317(), method_23318() + getStandingEyeHeight() + 1, method_23321(), 1, 0.1, 0.1, 0.1, 0.0);
((ServerWorld) getEntityWorld()).spawnParticles(ParticleTypes.BARRIER, getX(), getY() + getStandingEyeHeight() + 1, getZ(), 1, 0.1, 0.1, 0.1, 0.0);
}
else
{
@@ -181,7 +181,7 @@ public abstract class VillagerEntity_aiMixin extends AbstractTraderEntity
{
if (MobAI.isTracking(this, MobAI.TrackingType.IRON_GOLEM_SPAWNING))
{
((ServerWorld) getEntityWorld()).spawnParticles(ParticleTypes.BARRIER, method_23317(), method_23318()+3, method_23321(), 1, 0.1, 0.1, 0.1, 0.0);
((ServerWorld) getEntityWorld()).spawnParticles(ParticleTypes.BARRIER, getX(), getY()+3, getZ(), 1, 0.1, 0.1, 0.1, 0.0);
}
}
src/main/java/carpet/patches/EntityPlayerMPFake.java
+1 -1
View File
@@ -75,7 +75,7 @@ public class EntityPlayerMPFake extends ServerPlayerEntity
server.getPlayerManager().onPlayerConnect(new NetworkManagerFake(NetworkSide.SERVERBOUND), playerShadow);
playerShadow.setHealth(player.getHealth());
playerShadow.networkHandler.requestTeleport(player.method_23317(), player.method_23318(), player.method_23321(), player.yaw, player.pitch);
playerShadow.networkHandler.requestTeleport(player.getX(), player.getY(), player.getZ(), player.yaw, player.pitch);
interactionManagerIn.setGameMode(player.interactionManager.getGameMode());
((ServerPlayerEntityInterface) playerShadow).getActionPack().copyFrom(((ServerPlayerEntityInterface) player).getActionPack());
playerShadow.stepHeight = 0.6F;
src/main/java/carpet/script/CarpetExpression.java
+3 -3
View File
@@ -681,7 +681,7 @@ public class CarpetExpression
Entity e = ((EntityValue) arg).getEntity();
if (e == null)
throw new InternalExpressionException("Null entity");
Value retval = ListValue.of(new NumericValue(e.method_23317()), new NumericValue(e.method_23318()), new NumericValue(e.method_23321()));
Value retval = ListValue.of(new NumericValue(e.getX()), new NumericValue(e.getY()), new NumericValue(e.getZ()));
return (c_, t_) -> retval;
}
else
@@ -1365,8 +1365,8 @@ public class CarpetExpression
{
LivingEntity villager = (LivingEntity)owner;
// stolen from LookTargetUtil.give((VillagerEntity)owner, droppedStack, (LivingEntity) owner);
double double_1 = villager.method_23318() - 0.30000001192092896D + (double)villager.getStandingEyeHeight();
item = new ItemEntity(villager.world, villager.method_23317(), double_1, villager.method_23321(), droppedStack);
double double_1 = villager.getY() - 0.30000001192092896D + (double)villager.getStandingEyeHeight();
item = new ItemEntity(villager.world, villager.getX(), double_1, villager.getZ(), droppedStack);
Vec3d vec3d_1 = villager.getRotationVec(1.0F).normalize().multiply(0.3);// new Vec3d(0, 0.3, 0);
item.setVelocity(vec3d_1);
item.setToDefaultPickupDelay();
src/main/java/carpet/script/value/EntityValue.java
+18 -20
View File
@@ -180,11 +180,11 @@ public class EntityValue extends Value
put("removed", (entity, arg) -> new NumericValue(entity.removed));
put("uuid",(e, a) -> new StringValue(e.getUuidAsString()));
put("id",(e, a) -> new NumericValue(e.getEntityId()));
put("pos", (e, a) -> ListValue.of(new NumericValue(e.method_23317()), new NumericValue(e.method_23318()), new NumericValue(e.method_23321())));
put("location", (e, a) -> ListValue.of(new NumericValue(e.method_23317()), new NumericValue(e.method_23318()), new NumericValue(e.method_23321()), new NumericValue(e.yaw), new NumericValue(e.pitch)));
put("x", (e, a) -> new NumericValue(e.method_23317()));
put("y", (e, a) -> new NumericValue(e.method_23318()));
put("z", (e, a) -> new NumericValue(e.method_23321()));
put("pos", (e, a) -> ListValue.of(new NumericValue(e.getX()), new NumericValue(e.getY()), new NumericValue(e.getZ())));
put("location", (e, a) -> ListValue.of(new NumericValue(e.getX()), new NumericValue(e.getY()), new NumericValue(e.getZ()), new NumericValue(e.yaw), new NumericValue(e.pitch)));
put("x", (e, a) -> new NumericValue(e.getX()));
put("y", (e, a) -> new NumericValue(e.getY()));
put("z", (e, a) -> new NumericValue(e.getZ()));
put("motion", (e, a) ->
{
Vec3d velocity = e.getVelocity();
@@ -422,7 +422,7 @@ public class EntityValue extends Value
private static void updatePosition(Entity e)
{
if (e instanceof ServerPlayerEntity)
((ServerPlayerEntity)e).networkHandler.requestTeleport(e.method_23317(), e.method_23318(), e.method_23321(), e.yaw, e.pitch);
((ServerPlayerEntity)e).networkHandler.requestTeleport(e.getX(), e.getY(), e.getZ(), e.yaw, e.pitch);
else
((ServerWorld)e.getEntityWorld()).method_14178().sendToNearbyPlayers(e,new EntityPositionS2CPacket(e));
}
@@ -446,16 +446,15 @@ public class EntityValue extends Value
throw new InternalExpressionException("expected a list of 5 parameters as second argument");
}
List<Value> coords = ((ListValue) v).getItems();
e.method_23327(
NumericValue.asNumber(coords.get(0)).getDouble(),
NumericValue.asNumber(coords.get(1)).getDouble(),
NumericValue.asNumber(coords.get(2)).getDouble()
);
e.pitch = (float) NumericValue.asNumber(coords.get(4)).getDouble();
e.prevPitch = e.pitch;
e.yaw = (float) NumericValue.asNumber(coords.get(3)).getDouble();
e.prevYaw = e.yaw;
e.setPosition(e.method_23317(), e.method_23318(), e.method_23321());
e.setPosition(
NumericValue.asNumber(coords.get(0)).getDouble(),
NumericValue.asNumber(coords.get(1)).getDouble(),
NumericValue.asNumber(coords.get(2)).getDouble())
;
updatePosition(e);
});
put("pos", (e, v) ->
@@ -465,30 +464,29 @@ public class EntityValue extends Value
throw new InternalExpressionException("expected a list of 3 parameters as second argument");
}
List<Value> coords = ((ListValue) v).getItems();
e.method_23327(
NumericValue.asNumber(coords.get(0)).getDouble(),
NumericValue.asNumber(coords.get(1)).getDouble(),
NumericValue.asNumber(coords.get(2)).getDouble()
e.setPosition(
NumericValue.asNumber(coords.get(0)).getDouble(),
NumericValue.asNumber(coords.get(1)).getDouble(),
NumericValue.asNumber(coords.get(2)).getDouble()
);
e.setPosition(e.method_23317(), e.method_23318(), e.method_23321());
updatePosition(e);
});
put("x", (e, v) ->
{
//e.x = NumericValue.asNumber(v).getDouble();
e.setPosition(NumericValue.asNumber(v).getDouble(), e.method_23318(), e.method_23321());
e.setPosition(NumericValue.asNumber(v).getDouble(), e.getY(), e.getZ());
updatePosition(e);
});
put("y", (e, v) ->
{
//e.y = NumericValue.asNumber(v).getDouble();
e.setPosition(e.method_23317(), NumericValue.asNumber(v).getDouble(), e.method_23321());
e.setPosition(e.getX(), NumericValue.asNumber(v).getDouble(), e.getZ());
updatePosition(e);
});
put("z", (e, v) ->
{
//e.z = NumericValue.asNumber(v).getDouble();
e.setPosition(e.method_23317(), e.method_23318(), NumericValue.asNumber(v).getDouble());
e.setPosition(e.getX(), e.getY(), NumericValue.asNumber(v).getDouble());
updatePosition(e);
});
put("pitch", (e, v) ->
src/main/java/carpet/utils/EntityInfo.java
+1 -1
View File
@@ -65,7 +65,7 @@ public class EntityInfo
{
return "None";
}
return String.format("%s at [%.1f, %.1f, %.1f]",e.getDisplayName().getString(), e.method_23317(), e.method_23318(), e.method_23321());
return String.format("%s at [%.1f, %.1f, %.1f]",e.getDisplayName().getString(), e.getX(), e.getY(), e.getZ());
}
private static double get_speed(double internal)