Skip to content

Clean up bedrock ore fallback comments #4635

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
gustovafing merged 1 commit into from
Feb 15, 2026
+31 −32
Merged

Clean up bedrock ore fallback comments #4635

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
16 changes: 6 additions & 10 deletions src/main/java/com/gregtechceu/gtceu/api/gui/misc/ProspectorMode.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -309,16 +309,12 @@ public int getItemColor(OreInfo item) {
@Override
public IGuiTexture getItemIcon(OreInfo item) {
Material material = item.material;
ItemStack stack = ChemicalHelper.get(TagPrefix.get(ConfigHolder.INSTANCE.machines.bedrockOreDropTagPrefix),
material);
if (stack.isEmpty()) stack = ChemicalHelper.get(TagPrefix.crushed, material); // backup 1: crushed; if raw
// ore doesn't exist
if (stack.isEmpty()) stack = ChemicalHelper.get(TagPrefix.gem, material); // backup 2: gem; if crushed ore
// doesn't exist
if (stack.isEmpty()) stack = ChemicalHelper.get(TagPrefix.ore, material); // backup 3: ore; if gem doesn't
// exist
if (stack.isEmpty()) stack = ChemicalHelper.get(TagPrefix.dust, material); // backup 4: just fallback to
// dust...
ItemStack stack = GTUtil.getFirstNonEmpty(
ChemicalHelper.get(TagPrefix.get(ConfigHolder.INSTANCE.machines.bedrockOreDropTagPrefix), material),
ChemicalHelper.get(TagPrefix.crushed, material),
ChemicalHelper.get(TagPrefix.gem, material),
ChemicalHelper.get(TagPrefix.ore, material),
ChemicalHelper.get(TagPrefix.dust, material));
return new ItemStackTexture(stack).scale(0.8f);
}

Expand Down
28 changes: 6 additions & 22 deletions src/main/java/com/gregtechceu/gtceu/common/machine/trait/BedrockOreMinerLogic.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,28 +72,12 @@ private GTRecipe getOreMinerRecipe() {
WeightedMaterial wm = GTUtil.getRandomItem(serverLevel.random, veinMaterials);
if (wm == null) return null;
Material material = wm.material();
ItemStack stack = ChemicalHelper.get(TagPrefix.get(ConfigHolder.INSTANCE.machines.bedrockOreDropTagPrefix),
material, getOreToProduce());
if (stack.isEmpty()) stack = ChemicalHelper.get(TagPrefix.crushed, material, getOreToProduce()); // backup
// 1:
// crushed;
// if raw
// ore
// doesn't
// exist
if (stack.isEmpty()) stack = ChemicalHelper.get(TagPrefix.gem, material, getOreToProduce()); // backup 2:
// gem; if
// crushed ore
// doesn't
// exist
if (stack.isEmpty()) stack = ChemicalHelper.get(TagPrefix.ore, material, getOreToProduce()); // backup 3:
// normal ore;
// if gem
// doesn't
// exist.
if (stack.isEmpty()) stack = ChemicalHelper.get(TagPrefix.dust, material, getOreToProduce()); // backup 4:
// fallback to
// dust
ItemStack stack = GTUtil.getFirstNonEmpty(
ChemicalHelper.get(TagPrefix.get(ConfigHolder.INSTANCE.machines.bedrockOreDropTagPrefix), material),
ChemicalHelper.get(TagPrefix.crushed, material),
ChemicalHelper.get(TagPrefix.gem, material),
ChemicalHelper.get(TagPrefix.ore, material),
ChemicalHelper.get(TagPrefix.dust, material));
if (stack.isEmpty()) {
return null;
}
Expand Down
19 changes: 19 additions & 0 deletions src/main/java/com/gregtechceu/gtceu/utils/GTUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -300,6 +300,25 @@ public static byte getFloorTierByVoltage(long voltage) {
return ItemStack.EMPTY;
}

/**
* Returns first non-empty ItemStack from {@code stacks}.
*
* @param stacks list of candidates
* @return an ItemStack, or {@link ItemStack#EMPTY} if all the candidates are empty
* @throws IllegalArgumentException if {@code stacks} is empty
*/
public static @NotNull ItemStack getFirstNonEmpty(@NotNull ItemStack... stacks) {
if (stacks.length == 0) {
throw new IllegalArgumentException("Empty ItemStack candidates");
}
for (ItemStack stack : stacks) {
if (!stack.isEmpty()) {
return stack;
}
}
return ItemStack.EMPTY;
}

public static <M> M getItem(List<? extends M> list, int index, M replacement) {
if (index >= 0 && index < list.size())
return list.get(index);
Expand Down
Loading