Skip to content

Commit 89f7520

Browse files
committed
add nature's compass, disenchanter (grindstone equivalent), texfix, reach fix. add magic mine structure
1 parent ae75920 commit 89f7520

File tree

10 files changed

+390
-105
lines changed

10 files changed

+390
-105
lines changed

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1-
*.zip
1+
*.zip
2+
profile_temp

manifest.json

Lines changed: 23 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
]
1010
},
1111
"manifestType": "minecraftModpack",
12-
"manifestVersion": 5,
12+
"manifestVersion": 6,
1313
"name": "John's 1.12.2",
1414
"author": "",
1515
"files": [
@@ -183,9 +183,14 @@
183183
"fileID": 2859589,
184184
"required": true
185185
},
186+
{
187+
"projectID": 245769,
188+
"fileID": 3519704,
189+
"required": true
190+
},
186191
{
187192
"projectID": 247401,
188-
"fileID": 5651329,
193+
"fileID": 5655181,
189194
"required": true
190195
},
191196
{
@@ -233,6 +238,11 @@
233238
"fileID": 3812473,
234239
"required": true
235240
},
241+
{
242+
"projectID": 252848,
243+
"fileID": 2893527,
244+
"required": true
245+
},
236246
{
237247
"projectID": 253689,
238248
"fileID": 3633267,
@@ -260,7 +270,7 @@
260270
},
261271
{
262272
"projectID": 263420,
263-
"fileID": 5394758,
273+
"fileID": 5637004,
264274
"required": true
265275
},
266276
{
@@ -308,6 +318,11 @@
308318
"fileID": 2558337,
309319
"required": true
310320
},
321+
{
322+
"projectID": 283344,
323+
"fileID": 2518068,
324+
"required": true
325+
},
311326
{
312327
"projectID": 283644,
313328
"fileID": 4629597,
@@ -493,6 +508,11 @@
493508
"fileID": 4240757,
494509
"required": true
495510
},
511+
{
512+
"projectID": 556777,
513+
"fileID": 5543551,
514+
"required": true
515+
},
496516
{
497517
"projectID": 608287,
498518
"fileID": 5338903,

modlist.md

Lines changed: 105 additions & 101 deletions
Large diffs are not rendered by default.

overrides/config/disenchanter.cfg

Lines changed: 162 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,162 @@
1+
# Configuration file
2+
3+
crafting {
4+
# Should the recipe for the automatic-upgrade (disenchantment table) be available?
5+
B:EnableAutomaticTableUpgradeRecipe=false
6+
7+
# Should the recipe for the bulk-disenchanting-upgrade (disenchantment table) be available?
8+
B:EnableBulkDisenchantingTableUpgradeRecipe=false
9+
10+
# Should the recipe for upgrading the capacity (jar of experience) be available?
11+
B:EnableCapacityJarUpgradeRecipe=false
12+
13+
# Should the recipe for clearing all upgrades from a jar of experience be available?
14+
B:EnableClearJarRecipe=false
15+
16+
# Should the recipe for clearing all upgrades from a disenchantment table be available?
17+
B:EnableClearTableRecipe=false
18+
19+
# Should the recipe for the cycling-upgrade (disenchantment table) be available?
20+
B:EnableCyclingTableUpgradeRecipe=false
21+
22+
# Should the recipe for the normal disenchantment table be available?
23+
B:EnableDisenchantmentTableRecipe=true
24+
25+
# Should the recipe for the jar of experience be available?
26+
B:EnableJarRecipe=true
27+
28+
# Should the recipe for the overload-upgrade (jar of experience) be available?
29+
B:EnableOverloadJarUpgradeRecipe=false
30+
31+
# Should the recipe for the voiding-upgrade (disenchantment table) be available?
32+
B:EnableVoidingTableUpgradeRecipe=false
33+
}
34+
35+
36+
disenchanting {
37+
# How many ticks should the disenchanting process last when using an automatic disenchantment table?
38+
# Min: 1
39+
# Max: 2147483647
40+
I:AutomaticDisenchantingProcessTicks=100
41+
42+
# How many ticks should the cycling disenchantment table wait before switching to a new enchantment?
43+
# Min: 1
44+
# Max: 2147483647
45+
I:CyclingDisenchantingTicks=60
46+
47+
# Should non-damageable items like books be destroyed when disenchanted?
48+
B:DestroyNonDamageableItems=false
49+
50+
# Should curse-enchantments -like curse of vanishing- be ignored when disenchanting?
51+
B:DisableCurses=false
52+
53+
# Which enchantments should be ignored when disenchanting?
54+
# Entries are of the format `modid:enchantid`; for example minecraft:bane_of_arthropods
55+
# Java Regex can be used with a `[r]`-prefix; for example [r]minecraft:.* to ban all vanilla enchantments.
56+
S:DisabledEnchantments <
57+
>
58+
59+
# Which items should not be disenchantable?
60+
# Entries are of the format `modid:itemid`; for example minecraft:dirt
61+
# Java Regex can be used with a `[r]`-prefix; for example [r]minecraft:.* to ban all vanilla items.
62+
S:DisabledItems <
63+
>
64+
65+
# Should items from Tinkers Construct be handled differently?
66+
# Enchantments will not be able to be removed from these items.
67+
B:EnableTCBehaviour=true
68+
69+
# What should the probability be that an enchantment is lost when disenchanting?
70+
# Min: 0.0
71+
# Max: 1.0
72+
D:EnchantmentLossChance=0.0
73+
74+
# How much flat damage should be dealt to items when disenchanting?
75+
I:FlatDamage=10
76+
77+
# When converting an enchantment to XP, a flat amount of experience points will be added.
78+
# What should that amount be?
79+
I:FlatExperience=0
80+
81+
# By how much should the damage be multiplied when using an automatic disenchantment table?
82+
D:MachineDamageMultiplier=2.5
83+
84+
# How much of the item's maximum durability should be dealt as damage to items when disenchanting?
85+
D:MaxDurabilityDamage=0.025
86+
87+
# How much of the item's maximum durability should be dealt as reducible damage to items when disenchanting?
88+
# This can be reduced by surrounding the disenchantment table with blocks that increase the enchanting level for the enchanting table (e.g. bookshelves).
89+
D:MaxDurabilityDamageReducible=0.2
90+
91+
# When converting an enchantment to XP, experience points relative to the enchantment's maximum enchantability will be added.
92+
# What percentage of the enchantability should be used?
93+
D:MaxEnchantabilityExperience=0.15
94+
95+
# When converting an enchantment to XP, experience points relative to the enchantment's minimum enchantability will be added.
96+
# What percentage of the enchantability should be used?
97+
D:MinEnchantabilityExperience=0.33
98+
99+
# When converting an enchantment to XP, experience points relative to the enchantment's enchantability will be added.
100+
# Additionally a percentage of these experience points will be multiplied by the power and added to the total.
101+
# The power can be raised up to 15 by surrounding the disenchantment table with blocks that increase the enchanting level for the enchanting table (e.g. bookshelves).
102+
# What percentage of the enchantability should be used?
103+
D:PowerEnchantabilityExperienceMultiplier=0.008
104+
105+
# When converting an enchantment to XP, an amount of experience points multiplied by the power will be added.
106+
# The power can be raised up to 15 by surrounding the disenchantment table with blocks that increase the enchanting level for the enchanting table (e.g. bookshelves).
107+
# What should that amount be?
108+
D:PowerExperience=0.0
109+
110+
# By how much should the repair cost of the item (f.e. used by anvils) be multiplied when disenchanting?
111+
# 0.5 is halving the repair cost (using an anvil doubles the repair cost); 1.0 leaves the cost unchanged.
112+
# Min: 0.0
113+
# Max: 1.7976931348623157E308
114+
D:RepairCostMultiplier=0.5
115+
}
116+
117+
118+
experience_jar {
119+
# How many experience points should the jar of experience store at most by default?
120+
# Min: 0
121+
# Max: 2147483647
122+
I:JarDefaultExperienceCapacity=1024
123+
124+
# Should disenchanting be only possible with the jar of experience (as opposed to books)?
125+
B:JarDisenchantingOnly=true
126+
127+
# By how many experience points should the capacity be changed when upgrading a jar of experience?
128+
I:JarUpgradeCapacityChange=512
129+
130+
# What should be the maximal capacity of experience points obtainable via upgrades be for the jar of experience?
131+
# Min: 0
132+
# Max: 2147483647
133+
I:JarUpgradeMaxCapacity=2048
134+
135+
# Should players be able to manually extract experience points from the jar of experience by drinking from it?
136+
B:PlayerCanExtractXPFromJar=true
137+
138+
# Should players be able to manually insert experience points into the jar of experience by punching while sneaking?
139+
B:PlayerCanInsertXPIntoJar=true
140+
}
141+
142+
143+
visual {
144+
# Should the book above the disenchantment table be flipped upside-down?
145+
B:BookRendererFlipped=true
146+
147+
# Should the book above the disenchantment table be completely hidden?
148+
B:BookRendererHidden=false
149+
150+
# How should the book be positioned above the disenchantment table compared to the regular enchanting table?
151+
# 0.0 is the same as the enchanting table.
152+
# You will probably want to set this to about 0.1, if you want to disable BookRendererFlipped.
153+
D:BookRendererYOffset=0.4
154+
155+
# What color should be used for additional descriptions (f.e. list of table upgrades) shown in the GUI of a disenchantment table?
156+
I:DescriptionInGUIColor=11184810
157+
158+
# Should the different upgrades of a disenchantment table be listed when viewing the GUI of said table?
159+
B:ShowUpgradesInGUI=true
160+
}
161+
162+
-6.2 KB
Binary file not shown.
Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
{
2+
"version": 2,
3+
"inventoryGeneratorID": "random_mask_group_id",
4+
"items": [
5+
{
6+
"weight": 0.3978064954280853,
7+
"min": 1,
8+
"max": 1,
9+
"item": {
10+
"id": "mowziesmobs:barakoa_mask_fury",
11+
"damage": 0,
12+
"count": 1
13+
}
14+
},
15+
{
16+
"weight": 1.0,
17+
"min": 1,
18+
"max": 1,
19+
"item": {
20+
"id": "mowziesmobs:barakoa_mask_fear",
21+
"damage": 0,
22+
"count": 1
23+
}
24+
},
25+
{
26+
"weight": 1.0,
27+
"min": 1,
28+
"max": 1,
29+
"item": {
30+
"id": "mowziesmobs:barakoa_mask_rage",
31+
"damage": 0,
32+
"count": 1
33+
}
34+
},
35+
{
36+
"weight": 1.0,
37+
"min": 1,
38+
"max": 1,
39+
"item": {
40+
"id": "mowziesmobs:barakoa_mask_bliss",
41+
"damage": 0,
42+
"count": 1
43+
}
44+
},
45+
{
46+
"weight": 1.0,
47+
"min": 1,
48+
"max": 1,
49+
"item": {
50+
"id": "mowziesmobs:barakoa_mask_misery",
51+
"damage": 0,
52+
"count": 1
53+
}
54+
}
55+
],
56+
"dependencyExpression": ""
57+
}
3.41 KB
Binary file not shown.

scripts/format_manifest.py

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,26 @@
11
#!/usr/bin/env python3
2+
# used by import_automation.sh
23
import argparse, os, json
34
default_path = os.path.join(os.path.dirname(os.path.realpath(__file__)), "..", 'manifest.json')
45
parser = argparse.ArgumentParser(description="Sorts the entries by projectID, for better organization and git diffs.")
56
parser.add_argument('-p', '--path',
67
type=str,
78
default=default_path,
89
help='Specify the path to the manifest file. Default is <script_dir>/../manifest.json')
10+
parser.add_argument('--manifest-version',
11+
type=int,
12+
help='Set the manifest version. Must be a non-negative integer.')
913
args = parser.parse_args()
1014
with open(args.path, 'r+') as file:
1115
data = json.load(file)
1216
if not "files" in data:
1317
raise Exception(f'Error: "files" key not found in {args.path}')
1418
data["files"].sort(key=lambda x: x["projectID"])
19+
20+
if args.manifest_version:
21+
if args.manifest_version < 0:
22+
raise ValueError("Manifest version must be a non-negative integer.")
23+
data["manifestVersion"] = args.manifest_version
1524
file.seek(0)
1625
json.dump(data, file, indent=2)
1726
file.truncate()

scripts/get_manifest_version.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
#!/usr/bin/env python3
2+
# used by the CI
23
import argparse, os, json
34
default_path = os.path.join(os.path.dirname(os.path.realpath(__file__)), "..", 'manifest.json')
45
parser = argparse.ArgumentParser(description="Gets the manifest version.")

scripts/import_automation.sh

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
#!/bin/bash
2+
3+
# an automation helper which populates manifest.json and modlist.md from a curseforge profile (profile.zip)
4+
# this does not handle anything else (configs, etc)
5+
6+
set -e
7+
8+
SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
9+
cd -- "$SCRIPT_DIR/.."
10+
mkdir profile_temp
11+
unzip profile.zip -d profile_temp
12+
trap 'rm -rf profile_temp' EXIT
13+
14+
manifest_version=$(cat manifest.json | jq .manifestVersion)
15+
manifest_version=$((manifest_version + 1))
16+
17+
cp profile_temp/manifest.json ./manifest.json
18+
./scripts/format_manifest.py --manifest-version "$manifest_version"
19+
20+
cp profile_temp/modlist.html ./modlist.md
21+
22+
first_line=$(head -n 1 modlist.md)
23+
last_line=$(tail -n 1 modlist.md)
24+
middle_lines=$(sed '1d;$d' modlist.md | sort)
25+
26+
printf "%s\n" "$first_line" > modlist.md
27+
printf "%s\n" "$middle_lines" >> modlist.md
28+
printf "%s\n" "$last_line" >> modlist.md
29+
30+
rm -rf profile_temp
31+
rm profile.zip

0 commit comments

Comments
 (0)