Skip to content

Commit f401940

Browse files
RealAntEngineerRealAntEngineer
committed
display source and fix recipes
1 parent 98c5d18 commit f401940

25 files changed

+86
-51
lines changed

‎TODO.md‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
# TODO Report
22

33
- [src/main\java\com\rae\colony_api\thermal_utilities\WaterAsRealGazTransformationHelper.java:200] //TODO -> it seems to not be working when amount are too low -> protection against 0 values ?
4-
- [src/main\java\com\rae\crowns\content\nuclear\AssemblyBlockEntity.java:260] float easeCoef = 1f;//TODO config
5-
- [src/main\java\com\rae\crowns\content\nuclear\IAmRadioactiveSource.java:35] //TODO make the surface a variable
4+
- [src/main\java\com\rae\crowns\content\nuclear\AssemblyBlockEntity.java:259] float easeCoef = 1f; //TODO config
5+
- [src/main\java\com\rae\crowns\content\nuclear\AssemblyBlockEntity.java:264] float easeCoef = 1f; //TODO config
6+
- [src/main\java\com\rae\crowns\content\nuclear\IAmRadioactiveSource.java:61] //TODO make the surface a variable
67
- [src/main\java\com\rae\crowns\content\thermodynamics\compressor\CompressorBlockEntity.java:71] //TODO use a config
78
- [src/main\java\com\rae\crowns\content\thermodynamics\turbine\SteamCurrent.java:57] //TODO finish to assemble the bricks + test if it works
9+
- [src/main\java\com\rae\crowns\init\data\AABBSerializer.java:9] // TODO put this in the formic API
10+
- [src/main\java\com\rae\crowns\init\data\StateMapSerializer.java:11] // TODO put this in the formic API

‎gradle.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ mod_id=crowns
3333
mod_name=CROWNS
3434
mod_license=All Rights Reserved
3535

36-
mod_version=1.21.1_1.2
36+
mod_version=1.21.1_1.3
3737

3838
create_version = 6.0.4-55
3939
flywheel_version = 1.0.2

‎src/main/java/com/rae/colony_api/units/Pressure.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ public enum Pressure implements IUnit {
1414

1515
Pressure(float a) {
1616
this.a = a;
17-
this.symbol = CROWNSLang.translate("crowns.units.pressure.symbol"+name().toLowerCase()).component();
17+
this.symbol = CROWNSLang.translate("units.pressure.symbol."+name().toLowerCase()).component();
1818
}
1919

2020
public float convert(float pascal) {

‎src/main/java/com/rae/colony_api/units/RadiationFlux.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ public enum RadiationFlux implements IUnit{
1717

1818
RadiationFlux(float a) {
1919
this.a = a;
20-
this.symbol = CROWNSLang.translate("crowns.units.radiation_flux.symbol"+name().toLowerCase()).component();
20+
this.symbol = CROWNSLang.translate("units.radiation_flux.symbol."+name().toLowerCase()).component();
2121

2222
}
2323

‎src/main/java/com/rae/colony_api/units/Temperature.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ public enum Temperature implements IUnit{
1515
Temperature(float a, float b, String symbol) {
1616
this.a = a;
1717
this.b = b;
18-
this.symbol = CROWNSLang.translate("crowns.units.temperature.symbol"+name().toLowerCase()).component();
18+
this.symbol = CROWNSLang.translate("units.temperature.symbol."+name().toLowerCase()).component();
1919
}
2020

2121
public float convert(float kelvin) {

‎src/main/java/com/rae/crowns/CROWNSLang.java‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,18 +77,21 @@ public static LangBuilder formatTemperature(float temperature) {
7777
Temperature unit = CROWNSConfigs.CLIENT.units.temperature.get();
7878
return CreateLang.builder().add(Component.literal("T = "))
7979
.add(number(unit.convert(temperature)))
80+
.text(" ")
8081
.add(unit.getSymbol());
8182
}
8283
public static LangBuilder formatPressure(float pressure) {
8384
Pressure unit = CROWNSConfigs.CLIENT.units.pressure.get();
8485
return CreateLang.builder().add(Component.literal("P = "))
8586
.add(number(unit.convert(pressure)))
87+
.text(" ")
8688
.add(unit.getSymbol());
8789
}
8890
public static LangBuilder formatRadiationFlux(float radiationFlux) {
8991
RadiationFlux unit = CROWNSConfigs.CLIENT.units.radiationFlux.get();
90-
return CreateLang.builder().add(Component.literal("activity"))
92+
return CreateLang.builder().add(Component.literal("activity : "))
9193
.add(number(unit.convert(radiationFlux)))
94+
.text(" ")
9295
.add(unit.getSymbol());
9396
}
9497

‎src/main/java/com/rae/crowns/config/CROWNSCfgClient.java‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,24 @@
22

33
import com.rae.crowns.CROWNS;
44
import net.createmod.catnip.config.ConfigBase;
5+
import org.jetbrains.annotations.NotNull;
56

67
public class CROWNSCfgClient extends ConfigBase {
78

89

910
public final CROWNSUnits units = nested(0, CROWNSUnits::new, Comments.units);
10-
11+
public final ConfigGroup nuclear = new ConfigGroup("nuclear",0, Comments.nuclear);
12+
public final ConfigBool nuclearParticle = b(true, "nuclear_particle",Comments.nuclearParticle);
1113
@Override
12-
public String getName() {
14+
public @NotNull String getName() {
1315
return CROWNS.MODID +".client";
1416
}
1517

1618
private static class Comments {
1719
static String units = "Units used";
20+
static String nuclear = "Graphic config for nuclear";
21+
static String nuclearParticle = "Radiation Particles";
22+
1823
}
1924

2025
}

‎src/main/java/com/rae/crowns/content/nuclear/AssemblyBlockEntity.java‎

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,13 @@
33
import com.rae.crowns.CROWNS;
44
import com.rae.crowns.CROWNSLang;
55
import com.rae.crowns.content.thermodynamics.conduction.IHaveTemperature;
6-
import com.rae.colony_api.units.Temperature;
76
import com.rae.crowns.config.CROWNSConfigs;
87
import com.simibubi.create.api.equipment.goggles.IHaveGoggleInformation;
98
import com.simibubi.create.foundation.blockEntity.SmartBlockEntity;
109
import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour;
1110

12-
import com.simibubi.create.foundation.utility.CreateLang;
1311
import net.createmod.catnip.data.Couple;
1412
import net.minecraft.ChatFormatting;
15-
import net.minecraft.client.ParticleStatus;
16-
import net.minecraft.client.particle.Particle;
1713
import net.minecraft.core.BlockPos;
1814
import net.minecraft.core.HolderLookup;
1915
import net.minecraft.core.particles.ParticleTypes;
@@ -108,7 +104,8 @@ public void tick() {
108104
sendData();
109105
}
110106

111-
spawnRadiationParticles(level,getBlockPos(),nbrOfFission);
107+
if (CROWNSConfigs.CLIENT.nuclearParticle.get())
108+
spawnRadiationParticles(level,getBlockPos(),nbrOfFission);
112109
}
113110
if (Float.isNaN(temperature)){
114111
temperature = 300;
@@ -259,12 +256,13 @@ public void addTemperature(float dT) {
259256

260257
@Override
261258
public float getRadioactiveActivity() {
262-
float easeCoef = 1f;//TODO config
259+
float easeCoef = 1f; //TODO config
263260
return backgroundActivity+nbrOfFission * 2.5f*easeCoef;
264261
}
265262
@Override
266263
public float getEffectiveK() {
267-
return nbrOfFission/oldNbrOfFission;
264+
float easeCoef = 1f; //TODO config
265+
return (backgroundActivity + nbrOfFission * 2.5f * easeCoef)/(backgroundActivity + oldNbrOfFission * 2.5f * easeCoef);
268266
}
269267
//to optimise, cost too much on the server
270268

@@ -290,8 +288,7 @@ protected void read(CompoundTag tag, HolderLookup.Provider registries, boolean c
290288
@Override
291289
public boolean addToGoggleTooltip(List<Component> tooltip, boolean isPlayerSneaking) {
292290

293-
CreateLang.builder().add(Component.literal("activity : "+ (int)nbrOfFission*20))
294-
.add(Component.literal(" MBq"))
291+
CROWNSLang.formatRadiationFlux(getRadioactiveActivity()*20)
295292
.style(ChatFormatting.DARK_GREEN)
296293
.forGoggles(tooltip, 1);
297294

@@ -325,6 +322,4 @@ public Couple<Float> absorbNeutrons(Couple<Float> radiationFlux) {
325322
additionalNeutronsAbsorbed += fastAbsorbed + slowAbsorbed;
326323
return Couple.create(radiationFlux.getFirst()-fastAbsorbed,radiationFlux.getSecond()-slowAbsorbed);
327324
}
328-
329-
330325
}

‎src/main/java/com/rae/crowns/content/nuclear/RadiationSourceDisplaySource.java‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,11 @@ public List<MutableComponent> provideText(DisplayLinkContext context, DisplayTar
3838
return list;
3939
}
4040

41+
@Override
42+
public int getPassiveRefreshTicks() {
43+
return 5;
44+
}
45+
4146
@Override
4247
public List<List<MutableComponent>> provideFlapDisplayText(DisplayLinkContext context, DisplayTargetStats stats) {
4348
return super.provideFlapDisplayText(context, stats);
@@ -51,7 +56,7 @@ protected Stream<MutableComponent> provideEntries(DisplayLinkContext context, in
5156
return Stream.empty();
5257

5358
List<MutableComponent> values = new ArrayList<>();
54-
values.add(CROWNSLang.formatRadiationFlux(radioactiveSource.getRadioactiveActivity()).component());
59+
values.add(CROWNSLang.formatRadiationFlux(radioactiveSource.getRadioactiveActivity()*20).component());//the radiation flux is in /ticks and we are displaying per sec
5560
if (sourceBE instanceof IAmFissileMaterial fissileMaterial) {
5661
values.add(CROWNSLang.translateDirect("display_source.radiation_source.k_eff").append(String.valueOf(fissileMaterial.getEffectiveK())));
5762
}

‎src/main/java/com/rae/crowns/content/nuclear/TemperatureDisplaySource.java‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,10 @@ public List<MutableComponent> provideText(DisplayLinkContext context, DisplayTar
2828
}
2929

3030
static final int ENTRIES_PER_PAGE = 8;
31+
@Override
32+
public int getPassiveRefreshTicks() {
33+
return 5;
34+
}
3135

3236
protected Stream<MutableComponent> provideEntries(DisplayLinkContext context, int maxRows) {
3337
BlockEntity sourceBE = context.getSourceBlockEntity();

0 commit comments

Comments
 (0)