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

yeah sure why not

Browse Source
This commit is contained in:
Bob 2024-02-11 20:58:32 +01:00
parent a57a284d1c
commit 9e58492165
3 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
changelog
View File

@ -34,7 +34,9 @@
* PWRs on the edge of unloaded chunks now additionally reset their internal heat value to further reduce the time until they can potentially melt down
* Removed the assembly recipe for the radial engine since it will be retired soon
* Removed the endo and exothermal missiles
* Doomsday missiles are no longer laggy cluster missiles, instead they are now near-identical to thermonuclear missiles but with an added fallout radius of 100
* Doomsday missiles are no longer laggy cluster missiles, instead they are now near-identical to thermonuclear missiles but with an added fallout radius of 100#
* Fallout rain now uses the same variable length code that the MK5 uses for optimal tick utilization, making it a lot faster
* Lighter sellafite variants should no longer replace darker ones in overlapping craters, making bombed-out landscapes look more natural
## Fixed
* Fixed dupe caused by shift-clicking ashes out of the bricked furnace

8
src/main/java/com/hbm/config/FalloutConfigJSON.java
View File

@ -197,7 +197,7 @@ public class FalloutConfigJSON {
public FalloutEntry max(double max) { this.maxDist = max; return this; }
public FalloutEntry sol(boolean solid) { this.isSolid = solid; return this; }
public boolean eval(World world, int x, int y, int z, Block b, int meta, double dist) {
public boolean eval(World world, int x, int y, int z, Block b, int meta, double dist, Block originalBlock, int originalMeta) {
if(matchesBlock != null && b != matchesBlock) return false;
if(matchesMaterial != null && b.getMaterial() != matchesMaterial) return false;
@ -210,6 +210,9 @@ public class FalloutConfigJSON {
if(primaryBlocks == null) return false;
MetaBlock block = chooseRandomOutcome(primaryBlocks);
if(block.block == ModBlocks.sellafield_slaked && originalBlock == ModBlocks.sellafield_slaked) {
if(block.meta <= originalMeta) return false;
}
world.setBlock(x, y, z, block.block, block.meta, 3);
return true;
@ -218,6 +221,9 @@ public class FalloutConfigJSON {
if(secondaryBlocks == null) return false;
MetaBlock block = chooseRandomOutcome(secondaryBlocks);
if(block.block == ModBlocks.sellafield_slaked && originalBlock == ModBlocks.sellafield_slaked) {
if(block.meta <= originalMeta) return false;
}
world.setBlock(x, y, z, block.block, block.meta, 3);
return true;
}

2
src/main/java/com/hbm/entity/effect/EntityFalloutRain.java
View File

@ -199,7 +199,7 @@ public class EntityFalloutRain extends Entity {
for(FalloutEntry entry : FalloutConfigJSON.entries) {
if(entry.eval(worldObj, x, y, z, b, meta, dist)) {
if(entry.eval(worldObj, x, y, z, b, meta, dist, b, meta)) {
if(entry.isSolid()) {
depth++;
}