Build 1.6-22

Stop using JavaFX vectors as they don't seem to exist in a normal instance

build.gradle

@@ -1,5 +1,5 @@
 def mainVersion = "1.6"
-def buildNumber = "21"
+def buildNumber = "22"
 
 // For those who want the bleeding edge
 buildscript {
@@ -30,7 +30,7 @@ sourceCompatibility = 1.8
 targetCompatibility = 1.8
 
 minecraft {
-    version = "14.23.0.2512"
+    version = "14.22.1.2479"
     runDir = "run"
 
     replace '${version}', project.version

changelog.md

@@ -1,3 +1,11 @@
+#####Version 1.6-22
+ - Added a Seven-Segment display for control panels
+ - Panel components update their values as soon as they are changed in the GUI
+ - Fixed a crash when breaking a panel with buttons, locks or toggle switches on it under special circumstances
+ - Fixed server crashes when using panel components with a second controller id, but no channel set
+ - Fixed various NPE crashes with control panel models under heavy load
+ - Fixed wrong panel component ordering with raytracing
+
 #####Version 1.6-21
  - Added shaders for the Marx generator and Jacob's ladder
  - Fixed wires connected to a Marx generator on a server being invisible

src/main/java/malte0811/industrialWires/controlpanel/SevenSegDisplay.java

@@ -15,7 +15,6 @@
 
 package malte0811.industrialWires.controlpanel;
 
-import com.sun.javafx.geom.Vec2f;
 import malte0811.industrialWires.IndustrialWires;
 import malte0811.industrialWires.blocks.controlpanel.TileEntityPanel;
 import malte0811.industrialWires.client.RawQuad;
@@ -29,6 +28,7 @@ import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.nbt.NBTTagInt;
 import net.minecraft.util.EnumFacing;
 import net.minecraft.util.math.AxisAlignedBB;
+import net.minecraft.util.math.Vec2f;
 import net.minecraft.util.math.Vec3d;
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;

src/main/java/malte0811/industrialWires/util/MiscUtils.java

@@ -26,7 +26,6 @@ import blusunrize.immersiveengineering.common.blocks.IEBlockInterfaces;
 import blusunrize.immersiveengineering.common.util.Utils;
 import blusunrize.immersiveengineering.common.util.chickenbones.Matrix4;
 import com.google.common.collect.ImmutableSet;
-import com.sun.javafx.geom.Vec2f;
 import malte0811.industrialWires.IndustrialWires;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.client.Minecraft;
@@ -37,9 +36,12 @@ import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.EnumFacing;
 import net.minecraft.util.math.AxisAlignedBB;
 import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.Vec2f;
 import net.minecraft.util.math.Vec3d;
 import net.minecraft.world.World;
 import net.minecraftforge.common.property.IExtendedBlockState;
+import net.minecraftforge.fml.relauncher.Side;
+import net.minecraftforge.fml.relauncher.SideOnly;
 import org.lwjgl.util.vector.Vector3f;
 
 import javax.annotation.Nonnull;
@@ -223,24 +225,29 @@ public final class MiscUtils {
 	}
 	//End of code from TEImmersiveConnectable
 
+	@SideOnly(Side.CLIENT)
 	public static Vec2f rotate90(Vec2f in) {
 		//Yes, when rotating by 90 degrees, x becomes y!
 		//noinspection SuspiciousNameCombination
 		return new Vec2f(-in.y, in.x);
 	}
 
+	@SideOnly(Side.CLIENT)
 	public static Vec2f subtract(Vec2f a, Vec2f b) {
 		return new Vec2f(a.x-b.x, a.y-b.y);
 	}
 
+	@SideOnly(Side.CLIENT)
 	public static Vec2f add(Vec2f a, Vec2f b) {
 		return new Vec2f(a.x+b.x, a.y+b.y);
 	}
 
+	@SideOnly(Side.CLIENT)
 	public static Vec2f scale(Vec2f a, float f) {
 		return new Vec2f(a.x*f, a.y*f);
 	}
 
+	@SideOnly(Side.CLIENT)
 	public static Vector3f withNewY(Vec2f in, float y) {
 		return new Vector3f(in.x, y, in.y);
 	}