fix: photomask set creative-only shortcut working in survival

MrTJP · Dec 24, 2024 · 11d79ac · 11d79ac
1 parent 3b32a6f
commit 11d79ac
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 14 deletions.
diff --git a/fabrication/src/main/java/mrtjp/projectred/fabrication/item/ICBlueprintItem.java b/fabrication/src/main/java/mrtjp/projectred/fabrication/item/ICBlueprintItem.java
@@ -36,22 +36,26 @@ public void appendHoverText(ItemStack stack, @Nullable Level p_77624_2_, List<Co
 
     @Override
     public InteractionResult onItemUseFirst(ItemStack stack, UseOnContext context) {
+        // Allow creative mode players to directly obtain a Fabricated Gate
+        var player = context.getPlayer();
+        if (player == null || !player.isCreative()) {
+            return InteractionResult.PASS;
+        }
 
-        assert context.getPlayer() != null;
-        if (!context.getPlayer().isCreative()) return InteractionResult.PASS;
+        if (!canFabricate(stack.getTag())) {
+            return InteractionResult.PASS;
+        }
 
-        // Creative mode bypass: Convert blueprint directly to gate block
+        // Always prioritize placing blueprint on IC workbench
         BlockState blockState = context.getLevel().getBlockState(context.getClickedPos());
-        if (blockState.getBlock() == FabricationBlocks.IC_WORKBENCH_BLOCK.get()) { return InteractionResult.PASS; }
-
-        if (!canFabricate(stack.getTag())) {
+        if (blockState.getBlock() == FabricationBlocks.IC_WORKBENCH_BLOCK.get()) {
             return InteractionResult.PASS;
         }
 
         ItemStack gate = GateType.FABRICATED_GATE.makeStack();
         gate.setTag(createFabricationCopy(Objects.requireNonNull(stack.getTag())));
 
-        context.getPlayer().addItem(gate);
+        player.addItem(gate);
         return InteractionResult.SUCCESS;
     }
 

diff --git a/fabrication/src/main/java/mrtjp/projectred/fabrication/item/PhotomaskSetItem.java b/fabrication/src/main/java/mrtjp/projectred/fabrication/item/PhotomaskSetItem.java
@@ -1,5 +1,6 @@
 package mrtjp.projectred.fabrication.item;
 
+import mrtjp.projectred.fabrication.init.FabricationBlocks;
 import mrtjp.projectred.fabrication.init.FabricationItems;
 import mrtjp.projectred.integration.GateType;
 import net.minecraft.network.chat.Component;
@@ -9,11 +10,15 @@
 import net.minecraft.world.item.TooltipFlag;
 import net.minecraft.world.item.context.UseOnContext;
 import net.minecraft.world.level.Level;
+import net.minecraft.world.level.block.state.BlockState;
 
 import javax.annotation.Nullable;
 import java.util.List;
 import java.util.Objects;
 
+import static mrtjp.projectred.fabrication.editor.EditorDataUtils.canFabricate;
+import static mrtjp.projectred.fabrication.editor.EditorDataUtils.createFabricationCopy;
+
 public class PhotomaskSetItem extends Item {
 
     public PhotomaskSetItem() {
@@ -28,16 +33,21 @@ public void appendHoverText(ItemStack stack, @Nullable Level p_77624_2_, List<Co
 
     @Override
     public InteractionResult onItemUseFirst(ItemStack stack, UseOnContext context) {
+        // Allow creative mode players to directly obtain a Fabricated Gate
+        var player = context.getPlayer();
+        if (player == null || !player.isCreative()) {
+            return InteractionResult.PASS;
+        }
 
-        if (stack.getTag() != null && context.getPlayer() != null) {
-            ItemStack gate = GateType.FABRICATED_GATE.makeStack();
-            gate.setTag(stack.getTag());
-
-            context.getPlayer().addItem(gate);
-            return InteractionResult.SUCCESS;
+        if (!canFabricate(stack.getTag())) {
+            return InteractionResult.PASS;
         }
 
-        return InteractionResult.PASS;
+        ItemStack gate = GateType.FABRICATED_GATE.makeStack();
+        gate.setTag(createFabricationCopy(Objects.requireNonNull(stack.getTag())));
+
+        player.addItem(gate);
+        return InteractionResult.SUCCESS;
     }
 
     public static ItemStack createDieStack(ItemStack photomask, int count) {