Merge pull request #2831 from NillerMedDild/develop

0.5.7

.gitignore

@@ -5,8 +5,9 @@
 /.mixin.out/
 /logs/
 config/forgeendertech/Biomes/
-/local/
-/libraries/
+/local/ftbchunks/data
+/local/ftbutilities/
+/local/ftbultimine/
 /llibrary/
 /ESM/
 /saves/
@@ -168,18 +169,15 @@ automation/ModListCreator-1.2.1.jar
 .github_changelog_generator
 config/sounddeviceoptions-client.toml
 config/personality-client.toml
-config/miniutilities-client.toml
-config/twilightforest-client.toml
 config/framedblocks-client.toml
 config/cfm-client.toml
 config/entity_culling-client.toml
 config/terraforged/performance_internal.conf
-config/gravestone-client.toml
 config/jecalculation/record.json
 config/topaddons-client.toml
 config/diet-client.toml
 config/contentcreatorintegration/contentcreatorintegration-common.toml
 config/contentcreatorintegration/contentcreatorintegration.toml
 config/contentcreatorintegration/default/constants.json
 config/fml.toml
-config/waystones-client.toml
+config/storagedrawers-client.toml

automation/.build.json

@@ -3,5 +3,14 @@
     "minecraftVersion": "1.16.5",
     "modLoader": "forge",
     "modLoaderVersion": "36.1.31",
-    "includes": ["building_gadgets_patterns", "config", "defaultconfigs", "kubejs", "packmenu", "patchouli_books", "schematics"]
+    "includes": [
+        "building_gadgets_patterns",
+        "config",
+        "defaultconfigs",
+        "kubejs",
+        "local",
+        "packmenu",
+        "patchouli_books",
+        "schematics"
+    ]
 }

automation/InstanceSyncSetup.sh

@@ -1,10 +1,10 @@
-#!/bin/sh
-
-cd ..
-echo "#!/bin/sh" > .git/hooks/post-merge
-echo "java -jar InstanceSync.jar" >> .git/hooks/post-merge
-
-echo "Done setting up hooks"
-echo "Running InstanceSync"
-
+#!/bin/sh
+
+cd ..
+echo "#!/bin/sh" > .git/hooks/post-merge
+echo "java -jar InstanceSync.jar" >> .git/hooks/post-merge
+
+echo "Done setting up hooks"
+echo "Running InstanceSync"
+
 java -jar InstanceSync.jar

automation/modpack-uploader.ps1

@@ -156,6 +156,11 @@ function New-Changelog {
 
 function Push-ClientFiles {
     if ($ENABLE_MODPACK_UPLOADER_MODULE) {
+
+        if ($ENABLE_CURSE_CLIENT_MODULE -eq $false) {
+            Remove-BlacklistedFiles
+        }
+
         $CLIENT_METADATA = 
         "{
         'changelog': `'$CLIENT_CHANGELOG`',

automation/remove-client-mods.ps1

@@ -9,8 +9,15 @@ $CLIENT_MODS_TO_REMOVE_FROM_SERVER_FILES = @(
 	"PackMenu"
 )
 
-$InstanceRoot = ("$PSScriptRoot/.." | Resolve-Path)
-$modFolder = "$InstanceRoot/mods"
+if (Test-Path "mods" -PathType Container) {
+	$modFolder = "mods"
+}
+elseif (Test-Path "$PSScriptRoot/mods" -PathType Container) {
+	$modFolder = "$PSScriptRoot/mods"	
+}
+else {
+	Write-Host "Unable to find the mods folder, no client mods will be removed." -ForegroundColor Red
+}
 
 Write-Host
 Write-Host "Removing client only mods..." -ForegroundColor Cyan

automation/settings.cfg

@@ -14,5 +14,5 @@ HIGH_CPU_PRIORITY=0;
 
 MODPACK_NAME=Enigmatica 6;
 MCVER=1.16.5;
-FORGEVER=36.1.31;
-FORGEURL=https://files.minecraftforge.net/maven/net/minecraftforge/forge/1.16.5-36.1.31/forge-1.16.5-36.1.31-installer.jar;
+FORGEVER=36.2.1;
+FORGEURL=DISABLE;

automation/settings.ps1

@@ -29,11 +29,11 @@ $MODPACK_NAME = "Enigmatica6"
 $CLIENT_NAME = "Enigmatica6"
 
 # Version Of The Modpack
-$MODPACK_VERSION = "0.5.6"
+$MODPACK_VERSION = "0.5.7"
 
 # Last Version Of The Modpack
 # Needed For Changelog Parsing
-$LAST_MODPACK_VERSION = "0.5.5"
+$LAST_MODPACK_VERSION = "0.5.6"
 
 # =====================================================================//
 #  CHANGELOG SETTINGS
@@ -146,10 +146,10 @@ $CONFIGS_TO_REMOVE_FROM_CLIENT_FILES = @(
 	"contentcreatorintegration/contentcreatorintegration.toml",
 	"contentcreatorintegration/contentcreatorintegration-common.toml",
 	"contentcreatorintegration/default/constants.json",
-	"waystones-client.toml"
+	"storagedrawers-client.toml"
 )
 
-$FOLDERS_TO_REMOVE_FROM_CLIENT_FILES = @()
+$FOLDERS_TO_REMOVE_FROM_CLIENT_FILES = @("local/ftbutilities", "local/ftbchunks/data", "local/ftbultimine")
 
 #=====================================================================//
 #  SERVER FILE SETTINGS

automation/start-automated-server.bat

@@ -438,38 +438,12 @@ IF NOT %MC_SERVER_FORGEURL%==DISABLE (
 	GOTO DOWNLOADINSTALLER
 )
 
-SET MC_SERVER_TMP_FLAG=0
-
-:FETCHHTML
-REM Download Forge Download Index HTML to parse the URL for the direct download
-ECHO INFO: Fetching index html from forge ^( https://files.minecraftforge.net/maven/net/minecraftforge/forge/index_%MC_SERVER_MCVER%.html ^) 1>>  "%~dp0logs\serverstart.log" 2>&1
-%MC_SYS32%\bitsadmin.exe /rawreturn /nowrap /transfer dlforgehtml /download /priority FOREGROUND "https://files.minecraftforge.net/maven/net/minecraftforge/forge/index_%MC_SERVER_MCVER%.html" "%~dp0forge-%MC_SERVER_MCVER%.html"  1>> "%~dp0logs\serverstart.log" 2>&1
-
-IF NOT EXIST "%~dp0forge-%MC_SERVER_MCVER%.html" (
-	IF "%MC_SERVER_TMP_FLAG%"=="0" (
-		ECHO Something went wrong, trying again...
-		SET MC_SERVER_TMP_FLAG=1
-		GOTO FETCHHTML
-	) ELSE (
-		SET MC_SERVER_ERROR_REASON=ForgeIndexNotFound
-		GOTO ERROR
-	)
+IF %MC_SERVER_FORGEURL%==DISABLE (
+	SET MC_SERVER_FORGEURL="https://maven.minecraftforge.net/net/minecraftforge/forge/%MC_SERVER_MCVER%-%MC_SERVER_FORGEVER%/forge-%MC_SERVER_MCVER%-%MC_SERVER_FORGEVER%-installer.jar"
+	GOTO DOWNLOADINSTALLER
 )
 
-REM More complex wannabe-regex (aka magic)
-FOR /f tokens^=^5^ delims^=^=^<^>^" %%G in ('%MC_SYS32%\FINDSTR.EXE /ir "https://files.minecraftforge.net/maven/net/minecraftforge/forge/%MC_SERVER_MCVER%-%MC_SERVER_FORGEVER%/forge-%MC_SERVER_MCVER%-%MC_SERVER_FORGEVER%-installer.jar" "%~dp0forge-%MC_SERVER_MCVER%.html"') DO SET MC_SERVER_FORGEURL=%%G & GOTO FETCHHTML1
-
-:FETCHHTML1
-IF "%MC_SERVER_FORGEURL%"=="%MC_SERVER_FORGEURL:installer.jar=%" (
-	IF "%MC_SERVER_TMP_FLAG%"=="0" (
-		ECHO Something went wrong, trying again...
-		SET MC_SERVER_TMP_FLAG=1
-		GOTO FETCHHTML
-	) ELSE (
-		SET MC_SERVER_ERROR_REASON=ForgeDownloadURLNotFound
-		GOTO ERROR
-	)
-) 
+SET MC_SERVER_TMP_FLAG=0
 
 ECHO Downloading FORGE (step 2 of 2). This can take several minutes, please be patient...
 SET MC_SERVER_TMP_FLAG=0
@@ -505,8 +479,6 @@ ECHO Installing Forge now, please wait...
 ECHO INFO: Starting Forge install now, details below: 1>>  "%~dp0logs\serverstart.log" 2>&1
 java -jar "%~dp0forge-%MC_SERVER_MCVER%-%MC_SERVER_FORGEVER%-installer.jar" --installServer 1>>  "%~dp0logs\serverstart.log" 2>&1
 
-REM TODO: CHECKS TO VALIDATE SUCCESSFUL INSTALL
-
 REM Create default server.properties and eula.txt files
 IF NOT EXIST "%~dp0server.properties" (
 	ECHO Could not find server.properties, creating initial copy... 1>>  "%~dp0logs\serverstart.log" 2>&1

automation/start-automated-server.sh

@@ -44,7 +44,11 @@
 #
 # Make sure users aren't trying to run script via sh directly (won't work)
 
-powershell $PWD/remove-client-mods.ps1
+if test -f $PWD/remove-client-mods.ps1; then
+	powershell $PWD/remove-client-mods.ps1 >/dev/null
+elif test -f remove-client-mods.ps1; then
+	powershell remove-client-mods.ps1 >/dev/null
+fi
 
 unameOut="$(uname -s)"
 case "${unameOut}" in
@@ -74,7 +78,7 @@ install_server(){
 		fi
 	else
 		if [ "${FORGEURL}" = "DISABLE" ]; then
-			export URL="https://files.minecraftforge.net/maven/net/minecraftforge/forge/${MCVER}-${FORGEVER}/forge-${MCVER}-${FORGEVER}-installer.jar"
+			export URL="https://maven.minecraftforge.net/net/minecraftforge/forge/${MCVER}-${FORGEVER}/forge-${MCVER}-${FORGEVER}-installer.jar"
 		else
 			export URL="${FORGEURL}"
 		fi
@@ -163,15 +167,15 @@ check_connection(){
 		echo "WARN: Internet connectivity checking is disabled" >>serverstart.log 2>&1
 		echo "Skipping internet connectivity check"
 	else
-		if ping -c 1 8.8.8.8 >> /dev/null 2>&1; then
+		if ping 8.8.8.8 >> /dev/null 2>&1; then
 			echo "INFO: Ping to Google DNS successfull" >>serverstart.log 2>&1
 			echo "Ping to Google DNS successfull"
 		else
 			echo "ERROR: Ping to Google DNS failed. No internet access?" >>serverstart.log 2>&1
 			echo "Ping to Google DNS failed. No internet access?"
 		fi
 
-		if ping -c 1 4.2.2.1 >> /dev/null 2>&1; then
+		if ping 4.2.2.1 >> /dev/null 2>&1; then
 			echo "INFO: Ping to L4 successfull" >>serverstart.log 2>&1
 			echo "Ping to L4 successfull"
 		else
@@ -219,13 +223,11 @@ eula(){
 		echo "Could not find eula.txt starting server to generate it"
 		start_server
 		echo ""
-		echo "Closing to give user a change to accept the eula"
-		exit 0
+		read -p "Press any key to continue when you've accepted the EULA. Press CTRL+C to exit."
 	else
 		if grep -Fxq "eula=false" eula.txt; then
 			echo "Could not find 'eula=true' in 'eula.txt'"
-			echo "Closing to give user a change to accept the eula"
-			exit 0
+			read -p "Press any key to continue when you've accepted the EULA. Press CTRL+C to exit."
 		fi
 	fi
 }

changelogs/CHANGELOG.md

@@ -1,6 +1,14 @@
+### Enigmatica 6 v0.5.7
+
+_Using Forge-1.16.5-36.2.1_ | _[Mod Updates](https://github.com/NillerMedDild/Enigmatica6/blob/master/changelogs/changelog_mods_0.5.7.md)_ | _[Modlist](https://github.com/NillerMedDild/Enigmatica6/blob/master/changelogs/modlist_0.5.7.md)_
+
+**Changes/Improvements**
+
+-   Disabled JourneyMap Waystone Compatibility, as some people found it annoying.
+
 ### Enigmatica 6 v0.5.6
 
-_Using Forge-1.16.5-36.1.31_ | _[Mod Updates](https://github.com/NillerMedDild/Enigmatica6/blob/master/changelogs/changelog_mods_0.5.6.md)_ | _[Modlist](https://github.com/NillerMedDild/Enigmatica6/blob/master/changelogs/modlist_0.5.6md)_
+_Using Forge-1.16.5-36.1.31_ | _[Mod Updates](https://github.com/NillerMedDild/Enigmatica6/blob/master/changelogs/changelog_mods_0.5.6.md)_ | _[Modlist](https://github.com/NillerMedDild/Enigmatica6/blob/master/changelogs/modlist_0.5.6.md)_
 
 ### If you're updating from 0.4.x:
 

config/advancedperipherals-common.toml

@@ -1,15 +1,18 @@
 
 #No comment
 [Restrictions]
-	#Defines the chat box cooldown for message sending.
-	#Range: > 1
-	chatBoxCooldown = 10
 	#The max range of the player detector functions. If anyone use a higher range, the detector will use this max range
 	#Range: 0 ~ 100000000
 	playerDetMaxRange = 100000000
 	#Defines the maximum energy flow of the energy detector.
 	#Range: > 1
 	energyDetectorMaxFlow = 64000
+	#Defines max energy stored in any powered peripheral
+	#Range: > 1000000
+	poweredPeripheralMaxEnergyStored = 100000000
+	#Defines max nbt string that can be stored in nbt storage
+	#Range: > 0
+	nbtStorageMaxSize = 1048576
 
 #No comment
 [Features]
@@ -35,6 +38,94 @@
 	enableInventoryManager = true
 	#Enable the redstone integrator or not.
 	enableRedstoneIntegrator = true
+	#Enable the block reader or not.
+	enableBlockReader = true
+	#Enable the geo scanner or not.
+	enableGeoScanner = true
+	#Enable the colony integrator or not.
+	enableColonyIntegrator = true
+	#Enable the nbt storage block or not
+	enableNBTStorage = true
+	#Enable RF storage for peripherals, that could use it
+	enablePoweredPeripherals = false
+
+#No comment
+[Defaults]
+	#Defines default chatbox prefix
+	defaultChatBoxPrefix = "AP"
+
+#No comment
+[operations]
+	#Range: > 1000
+	digCooldown = 1000
+	#Range: > 0
+	digCost = 1
+	#Range: > 1000
+	useOnBlockCooldown = 5000
+	#Range: > 0
+	useOnBlockCost = 1
+	#Range: > 1000
+	suckCooldown = 1000
+	#Range: > 0
+	suckCost = 1
+	#Range: > 1000
+	useOnAnimalCooldown = 2500
+	#Range: > 0
+	useOnAnimalCost = 10
+	#Range: > 1000
+	captureAnimalCooldown = 50000
+	#Range: > 0
+	captureAnimalCost = 100
+	#Range: > 1000
+	warpCooldown = 1000
+	#Range: > 0
+	warpCost = 1
+	#Range: > 1000
+	scanBlocksCooldown = 2000
+	#Range: 1 ~ 64
+	scanBlocksMaxFreeRadius = 8
+	#Range: 1 ~ 64
+	scanBlocksMaxCostRadius = 16
+	#Range: 0.1 ~ 1.7976931348623157E308
+	scanBlocksExtraBlockCost = 0.17
+	#Range: > 1000
+	scanEntitiesCooldown = 2000
+	#Range: 1 ~ 64
+	scanEntitiesMaxFreeRadius = 8
+	#Range: 1 ~ 64
+	scanEntitiesMaxCostRadius = 16
+	#Range: 0.1 ~ 1.7976931348623157E308
+	scanEntitiesExtraBlockCost = 0.17
+	#Range: > 1000
+	chatMessageCooldown = 10000
+
+#No comment
+[metaphysics]
+	#Defines energy to fuel rate
+	#Range: > 575
+	energyToFuelRate = 575
+	enableWeakAutomataCore = true
+	enableEndAutomataCore = true
+	enableHusbandryAutomataCore = true
+	#Range: 1 ~ 64
+	tier1AutomataCoreInteractionRadius = 2
+	#Range: 1 ~ 32
+	tier1AutomataCoreMaxFuelConsumptionRate = 2
+	#Range: 1 ~ 64
+	tier2AutomataCoreInteractionRadius = 4
+	#Range: 1 ~ 32
+	tier2AutomataCoreMaxFuelConsumptionRate = 3
+	#Range: 1 ~ 64
+	overpoweredTier1AutomataCoreInteractionRadius = 4
+	#Range: 1 ~ 32
+	overpoweredTier1AutomataCoreMaxFuelConsumptionRate = 3
+	#Range: 1 ~ 64
+	overpoweredTier2AutomataCoreInteractionRadius = 6
+	#Range: 1 ~ 32
+	overpoweredTier2AutomataCoreMaxFuelConsumptionRate = 4
+
+#No comment
+[world]
 	#Enable the villager structures for the computer scientist.
 	enableVillagerStructures = true