Merge pull request #217 from mrsterner/1.5.1-1.20.1

1.5.1 1.20.1

.gitignore

@@ -23,3 +23,5 @@ run
 
 # Files from Forge MDK
 forge*changelog.txt
+/run-data/logs/
+/src/generated/resources/.cache/

build.gradle.kts

@@ -164,7 +164,7 @@ dependencies {
 
     implementation(fg.deobf("curse.maven:farmers_delight-398521:4638874"))
     implementation(fg.deobf("curse.maven:create-328085:4626108"))
-    implementation(fg.deobf("curse.maven:jeed-532286:4599236"))
+    //implementation(fg.deobf("curse.maven:jeed-532286:4599236"))
     runtimeOnly(fg.deobf("curse.maven:world-stripper-250603:4578579"))
     runtimeOnly(fg.deobf("curse.maven:spark-361579:4587309"))
 }

gradle.properties

@@ -8,7 +8,7 @@ modJavaVersion=17
 minecraftVersion=1.20.1
 minecraftVersionRange=[1.20.1,1.21]
 # Forge Versions
-forgeVersion=47.1.0
+forgeVersion=47.2.1
 forgeVersionRange=[47,)
 loaderVersionRange=[47,)
 
@@ -35,6 +35,6 @@ modAuthors=Sammy Semicolon
 # The description of the mod. This is a simple multiline text string that is used for display purposes in the mod list.
 modDescription=A dark magic mod focused on soul and spirit magic.
 # Mod Dependency Versions
-lodestoneVersion=1.4.20
+lodestoneVersion=1.4.22
 jeiVersion=15.2.0.22
-curiosVersion=5.2.0-beta.3+1.20.1
+curiosVersion=5.4.0+1.20.1

run-data/config/fml.toml

@@ -0,0 +1,25 @@
+#Early window height
+earlyWindowHeight = 480
+#Early window framebuffer scale
+earlyWindowFBScale = 1
+#Enable forge global version checking
+versionCheck = true
+#Early window provider
+earlyWindowProvider = "fmlearlywindow"
+#Early window width
+earlyWindowWidth = 854
+#Early window starts maximized
+earlyWindowMaximized = false
+#Default config path for servers
+defaultConfigPath = "defaultconfigs"
+#Disables Optimized DFU client-side - already disabled on servers
+disableOptimizedDFU = true
+#Skip specific GL versions, may help with buggy graphics card drivers
+earlyWindowSkipGLVersions = []
+#Should we control the window. Disabling this disables new GL features and can be bad for mods that rely on them.
+earlyWindowControl = true
+#Max threads for early initialization parallelism,  -1 is based on processor count
+maxThreads = -1
+#Squir?
+earlyWindowSquir = false
+

run-data/config/jei/jei-client.ini

@@ -0,0 +1,141 @@
+[advanced]
+	# Description: Display search bar in the center
+	# Valid Values: [true, false]
+	# Default Value: false
+	CenterSearch = false
+
+	# Description: Set low-memory mode (makes search very slow, but uses less RAM)
+	# Valid Values: [true, false]
+	# Default Value: false
+	LowMemorySlowSearchEnabled = false
+
+	# Description: Enable cheating items into the hotbar by using the shift+number keys.
+	# Valid Values: [true, false]
+	# Default Value: false
+	CheatToHotbarUsingHotkeysEnabled = false
+
+	# Description: Enable adding new bookmarks to the front of the bookmark list.
+	# Valid Values: [true, false]
+	# Default Value: true
+	AddBookmarksToFrontEnabled = true
+
+	# Description: When looking up recipes with items that contain fluids, also look up recipes for the fluids.
+	# Valid Values: [true, false]
+	# Default Value: false
+	LookupFluidContents = false
+
+	# Description: How items should be handed to you
+	# Valid Values: [INVENTORY, MOUSE_PICKUP]
+	# Default Value: MOUSE_PICKUP
+	GiveMode = MOUSE_PICKUP
+
+	# Description: Max. recipe gui height
+	# Valid Values: Any integer greater than or equal to 175
+	# Default Value: 350
+	RecipeGuiHeight = 350
+
+
+[sorting]
+	# Description: Sorting order for the ingredient list
+	# Valid Values: A comma-separated list containing values of:
+	# [MOD_NAME, INGREDIENT_TYPE, ALPHABETICAL, CREATIVE_MENU, TAG, ARMOR, MAX_DURABILITY]
+	# Default Value: MOD_NAME, INGREDIENT_TYPE, CREATIVE_MENU
+	IngredientSortStages = MOD_NAME, INGREDIENT_TYPE, CREATIVE_MENU
+
+
+[search]
+	# Description: Search mode for Mod Names (prefix: @)
+	# Valid Values: [ENABLED, REQUIRE_PREFIX, DISABLED]
+	# Default Value: REQUIRE_PREFIX
+	ModNameSearchMode = REQUIRE_PREFIX
+
+	# Description: Search mode for Tooltips (prefix: #)
+	# Valid Values: [ENABLED, REQUIRE_PREFIX, DISABLED]
+	# Default Value: ENABLED
+	TooltipSearchMode = ENABLED
+
+	# Description: Search mode for Tag Names (prefix: $)
+	# Valid Values: [ENABLED, REQUIRE_PREFIX, DISABLED]
+	# Default Value: REQUIRE_PREFIX
+	TagSearchMode = REQUIRE_PREFIX
+
+	# Description: Search mode for Colors (prefix: ^)
+	# Valid Values: [ENABLED, REQUIRE_PREFIX, DISABLED]
+	# Default Value: DISABLED
+	ColorSearchMode = DISABLED
+
+	# Description: Search mode for resources locations (prefix: &)
+	# Valid Values: [ENABLED, REQUIRE_PREFIX, DISABLED]
+	# Default Value: DISABLED
+	ResourceLocationSearchMode = DISABLED
+
+	# Description: Search advanced tooltips (visible with F3+H)
+	# Valid Values: [true, false]
+	# Default Value: false
+	SearchAdvancedTooltips = false
+
+
+[IngredientList]
+	# Description: Max number of rows shown
+	# Valid Values: An integer in the range [1, 100] (inclusive)
+	# Default Value: 16
+	MaxRows = 16
+
+	# Description: Max number of columns shown
+	# Valid Values: An integer in the range [4, 100] (inclusive)
+	# Default Value: 9
+	MaxColumns = 9
+
+	# Description: Horizontal alignment of the ingredient grid inside the available area
+	# Valid Values: [LEFT, CENTER, RIGHT]
+	# Default Value: RIGHT
+	HorizontalAlignment = RIGHT
+
+	# Description: Vertical alignment of the ingredient grid inside the available area
+	# Valid Values: [TOP, CENTER, BOTTOM]
+	# Default Value: TOP
+	VerticalAlignment = TOP
+
+	# Description: Visibility of the top page buttons. Use AUTO_HIDE to only show it when there are multiple pages.
+	# Valid Values: [ENABLED, AUTO_HIDE, DISABLED]
+	# Default Value: ENABLED
+	ButtonNavigationVisibility = ENABLED
+
+	# Description: Set to true to draw a background texture behind the gui.
+	# Valid Values: [true, false]
+	# Default Value: false
+	DrawBackground = false
+
+
+[BookmarkList]
+	# Description: Max number of rows shown
+	# Valid Values: An integer in the range [1, 100] (inclusive)
+	# Default Value: 16
+	MaxRows = 16
+
+	# Description: Max number of columns shown
+	# Valid Values: An integer in the range [4, 100] (inclusive)
+	# Default Value: 9
+	MaxColumns = 9
+
+	# Description: Horizontal alignment of the ingredient grid inside the available area
+	# Valid Values: [LEFT, CENTER, RIGHT]
+	# Default Value: LEFT
+	HorizontalAlignment = LEFT
+
+	# Description: Vertical alignment of the ingredient grid inside the available area
+	# Valid Values: [TOP, CENTER, BOTTOM]
+	# Default Value: TOP
+	VerticalAlignment = TOP
+
+	# Description: Visibility of the top page buttons. Use AUTO_HIDE to only show it when there are multiple pages.
+	# Valid Values: [ENABLED, AUTO_HIDE, DISABLED]
+	# Default Value: ENABLED
+	ButtonNavigationVisibility = ENABLED
+
+	# Description: Set to true to draw a background texture behind the gui.
+	# Valid Values: [true, false]
+	# Default Value: false
+	DrawBackground = false
+
+

run-data/config/jei/jei-colors.ini

@@ -0,0 +1,8 @@
+[colors]
+	# Description: Color values to search for
+	# Valid Values: A comma-separated list containing values of:
+	# Any color name and an RGB hex color, separated by a ':'
+	# Default Value: White:EEEEEE, LightBlue:7492CC, Cyan:00EEEE, Blue:2222DD, LapisBlue:25418B, Teal:008080, Yellow:CACB58, GoldenYellow:EED700, Orange:D97634, Pink:D1899D, HotPink:FC0FC0, Magenta:B24BBB, Purple:813EB9, EvilPurple:2E1649, Lavender:B57EDC, Indigo:480082, Sand:DBD3A0, Tan:BB9B63, LightBrown:A0522D, Brown:634B33, DarkBrown:3A2D13, LimeGreen:43B239, SlimeGreen:83CB73, Green:008000, DarkGreen:224D22, GrassGreen:548049, Red:963430, BrickRed:B0604B, NetherBrick:2A1516, Redstone:CE3E36, Black:181515, CharcoalGray:464646, IronGray:646464, Gray:808080, Silver:C0C0C0
+	SearchColors = White:EEEEEE, LightBlue:7492CC, Cyan:00EEEE, Blue:2222DD, LapisBlue:25418B, Teal:008080, Yellow:CACB58, GoldenYellow:EED700, Orange:D97634, Pink:D1899D, HotPink:FC0FC0, Magenta:B24BBB, Purple:813EB9, EvilPurple:2E1649, Lavender:B57EDC, Indigo:480082, Sand:DBD3A0, Tan:BB9B63, LightBrown:A0522D, Brown:634B33, DarkBrown:3A2D13, LimeGreen:43B239, SlimeGreen:83CB73, Green:008000, DarkGreen:224D22, GrassGreen:548049, Red:963430, BrickRed:B0604B, NetherBrick:2A1516, Redstone:CE3E36, Black:181515, CharcoalGray:464646, IronGray:646464, Gray:808080, Silver:C0C0C0
+
+

run-data/config/jei/jei-debug.ini

@@ -0,0 +1,12 @@
+[debug]
+	# Description: Debug mode enabled
+	# Valid Values: [true, false]
+	# Default Value: false
+	DebugMode = false
+
+	# Description: Debug inputs enabled
+	# Valid Values: [true, false]
+	# Default Value: false
+	DebugInputs = false
+
+

run-data/config/jei/jei-mod-id-format.ini

@@ -0,0 +1,11 @@
+[modname]
+	# Description: Formatting for mod name tooltip
+	# Valid Values: A chat formatting string.
+	# Use these formatting colors:
+	# black dark_blue dark_green dark_aqua dark_red dark_purple gold gray dark_gray blue green aqua red light_purple yellow white
+	# With these formatting options:
+	# obfuscated bold strikethrough underline italic
+	# Default Value: blue italic
+	ModNameFormat = blue italic
+
+

run-data/config/worldstripper/stripper.json

@@ -0,0 +1,50 @@
+{
+  "entries": [
+    "minecraft:dirt",
+    "minecraft:grass",
+    "minecraft:grass_path",
+    "minecraft:tall_grass",
+    "minecraft:grass_block",
+    "minecraft:stone",
+    "minecraft:diorite",
+    "minecraft:granite",
+    "minecraft:andesite",
+    "minecraft:gravel",
+    "minecraft:sand",
+    "minecraft:sandstone",
+    "minecraft:red_sand",
+    "minecraft:red_sandstone",
+    "minecraft:ice",
+    "minecraft:snow",
+    "minecraft:snow_block",
+    "minecraft:powder_snow",
+    "minecraft:oak_log",
+    "minecraft:dark_oak_log",
+    "minecraft:spruce_log",
+    "minecraft:birch_log",
+    "minecraft:jungle_log",
+    "minecraft:acacia_log",
+    "minecraft:oak_leaves",
+    "minecraft:dark_oak_leaves",
+    "minecraft:spruce_leaves",
+    "minecraft:birch_leaves",
+    "minecraft:jungle_leaves",
+    "minecraft:acacia_leaves",
+    "minecraft:water",
+    "minecraft:flowing_water",
+    "minecraft:lava",
+    "minecraft:flowing_lava",
+    "minecraft:netherrack",
+    "minecraft:end_stone",
+    "minecraft:podzol",
+    "minecraft:mycelium",
+    "minecraft:bamboo",
+    "minecraft:seagrass",
+    "minecraft:tall_seagrass",
+    "minecraft:kelp",
+    "minecraft:kelp_plant",
+    "minecraft:deepslate",
+    "minecraft:tuff",
+    "minecraft:glow_lichen"
+  ]
+}