Skip to content

Commit c1cbb48

Browse files
tried to make the entropy tables better
1 parent 7c10402 commit c1cbb48

5 files changed

Lines changed: 26764 additions & 68866 deletions

File tree

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ mod_id=formicapi
2828
mod_name=Formic API
2929
mod_license=MIT
3030

31-
mod_version=2.2.4
31+
mod_version=2.2.5
3232

3333
create_version = 6.0.8-169
3434
flywheel_version = 1.0.6

src/main/java/com/rae/formicapi/content/data/managers/TwoDSparceTabulatedFunctionLoader.java

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import com.google.gson.JsonObject;
66
import com.mojang.logging.LogUtils;
77
import com.mojang.serialization.JsonOps;
8+
import com.rae.formicapi.FormicAPI;
89
import com.rae.formicapi.fondation.math.data.TwoDSparseTabulatedFunction;
910
import net.minecraft.client.Minecraft;
1011
import net.minecraft.nbt.CompoundTag;
@@ -85,6 +86,12 @@ public void mergeFromNBT(CompoundTag tag){
8586
}
8687
}
8788
public void clearFunction(){
88-
FUNCTION.clear();
89+
if (FUNCTION!=null) {
90+
FUNCTION.clear();
91+
}
92+
else {
93+
FormicAPI.LOGGER.debug("Useless call to clear a table : {} the table hasn't being loaded yet, " +
94+
"the player is probably joining a world for the first time in this session", FILE_NAME);
95+
}
8996
}
9097
}

src/main/java/com/rae/formicapi/content/thermal_utilities/FullTableBased.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,11 @@
44
import com.rae.formicapi.content.data.managers.TwoDSparceTabulatedFunctionLoader;
55
import com.rae.formicapi.init.PacketInit;
66
import net.createmod.catnip.net.base.ClientboundPacketPayload;
7-
import net.minecraft.client.Minecraft;
87
import net.minecraft.client.player.LocalPlayer;
98
import net.minecraft.nbt.CompoundTag;
109
import net.minecraft.network.FriendlyByteBuf;
1110
import net.minecraft.network.RegistryFriendlyByteBuf;
1211
import net.minecraft.network.codec.StreamCodec;
13-
import net.minecraft.server.MinecraftServer;
1412
import net.minecraft.server.level.ServerPlayer;
1513
import net.minecraft.world.entity.player.Player;
1614
import net.neoforged.api.distmarker.Dist;
@@ -68,16 +66,18 @@ public static SpecificRealGasState isentropicExpansion(SpecificRealGasState init
6866

6967
// Safety check
7068
if (Math.abs(df) < 1e-8f) {
69+
FormicAPI.LOGGER.info("early break in isentropic computation cause by derivative too small");
7170
break; // derivative too small → avoid explosion
7271
}
7372

7473
h -= f / df;
7574
}
7675

77-
float Tfinal = getT(finalPressure, h);
76+
float TFinal = getT(finalPressure, h);
7877
float xFinal = getX(finalPressure, h);
78+
float sFinal = getS(finalPressure, h);
7979

80-
return new SpecificRealGasState(finalPressure, h, Tfinal, sTarget, xFinal);
80+
return new SpecificRealGasState(finalPressure, h, TFinal, sFinal, xFinal);
8181
}
8282

8383
public static float getS(float P, float H) {

0 commit comments

Comments
 (0)