Merge branch 'master' of https://github.com/gnembon/carpetmod

installer/create_installer_unix.sh

@@ -0,0 +1,36 @@
+#!/bin/bash
+
+# For debug: Print commands and their arguments as they are executed.
+#set -x
+
+# Some colors for bash
+RED='\033[0;31m'
+NOCOLOR='\033[0m'
+
+if [[ ! -f  ../build/distributions/carpetmod_1.13.2_Client.zip ]]; then
+    printf "${RED}Patches missing, create them with /gradlew createRelease"
+    exit 1
+fi
+if [[ ! -f ../build/distributions/carpetmod_1.13.2_Server.zip ]]; then
+    printf "${RED}Patches missing, create them with /gradlew createRelease"
+    exit 1
+fi
+
+[[ -d output-ux ]] && rm -rf output-ux
+mkdir output-ux
+
+printf "${NOCOLOR}Copying files ...\n"
+cp ../build/distributions/carpetmod_1.13.2_Client.zip output-ux
+cp ../build/distributions/carpetmod_1.13.2_Server.zip output-ux
+cp unix_install_server.sh output-ux
+cp unix_install_singleplayer.sh output-ux
+cp README.txt output-ux
+
+echo "Zipping ..."
+[[ -f carpet_package_ux.zip ]] && rm -f carpet_package_ux.zip
+pushd output-ux > /dev/null
+tar czf ../carpet_package_ux.tar.gz *
+popd > /dev/null
+
+echo "Cleaning ..."
+rm -rf output-ux

installer/create_installer_win.sh

@@ -0,0 +1,37 @@
+#!/bin/bash
+
+# For debug: Print commands and their arguments as they are executed.
+#set -x
+
+# Some colors for bash
+RED='\033[0;31m'
+NOCOLOR='\033[0m'
+
+if [[ ! -f  ../build/distributions/carpetmod_1.13.2_Client.zip ]]; then
+    echo "${RED}Patches missing, create them with /gradlew createRelease"
+    exit 1
+fi
+if [[ ! -f ../build/distributions/carpetmod_1.13.2_Server.zip ]]; then
+    echo "${RED}Patches missing, create them with /gradlew createRelease"
+    exit 1
+fi
+
+[[ -d output-win ]] && rm -rf output-win
+mkdir output-win
+
+echo "${NOCOLOR}Copying files ..."
+cp ../build/distributions/carpetmod_1.13.2_Client.zip output-win
+cp ../build/distributions/carpetmod_1.13.2_Server.zip output-win
+cp 7za.exe output-win
+cp win_install_server.cmd output-win
+cp win_install_singleplayer.cmd output-win
+cp README.txt output-win
+
+echo "Zipping ..."
+[[ -f carpet_package_win.zip ]] && rm -f carpet_package_win.zip
+pushd output-win > /dev/null
+zip -r ../carpet_package_win.zip * > /dev/null
+popd > /dev/null
+
+echo "Cleaning ..."
+rm -rf output-win

installer/unix_install_server.sh

@@ -0,0 +1,27 @@
+#!/bin/bash
+
+# For debug: Print commands and their arguments as they are executed.
+# set -x
+
+# Some colors for bash
+RED='\033[0;31m'
+NOCOLOR='\033[0m'
+
+echo "Location server..."
+if [[ ! -f server.jar ]]; then
+     printf "${RED}... cannot locate server jar, make sure its placed in current directory\n"
+     echo "    and its named like: server.jar"
+     exit 1
+fi
+
+cp server.jar ____server.jar
+printf "${NOCOLOR}Extracting patches ..."
+unzip carpetmod_1.13.2_Server.zip -d ____patches
+echo "Patching server ..."
+pushd ____patches > /dev/null
+zip -ur  ../____server.jar *
+popd > /dev/null
+echo "Cleanup ..."
+rm -rf ____patches
+mv ____server.jar minecraft_server.1.13.2_carpet.jar
+echo "Done"

src/main/java/carpet/script/CarpetExpression.java

@@ -8,7 +8,6 @@
 import carpet.utils.Messenger;
 import com.mojang.brigadier.StringReader;
 import com.mojang.brigadier.exceptions.CommandSyntaxException;
-import javafx.util.Pair;
 import net.minecraft.block.Block;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.command.CommandSource;
@@ -34,6 +33,7 @@
 import net.minecraft.world.WorldServer;
 import net.minecraft.world.gen.Heightmap;
 import net.minecraft.world.storage.SessionLockException;
+import org.apache.commons.lang3.tuple.Pair;
 
 import java.math.BigInteger;
 import java.util.ArrayList;

src/main/java/carpet/script/EntityValue.java

@@ -2,7 +2,6 @@
 
 import com.mojang.brigadier.StringReader;
 import com.mojang.brigadier.exceptions.CommandSyntaxException;
-import javafx.util.Pair;
 import net.minecraft.command.CommandSource;
 import net.minecraft.command.arguments.EntitySelector;
 import net.minecraft.command.arguments.EntitySelectorParser;
@@ -28,6 +27,7 @@
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.registry.IRegistry;
 import net.minecraft.util.text.TextComponentString;
+import org.apache.commons.lang3.tuple.Pair;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -112,11 +112,11 @@ public static Pair<Class<? extends Entity>, Predicate<? super Entity>> getPredic
     private static Map<String, Pair<Class<? extends Entity>, Predicate<? super Entity>>> entityPredicates =
             new HashMap<String, Pair<Class<? extends Entity>, Predicate<? super Entity>>>()
     {{
-        put("*", new Pair<>(Entity.class, EntitySelectors.IS_ALIVE));
-        put("living", new Pair<>(EntityLivingBase.class, EntitySelectors.IS_ALIVE));
-        put("items", new Pair<>(EntityItem.class, EntitySelectors.IS_ALIVE));
-        put("players", new Pair<>(EntityPlayer.class, EntitySelectors.IS_ALIVE));
-        put("!players", new Pair<>(Entity.class, (e) -> !(e instanceof EntityPlayer) ));
+        put("*", Pair.of(Entity.class, EntitySelectors.IS_ALIVE));
+        put("living", Pair.of(EntityLivingBase.class, EntitySelectors.IS_ALIVE));
+        put("items", Pair.of(EntityItem.class, EntitySelectors.IS_ALIVE));
+        put("players", Pair.of(EntityPlayer.class, EntitySelectors.IS_ALIVE));
+        put("!players", Pair.of(Entity.class, (e) -> !(e instanceof EntityPlayer) ));
     }};
     public Value get(String what, Value arg)
     {