Merge branch 'master' of https://github.com/Vazkii/Psi

Author: Dudblockman

contributors.properties

@@ -142,3 +142,4 @@ pereiraa16_=#000000,#ff0000,#ffa500
 amymialee=#a55fe6,#973aff,#291b37,#1d1d1d,#291b37,#973aff,#a55fe6
 bananawilta=#5bcefa,#f5abba,#ffffff,#ffffff,#f5abba,#5bcefa
 seppl250=#D60270,#9B4F96,#0038A8
+pancakezombie2=#339CFF,#1EEBE2,#935AE4

src/main/java/vazkii/psi/api/spell/LoopcastEndEvent.java

@@ -0,0 +1,50 @@
+/*
+ * This class is distributed as part of the Psi Mod.
+ * Get the Source Code in github:
+ * https://github.com/Vazkii/Psi
+ *
+ * Psi is Open Source and distributed under the
+ * Psi License: https://psi.vazkii.net/license.php
+ */
+package vazkii.psi.api.spell;
+
+import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.util.Hand;
+import net.minecraftforge.eventbus.api.Event;
+
+import vazkii.psi.api.internal.IPlayerData;
+
+/**
+ * Posted when loopcast ends.
+ * This event has no result and is not cancellable
+ */
+public class LoopcastEndEvent extends Event {
+
+	private final PlayerEntity player;
+	private final IPlayerData playerData;
+	private final Hand hand;
+	private final int loopcastAmount;
+
+	public LoopcastEndEvent(PlayerEntity player, IPlayerData playerData, Hand hand, int loopcastAmount) {
+		this.player = player;
+		this.playerData = playerData;
+		this.hand = hand;
+		this.loopcastAmount = loopcastAmount;
+	}
+
+	public PlayerEntity getPlayer() {
+		return player;
+	}
+
+	public IPlayerData getPlayerData() {
+		return playerData;
+	}
+
+	public Hand getHand() {
+		return hand;
+	}
+
+	public int getLoopcastAmount() {
+		return loopcastAmount;
+	}
+}

src/main/java/vazkii/psi/client/gui/GuiProgrammer.java

@@ -51,6 +51,7 @@
 import vazkii.psi.api.spell.SpellCompilationException;
 import vazkii.psi.api.spell.SpellGrid;
 import vazkii.psi.api.spell.SpellParam;
+import vazkii.psi.api.spell.SpellParam.Side;
 import vazkii.psi.api.spell.SpellPiece;
 import vazkii.psi.client.core.helper.SharingHelper;
 import vazkii.psi.client.gui.button.GuiButtonHelp;
@@ -71,6 +72,7 @@
 import vazkii.psi.common.network.MessageRegister;
 import vazkii.psi.common.network.message.MessageSpellModified;
 import vazkii.psi.common.spell.SpellCompiler;
+import vazkii.psi.common.spell.other.PieceConnector;
 import vazkii.psi.mixin.client.AccessorRenderState;
 
 import java.util.ArrayList;
@@ -675,6 +677,14 @@ public boolean keyPressed(int keyCode, int scanCode, int modifiers) {
 					if (!onSideButtonKeybind(piece, param, SpellParam.Side.TOP) && selectedY > 0) {
 						selectedY--;
 						onSelectedChanged();
+						if (hasShiftDown() && spell.grid.gridData[selectedX][selectedY] == null) {
+							PieceConnector connector = new PieceConnector(spell);
+							connector.x = selectedX;
+							connector.y = selectedY;
+							connector.paramSides.put(connector.target, Side.BOTTOM);
+							spell.grid.gridData[selectedX][selectedY] = connector;
+							onSpellChanged(false);
+						}
 						return true;
 					}
 				}
@@ -696,6 +706,14 @@ public boolean keyPressed(int keyCode, int scanCode, int modifiers) {
 					if (!onSideButtonKeybind(piece, param, SpellParam.Side.LEFT) && selectedX > 0) {
 						selectedX--;
 						onSelectedChanged();
+						if (hasShiftDown() && spell.grid.gridData[selectedX][selectedY] == null) {
+							PieceConnector connector = new PieceConnector(spell);
+							connector.x = selectedX;
+							connector.y = selectedY;
+							connector.paramSides.put(connector.target, Side.RIGHT);
+							spell.grid.gridData[selectedX][selectedY] = connector;
+							onSpellChanged(false);
+						}
 						return true;
 					}
 				}
@@ -717,6 +735,14 @@ public boolean keyPressed(int keyCode, int scanCode, int modifiers) {
 					if (!onSideButtonKeybind(piece, param, SpellParam.Side.RIGHT) && selectedX < SpellGrid.GRID_SIZE - 1) {
 						selectedX++;
 						onSelectedChanged();
+						if (hasShiftDown() && spell.grid.gridData[selectedX][selectedY] == null) {
+							PieceConnector connector = new PieceConnector(spell);
+							connector.x = selectedX;
+							connector.y = selectedY;
+							connector.paramSides.put(connector.target, Side.LEFT);
+							spell.grid.gridData[selectedX][selectedY] = connector;
+							onSpellChanged(false);
+						}
 						return true;
 					}
 				}
@@ -738,6 +764,14 @@ public boolean keyPressed(int keyCode, int scanCode, int modifiers) {
 					if (!onSideButtonKeybind(piece, param, SpellParam.Side.BOTTOM) && selectedY < SpellGrid.GRID_SIZE - 1) {
 						selectedY++;
 						onSelectedChanged();
+						if (hasShiftDown() && spell.grid.gridData[selectedX][selectedY] == null) {
+							PieceConnector connector = new PieceConnector(spell);
+							connector.x = selectedX;
+							connector.y = selectedY;
+							connector.paramSides.put(connector.target, Side.TOP);
+							spell.grid.gridData[selectedX][selectedY] = connector;
+							onSpellChanged(false);
+						}
 						return true;
 					}
 				}

src/main/java/vazkii/psi/common/core/handler/PlayerDataHandler.java

@@ -54,6 +54,7 @@
 import vazkii.psi.api.internal.Vector3;
 import vazkii.psi.api.spell.EnumSpellStat;
 import vazkii.psi.api.spell.ISpellAcceptor;
+import vazkii.psi.api.spell.LoopcastEndEvent;
 import vazkii.psi.api.spell.PieceExecutedEvent;
 import vazkii.psi.api.spell.PieceGroupAdvancementComplete;
 import vazkii.psi.api.spell.PieceKnowledgeEvent;
@@ -359,6 +360,10 @@ public void tick() {
 			float b = PsiRenderHelper.b(color) / 255F;
 
 			loopcast: {
+				if (player.isSpectator()) {
+					stopLoopcast();
+				}
+
 				if (overflowed) {
 					stopLoopcast();
 				}
@@ -598,8 +603,11 @@ private void applyRegen(PlayerEntity player, int max, ItemStack cadStack) {
 		}
 
 		public void stopLoopcast() {
+			PlayerEntity player = playerWR.get();
+
 			if (loopcasting) {
 				loopcastFadeTime = 5;
+				MinecraftForge.EVENT_BUS.post(new LoopcastEndEvent(player, this, loopcastHand, loopcastAmount));
 			}
 			loopcasting = false;
 
@@ -609,7 +617,6 @@ public void stopLoopcast() {
 			loopcastTime = 1;
 			loopcastAmount = 0;
 
-			PlayerEntity player = playerWR.get();
 			if (player instanceof ServerPlayerEntity) {
 				LoopcastTrackingHandler.syncForTrackersAndSelf((ServerPlayerEntity) player);
 			}