xircon/Hbm-s-Nuclear-Tech-GIT
1
0
Fork 0
mirror of https://github.com/HbmMods/Hbm-s-Nuclear-Tech-GIT.git synced 2026-01-25 10:32:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2098 from Dash1269/ntmain-accelerator-tweaks

Browse Source 
PA Dipole tweaks and particle serialisation
This commit is contained in:
HbmMods 2025-04-21 17:37:53 +02:00 committed by GitHub
commit 31dc235dc1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 74 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
src/main/java/com/hbm/tileentity/machine/albion/TileEntityPADipole.java
View File

@ -31,9 +31,9 @@ public class TileEntityPADipole extends TileEntityCooledBase implements IGUIProv
public int dirUpper;
public int dirRedstone;
public int threshold;
public static final long usage = 100_000;
public TileEntityPADipole() {
super(2);
}
@ -66,37 +66,46 @@ public class TileEntityPADipole extends TileEntityCooledBase implements IGUIProv
@Override
public void onEnter(Particle particle, ForgeDirection dir) {
EnumCoilType type = null;
boolean isInline = dir.equals(getExitDir(particle));
int mult = 1;
if(slots[1] != null && slots[1].getItem() == ModItems.pa_coil) {
type = EnumUtil.grabEnumSafely(EnumCoilType.class, slots[1].getItemDamage());
if(type.diMin > particle.momentum) mult *= 10;
if(type.diDistMin > particle.distanceTraveled) mult *= 10;
if(isInline) mult = 1;
}
if(!isCool()) particle.crash(PAState.CRASH_NOCOOL);
if(this.power < this.usage * mult) particle.crash(PAState.CRASH_NOPOWER);
if(type == null) particle.crash(PAState.CRASH_NOCOIL);
if(type != null && type.diMax < particle.momentum) particle.crash(PAState.CRASH_OVERSPEED);
if(particle.invalid) return;
particle.resetDistance();
if (isInline) {
particle.addDistance(3);
} else {
particle.resetDistance();
}
this.power -= this.usage * mult;
}
@Override
public BlockPos getExitPos(Particle particle) {
if(particle.momentum >= this.threshold) {
ForgeDirection dir = this.ditToForgeDir(checkRedstone() ? dirRedstone : dirUpper);
particle.dir = dir;
return new BlockPos(xCoord, yCoord, zCoord).offset(dir, 2);
}
ForgeDirection dir = this.ditToForgeDir(dirLower);
particle.dir = dir;
return new BlockPos(xCoord, yCoord, zCoord).offset(dir, 2);
particle.dir = getExitDir(particle);
return new BlockPos(xCoord, yCoord, zCoord).offset(particle.dir, 2);
}
public ForgeDirection getExitDir(Particle particle) {
int dit = particle.momentum < this.threshold
? dirLower : checkRedstone()
? dirRedstone : dirUpper;
return ditToForgeDir(dit);
}
public boolean checkRedstone() {
for(DirPos pos : getConPos()) {
if(worldObj.isBlockIndirectlyGettingPowered(pos.getX(), pos.getY(), pos.getZ())) return true;
@ -106,11 +115,11 @@ public class TileEntityPADipole extends TileEntityCooledBase implements IGUIProv
@Override
public void updateEntity() {
if(!worldObj.isRemote) {
this.power = Library.chargeTEFromItems(slots, 0, power, this.getMaxPower());
}
super.updateEntity();
}
@ -151,12 +160,12 @@ public class TileEntityPADipole extends TileEntityCooledBase implements IGUIProv
nbt.setInteger("dirRedstone", dirRedstone);
nbt.setInteger("threshold", threshold);
}
AxisAlignedBB bb = null;
@Override
public AxisAlignedBB getRenderBoundingBox() {
if(bb == null) {
bb = AxisAlignedBB.getBoundingBox(
xCoord - 1,
@ -167,10 +176,10 @@ public class TileEntityPADipole extends TileEntityCooledBase implements IGUIProv
zCoord + 2
);
}
return bb;
}
@Override
@SideOnly(Side.CLIENT)
public double getMaxRenderDistanceSquared() {
@ -216,10 +225,10 @@ public class TileEntityPADipole extends TileEntityCooledBase implements IGUIProv
if(this.dirLower > 3) this.dirLower -= 4;
if(this.dirUpper > 3) this.dirUpper -= 4;
if(this.dirRedstone > 3) this.dirRedstone -= 4;
this.threshold = MathHelper.clamp_int(threshold, 0, 999_999_999);
}
public static ForgeDirection ditToForgeDir(int dir) {
if(dir == 1) return ForgeDirection.EAST;
if(dir == 2) return ForgeDirection.SOUTH;

41
src/main/java/com/hbm/tileentity/machine/albion/TileEntityPASource.java
View File

@ -233,6 +233,47 @@ public class TileEntityPASource extends TileEntityCooledBase implements IGUIProv
}
}
@Override
public void writeToNBT(NBTTagCompound nbt) {
super.writeToNBT(nbt);
NBTTagCompound particleTag = new NBTTagCompound();
particleTag.setInteger("x", particle.x);
particleTag.setInteger("y", particle.y);
particleTag.setInteger("z", particle.z);
particleTag.setByte("dir", (byte) particle.dir.ordinal());
particleTag.setInteger("momentum", particle.momentum);
particleTag.setInteger("defocus", particle.defocus);
particleTag.setInteger("dist", particle.distanceTraveled);
NBTTagCompound inputTag1 = new NBTTagCompound();
NBTTagCompound inputTag2 = new NBTTagCompound();
particle.input1.writeToNBT(inputTag1);
particle.input2.writeToNBT(inputTag2);
particleTag.setTag("input1", inputTag1);
particleTag.setTag("input2", inputTag2);
nbt.setTag("particle", particleTag);
}
@Override
public void readFromNBT(NBTTagCompound nbt) {
super.readFromNBT(nbt);
if(!nbt.hasKey("particle")) return;
NBTTagCompound particleTag = nbt.getCompoundTag("particle");
int x = particleTag.getInteger("x");
int y = particleTag.getInteger("y");
int z = particleTag.getInteger("z");
ForgeDirection dir = EnumUtil.grabEnumSafely(ForgeDirection.class, particleTag.getInteger("dir"));
ItemStack input1 = ItemStack.loadItemStackFromNBT(particleTag.getCompoundTag("input1"));
ItemStack input2 = ItemStack.loadItemStackFromNBT(particleTag.getCompoundTag("input2"));
this.particle = new Particle(this, x, y, z, dir, input1, input2);
this.particle.momentum = particleTag.getInteger("momentum");
this.particle.defocus = particleTag.getInteger("defocus");
this.particle.distanceTraveled = particleTag.getInteger("dist");
}
public static class Particle {
private TileEntityPASource source;