mirror of
https://github.com/HbmMods/Hbm-s-Nuclear-Tech-GIT.git
synced 2026-01-25 10:32:49 +00:00
github what made you think i wanted to commit only the additions???
This commit is contained in:
parent
252659bdf0
commit
ada5ccbf77
@ -19,8 +19,7 @@ import net.minecraftforge.event.world.WorldEvent;
|
|||||||
* @author hbm
|
* @author hbm
|
||||||
*/
|
*/
|
||||||
public class ChunkRadiationHandler3D extends ChunkRadiationHandler {
|
public class ChunkRadiationHandler3D extends ChunkRadiationHandler {
|
||||||
|
|
||||||
private HashMap<World, ThreeDimRadiationPerWorld> perWorld = new HashMap();
|
|
||||||
private Map<World, ThreeDimRadiationPerWorld> perWorld = new HashMap<>();
|
private Map<World, ThreeDimRadiationPerWorld> perWorld = new HashMap<>();
|
||||||
|
|
||||||
@Override @Untested
|
@Override @Untested
|
||||||
@ -74,9 +73,7 @@ public class ChunkRadiationHandler3D extends ChunkRadiationHandler {
|
|||||||
public void updateSystem() {
|
public void updateSystem() {
|
||||||
|
|
||||||
for(Entry<World, ThreeDimRadiationPerWorld> entry : perWorld.entrySet()) {
|
for(Entry<World, ThreeDimRadiationPerWorld> entry : perWorld.entrySet()) {
|
||||||
|
|
||||||
HashMap<ChunkCoordIntPair, Float[]> radiation = entry.getValue().radiation;
|
|
||||||
HashMap<ChunkCoordIntPair, Float[]> buff = new HashMap(radiation);
|
|
||||||
Map<ChunkCoordIntPair, Float[]> radiation = entry.getValue().radiation;
|
Map<ChunkCoordIntPair, Float[]> radiation = entry.getValue().radiation;
|
||||||
Map<ChunkCoordIntPair, Float[]> buff = new HashMap<>(radiation);
|
Map<ChunkCoordIntPair, Float[]> buff = new HashMap<>(radiation);
|
||||||
radiation.clear();
|
radiation.clear();
|
||||||
@ -186,7 +183,6 @@ public class ChunkRadiationHandler3D extends ChunkRadiationHandler {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public static class ThreeDimRadiationPerWorld {
|
public static class ThreeDimRadiationPerWorld {
|
||||||
|
|
||||||
public Map<ChunkCoordIntPair, Float[]> radiation = new HashMap<>();
|
public Map<ChunkCoordIntPair, Float[]> radiation = new HashMap<>();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -35,8 +35,7 @@ import net.minecraftforge.event.world.WorldEvent;
|
|||||||
public class ChunkRadiationHandlerNT extends ChunkRadiationHandler {
|
public class ChunkRadiationHandlerNT extends ChunkRadiationHandler {
|
||||||
|
|
||||||
/* once i have to start debugging this, even my nightmares will start shitting themselves */
|
/* once i have to start debugging this, even my nightmares will start shitting themselves */
|
||||||
|
|
||||||
private static HashMap<World, WorldRadiationData> worldMap = new HashMap();
|
|
||||||
private static Map<World, WorldRadiationData> worldMap = new HashMap<>();
|
private static Map<World, WorldRadiationData> worldMap = new HashMap<>();
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@ -728,17 +727,13 @@ public class ChunkRadiationHandlerNT extends ChunkRadiationHandler {
|
|||||||
|
|
||||||
public static class WorldRadiationData {
|
public static class WorldRadiationData {
|
||||||
public World world;
|
public World world;
|
||||||
private Set<BlockPos> dirtyChunks = new HashSet();
|
|
||||||
private Set<BlockPos> dirtyChunks2 = new HashSet();
|
|
||||||
private Set<BlockPos> dirtyChunks = new HashSet<>();
|
private Set<BlockPos> dirtyChunks = new HashSet<>();
|
||||||
private Set<BlockPos> dirtyChunks2 = new HashSet<>();
|
private Set<BlockPos> dirtyChunks2 = new HashSet<>();
|
||||||
private boolean iteratingDirty = false;
|
private boolean iteratingDirty = false;
|
||||||
|
|
||||||
public Set<RadPocket> activePockets = new HashSet();
|
|
||||||
public HashMap<ChunkCoordIntPair, ChunkRadiationStorage> data = new HashMap();
|
|
||||||
|
|
||||||
public Set<RadPocket> activePockets = new HashSet<>();
|
public Set<RadPocket> activePockets = new HashSet<>();
|
||||||
public Map<ChunkCoordIntPair, ChunkRadiationStorage> data = new HashMap<>();
|
public Map<ChunkCoordIntPair, ChunkRadiationStorage> data = new HashMap<>();
|
||||||
|
|
||||||
public WorldRadiationData(World world) {
|
public WorldRadiationData(World world) {
|
||||||
this.world = world;
|
this.world = world;
|
||||||
}
|
}
|
||||||
|
|||||||
@ -45,8 +45,7 @@ import net.minecraftforge.event.world.WorldEvent;
|
|||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
public class ChunkRadiationHandlerPRISM extends ChunkRadiationHandler {
|
public class ChunkRadiationHandlerPRISM extends ChunkRadiationHandler {
|
||||||
|
|
||||||
public ConcurrentHashMap<World, RadPerWorld> perWorld = new ConcurrentHashMap();
|
|
||||||
public Map<World, RadPerWorld> perWorld = new ConcurrentHashMap<>();
|
public Map<World, RadPerWorld> perWorld = new ConcurrentHashMap<>();
|
||||||
public static int cycles = 0;
|
public static int cycles = 0;
|
||||||
|
|
||||||
@ -173,8 +172,7 @@ public class ChunkRadiationHandlerPRISM extends ChunkRadiationHandler {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public static final HashMap<ChunkCoordIntPair, SubChunk[]> newAdditions = new HashMap();
|
|
||||||
public static final Map<ChunkCoordIntPair, SubChunk[]> newAdditions = new HashMap<>();
|
public static final Map<ChunkCoordIntPair, SubChunk[]> newAdditions = new HashMap<>();
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user