Skip to content

Refactor item validation in ReactorInputInventory to use CNTags for better maintainability #63

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MathisGredt merged 1 commit into from
Sep 21, 2025
Merged

Refactor item validation in ReactorInputInventory to use CNTags for better maintainability #63

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 6 additions & 9 deletions ...nuclearteam/createnuclear/content/multiblock/controller/ReactorControllerBlockEntity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,7 @@
import net.minecraft.world.level.block.entity.BlockEntity;
import net.minecraft.world.level.block.entity.BlockEntityType;
import net.minecraft.world.level.block.state.BlockState;
import net.nuclearteam.createnuclear.CNBlocks;
import net.nuclearteam.createnuclear.CNItems;
import net.nuclearteam.createnuclear.CNPackets;
import net.nuclearteam.createnuclear.CreateNuclear;
import net.nuclearteam.createnuclear.*;
import net.nuclearteam.createnuclear.content.multiblock.IHeat;
import net.nuclearteam.createnuclear.content.multiblock.input.ReactorInputEntity;
import net.nuclearteam.createnuclear.content.multiblock.output.ReactorOutput;
Expand Down Expand Up @@ -319,10 +316,10 @@ private double calculateHeat(CompoundTag tag) {
String currentRod = "";
ListTag list = inventory.getStackInSlot(0).getOrCreateTag().getCompound("pattern").getList("Items", Tag.TAG_COMPOUND);
for (int i = 0; i < list.size(); i++) {
if (list.getCompound(i).getString("id").equals("createnuclear:uranium_rod")) {
if (ItemStack.of(list.getCompound(i)).is(CNTags.CNItemTags.FUEL.tag)) {
heat += baseUraniumHeat;
currentRod = "u";
} else if (list.getCompound(i).getString("id").equals("createnuclear:graphite_rod")) {
} else if (ItemStack.of(list.getCompound(i)).is(CNTags.CNItemTags.COOLER.tag)) {
heat += baseGraphiteHeat;
currentRod = "g";
}
Expand Down Expand Up @@ -350,10 +347,10 @@ private double calculateHeat(CompoundTag tag) {
if (list.getCompound(l).getInt("Slot") == neighborSlot) {
// If the currentRod equals "u", apply the corresponding heat
if (currentRod.equals("u")) {
String id = list.getCompound(l).getString("id");
if (id.equals("createnuclear:uranium_rod")) {
ItemStack stack = ItemStack.of(list.getCompound(i));
if (stack.is(CNTags.CNItemTags.FUEL.tag)) {
heat += proximityUraniumHeat;
} else if (id.equals("createnuclear:graphite_rod")) {
} else if (stack.is(CNTags.CNItemTags.COOLER.tag)) {
heat += proximityGraphiteHeat;
}
}
Expand Down
5 changes: 3 additions & 2 deletions ...in/java/net/nuclearteam/createnuclear/content/multiblock/input/ReactorInputInventory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import net.minecraft.world.item.ItemStack;
import net.minecraftforge.items.ItemStackHandler;
import net.nuclearteam.createnuclear.CNItems;
import net.nuclearteam.createnuclear.CNTags;
import org.jetbrains.annotations.NotNull;

public class ReactorInputInventory extends ItemStackHandler {
Expand All @@ -23,8 +24,8 @@ protected void onContentsChanged(int slot) {
@Override
public boolean isItemValid(int slot, @NotNull ItemStack stack) {
return switch (slot) {
case 0 -> CNItems.URANIUM_ROD.get() == stack.getItem();
case 1 -> CNItems.GRAPHITE_ROD.get() == stack.getItem();
case 0 -> CNTags.CNItemTags.FUEL.matches(stack);
case 1 -> CNTags.CNItemTags.COOLER.matches(stack);
default -> !super.isItemValid(slot, stack);
};
}
Expand Down