Skip to content

Chanced spoilage #5341

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

Open
TarLaboratories wants to merge 2 commits into
base: 1.20.1
Choose a base branch
from
Open

Chanced spoilage #5341

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6f80916
add ability to multiply result by a float
TarLaboratories Aug 23, 2026
ff29594
oops v2
TarLaboratories Aug 23, 2026
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
3 changes: 2 additions & 1 deletion src/main/java/com/gregtechceu/gtceu/common/CommonProxy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,8 +259,9 @@ public void registerDevSpoilables(RegisterSpoilablesEvent event) {
event.getBuilder()
.ticks(10)
.result(Items.DRAGON_EGG)
.multiplyLastResult(3)
.result(EntityType.PIG)
.multiplyResult(3)
.multiplyLastResult(3)
.build()
.attachTo(Items.EGG);
}
Expand Down
89 changes: 57 additions & 32 deletions src/main/java/com/gregtechceu/gtceu/common/item/behavior/SpoilableBehavior.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
import net.minecraft.network.chat.MutableComponent;
import net.minecraft.world.entity.EntityType;
import net.minecraft.world.entity.Mob;
import net.minecraft.world.item.Item;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.level.ItemLike;
import net.minecraftforge.common.MinecraftForge;
Expand All @@ -38,7 +37,7 @@ public class SpoilableBehavior {
private final Function<ItemStack, Long> ticks;
private final SpoilResultProvider spoilResult;
private final Function<ItemStack, Component> spoilsIntoTooltip;
private final List<Item> attachedTo = new ArrayList<>();
private final List<ItemLike> attachedTo = new ArrayList<>();

public static void init(IEventBus eventBus) {
RegisterSpoilablesEvent event = new RegisterSpoilablesEvent(SpoilableBehavior::builder);
Expand Down Expand Up @@ -70,14 +69,14 @@ public SpoilableBehavior attachTo(ItemLike item) {
if (attachedTo.isEmpty()) {
MinecraftForge.EVENT_BUS.register(this);
}
attachedTo.add(item.asItem());
attachedTo.add(item);
return this;
}

@SubscribeEvent
public void attachCapability(AttachCapabilitiesEvent<ItemStack> event) {
ItemStack stack = event.getObject();
if (attachedTo.stream().anyMatch(stack::is)) {
if (attachedTo.stream().map(ItemLike::asItem).anyMatch(stack::is)) {
event.addCapability(GTCEu.id("spoilable"), new SpoilableBehaviourStack(stack));
}
}
Expand Down Expand Up @@ -117,16 +116,32 @@ public interface SpoilResultProvider {
public static class Builder {

private Function<ItemStack, Long> ticks;
private SpoilResultProvider result;
private Function<ItemStack, Component> tooltip;
private final List<SpoilResultProvider> result = new ArrayList<>();
private final List<Function<ItemStack, Component>> tooltip = new ArrayList<>();

private Builder() {
ticks(100);
result(ItemStack.EMPTY);
}

public SpoilableBehavior build() {
return new SpoilableBehavior(ticks, result, tooltip);
return new SpoilableBehavior(ticks, (stack, ctx, simulate) -> {
ItemStack lastResult = ItemStack.EMPTY;
for (SpoilResultProvider spoilResult : result) {
ItemStack tempResult = spoilResult.getSpoilResult(stack, ctx, simulate);
if (!tempResult.isEmpty()) lastResult = tempResult;
}
return lastResult;
}, stack -> {
MutableComponent component = Component.empty();
this.tooltip.stream()
.map(func -> func.apply(stack))
.forEach(c -> {
if (!component.getString().isEmpty()) component.append(", ");
component.append(c);
});
return component;
});
}

public Builder ticks(Function<ItemStack, Long> ticks) {
Expand All @@ -135,12 +150,12 @@ public Builder ticks(Function<ItemStack, Long> ticks) {
}

public Builder result(SpoilResultProvider result) {
this.result = result;
this.result.add(result);
return this;
}

public Builder tooltip(Function<ItemStack, Component> tooltip) {
this.tooltip = tooltip;
this.tooltip.add(tooltip);
return this;
}

Expand Down Expand Up @@ -170,39 +185,49 @@ public Builder result(EntityType<? extends Mob> entityType) {
}

public Builder result(Supplier<? extends EntityType<? extends Mob>> entityType) {
SpoilResultProvider previousResult = result;
Function<ItemStack, Component> previousTooltip = tooltip;
return result((stack, spoilContext, simulate) -> {
if (!simulate) {
EntityType<? extends Mob> type = entityType.get();
SpoilUtils.spawnEntity(spoilContext, type, stack.getCount());
}
return previousResult.getSpoilResult(stack, spoilContext, simulate);
return ItemStack.EMPTY;
}).tooltip(stack -> {
EntityType<? extends Mob> type = entityType.get();
MutableComponent component = type.getDescription().copy();
Component previous = previousTooltip.apply(stack);
if (!previous.getString().isEmpty()) component.append(", ").append(previous);
return component;
return type.getDescription().copy();
});
}

public Builder multiplyResult(int mult) {
SpoilResultProvider prevResult = result;
Function<ItemStack, Component> previousTooltip = tooltip;
return result((stack, spoilContext, simulate) -> {
ItemStack total = prevResult.getSpoilResult(stack, spoilContext, simulate);
for (int i = 1; i < mult; i++) {
ItemStack temp = prevResult.getSpoilResult(stack, spoilContext, simulate);
if (ItemStack.isSameItemSameTags(total, temp)) total.grow(temp.getCount());
}
return total;
}).tooltip(stack -> {
MutableComponent component = Component.literal("(");
component.append(previousTooltip.apply(stack));
component.append(") x").append(Integer.toString(mult));
return component;
});
public Builder multiplyLastResult(float mult) {
if (!this.result.isEmpty()) {
SpoilResultProvider lastResult = this.result.get(this.result.size() - 1);
this.result.remove(this.result.size() - 1);

this.result((stack, spoilContext, simulate) -> {
ItemStack total = ItemStack.EMPTY;
for (float multLeft = mult; multLeft > 0; multLeft--) {
if (multLeft < 1 && Math.random() > multLeft) continue;
ItemStack temp = lastResult.getSpoilResult(stack, spoilContext, simulate);
if (total.isEmpty()) total = temp;
else if (ItemStack.isSameItemSameTags(total, temp)) total.grow(temp.getCount());
}
return total;
});
}

if (!this.tooltip.isEmpty()) {
Function<ItemStack, Component> lastTooltip = this.tooltip.get(this.tooltip.size() - 1);
this.tooltip.remove(this.tooltip.size() - 1);
this.tooltip(stack -> {
MutableComponent component = Component.empty();
if (mult < 1) component.append("%.0f%% ".formatted(mult * 100));
else if (mult == (int) mult) component.append("%d x ".formatted((int) mult));
else component.append("%s x ".formatted(mult));
component.append(lastTooltip.apply(stack));
return component;
});
}

return this;
}

public Builder tooltip(Component tooltip) {
Expand Down
Loading