improve

Author: khjxiaogu

src/main/java/com/teammoeg/frostedheart/content/climate/player/SurroundingTemperatureSimulator.java

@@ -158,8 +158,8 @@ public static void init() {
 
     }
 
-    public SurroundingTemperatureSimulator(ServerPlayer player) {
-        int sourceX = Mth.floor(player.getX()), sourceY = Mth.floor(player.getEyeY()), sourceZ = Mth.floor(player.getZ());
+    public SurroundingTemperatureSimulator(ServerLevel world,double sx,double sy,double sz,boolean threadSafe) {
+        int sourceX = Mth.floor(sx), sourceY = Mth.floor(sy), sourceZ = Mth.floor(sz);
         // these are block position offset
         int offsetN = sourceZ - range;
         int offsetW = sourceX - range;
@@ -168,12 +168,10 @@ public SurroundingTemperatureSimulator(ServerPlayer player) {
         int chunkOffsetW = offsetW >> 4;
         int chunkOffsetN = offsetN >> 4;
         int chunkOffsetD = offsetD >> 4;
-        
         // get origin point(center of 8 sections)
         origin = new BlockPos((chunkOffsetW + 1) << 4, (chunkOffsetD + 1) << 4, (chunkOffsetN + 1) << 4);
         // fetch all sections to lower calculation cost
         int i = 0;
-        ServerLevel world = player.serverLevel();
 
         for (int x = chunkOffsetW; x <= chunkOffsetW + 1; x++)
             for (int z = chunkOffsetN; z <= chunkOffsetN + 1; z++) {
@@ -182,16 +180,23 @@ public SurroundingTemperatureSimulator(ServerPlayer player) {
                 int index0=cnk.getSectionIndexFromSectionY(chunkOffsetD);
                 int index1=index0+1;
                 maps[i / 2] = cnk.getOrCreateHeightmapUnprimed(Types.MOTION_BLOCKING_NO_LEAVES);
-                //copy to avoid threading issue
+               
                 if(index0>=0&&index0<maxIndex)
-                	sections[i] = cnk.getSection(index0).getStates().copy();
+                	sections[i] = cnk.getSection(index0).getStates();
                 //System.out.println(sections[i].get(0, 0, 0));
                 if(index1>=0&&index1<maxIndex)
-                	sections[i + 1] = cnk.getSection(index1).getStates().copy();
+                	sections[i + 1] = cnk.getSection(index1).getStates();
                 //System.out.println(sections[i+1].get(0, 0, 0));
                 i += 2;
             }
-        rnd = new Random(player.blockPosition().asLong() ^ (world.getGameTime() >> 6));
+        //copy to avoid threading issue
+        if(threadSafe) {
+        	for(int j=0;j<sections.length;j++)
+        		if(sections[j]!=null)
+        			sections[j]=sections[j].copy();
+        		
+        }
+        rnd = new Random(new BlockPos(sourceX,sourceY,sourceZ).asLong() ^ (world.getGameTime() >> 6));
     }
 
     /**

src/main/java/com/teammoeg/frostedheart/content/climate/player/TemperatureThreadingPool.java

@@ -14,11 +14,17 @@
 import com.teammoeg.chorda.util.CUtils;
 import com.teammoeg.frostedheart.content.climate.player.SurroundingTemperatureSimulator.SimulationResult;
 
+import lombok.Getter;
 import net.minecraft.server.level.ServerPlayer;
 
 public class TemperatureThreadingPool {
 	Map<UUID,Future<SimulationResult>> resultMap;
 	ExecutorService scheduler;
+	/**
+	 * Used to benchmark temperature calculation performance
+	 * */
+	@Getter
+	int tasksRemain;
 	public TemperatureThreadingPool(int threadNum) {
 		if(threadNum!=0) {
 			scheduler=Executors.newFixedThreadPool(threadNum, CUtils.makeThreadFactory("block-temperature-calculation", true));
@@ -31,20 +37,20 @@ public boolean tryCommitWork(ServerPlayer player) {
 		double y=player.getEyeY()-0.7;
 		double z=player.getZ();
 		if(scheduler==null) {
-			SurroundingTemperatureSimulator sts=new SurroundingTemperatureSimulator(player);
+			SurroundingTemperatureSimulator sts=new SurroundingTemperatureSimulator(player.serverLevel(),player.getX(),player.getEyeY(),player.getZ(),false);
 			submitPlayerData(player, sts.getBlockTemperatureAndWind(x, y, z));
 			return true;
 		}else if(!resultMap.containsKey(player.getUUID())){
 			//System.out.println("committing work for "+player.getName().getString());
-			SurroundingTemperatureSimulator sts=new SurroundingTemperatureSimulator(player);
+			SurroundingTemperatureSimulator sts=new SurroundingTemperatureSimulator(player.serverLevel(),player.getX(),player.getEyeY(),player.getZ(),true);
 			resultMap.put(player.getUUID(), scheduler.submit(()->sts.getBlockTemperatureAndWind(x, y, z)));
 			return true;
 		}
 		return false;
 	}
 	public void tick() {
 		if(resultMap!=null) {
-			
+			int tasksRemain=0;
 			for(Iterator<Entry<UUID, Future<SimulationResult>>> it=resultMap.entrySet().iterator();it.hasNext();) {
 				Entry<UUID, Future<SimulationResult>> entry=it.next();
 				if(entry.getValue().isDone()) {
@@ -61,8 +67,9 @@ public void tick() {
 							throw new RuntimeException(e.getCause());
 						}
 					}
-				}
+				}else tasksRemain++;
 			}
+			this.tasksRemain=tasksRemain;
 		}
 	}
 	public void close() {
@@ -71,7 +78,7 @@ public void close() {
 
 	}
 	private void submitPlayerData(ServerPlayer player,SimulationResult result) {
-		System.out.println(result);
+		//System.out.println(result);
 		PlayerTemperatureData.getCapability(player).ifPresent(t->{
 			t.blockTemp=result.blockTemp();
 			t.windStrengh=result.windStrengh();