Skip to content

Commit 1c65645

Browse files
committed
Use ResourceLocation for depleted nuclear fuel counterpart
1 parent 39d2650 commit 1c65645

File tree

1 file changed

+7
-5
lines changed

1 file changed

+7
-5
lines changed

src/main/java/aztech/modern_industrialization/nuclear/NuclearFuel.java

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
import aztech.modern_industrialization.machines.components.NuclearEfficiencyHistoryComponent;
3131
import aztech.modern_industrialization.thirdparty.fabrictransfer.api.item.ItemVariant;
3232
import net.minecraft.core.registries.BuiltInRegistries;
33+
import net.minecraft.resources.ResourceLocation;
3334
import net.minecraft.util.RandomSource;
3435
import net.minecraft.world.item.ItemStack;
3536

@@ -38,7 +39,7 @@ public class NuclearFuel extends NuclearAbsorbable {
3839
public final double directEnergyFactor;
3940
public final double neutronMultiplicationFactor;
4041

41-
public final String depletedVersionId;
42+
public final ResourceLocation depletedVersionId;
4243

4344
public final int size;
4445

@@ -52,7 +53,7 @@ public final static record NuclearFuelParams(int desintegrationMax, int maxTempe
5253
double neutronMultiplicationFactor, double directEnergyFactor, int size) {
5354
}
5455

55-
public NuclearFuel(Properties settings, NuclearFuelParams params, INeutronBehaviour neutronBehaviour, String depletedVersionId) {
56+
public NuclearFuel(Properties settings, NuclearFuelParams params, INeutronBehaviour neutronBehaviour, ResourceLocation depletedVersionId) {
5657

5758
this(settings, params.desintegrationMax, params.maxTemperature, params.tempLimitLow, params.tempLimitHigh, params.neutronMultiplicationFactor,
5859
params.directEnergyFactor, neutronBehaviour, params.size, depletedVersionId);
@@ -64,7 +65,8 @@ private static int clampTemp(int temperature) {
6465
}
6566

6667
private NuclearFuel(Properties settings, int desintegrationMax, int maxTemperature, int tempLimitLow, int tempLimitHigh,
67-
double neutronMultiplicationFactor, double directEnergyFactor, INeutronBehaviour neutronBehaviour, int size, String depletedVersionId) {
68+
double neutronMultiplicationFactor, double directEnergyFactor, INeutronBehaviour neutronBehaviour, int size,
69+
ResourceLocation depletedVersionId) {
6870

6971
super(settings, clampTemp(maxTemperature), 0.8 * NuclearConstant.BASE_HEAT_CONDUCTION, neutronBehaviour, desintegrationMax);
7072

@@ -84,13 +86,13 @@ private NuclearFuel(Properties settings, int desintegrationMax, int maxTemperatu
8486
public static ItemDefinition<NuclearFuel> of(String englishName, String id, NuclearFuelParams params, INeutronBehaviour neutronBehaviour,
8587
String depletedVersionId) {
8688
return MIItem
87-
.item(englishName, id, (settings) -> new NuclearFuel(settings.stacksTo(1), params, neutronBehaviour, depletedVersionId),
89+
.item(englishName, id, (settings) -> new NuclearFuel(settings.stacksTo(1), params, neutronBehaviour, MI.id(depletedVersionId)),
8890
SortOrder.ITEMS_OTHER);
8991
}
9092

9193
@Override
9294
public ItemVariant getNeutronProduct() {
93-
return ItemVariant.of(BuiltInRegistries.ITEM.getOptional(MI.id(depletedVersionId)).get());
95+
return ItemVariant.of(BuiltInRegistries.ITEM.getOptional(depletedVersionId).get());
9496
}
9597

9698
@Override

0 commit comments

Comments
 (0)