From 252659bdf08cb77e8c138e9c107051a040f108b9 Mon Sep 17 00:00:00 2001 From: BallOfEnergy <66693744+ballofenergy1@users.noreply.github.com> Date: Sun, 9 Nov 2025 22:45:00 -0600 Subject: [PATCH] My life is a living hell, and this will make it significantly less horrible. --- .../hbm/handler/radiation/ChunkRadiationHandler3D.java | 8 ++++++-- .../hbm/handler/radiation/ChunkRadiationHandlerNT.java | 5 +++++ .../handler/radiation/ChunkRadiationHandlerPRISM.java | 9 ++++++--- .../handler/radiation/ChunkRadiationHandlerSimple.java | 9 +++++---- 4 files changed, 22 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/hbm/handler/radiation/ChunkRadiationHandler3D.java b/src/main/java/com/hbm/handler/radiation/ChunkRadiationHandler3D.java index ed64bfc90..a7d5df2eb 100644 --- a/src/main/java/com/hbm/handler/radiation/ChunkRadiationHandler3D.java +++ b/src/main/java/com/hbm/handler/radiation/ChunkRadiationHandler3D.java @@ -1,6 +1,7 @@ package com.hbm.handler.radiation; import java.util.HashMap; +import java.util.Map; import java.util.Map.Entry; import com.hbm.interfaces.Untested; @@ -20,6 +21,7 @@ import net.minecraftforge.event.world.WorldEvent; public class ChunkRadiationHandler3D extends ChunkRadiationHandler { private HashMap perWorld = new HashMap(); + private Map perWorld = new HashMap<>(); @Override @Untested public float getRadiation(World world, int x, int y, int z) { @@ -75,6 +77,8 @@ public class ChunkRadiationHandler3D extends ChunkRadiationHandler { HashMap radiation = entry.getValue().radiation; HashMap buff = new HashMap(radiation); + Map radiation = entry.getValue().radiation; + Map buff = new HashMap<>(radiation); radiation.clear(); for(Entry chunk : buff.entrySet()) { @@ -182,7 +186,7 @@ public class ChunkRadiationHandler3D extends ChunkRadiationHandler { } public static class ThreeDimRadiationPerWorld { - - public HashMap radiation = new HashMap(); + + public Map radiation = new HashMap<>(); } } diff --git a/src/main/java/com/hbm/handler/radiation/ChunkRadiationHandlerNT.java b/src/main/java/com/hbm/handler/radiation/ChunkRadiationHandlerNT.java index 50144d6aa..504b0a14e 100644 --- a/src/main/java/com/hbm/handler/radiation/ChunkRadiationHandlerNT.java +++ b/src/main/java/com/hbm/handler/radiation/ChunkRadiationHandlerNT.java @@ -37,6 +37,7 @@ public class ChunkRadiationHandlerNT extends ChunkRadiationHandler { /* once i have to start debugging this, even my nightmares will start shitting themselves */ private static HashMap worldMap = new HashMap(); + private static Map worldMap = new HashMap<>(); @Override public void clearSystem(World world) { @@ -729,11 +730,15 @@ public class ChunkRadiationHandlerNT extends ChunkRadiationHandler { public World world; private Set dirtyChunks = new HashSet(); private Set dirtyChunks2 = new HashSet(); + private Set dirtyChunks = new HashSet<>(); + private Set dirtyChunks2 = new HashSet<>(); private boolean iteratingDirty = false; public Set activePockets = new HashSet(); public HashMap data = new HashMap(); + public Set activePockets = new HashSet<>(); + public Map data = new HashMap<>(); public WorldRadiationData(World world) { this.world = world; } diff --git a/src/main/java/com/hbm/handler/radiation/ChunkRadiationHandlerPRISM.java b/src/main/java/com/hbm/handler/radiation/ChunkRadiationHandlerPRISM.java index 861d029db..43a399e13 100644 --- a/src/main/java/com/hbm/handler/radiation/ChunkRadiationHandlerPRISM.java +++ b/src/main/java/com/hbm/handler/radiation/ChunkRadiationHandlerPRISM.java @@ -2,6 +2,7 @@ package com.hbm.handler.radiation; import java.util.HashMap; import java.util.Iterator; +import java.util.Map; import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; @@ -46,6 +47,7 @@ import net.minecraftforge.event.world.WorldEvent; public class ChunkRadiationHandlerPRISM extends ChunkRadiationHandler { public ConcurrentHashMap perWorld = new ConcurrentHashMap(); + public Map perWorld = new ConcurrentHashMap<>(); public static int cycles = 0; public static final float MAX_RADIATION = 1_000_000; @@ -173,6 +175,7 @@ public class ChunkRadiationHandlerPRISM extends ChunkRadiationHandler { } public static final HashMap newAdditions = new HashMap(); + public static final Map newAdditions = new HashMap<>(); @Override public void updateSystem() { @@ -260,8 +263,8 @@ public class ChunkRadiationHandlerPRISM extends ChunkRadiationHandler { } /** Returns the amount of radiation spread */ - private static float spreadRadiation(World world, SubChunk source, int y, ChunkCoordIntPair origin, SubChunk[] chunk, ConcurrentHashMap map, ForgeDirection dir) { - + private static float spreadRadiation(World world, SubChunk source, int y, ChunkCoordIntPair origin, SubChunk[] chunk, Map map, ForgeDirection dir) { + float spread = 0.1F; float amount = source.prevRadiation * spread; @@ -305,7 +308,7 @@ public class ChunkRadiationHandlerPRISM extends ChunkRadiationHandler { } public static class RadPerWorld { - public ConcurrentHashMap radiation = new ConcurrentHashMap(); + public Map radiation = new ConcurrentHashMap<>(); } public static class SubChunk { diff --git a/src/main/java/com/hbm/handler/radiation/ChunkRadiationHandlerSimple.java b/src/main/java/com/hbm/handler/radiation/ChunkRadiationHandlerSimple.java index d77c6b34b..687294b64 100644 --- a/src/main/java/com/hbm/handler/radiation/ChunkRadiationHandlerSimple.java +++ b/src/main/java/com/hbm/handler/radiation/ChunkRadiationHandlerSimple.java @@ -1,6 +1,7 @@ package com.hbm.handler.radiation; import java.util.HashMap; +import java.util.Map; import java.util.Map.Entry; import com.hbm.blocks.ModBlocks; @@ -25,7 +26,7 @@ import net.minecraftforge.event.world.WorldEvent; */ public class ChunkRadiationHandlerSimple extends ChunkRadiationHandler { - private HashMap perWorld = new HashMap(); + private Map perWorld = new HashMap<>(); private static final float maxRad = 100_000F; @Override @@ -71,8 +72,8 @@ public class ChunkRadiationHandlerSimple extends ChunkRadiationHandler { for(Entry entry : perWorld.entrySet()) { - HashMap radiation = entry.getValue().radiation; - HashMap buff = new HashMap(radiation); + Map radiation = entry.getValue().radiation; + Map buff = new HashMap<>(radiation); radiation.clear(); World world = entry.getKey(); @@ -183,7 +184,7 @@ public class ChunkRadiationHandlerSimple extends ChunkRadiationHandler { public static class SimpleRadiationPerWorld { - public HashMap radiation = new HashMap(); + public Map radiation = new HashMap<>(); } @Override