Skip to content

Commit 6561a56

Browse files
committed
Remove custom crafters library
1 parent 8d56012 commit 6561a56

184 files changed

Lines changed: 54 additions & 2966 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

docs/code-conventions.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ All functions should start with a header comment that consists of:
3636
- a single function, if the function is run by `/function ...`: `# run from zauber_cauldrons:cauldron/create`.
3737
- a folder, if multiple functions call this function using `/function`: `# run from functions in gm4_pig_tractors:till/blocks/`.
3838
- a function from where it was scheduled: `# scheduled by zauber_cauldrons:cauldron/create`.
39-
- a function and function-tag pair: `# run from gm4_custom_crafters-3.0:process_input/check_item via #gm4_custom_crafter:custom_item_checks`.
39+
- a function and function-tag pair: `# run from gm4_trees-1.0:tick via #gm4_trees:destroy_leaf`.
4040
- an advancement reward: `# run from advancement damaged/armor/stall`
4141
- a combination of these, in which multiple lines may be used.
4242

docs/making-a-module.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,15 +51,13 @@ pipeline:
5151

5252
# Include any libraries
5353
- gm4.plugins.include.lib_machines
54-
- gm4.plugins.include.lib_custom_crafters
5554

5655
# Metadata for the build and publishing on the website
5756
meta:
5857
gm4:
5958
versioning:
6059
# A list of minimum-required versions for libraries or other modules
6160
required:
62-
- lib_custom_crafters: 3.0.0
6361
- lib_machines: 1.1.0
6462
- gm4_bat_grenades: 1.2.0
6563

gm4/plugins/resource_pack.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1005,7 +1005,7 @@ def apply_transform(self, model: Model):
10051005

10061006
#== Convience Template/Transform Presets ==#
10071007
class LegacyMachineArmorStand(BlockTemplate, TemplateOptions):
1008-
"""An 'block' template preset with the 'item_display' transformer for the legacy small-armor-stand-head-slot of custom crafters"""
1008+
"""An 'block' template preset with the 'item_display' transformer for the legacy small-armor-stand-head-slot of some machines"""
10091009
default_transforms = [
10101010
ItemDisplayModel(
10111011
origin=[0.5, 1, 0.5],

gm4/skin_cache.json

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1093,7 +1093,6 @@
10931093
"gm4_potion_liquids:liquids/harming",
10941094
"gm4_potion_liquids:liquids/healing",
10951095
"gm4_potion_liquids:liquids/leaping",
1096-
"gm4_potion_liquids:liquids/harming",
10971096
"gm4_potion_liquids:liquids/poison",
10981097
"gm4_potion_liquids:liquids/regeneration",
10991098
"gm4_potion_liquids:liquids/strength",
@@ -1104,15 +1103,6 @@
11041103
],
11051104
"gm4_auto_crafting": [
11061105
"gm4_custom_crafters:custom_crafter"
1107-
],
1108-
"gm4_zauber_liquids": [
1109-
"gm4_potion_liquids:liquids/harming",
1110-
"gm4_potion_liquids:liquids/healing",
1111-
"gm4_potion_liquids:liquids/leaping",
1112-
"gm4_potion_liquids:liquids/poison",
1113-
"gm4_potion_liquids:liquids/regeneration",
1114-
"gm4_potion_liquids:liquids/strength",
1115-
"gm4_potion_liquids:liquids/swiftness"
11161106
]
11171107
}
11181108
}

gm4_block_compressors/assets/translations.csv

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,5 @@ container.gm4.block_compressor,Compression Amount
88
text.gm4.block_compressors.compressed,Compressed ×%s
99
text.gm4.guidebook.module_desc.block_compressors,"Chest space won't be an issue with this module! Use a Block Compressor to compress stacks of items, turning a stack of items into a single item for long-term storage. Make sure to uncompress your items before using them again, though!"
1010
text.gm4.guidebook.block_compressors.description,"Block Compressors can be used to cut down on bulk storage. Item stacks can be compressed into a single item, and vice versa."
11-
text.gm4.guidebook.block_compressors.crafting,A Block Compressor can be crafted in a Custom Crafter:
11+
text.gm4.guidebook.block_compressors.crafting,A Block Compressor can be crafted in a crafting table:
1212
text.gm4.guidebook.block_compressors.usage,"To select the amount of compression, put that amount of items inside the block compressor, then drop the items on top of the compressor.\n\nPutting 1 item in the compressor will decompress any items on top."

gm4_block_compressors/beet.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,11 @@ pipeline:
1212
- gm4.plugins.extend.module
1313
- gm4.plugins.include.lib_forceload
1414
- gm4.plugins.include.lib_machines
15-
- gm4.plugins.include.lib_custom_crafters
1615

1716
meta:
1817
gm4:
1918
versioning:
2019
required:
21-
lib_custom_crafters: 3.4.0
2220
lib_machines: 1.4.0
2321
schedule_loops: [main]
2422
model_data:

gm4_block_compressors/data/gm4/advancement/block_compressors.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
"color": "gray"
1717
}
1818
},
19-
"parent": "gm4:custom_crafters",
19+
"parent": "gm4:root",
2020
"criteria": {
2121
"obtain_block_compressor": {
2222
"trigger": "minecraft:inventory_changed",

gm4_block_compressors/data/gm4_block_compressors/function/check_recipes.mcfunction

Lines changed: 0 additions & 4 deletions
This file was deleted.

gm4_block_compressors/data/gm4_block_compressors/guidebook/block_compressors.json

Lines changed: 2 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -6,43 +6,6 @@
66
"id": "minecraft:piston"
77
},
88
"criteria": {
9-
"create_custom_crafter": {
10-
"trigger": "minecraft:tick",
11-
"conditions": {
12-
"player": [
13-
{
14-
"condition": "minecraft:entity_properties",
15-
"entity": "this",
16-
"predicate": {
17-
"type_specific": {
18-
"type": "player",
19-
"advancements": {
20-
"gm4:custom_crafters": true
21-
}
22-
}
23-
}
24-
}
25-
]
26-
}
27-
},
28-
"open_custom_crafter": {
29-
"trigger": "minecraft:default_block_use",
30-
"conditions": {
31-
"location": [
32-
{
33-
"condition": "minecraft:location_check",
34-
"predicate": {
35-
"block": {
36-
"blocks": [
37-
"minecraft:dropper"
38-
],
39-
"nbt": "{CustomName:{\"translate\":\"gm4.second\",\"fallback\":\"%1$s\",\"with\":[{\"translate\":\"container.gm4.custom_crafter\",\"fallback\":\"Custom Crafter\"},{\"text\":\" \",\"extra\":[{\"translate\":\"container.gm4.custom_crafter\",\"fallback\":\"Custom Crafter\",\"font\":\"gm4:half_invert\"},{\"translate\":\"container.gm4.custom_crafter\",\"fallback\":\"Custom Crafter\",\"font\":\"gm4:offscreen\"},{\"translate\":\"gui.gm4.custom_crafter\",\"fallback\":\"\",\"font\":\"gm4:container_gui\",\"color\":\"white\"},{\"text\":\" \",\"font\":\"gm4:half_invert\"},{\"translate\":\"container.gm4.custom_crafter\",\"fallback\":\"Custom Crafter\",\"font\":\"gm4:half_invert\"},{\"translate\":\"container.gm4.custom_crafter\",\"fallback\":\"Custom Crafter\",\"font\":\"gm4:default\",\"color\":\"#404040\"}],\"font\":\"gm4:half_invert\"}]}}"
40-
}
41-
}
42-
}
43-
]
44-
}
45-
},
469
"obtain_obsidian": {
4710
"trigger": "minecraft:inventory_changed",
4811
"conditions": {
@@ -105,12 +68,7 @@
10568
{
10669
"name": "description",
10770
"enable": [],
108-
"requirements": [
109-
[
110-
"create_custom_crafter",
111-
"open_custom_crafter"
112-
]
113-
],
71+
"requirements": [],
11472
"pages": [
11573
[
11674
{
@@ -136,7 +94,7 @@
13694
[
13795
{
13896
"translate": "text.gm4.guidebook.block_compressors.crafting",
139-
"fallback": "A Block Compressor can be crafted in a Custom Crafter:"
97+
"fallback": "A Block Compressor can be crafted in a crafting table:"
14098
},
14199
"\n",
142100
{

gm4_block_compressors/data/gm4_block_compressors/loot_table/crafting/block_compressor.json

Lines changed: 0 additions & 29 deletions
This file was deleted.

0 commit comments

Comments
 (0)