-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #5 from topi-banana/master
Update 1.2.1. GG~
- Loading branch information
Showing
43 changed files
with
1,766 additions
and
88 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
62 changes: 62 additions & 0 deletions
62
src/main/java/PCA/mixin/rule/playerSit/MixinArmorStandEntity.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,62 @@ | ||
| package PCA.mixin.rule.playerSit; | ||
|
|
||
| import PCA.util.rule.playerSit.SitEntity; | ||
| import net.minecraft.entity.Entity; | ||
| import net.minecraft.entity.EntityType; | ||
| import net.minecraft.entity.LivingEntity; | ||
| import net.minecraft.entity.decoration.ArmorStandEntity; | ||
| import net.minecraft.nbt.NbtCompound; | ||
| import net.minecraft.nbt.NbtElement; | ||
| import net.minecraft.world.World; | ||
| 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(ArmorStandEntity.class) | ||
| public abstract class MixinArmorStandEntity extends LivingEntity implements SitEntity { | ||
| private boolean sitEntity = false; | ||
|
|
||
| protected MixinArmorStandEntity(EntityType<? extends LivingEntity> entityType, World world) { | ||
| super(entityType, world); | ||
| } | ||
|
|
||
| @Shadow | ||
| protected abstract void setMarker(boolean marker); | ||
|
|
||
| @Override | ||
| public boolean isSitEntity() { | ||
| return sitEntity; | ||
| } | ||
|
|
||
| @Override | ||
| public void setSitEntity(boolean isSitEntity) { | ||
| this.sitEntity = isSitEntity; | ||
| this.setMarker(isSitEntity); | ||
| this.setInvisible(isSitEntity); | ||
| } | ||
|
|
||
| @Override | ||
| protected void removePassenger(Entity passenger) { | ||
| if (this.isSitEntity()) { | ||
| this.setPosition(this.getX(), this.getY() + 0.16, this.getZ()); | ||
| this.kill(); | ||
| } | ||
| super.removePassenger(passenger); | ||
| } | ||
|
|
||
| @Inject(method = "writeCustomDataToNbt", at = @At(value = "RETURN")) | ||
| private void postWriteCustomDataToNbt(NbtCompound nbt, CallbackInfo ci) { | ||
| if (this.sitEntity) { | ||
| nbt.putBoolean("SitEntity", true); | ||
| } | ||
| } | ||
|
|
||
| @Inject(method = "readCustomDataFromNbt", at = @At(value = "RETURN")) | ||
| private void postReadCustomDataFromNbt(NbtCompound nbt, CallbackInfo ci) { | ||
| if (nbt.contains("SitEntity", NbtElement.BYTE_TYPE)) { | ||
| this.sitEntity = nbt.getBoolean("SitEntity"); | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| package PCA.util.rule.playerSit; | ||
|
|
||
| public interface SitEntity { | ||
| boolean isSitEntity(); | ||
|
|
||
| void setSitEntity(boolean sitEntity); | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,57 @@ | ||
| package carpetfixes.helpers; | ||
|
|
||
| public class FastMath { | ||
|
|
||
| private static final double HYPOT_MAX_MAG = 2^511; | ||
| private static final double HYPOT_FACTOR = 2^750; | ||
|
|
||
| /** | ||
| * @author FX - PR0CESS | ||
| * ~1.25x faster than {@link Math#round(float)} | ||
| */ | ||
| public static int round(float a) { | ||
| return a > 0F ? (int)(a + .5F) : (int)(a - .5F); | ||
| } | ||
|
|
||
| /** | ||
| * @author FX - PR0CESS | ||
| * ~1.28x faster than {@link Math#round(double)} | ||
| */ | ||
| public static long round(double a) { | ||
| return a > 0D ? (long)(a + .5D) : (long)(a - .5D); | ||
| } | ||
|
|
||
| /** | ||
| * @author FX - PR0CESS | ||
| * Hypot implementation from the jafama library. Not 100% accurate! (3E-14%, 15 is perfectly accurate) | ||
| * ~1.6x faster than {@link Math#hypot(double,double)} | ||
| */ | ||
| public static double hypot(double x, double y) { | ||
| x = Math.abs(x); | ||
| y = Math.abs(y); | ||
| if (y < x) { // Ensuring x <= y | ||
| final double a = x; | ||
| x = y; | ||
| y = a; | ||
| } else if (!(y >= x)) { // Testing if we have some NaN | ||
| return x == Double.POSITIVE_INFINITY ? Double.POSITIVE_INFINITY : Double.NaN; | ||
| } | ||
| if (y-x == y) { // x too small to subtract from y | ||
| return y; | ||
| } else { | ||
| double factor; | ||
| if (y > HYPOT_MAX_MAG) { // y is too large: scaling down | ||
| x *= (1/HYPOT_FACTOR); | ||
| y *= (1/HYPOT_FACTOR); | ||
| factor = HYPOT_FACTOR; | ||
| } else if (x < (1/HYPOT_MAX_MAG)) { // x is too small: scaling up | ||
| x *= HYPOT_FACTOR; | ||
| y *= HYPOT_FACTOR; | ||
| factor = (1/HYPOT_FACTOR); | ||
| } else { | ||
| factor = 1.0; | ||
| } | ||
| return factor * Math.sqrt(x*x+y*y); | ||
| } | ||
| } | ||
| } |
Oops, something went wrong.