Update 1.21 by TarLaboratories · Pull Request #5301 · GregTechCEu/GregTech-Modern

TarLaboratories · 2026-08-16T20:30:08Z

What

I cherry-picked 4 commits into 1.21:

42bfe72 Delete Unused Mixins (Delete Unused Mixins #5297)
24ce411 Spoilage (Spoilage #3874)
9490c65 bugfix: corrected a typo in the ru word tooltip_energy_cracking (bugfix: corrected a typo in the ru word tooltip_energy_cracking #5280)
e1b6f14 Update zh_tw.json (Update zh_tw.json #4747)

Implementation Details

Uhh spoilage uses data components now i guess. Also eliminated some spoilage-related mixins since they weren't needed anymore

AI Usage

no

Outcome

1.21.1 is up to date and i get to work on modular armor yaaaaaay

How Was This Tested

logged into the game, ran gametests

screret · 2026-08-17T12:23:39Z


+    public static final Codec<SpoilContext> CODEC = CompoundTag.CODEC.xmap(SpoilContext::deserializeNBT,
+            SpoilContext::serializeNBT);
+    public static final StreamCodec<ByteBuf, SpoilContext> STREAM_CODEC = ByteBufCodecs.COMPOUND_TAG


same here for the stream codec

screret · 2026-08-18T08:19:36Z

+    private static SpoilContext build(ResourceKey<Level> levelKey, BlockPos pos, Integer entityId,
+                                      ResourceLocation itemHandlerSourceId, CompoundTag itemHandlerData, int slot) {
+        MinecraftServer server = ServerLifecycleHooks.getCurrentServer();
+        Level level = server == null ? null : server.getLevel(levelKey);
+        return new SpoilContext(level, pos, level != null && entityId != null ? level.getEntity(entityId) : null,
+                ItemHandlerSource.getById(itemHandlerSourceId), itemHandlerData, slot);
+    }


Suggested change

private static SpoilContext build(ResourceKey<Level> levelKey, BlockPos pos, Integer entityId,

ResourceLocation itemHandlerSourceId, CompoundTag itemHandlerData, int slot) {

MinecraftServer server = ServerLifecycleHooks.getCurrentServer();

Level level = server == null ? null : server.getLevel(levelKey);

return new SpoilContext(level, pos, level != null && entityId != null ? level.getEntity(entityId) : null,

ItemHandlerSource.getById(itemHandlerSourceId), itemHandlerData, slot);

}

private static SpoilContext build(Optional<ResourceKey<Level>> dimension, Optional<BlockPos> pos, Optional<UUID> entityId,

Optional<ResourceLocation> itemHandlerSourceId, Optional<CompoundTag> itemHandlerData, int slot) {

MinecraftServer server = ServerLifecycleHooks.getCurrentServer();

Level level = server == null || dimension.isEmpty() ? null : server.getLevel(dimension.get());

return new SpoilContext(level, pos, level != null && entityId.isPresent() ? level.getEntities().get(entityId.get()) : null,

itemHandlerSourceId.isPresent() ? ItemHandlerSource.getById(itemHandlerSourceId.get()) : null, itemHandlerData.orElse(null), slot);

}

screret · 2026-08-18T08:28:13Z

+    public static final Codec<SpoilContext> CODEC = RecordCodecBuilder.create(instance -> instance.group(
+            Level.RESOURCE_KEY_CODEC.optionalFieldOf("level", null)
+                    .forGetter(ctx -> ctx.level == null ? null : ctx.level.dimension()),
+            BlockPos.CODEC.optionalFieldOf("pos", null).forGetter(SpoilContext::pos),
+            Codec.INT.optionalFieldOf("entity", null).forGetter(ctx -> ctx.entity == null ? null : ctx.entity.getId()),
+            ResourceLocation.CODEC.optionalFieldOf("item_handler", null)
+                    .forGetter(ctx -> ctx.itemHandlerSource == null ? null : ctx.itemHandlerSource.getId()),
+            CompoundTag.CODEC.optionalFieldOf("item_handler_data", null).forGetter(SpoilContext::itemHandlerData),
+            Codec.INT.optionalFieldOf("slot", -1).forGetter(SpoilContext::slot)).apply(instance, SpoilContext::build));


DFU actually really hates null default values, so do this instead:

Suggested change

public static final Codec<SpoilContext> CODEC = RecordCodecBuilder.create(instance -> instance.group(

Level.RESOURCE_KEY_CODEC.optionalFieldOf("level", null)

.forGetter(ctx -> ctx.level == null ? null : ctx.level.dimension()),

BlockPos.CODEC.optionalFieldOf("pos", null).forGetter(SpoilContext::pos),

Codec.INT.optionalFieldOf("entity", null).forGetter(ctx -> ctx.entity == null ? null : ctx.entity.getId()),

ResourceLocation.CODEC.optionalFieldOf("item_handler", null)

.forGetter(ctx -> ctx.itemHandlerSource == null ? null : ctx.itemHandlerSource.getId()),

CompoundTag.CODEC.optionalFieldOf("item_handler_data", null).forGetter(SpoilContext::itemHandlerData),

Codec.INT.optionalFieldOf("slot", -1).forGetter(SpoilContext::slot)).apply(instance, SpoilContext::build));

// spotless:off

public static final Codec<SpoilContext> CODEC = RecordCodecBuilder.create(instance -> instance.group(

Level.RESOURCE_KEY_CODEC.optionalFieldOf("dimension").forGetter(ctx -> ctx.level == null ? Optional.empty() : Optional.of(ctx.level.dimension())),

BlockPos.CODEC.optionalFieldOf("pos").forGetter(ctx -> Optional.ofNullable(ctx.pos)),

UUIDUtil.CODEC.optionalFieldOf("entity").forGetter(ctx -> ctx.entity == null ? Optional.empty() : Optional.of(ctx.entity.getUUID())),

ResourceLocation.CODEC.optionalFieldOf("item_handler").forGetter(ctx -> ctx.itemHandlerSource == null ? Optional.empty() : Optional.of(ctx.itemHandlerSource.getId())),

CompoundTag.CODEC.optionalFieldOf("item_handler_data").forGetter(ctx -> Optional.ofNullable(ctx.itemHandlerData)),

Codec.INT.optionalFieldOf("slot", -1).forGetter(SpoilContext::slot)

).apply(instance, SpoilContext::build));

// spotless:on

Another suggestion will follow for the builder function.

P.S. I also changed the type of the entity field because that ID isn't consistent across world loads.

Also add an 'empty' context as a default value:

public static final SpoilContext EMPTY = new SpoilContext();

screret · 2026-08-18T08:31:40Z

Add this to injected_interfaces/interfaces.json.

screret · 2026-08-18T08:33:54Z

+
+public interface ISpoilableItemStackExtension {
+
+    void gtceu$setStack(ItemStack newStack);


Rename this method to gtceu$forceMyContentTo.
this should really be implemented as swapping the ItemStack instance to another one, though.

screret · 2026-08-18T08:35:21Z

        private ContentModifier outputModifier = ContentModifier.IDENTITY;
        private ContentModifier tickInputModifier = ContentModifier.IDENTITY;
        private ContentModifier tickOutputModifier = ContentModifier.IDENTITY;
+        private BiConsumer<GTRecipe, Object> actualOutputModifier = (recipe, object) -> {};


does this also include the (optional) KJS output modifiers from GTRecipe?

screret · 2026-08-18T09:27:13Z

+                    return new CustomItemStackHandler(player.getInventory().items);
+                } else return null;
+            }
+        };


Consider adding a 3rd default type: generic entity inventory.

/** * Represents getting an item handler as an entity's inventory (used if {@link SpoilContext#entity} is NOT a * {@link Player}) */ public static final ItemHandlerSource ENTITY_CAPABILITY = new ItemHandlerSource(GTCEu.id("entity_capability")) { @Override protected @Nullable IItemHandler getHandler(SpoilContext ctx) { if (ctx.entity != null) { return ctx.entity.getCapability(Capabilities.ItemHandler.ENTITY); } else { return null; } } };

screret · 2026-08-18T09:28:44Z

+    public SpoilContext(@NotNull Entity entity) {
+        this(entity.level(), entity.blockPosition(), entity, null, null, -1);


(for the "generic entity" item handler source)

Suggested change

public SpoilContext(@NotNull Entity entity) {

this(entity.level(), entity.blockPosition(), entity, null, null, -1);

public SpoilContext(@NotNull Entity entity, int slot) {

this(entity.level(), entity.blockPosition(), entity, ItemHandlerSource.ENTITY_INVENTORY, null, slot);

screret · 2026-08-18T09:31:05Z

+        if (side == null) return this.withItemHandlerSource(ItemHandlerSource.BLOCK_CAPABILITY);
+        return this.withItemHandlerSource(ItemHandlerSource.BLOCK_CAPABILITY)
+                .withItemHandlerData("side", StringTag.valueOf(side.getSerializedName()));


Suggested change

if (side == null) return this.withItemHandlerSource(ItemHandlerSource.BLOCK_CAPABILITY);

return this.withItemHandlerSource(ItemHandlerSource.BLOCK_CAPABILITY)

.withItemHandlerData("side", StringTag.valueOf(side.getSerializedName()));

SpoilContext self = this.withItemHandlerSource(ItemHandlerSource.BLOCK_CAPABILITY);

if (side != null) {

self = self.withItemHandlerData("side", StringTag.valueOf(side.getSerializedName()));

}

return self;

screret · 2026-08-18T09:32:03Z

+                           @Nullable BlockPos pos,
+                           @Nullable Entity entity,
+                           @Nullable ItemHandlerSource itemHandlerSource,
+                           @Nullable CompoundTag itemHandlerData,


This field should be made private if at all possible so people can't mistakenly modify it.

screret · 2026-08-18T09:32:40Z

+    private void gtceu$tickFreshness(Level level, Entity entity, int inventorySlot, boolean isCurrentItem,
+                                     CallbackInfo ci) {
+        if (entity instanceof Player player) gtceu$updateFreshness(new SpoilContext(player, inventorySlot), true);
+        else gtceu$updateFreshness(new SpoilContext(entity), true);


(for the "generic entity" item handler source)

Suggested change

else gtceu$updateFreshness(new SpoilContext(entity), true);

else gtceu$updateFreshness(new SpoilContext(entity, inventorySlot), true);

TarLaboratories requested a review from a team as a code owner August 16, 2026 20:30

github-actions Bot added 1.21 Tests: Passed Game Tests have passed on this PR labels Aug 16, 2026

screret suggested changes Aug 17, 2026

View reviewed changes

Spoilage (#3874)

7e5420c

TarLaboratories force-pushed the tar/update-1.21 branch from 9a6ae73 to 7e5420c Compare August 18, 2026 08:08

stivosha and others added 2 commits August 18, 2026 11:11

bugfix: corrected a typo in the ru word tooltip_energy_cracking (#5280)

ba8e19b

Update zh_tw.json (#4747)

8a69f41

TarLaboratories force-pushed the tar/update-1.21 branch from 9043220 to 8a69f41 Compare August 18, 2026 08:16

screret suggested changes Aug 18, 2026

View reviewed changes

Ghostipedia added the Do Not Merge DO NOT MERGE THIS PR YET! label Aug 18, 2026


		public interface ISpoilableItemStackExtension {

		void gtceu$setStack(ItemStack newStack);

		public SpoilContext(@NotNull Entity entity) {
		this(entity.level(), entity.blockPosition(), entity, null, null, -1);

-        if (side == null) return this.withItemHandlerSource(ItemHandlerSource.BLOCK_CAPABILITY);
-        return this.withItemHandlerSource(ItemHandlerSource.BLOCK_CAPABILITY)
-                .withItemHandlerData("side", StringTag.valueOf(side.getSerializedName()));
+        SpoilContext self = this.withItemHandlerSource(ItemHandlerSource.BLOCK_CAPABILITY);
+        if (side != null) {
+            self = self.withItemHandlerData("side", StringTag.valueOf(side.getSerializedName()));
+        }
+        return self;

	else gtceu$updateFreshness(new SpoilContext(entity), true);
	else gtceu$updateFreshness(new SpoilContext(entity, inventorySlot), true);

Uh oh!

Conversation

TarLaboratories commented Aug 16, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

What

Implementation Details

AI Usage

Outcome

How Was This Tested

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

TarLaboratories commented Aug 16, 2026 •

edited

Loading