+ * See also: {@link CraftingBlockItemMixin} + */ +@Mixin(AbstractCraftingUnitBlock.class) +public abstract class AbstractCraftingUnitBlockMixin extends AEBaseBlock { + @Shadow + @Final + public ICraftingUnitType type; + + protected AbstractCraftingUnitBlockMixin(Properties props) { + super(props); + } + + @Shadow + public abstract InteractionResult removeUpgrade(Level level, Player player, BlockPos pos, BlockState newState); + + // spotless:off + @Redirect( + method = "useWithoutItem", + at = @At( + value = "INVOKE", + target = "Lappeng/block/crafting/AbstractCraftingUnitBlock;removeUpgrade(Lnet/minecraft/world/level/Level;Lnet/minecraft/world/entity/player/Player;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/state/BlockState;)Lnet/minecraft/world/InteractionResult;")) + // spotless:on + private InteractionResult removeMegaUpgrade( + AbstractCraftingUnitBlock instance, Level level, Player player, BlockPos pos, BlockState newState) { + var unitBlock = Objects.requireNonNull(instance.getRegistryName()) + .getNamespace() + .equals(MEGACells.MODID) + ? MEGABlocks.MEGA_CRAFTING_UNIT + : AEBlocks.CRAFTING_UNIT; + return removeUpgrade(level, player, pos, unitBlock.block().defaultBlockState()); + } + + @ModifyExpressionValue( + method = "removeUpgrade", + at = @At(value = "INVOKE", target = "Lnet/minecraft/world/level/Level;isClientSide()Z")) + private boolean isMegaUnit(boolean original) { + return original || type == MEGACraftingUnitType.UNIT; + } + + // spotless:off + @ModifyExpressionValue( + method = "upgrade", + at = @At( + value = "INVOKE", + target = "Lappeng/recipes/game/CraftingUnitTransformRecipe;getUpgradedBlock(Lnet/minecraft/world/level/Level;Lnet/minecraft/world/item/ItemStack;)Lnet/minecraft/world/level/block/Block;")) + // spotless:on + private Block isMegaRecipe( + Block original, @Local(argsOnly = true) ItemStack heldItem, @Local(argsOnly = true) Level level) { + if (original == null) { + return null; + } + + return Objects.requireNonNull(getRegistryName()).getNamespace().equals(MEGACells.MODID) + && !mega$isFromMegaRecipe(level, heldItem) + ? null + : original; + } + + @Unique + private static boolean mega$isFromMegaRecipe(Level level, ItemStack heldItem) { + for (var holder : level.getRecipeManager().getAllRecipesFor(AERecipeTypes.CRAFTING_UNIT_TRANSFORM)) { + if (heldItem.is(holder.value().getUpgradeItem())) { + return holder.id().getNamespace().equals(MEGACells.MODID); + } + } + + return false; + } +} diff --git a/src/main/java/gripe/_90/megacells/mixin/CraftingBlockItemMixin.java b/src/main/java/gripe/_90/megacells/mixin/CraftingBlockItemMixin.java new file mode 100644 index 00000000..ec49cd64 --- /dev/null +++ b/src/main/java/gripe/_90/megacells/mixin/CraftingBlockItemMixin.java @@ -0,0 +1,44 @@ +package gripe._90.megacells.mixin; + +import com.llamalad7.mixinextras.sugar.Local; + +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Redirect; + +import net.minecraft.core.registries.BuiltInRegistries; +import net.minecraft.world.entity.player.Inventory; +import net.minecraft.world.item.ItemStack; + +import appeng.block.crafting.CraftingBlockItem; +import appeng.core.definitions.AEBlocks; + +import gripe._90.megacells.MEGACells; +import gripe._90.megacells.definition.MEGABlocks; + +/** + * Temporary solution to the current crafting unit transform recipe system being hard-coded against AE2's own crafting + * unit block. + *
+ * See also: {@link AbstractCraftingUnitBlockMixin} + */ +@Mixin(CraftingBlockItem.class) +public abstract class CraftingBlockItemMixin { + // spotless:off + @Redirect( + method = "use", + at = @At( + value = "INVOKE", + target = "Lnet/minecraft/world/entity/player/Inventory;placeItemBackInInventory(Lnet/minecraft/world/item/ItemStack;)V", + ordinal = 1)) + // spotless:on + private void placeBackMegaUnit(Inventory inv, ItemStack stack, @Local int itemCount) { + var unit = BuiltInRegistries.ITEM + .getKey((CraftingBlockItem) (Object) this) + .getNamespace() + .equals(MEGACells.MODID) + ? MEGABlocks.MEGA_CRAFTING_UNIT + : AEBlocks.CRAFTING_UNIT; + inv.placeItemBackInInventory(unit.stack(itemCount)); + } +} diff --git a/src/main/resources/megacells.mixins.json b/src/main/resources/megacells.mixins.json index 22a3f69f..57fd45af 100644 --- a/src/main/resources/megacells.mixins.json +++ b/src/main/resources/megacells.mixins.json @@ -3,8 +3,10 @@ "minVersion": "0.8.5", "package": "gripe._90.megacells.mixin", "mixins": [ + "AbstractCraftingUnitBlockMixin", "CellWorkbenchBlockEntityMixin", "CellWorkbenchMenuMixin", + "CraftingBlockItemMixin", "ItemEntityMixin", "ItemMenuHostMixin", "PatternProviderMenuAccessor"