sat dock fix, AP&DU nerf

This commit is contained in:
Boblet 2025-04-28 16:46:52 +02:00
parent f42b4b3dd4
commit 30f41fe1b0
11 changed files with 224 additions and 318 deletions

View File

@ -1,49 +1,6 @@
## Added
* Laser pistol
* Saturnite-tier pistol using capacitors
* Also has variants
* B-side for the assault rifle
* Ammo bag
* Holds up to 8 stacks of items with no NBT
* Reloading guns will access the contents of the bag directly without it having to be emptied first
* Comes with a handy little indicator to shot roughly how full it is
## Changed ## Changed
* Trenchmaster armor now has the fast reload and more ammo traits again * Nerfed AP and DU round damage multiplier
* Fast reload now also plays the animation twice as fast * Effective damage is still much higher than on gunmetal ammo due to the armor piercing effect
* More ammo does not apply to weapons that can only hold one round, like nuke and rocket launchers
* Ace of spades now works as advertised again
* Clay tablets now have "pools", tablets obtained from a black room no longer shows recipes for things not related to black rooms
* Pedestal crafting extras `GOOD_KARMA` and `BAD_KARMA` are now properly implemented
* If you don't know what this means, just ignore it
* Pneumatic tubes now have a special case when supplying autocrafters, they will only send single items since larger stacks are not accepted
* Simplified turbofan recipe
* Solar boilers will now show a tooltip when they are too cold
* Updated the satellite dish structure, due to the new spawn rules it's also no longer obscenely rare
* The rare small lab structures have been removed and replaced with a new lighthouse
* ReaSim connectors will no longer function if ReaSim boilers are disabled
* Updated the placed geiger counter model
* Updated random gear on hostile mobs, there's now more variety in what armor/weapons mobs can have
* Removed the cryo cannon. It was the last true weapon to use the NT system and may return later
* Mines will no longer trigger from all ambient creatures (originally just bats) and water creatures
* Mines can no longer be triggered if a non-air block is above them
* Moved the cooling tower particle toggle from `hbm.cfg` to the client config, named `COOLING_TOWER_PARTICLES`
* Updated HSS textures
* The diesel generator and turbofan will both now halt operation when powered by redstone
* Infinite batteries will now also drain energy when put into a charging slot
* TOREX effects now cause the sky to go fullbright again for 10 seconds after they spawn
* Weapon tooltips now show the weapon's condition
* Updated the catalytic cracking tower model
* Leviathan turbine and powered condenser tooltip now use thousand separaators to make the numbers actually readable
* Catalytic converters can now be crafted with `ANY_BISMOID` instead of just bismuth (that includes arsenic)
## Fixed ## Fixed
* Fixed fatal gamebreaking hard drive corrupting issue where taurun leggings were misspelled * Fixed a potential crash caused by cargo dropships landing on cargo docks with no satellite chip installed
* Fixed minor display issue where compressed air ducts would visually connect to non-ejector pneumatic tubes
* Fixed special creeper types being able to spawn in other dimensions
* Fixed modeled armor using weird rotation rules, causing issues with Customizable Player Models
* Fixed rotation issues for certain blocks using the new structure system
* Fixed ReaSim water never moving if the reactor is at 20°
* Fixed strand caster LPS gauge exceeding the limit
* The SPAS-12 and congo lake now change type immediately when hitting the reload key, fixing an issue where the first loaded round may have the worng color when the ammo type changes
* Fixed crash caused by `/ntmreload` when NEI is not installed

View File

@ -42,7 +42,7 @@ public class XFactory22lr {
.setCasing(casing22.clone().register("p22fmj")); .setCasing(casing22.clone().register("p22fmj"));
p22_jhp = new BulletConfig().setItem(EnumAmmo.P22_JHP).setCasing(EnumCasingType.SMALL, 24).setKnockback(0F).setDamage(1.5F).setHeadshot(1.5F).setArmorPiercing(-0.25F) p22_jhp = new BulletConfig().setItem(EnumAmmo.P22_JHP).setCasing(EnumCasingType.SMALL, 24).setKnockback(0F).setDamage(1.5F).setHeadshot(1.5F).setArmorPiercing(-0.25F)
.setCasing(casing22.clone().register("p22jhp")); .setCasing(casing22.clone().register("p22jhp"));
p22_ap = new BulletConfig().setItem(EnumAmmo.P22_AP).setCasing(EnumCasingType.SMALL_STEEL, 24).setKnockback(0F).setDoesPenetrate(true).setDamageFalloutByPen(false).setDamage(1.5F).setThresholdNegation(2.5F).setArmorPiercing(0.15F) p22_ap = new BulletConfig().setItem(EnumAmmo.P22_AP).setCasing(EnumCasingType.SMALL_STEEL, 24).setKnockback(0F).setDoesPenetrate(true).setDamageFalloutByPen(false).setDamage(1.25F).setThresholdNegation(2.5F).setArmorPiercing(0.15F)
.setCasing(casing22.clone().setColor(SpentCasing.COLOR_CASE_44).register("p22ap")); .setCasing(casing22.clone().setColor(SpentCasing.COLOR_CASE_44).register("p22ap"));
ModItems.gun_am180 = new ItemGunBaseNT(WeaponQuality.A_SIDE, new GunConfig() ModItems.gun_am180 = new ItemGunBaseNT(WeaponQuality.A_SIDE, new GunConfig()

View File

@ -35,7 +35,7 @@ public class XFactory357 {
m357_sp = new BulletConfig().setItem(EnumAmmo.M357_SP).setCasing(EnumCasingType.SMALL, 8); m357_sp = new BulletConfig().setItem(EnumAmmo.M357_SP).setCasing(EnumCasingType.SMALL, 8);
m357_fmj = new BulletConfig().setItem(EnumAmmo.M357_FMJ).setCasing(EnumCasingType.SMALL, 8).setDamage(0.8F).setThresholdNegation(2F).setArmorPiercing(0.1F); m357_fmj = new BulletConfig().setItem(EnumAmmo.M357_FMJ).setCasing(EnumCasingType.SMALL, 8).setDamage(0.8F).setThresholdNegation(2F).setArmorPiercing(0.1F);
m357_jhp = new BulletConfig().setItem(EnumAmmo.M357_JHP).setCasing(EnumCasingType.SMALL, 8).setDamage(1.5F).setHeadshot(1.5F).setArmorPiercing(-0.25F); m357_jhp = new BulletConfig().setItem(EnumAmmo.M357_JHP).setCasing(EnumCasingType.SMALL, 8).setDamage(1.5F).setHeadshot(1.5F).setArmorPiercing(-0.25F);
m357_ap = new BulletConfig().setItem(EnumAmmo.M357_AP).setCasing(EnumCasingType.SMALL_STEEL, 8).setDoesPenetrate(true).setDamageFalloutByPen(false).setDamage(1.5F).setThresholdNegation(5F).setArmorPiercing(0.15F); m357_ap = new BulletConfig().setItem(EnumAmmo.M357_AP).setCasing(EnumCasingType.SMALL_STEEL, 8).setDoesPenetrate(true).setDamageFalloutByPen(false).setDamage(1.25F).setThresholdNegation(5F).setArmorPiercing(0.15F);
m357_express = new BulletConfig().setItem(EnumAmmo.M357_EXPRESS).setCasing(EnumCasingType.SMALL, 8).setDoesPenetrate(true).setDamage(1.5F).setThresholdNegation(2F).setArmorPiercing(0.1F).setWear(1.5F); m357_express = new BulletConfig().setItem(EnumAmmo.M357_EXPRESS).setCasing(EnumCasingType.SMALL, 8).setDoesPenetrate(true).setDamage(1.5F).setThresholdNegation(2F).setArmorPiercing(0.1F).setWear(1.5F);
ModItems.gun_light_revolver = new ItemGunBaseNT(WeaponQuality.A_SIDE, new GunConfig() ModItems.gun_light_revolver = new ItemGunBaseNT(WeaponQuality.A_SIDE, new GunConfig()

View File

@ -77,7 +77,7 @@ public class XFactory44 {
.setCasing(casing44.clone().register("m44fmj")); .setCasing(casing44.clone().register("m44fmj"));
m44_jhp = new BulletConfig().setItem(EnumAmmo.M44_JHP).setCasing(EnumCasingType.SMALL, 6).setDamage(1.5F).setHeadshot(1.5F).setArmorPiercing(-0.25F) m44_jhp = new BulletConfig().setItem(EnumAmmo.M44_JHP).setCasing(EnumCasingType.SMALL, 6).setDamage(1.5F).setHeadshot(1.5F).setArmorPiercing(-0.25F)
.setCasing(casing44.clone().register("m44jhp")); .setCasing(casing44.clone().register("m44jhp"));
m44_ap = new BulletConfig().setItem(EnumAmmo.M44_AP).setCasing(EnumCasingType.SMALL_STEEL, 6).setDoesPenetrate(true).setDamageFalloutByPen(false).setDamage(1.5F).setThresholdNegation(7.5F).setArmorPiercing(0.15F) m44_ap = new BulletConfig().setItem(EnumAmmo.M44_AP).setCasing(EnumCasingType.SMALL_STEEL, 6).setDoesPenetrate(true).setDamageFalloutByPen(false).setDamage(1.25F).setThresholdNegation(7.5F).setArmorPiercing(0.15F)
.setCasing(casing44.clone().setColor(SpentCasing.COLOR_CASE_44).register("m44ap")); .setCasing(casing44.clone().setColor(SpentCasing.COLOR_CASE_44).register("m44ap"));
m44_express = new BulletConfig().setItem(EnumAmmo.M44_EXPRESS).setCasing(EnumCasingType.SMALL, 6).setDoesPenetrate(true).setDamage(1.5F).setThresholdNegation(3F).setArmorPiercing(0.1F).setWear(1.5F) m44_express = new BulletConfig().setItem(EnumAmmo.M44_EXPRESS).setCasing(EnumCasingType.SMALL, 6).setDoesPenetrate(true).setDamage(1.5F).setThresholdNegation(3F).setArmorPiercing(0.1F).setWear(1.5F)
.setCasing(casing44.clone().register("m44express")); .setCasing(casing44.clone().register("m44express"));

View File

@ -22,7 +22,7 @@ public class XFactory45 {
.setCasing(casing9.clone().register("p45fmj")); .setCasing(casing9.clone().register("p45fmj"));
p45_jhp = new BulletConfig().setItem(EnumAmmo.P45_JHP).setCasing(EnumCasingType.SMALL, 8).setDamage(1.5F).setHeadshot(1.5F).setArmorPiercing(-0.25F) p45_jhp = new BulletConfig().setItem(EnumAmmo.P45_JHP).setCasing(EnumCasingType.SMALL, 8).setDamage(1.5F).setHeadshot(1.5F).setArmorPiercing(-0.25F)
.setCasing(casing9.clone().register("p45jhp")); .setCasing(casing9.clone().register("p45jhp"));
p45_ap = new BulletConfig().setItem(EnumAmmo.P45_AP).setCasing(EnumCasingType.SMALL_STEEL, 8).setDoesPenetrate(true).setDamageFalloutByPen(false).setDamage(1.5F).setThresholdNegation(5F).setArmorPiercing(0.15F) p45_ap = new BulletConfig().setItem(EnumAmmo.P45_AP).setCasing(EnumCasingType.SMALL_STEEL, 8).setDoesPenetrate(true).setDamageFalloutByPen(false).setDamage(1.25F).setThresholdNegation(5F).setArmorPiercing(0.15F)
.setCasing(casing9.clone().setColor(SpentCasing.COLOR_CASE_44).register("p45ap")); .setCasing(casing9.clone().setColor(SpentCasing.COLOR_CASE_44).register("p45ap"));
p45_du = new BulletConfig().setItem(EnumAmmo.P45_DU).setCasing(EnumCasingType.SMALL_STEEL, 8).setDoesPenetrate(true).setDamageFalloutByPen(false).setDamage(2.5F).setThresholdNegation(15F).setArmorPiercing(0.25F) p45_du = new BulletConfig().setItem(EnumAmmo.P45_DU).setCasing(EnumCasingType.SMALL_STEEL, 8).setDoesPenetrate(true).setDamageFalloutByPen(false).setDamage(2.5F).setThresholdNegation(15F).setArmorPiercing(0.25F)
.setCasing(casing9.clone().setColor(SpentCasing.COLOR_CASE_44).register("p45du")); .setCasing(casing9.clone().setColor(SpentCasing.COLOR_CASE_44).register("p45du"));

View File

@ -47,11 +47,11 @@ public class XFactory50 {
.setCasing(casing762.clone().register("bmg50fmj")); .setCasing(casing762.clone().register("bmg50fmj"));
bmg50_jhp = new BulletConfig().setItem(EnumAmmo.BMG50_JHP).setCasing(EnumCasingType.LARGE, 12).setDamage(1.5F).setHeadshot(1.5F).setArmorPiercing(-0.25F) bmg50_jhp = new BulletConfig().setItem(EnumAmmo.BMG50_JHP).setCasing(EnumCasingType.LARGE, 12).setDamage(1.5F).setHeadshot(1.5F).setArmorPiercing(-0.25F)
.setCasing(casing762.clone().register("bmg50jhp")); .setCasing(casing762.clone().register("bmg50jhp"));
bmg50_ap = new BulletConfig().setItem(EnumAmmo.BMG50_AP).setCasing(EnumCasingType.LARGE_STEEL, 12).setDoesPenetrate(true).setDamageFalloutByPen(false).setDamage(1.5F).setThresholdNegation(17.5F).setArmorPiercing(0.15F) bmg50_ap = new BulletConfig().setItem(EnumAmmo.BMG50_AP).setCasing(EnumCasingType.LARGE_STEEL, 12).setDoesPenetrate(true).setDamageFalloutByPen(false).setDamage(1.25F).setThresholdNegation(17.5F).setArmorPiercing(0.15F)
.setCasing(casing762.clone().setColor(SpentCasing.COLOR_CASE_44).register("bmg50ap")); .setCasing(casing762.clone().setColor(SpentCasing.COLOR_CASE_44).register("bmg50ap"));
bmg50_du = new BulletConfig().setItem(EnumAmmo.BMG50_DU).setCasing(EnumCasingType.LARGE_STEEL, 12).setDoesPenetrate(true).setDamageFalloutByPen(false).setDamage(2.5F).setThresholdNegation(21F).setArmorPiercing(0.25F) bmg50_du = new BulletConfig().setItem(EnumAmmo.BMG50_DU).setCasing(EnumCasingType.LARGE_STEEL, 12).setDoesPenetrate(true).setDamageFalloutByPen(false).setDamage(1.5F).setThresholdNegation(21F).setArmorPiercing(0.25F)
.setCasing(casing762.clone().setColor(SpentCasing.COLOR_CASE_44).register("bmg50du")); .setCasing(casing762.clone().setColor(SpentCasing.COLOR_CASE_44).register("bmg50du"));
bmg50_he = new BulletConfig().setItem(EnumAmmo.BMG50_HE).setCasing(EnumCasingType.LARGE_STEEL, 12).setWear(3F).setDoesPenetrate(true).setDamageFalloutByPen(false).setDamage(2F).setOnImpact(LAMBDA_STANDARD_EXPLODE) bmg50_he = new BulletConfig().setItem(EnumAmmo.BMG50_HE).setCasing(EnumCasingType.LARGE_STEEL, 12).setWear(3F).setDoesPenetrate(true).setDamageFalloutByPen(false).setDamage(1.75F).setOnImpact(LAMBDA_STANDARD_EXPLODE)
.setCasing(casing762.clone().setColor(SpentCasing.COLOR_CASE_44).register("bmg50he")); .setCasing(casing762.clone().setColor(SpentCasing.COLOR_CASE_44).register("bmg50he"));
ModItems.gun_m2 = new ItemGunBaseNT(WeaponQuality.A_SIDE, new GunConfig() ModItems.gun_m2 = new ItemGunBaseNT(WeaponQuality.A_SIDE, new GunConfig()

View File

@ -64,7 +64,7 @@ public class XFactory556mm {
.setCasing(casing556.clone().register("r556fmj")); .setCasing(casing556.clone().register("r556fmj"));
r556_jhp = new BulletConfig().setItem(EnumAmmo.R556_JHP).setCasing(EnumCasingType.SMALL, 8).setDamage(1.5F).setHeadshot(1.5F).setArmorPiercing(-0.25F) r556_jhp = new BulletConfig().setItem(EnumAmmo.R556_JHP).setCasing(EnumCasingType.SMALL, 8).setDamage(1.5F).setHeadshot(1.5F).setArmorPiercing(-0.25F)
.setCasing(casing556.clone().register("r556jhp")); .setCasing(casing556.clone().register("r556jhp"));
r556_ap = new BulletConfig().setItem(EnumAmmo.R556_AP).setCasing(EnumCasingType.SMALL_STEEL, 8).setDoesPenetrate(true).setDamageFalloutByPen(false).setDamage(1.5F).setThresholdNegation(10F).setArmorPiercing(0.15F) r556_ap = new BulletConfig().setItem(EnumAmmo.R556_AP).setCasing(EnumCasingType.SMALL_STEEL, 8).setDoesPenetrate(true).setDamageFalloutByPen(false).setDamage(1.25F).setThresholdNegation(10F).setArmorPiercing(0.15F)
.setCasing(casing556.clone().setColor(SpentCasing.COLOR_CASE_44).register("r556ap")); .setCasing(casing556.clone().setColor(SpentCasing.COLOR_CASE_44).register("r556ap"));
r556_inc_sp = r556_sp.clone().setOnImpact(INCENDIARY); r556_inc_sp = r556_sp.clone().setOnImpact(INCENDIARY);

View File

@ -54,11 +54,11 @@ public class XFactory762mm {
.setCasing(casing762.clone().register("r762fmj")); .setCasing(casing762.clone().register("r762fmj"));
r762_jhp = new BulletConfig().setItem(EnumAmmo.R762_JHP).setCasing(EnumCasingType.SMALL, 6).setDamage(1.5F).setHeadshot(1.5F).setArmorPiercing(-0.25F) r762_jhp = new BulletConfig().setItem(EnumAmmo.R762_JHP).setCasing(EnumCasingType.SMALL, 6).setDamage(1.5F).setHeadshot(1.5F).setArmorPiercing(-0.25F)
.setCasing(casing762.clone().register("r762jhp")); .setCasing(casing762.clone().register("r762jhp"));
r762_ap = new BulletConfig().setItem(EnumAmmo.R762_AP).setCasing(EnumCasingType.SMALL_STEEL, 6).setDoesPenetrate(true).setDamageFalloutByPen(false).setDamage(1.5F).setThresholdNegation(12.5F).setArmorPiercing(0.15F) r762_ap = new BulletConfig().setItem(EnumAmmo.R762_AP).setCasing(EnumCasingType.SMALL_STEEL, 6).setDoesPenetrate(true).setDamageFalloutByPen(false).setDamage(1.25F).setThresholdNegation(12.5F).setArmorPiercing(0.15F)
.setCasing(casing762.clone().setColor(SpentCasing.COLOR_CASE_44).register("r762ap")); .setCasing(casing762.clone().setColor(SpentCasing.COLOR_CASE_44).register("r762ap"));
r762_du = new BulletConfig().setItem(EnumAmmo.R762_DU).setCasing(EnumCasingType.SMALL_STEEL, 6).setDoesPenetrate(true).setDamageFalloutByPen(false).setDamage(2.5F).setThresholdNegation(15F).setArmorPiercing(0.25F) r762_du = new BulletConfig().setItem(EnumAmmo.R762_DU).setCasing(EnumCasingType.SMALL_STEEL, 6).setDoesPenetrate(true).setDamageFalloutByPen(false).setDamage(1.5F).setThresholdNegation(15F).setArmorPiercing(0.25F)
.setCasing(casing762.clone().setColor(SpentCasing.COLOR_CASE_44).register("r762du")); .setCasing(casing762.clone().setColor(SpentCasing.COLOR_CASE_44).register("r762du"));
r762_he = new BulletConfig().setItem(EnumAmmo.R762_HE).setCasing(EnumCasingType.SMALL_STEEL, 6).setWear(3F).setDamage(2F).setOnImpact(LAMBDA_TINY_EXPLODE) r762_he = new BulletConfig().setItem(EnumAmmo.R762_HE).setCasing(EnumCasingType.SMALL_STEEL, 6).setWear(3F).setDamage(1.75F).setOnImpact(LAMBDA_TINY_EXPLODE)
.setCasing(casing762.clone().setColor(SpentCasing.COLOR_CASE_44).register("r762he")); .setCasing(casing762.clone().setColor(SpentCasing.COLOR_CASE_44).register("r762he"));
energy_lacunae = new BulletConfig().setItem(EnumAmmo.CAPACITOR).setCasing(new ItemStack(ModItems.ingot_polymer, 2), 4 * 40).setupDamageClass(DamageClass.LASER).setBeam().setReloadCount(40).setSpread(0.0F).setLife(5).setRenderRotations(false).setOnBeamImpact(BulletConfig.LAMBDA_STANDARD_BEAM_HIT); energy_lacunae = new BulletConfig().setItem(EnumAmmo.CAPACITOR).setCasing(new ItemStack(ModItems.ingot_polymer, 2), 4 * 40).setupDamageClass(DamageClass.LASER).setBeam().setReloadCount(40).setSpread(0.0F).setLife(5).setRenderRotations(false).setOnBeamImpact(BulletConfig.LAMBDA_STANDARD_BEAM_HIT);

View File

@ -47,7 +47,7 @@ public class XFactory9mm {
.setCasing(casing9.clone().register("p9fmj")); .setCasing(casing9.clone().register("p9fmj"));
p9_jhp = new BulletConfig().setItem(EnumAmmo.P9_JHP).setCasing(EnumCasingType.SMALL, 12).setDamage(1.5F).setHeadshot(1.5F).setArmorPiercing(-0.25F) p9_jhp = new BulletConfig().setItem(EnumAmmo.P9_JHP).setCasing(EnumCasingType.SMALL, 12).setDamage(1.5F).setHeadshot(1.5F).setArmorPiercing(-0.25F)
.setCasing(casing9.clone().register("p9jhp")); .setCasing(casing9.clone().register("p9jhp"));
p9_ap = new BulletConfig().setItem(EnumAmmo.P9_AP).setCasing(EnumCasingType.SMALL_STEEL, 12).setDoesPenetrate(true).setDamageFalloutByPen(false).setDamage(1.5F).setThresholdNegation(5F).setArmorPiercing(0.15F) p9_ap = new BulletConfig().setItem(EnumAmmo.P9_AP).setCasing(EnumCasingType.SMALL_STEEL, 12).setDoesPenetrate(true).setDamageFalloutByPen(false).setDamage(1.25F).setThresholdNegation(5F).setArmorPiercing(0.15F)
.setCasing(casing9.clone().setColor(SpentCasing.COLOR_CASE_44).register("p9ap")); .setCasing(casing9.clone().setColor(SpentCasing.COLOR_CASE_44).register("p9ap"));
ModItems.gun_greasegun = new ItemGunBaseNT(WeaponQuality.A_SIDE, new GunConfig() ModItems.gun_greasegun = new ItemGunBaseNT(WeaponQuality.A_SIDE, new GunConfig()

View File

@ -27,27 +27,17 @@ import net.minecraft.world.World;
import java.util.List; import java.util.List;
public class TileEntityMachineSatDock extends TileEntity implements ISidedInventory, IGUIProvider { public class TileEntityMachineSatDock extends TileEntity implements ISidedInventory, IGUIProvider {
private ItemStack[] slots;
private ItemStack[] slots;
private static final int[] access = new int[] { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14 }; private static final int[] access = new int[] { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14 };
private String customName; private String customName;
private AxisAlignedBB renderBoundingBox; private AxisAlignedBB renderBoundingBox;
public TileEntityMachineSatDock() { public TileEntityMachineSatDock() { slots = new ItemStack[16]; }
slots = new ItemStack[16];
}
@Override @Override public int getSizeInventory() { return slots.length; }
public int getSizeInventory() { @Override public ItemStack getStackInSlot(int i) { return slots[i]; }
return slots.length;
}
@Override
public ItemStack getStackInSlot(int i) {
return slots[i];
}
@Override @Override
public ItemStack getStackInSlotOnClosing(int i) { public ItemStack getStackInSlotOnClosing(int i) {
@ -68,24 +58,10 @@ public class TileEntityMachineSatDock extends TileEntity implements ISidedInvent
} }
} }
@Override @Override public String getInventoryName() { return this.hasCustomInventoryName() ? this.customName : "container.satDock"; }
public String getInventoryName() { @Override public boolean hasCustomInventoryName() { return this.customName != null && this.customName.length() > 0; }
return this.hasCustomInventoryName() ? this.customName : "container.satDock"; public void setCustomName(String name) { this.customName = name; }
} @Override public int getInventoryStackLimit() { return 64; }
@Override
public boolean hasCustomInventoryName() {
return this.customName != null && this.customName.length() > 0;
}
public void setCustomName(String name) {
this.customName = name;
}
@Override
public int getInventoryStackLimit() {
return 64;
}
@Override @Override
public boolean isUseableByPlayer(EntityPlayer player) { public boolean isUseableByPlayer(EntityPlayer player) {
@ -96,19 +72,11 @@ public class TileEntityMachineSatDock extends TileEntity implements ISidedInvent
} }
} }
//You scrubs aren't needed for anything (right now) @Override public void openInventory() { }
@Override @Override public void closeInventory() { }
public void openInventory() {
}
@Override @Override
public void closeInventory() { public boolean isItemValidForSlot(int i, ItemStack itemStack) { return i == 15; }
}
@Override
public boolean isItemValidForSlot(int i, ItemStack itemStack) {
return i != 2 && i != 3 && i != 4 && i != 5;
}
@Override @Override
public ItemStack decrStackSize(int i, int j) { public ItemStack decrStackSize(int i, int j) {
@ -161,20 +129,9 @@ public class TileEntityMachineSatDock extends TileEntity implements ISidedInvent
nbt.setTag("items", list); nbt.setTag("items", list);
} }
@Override @Override public int[] getAccessibleSlotsFromSide(int p_94128_1_) { return access; }
public int[] getAccessibleSlotsFromSide(int p_94128_1_) { @Override public boolean canInsertItem(int i, ItemStack itemStack, int j) { return this.isItemValidForSlot(i, itemStack); }
return access; @Override public boolean canExtractItem(int i, ItemStack itemStack, int j) { return true; }
}
@Override
public boolean canInsertItem(int i, ItemStack itemStack, int j) {
return this.isItemValidForSlot(i, itemStack);
}
@Override
public boolean canExtractItem(int i, ItemStack itemStack, int j) {
return true;
}
@Override @Override
public void updateEntity() { public void updateEntity() {
@ -206,11 +163,9 @@ public class TileEntityMachineSatDock extends TileEntity implements ISidedInvent
} }
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
List<EntityMinerRocket> list = worldObj.getEntitiesWithinAABBExcludingEntity( List<EntityMinerRocket> list = worldObj.getEntitiesWithinAABBExcludingEntity(null,
null,
AxisAlignedBB.getBoundingBox(xCoord - 0.25 + 0.5, yCoord + 0.75, zCoord - 0.25 + 0.5, xCoord + 0.25 + 0.5, yCoord + 2, zCoord + 0.25 + 0.5), AxisAlignedBB.getBoundingBox(xCoord - 0.25 + 0.5, yCoord + 0.75, zCoord - 0.25 + 0.5, xCoord + 0.25 + 0.5, yCoord + 2, zCoord + 0.25 + 0.5),
entity -> entity instanceof EntityMinerRocket entity -> entity instanceof EntityMinerRocket);
);
for(EntityMinerRocket rocket : list) { for(EntityMinerRocket rocket : list) {
if(slots[15] != null && ISatChip.getFreqS(slots[15]) != rocket.getDataWatcher().getWatchableObjectInt(17)) { if(slots[15] != null && ISatChip.getFreqS(slots[15]) != rocket.getDataWatcher().getWatchableObjectInt(17)) {
@ -221,7 +176,7 @@ public class TileEntityMachineSatDock extends TileEntity implements ISidedInvent
if(rocket.getDataWatcher().getWatchableObjectInt(16) == 1 && rocket.timer == 50) { if(rocket.getDataWatcher().getWatchableObjectInt(16) == 1 && rocket.timer == 50) {
Satellite sat = data.getSatFromFreq(ISatChip.getFreqS(slots[15])); Satellite sat = data.getSatFromFreq(ISatChip.getFreqS(slots[15]));
unloadCargo((SatelliteMiner) sat); if(sat != null) unloadCargo((SatelliteMiner) sat);
} }
} }
@ -250,7 +205,8 @@ public class TileEntityMachineSatDock extends TileEntity implements ISidedInvent
slots[i].stackSize += toAdd; slots[i].stackSize += toAdd;
stack.stackSize -= toAdd; stack.stackSize -= toAdd;
if (stack.stackSize <= 0) return; if(stack.stackSize <= 0)
return;
} }
} }
@ -274,8 +230,8 @@ public class TileEntityMachineSatDock extends TileEntity implements ISidedInvent
ItemStack sta = slots[i].copy(); ItemStack sta = slots[i].copy();
sta.stackSize = 1; sta.stackSize = 1;
if (chest.getStackInSlot(j) != null && chest.getStackInSlot(j).isItemEqual(slots[i]) && ItemStack.areItemStackTagsEqual(chest.getStackInSlot(j), slots[i]) && if(chest.getStackInSlot(j) != null && chest.getStackInSlot(j).isItemEqual(slots[i]) && ItemStack.areItemStackTagsEqual(chest.getStackInSlot(j), slots[i])
chest.getStackInSlot(j).stackSize < chest.getStackInSlot(j).getMaxStackSize()) { && chest.getStackInSlot(j).stackSize < chest.getStackInSlot(j).getMaxStackSize()) {
slots[i].stackSize--; slots[i].stackSize--;
@ -313,14 +269,7 @@ public class TileEntityMachineSatDock extends TileEntity implements ISidedInvent
@Override @Override
public AxisAlignedBB getRenderBoundingBox() { public AxisAlignedBB getRenderBoundingBox() {
if(renderBoundingBox == null) { if(renderBoundingBox == null) {
renderBoundingBox = AxisAlignedBB.getBoundingBox( renderBoundingBox = AxisAlignedBB.getBoundingBox(xCoord - 1, yCoord, zCoord - 1, xCoord + 2, yCoord + 1, zCoord + 2);
xCoord - 1,
yCoord,
zCoord - 1,
xCoord + 2,
yCoord + 1,
zCoord + 2
);
} }
return renderBoundingBox; return renderBoundingBox;