Skip to content

Commit 88d87a1

Browse files
Edivad99Edivad99
committed
Really fix #208 
1 parent 44dcd9e commit 88d87a1

File tree

9 files changed

+18
-18
lines changed

9 files changed

+18
-18
lines changed

‎src/generated/resources/.cache/4321ebcc8000f73dd5749a5c2d45335d60b185ec

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
// 1.20.1 2024-07-01T17:25:30.149087 Tags for minecraft:block mod id railcraft
1+
// 1.20.1 2024-07-02T18:29:38.982525 Tags for minecraft:block mod id railcraft
22
9732f1964281f5d5e6f3d067e648bb4bfc5cbafb data/forge/tags/blocks/enderman_place_on_blacklist.json
33
e36857f35c1bac4bde5a8450008b92cf82656216 data/forge/tags/blocks/ore_rates/dense.json
44
8ce5fa4b4f1c2619e124ef387b086d72f9c26f04 data/forge/tags/blocks/ore_rates/singular.json
5-
c31435450cdbffad0151b7e26a9cc131bf672a75 data/forge/tags/blocks/ores.json
5+
fa98655e67381fc33f8aff33d36629bd937280a6 data/forge/tags/blocks/ores.json
66
8c50a9944556e96063fbc340f5ad0cc8db547ff3 data/forge/tags/blocks/ores/lead.json
77
83ceb2d2883c80859eebd5d5bb21fc2bfb849cf9 data/forge/tags/blocks/ores/nickel.json
8-
35a98a11222809a20225372b2d7129082cbbc2b8 data/forge/tags/blocks/ores/salt.json
8+
35a98a11222809a20225372b2d7129082cbbc2b8 data/forge/tags/blocks/ores/saltpeter.json
99
8570ce0086d3cce7d0bfa04d10c388cbcd4d4e04 data/forge/tags/blocks/ores/silver.json
1010
7094cc9c85699e7afa6c283f7a769bab75eeeaff data/forge/tags/blocks/ores/sulfur.json
1111
0fbe7a7a55102f803486517de1004a189959f607 data/forge/tags/blocks/ores/tin.json
@@ -16,10 +16,10 @@ cba1c5a31aa2960efa0703b2e57f8390f53d4ce6 data/forge/tags/blocks/ores_in_ground/n
1616
aefbbbc5abb467f81217a20784fffded5a4cc0df data/minecraft/tags/blocks/anvil.json
1717
491830ad886621c3a078a87ab488fd45839ad64d data/minecraft/tags/blocks/climbable.json
1818
5f095a79961790ef28559752e75223a6097fb997 data/minecraft/tags/blocks/mineable/axe.json
19-
0753d13cfcc255b60000c89fd44b6077897744b2 data/minecraft/tags/blocks/mineable/pickaxe.json
19+
a196638b5813c61d659d954c3d0b3b32ecce61a2 data/minecraft/tags/blocks/mineable/pickaxe.json
2020
332c14b52b24decc1c1cc905d2e32eb330f9df78 data/minecraft/tags/blocks/needs_diamond_tool.json
2121
e28c7fdf089f8fc76f9e5565d74f0293e412cfbc data/minecraft/tags/blocks/needs_iron_tool.json
22-
b896f8308935dbcc1d849f150ffc664342a4e4fc data/minecraft/tags/blocks/needs_stone_tool.json
22+
a6ee9b4fd2bed4758113462791f814c2f4a710bb data/minecraft/tags/blocks/needs_stone_tool.json
2323
e1d606686d8d1ae939af83da8c931c49c2e9df5e data/minecraft/tags/blocks/rails.json
2424
4276d58b0cb375037387fa9b749ae6b1e09d33c9 data/railcraft/tags/blocks/abandoned_track.json
2525
9b21abe5b3e3997560ef95937505d9a8112afa92 data/railcraft/tags/blocks/abyssal.json

‎src/generated/resources/.cache/7cc9f5a39f84776d809436456ff87e0cabca2d5a

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// 1.20.1 2024-06-30T09:55:16.1588 Tags for minecraft:item mod id railcraft
1+
// 1.20.1 2024-07-02T18:27:53.134603 Tags for minecraft:item mod id railcraft
22
f0feda62604edc32e6dcc0eb8d52c2defbf8a4d2 data/forge/tags/items/armors/boots.json
33
e4b5c3cfded4b9b76efeda37728f26dc89261239 data/forge/tags/items/armors/boots/steel.json
44
32b89e811b184ba832d5a6e71cadeca8e34dff42 data/forge/tags/items/armors/chestplates.json
@@ -45,10 +45,10 @@ d7508b44d29858b83d1e638039e714f27c55ed4d data/forge/tags/items/nuggets/tin.json
4545
03a440b41fdd236f8c6f52f1e0f73424f859282b data/forge/tags/items/nuggets/zinc.json
4646
e36857f35c1bac4bde5a8450008b92cf82656216 data/forge/tags/items/ore_rates/dense.json
4747
8ce5fa4b4f1c2619e124ef387b086d72f9c26f04 data/forge/tags/items/ore_rates/singular.json
48-
c31435450cdbffad0151b7e26a9cc131bf672a75 data/forge/tags/items/ores.json
48+
fa98655e67381fc33f8aff33d36629bd937280a6 data/forge/tags/items/ores.json
4949
8c50a9944556e96063fbc340f5ad0cc8db547ff3 data/forge/tags/items/ores/lead.json
5050
83ceb2d2883c80859eebd5d5bb21fc2bfb849cf9 data/forge/tags/items/ores/nickel.json
51-
35a98a11222809a20225372b2d7129082cbbc2b8 data/forge/tags/items/ores/salt.json
51+
35a98a11222809a20225372b2d7129082cbbc2b8 data/forge/tags/items/ores/saltpeter.json
5252
8570ce0086d3cce7d0bfa04d10c388cbcd4d4e04 data/forge/tags/items/ores/silver.json
5353
7094cc9c85699e7afa6c283f7a769bab75eeeaff data/forge/tags/items/ores/sulfur.json
5454
0fbe7a7a55102f803486517de1004a189959f607 data/forge/tags/items/ores/tin.json

‎src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// 1.20.1 2024-06-30T09:48:54.581156 Recipes
1+
// 1.20.1 2024-07-02T18:27:53.128994 Recipes
22
69d5595b9dbfe88136b7a2ab172e71e90898b0fb data/minecraft/advancements/recipes/misc/gunpowder.json
33
4a6e67942b0734508f9373351ab324c6cdd81244 data/minecraft/advancements/recipes/misc/lead_ingot_from_blasting_deepslate_lead_ore.json
44
33c838f63222211d4d44845f4f963dfe2cec8fc9 data/minecraft/advancements/recipes/misc/lead_ingot_from_blasting_lead_ore.json
@@ -780,7 +780,7 @@ ebbf642d66dbaba1e4ed852663580714a06b8734 data/railcraft/recipes/crusher/crushing
780780
e8e3868eb55d7c65810409ca376e92052b8f5a91 data/railcraft/recipes/crusher/crushing_tags_ores_nickel.json
781781
4b25c6fa1dd055731e9d151cbfe927d813709c1d data/railcraft/recipes/crusher/crushing_tags_ores_quartz.json
782782
9480cf1e176fbb52a15233425c677ebdd2cd746e data/railcraft/recipes/crusher/crushing_tags_ores_redstone.json
783-
dca6984e60d9ec217b54d52f88019eed322e29e2 data/railcraft/recipes/crusher/crushing_tags_ores_salt.json
783+
627ba8a51e9b3f7f772eb25b699fe6d51178ed9e data/railcraft/recipes/crusher/crushing_tags_ores_saltpeter.json
784784
0ca471680846dee14eff685ceaeaa848c97302ea data/railcraft/recipes/crusher/crushing_tags_ores_silver.json
785785
ba67d7c97ebf6a8c84782a1ba5f3ff61f7bfc121 data/railcraft/recipes/crusher/crushing_tags_ores_sulfur.json
786786
7a7c879b5e7a8c61cc5ecb7100324f19a385c1ad data/railcraft/recipes/crusher/crushing_tags_quarried.json

‎src/generated/resources/data/forge/tags/blocks/ores/salt.json renamed to ‎src/generated/resources/data/forge/tags/blocks/ores/saltpeter.json

File renamed without changes.

‎src/generated/resources/data/forge/tags/items/ores/salt.json renamed to ‎src/generated/resources/data/forge/tags/items/ores/saltpeter.json

File renamed without changes.

‎src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@
4848
"#forge:ores/sulfur",
4949
"#forge:ores/tin",
5050
"#forge:ores/zinc",
51+
"#forge:ores/saltpeter",
5152
"#railcraft:post",
5253
"#railcraft:strengthened_glass",
5354
"#railcraft:iron_tank_gauge",
@@ -65,7 +66,6 @@
6566
"railcraft:quarried_brick_stairs",
6667
"railcraft:quarried_paver_stairs",
6768
"railcraft:quarried_brick_slab",
68-
"railcraft:quarried_paver_slab",
69-
"railcraft:saltpeter_ore"
69+
"railcraft:quarried_paver_slab"
7070
]
7171
}

‎src/generated/resources/data/railcraft/recipes/crusher/crushing_tags_ores_salt.json renamed to ‎src/generated/resources/data/railcraft/recipes/crusher/crushing_tags_ores_saltpeter.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@
55
"type": "forge:not",
66
"value": {
77
"type": "forge:tag_empty",
8-
"tag": "forge:ores/salt"
8+
"tag": "forge:ores/saltpeter"
99
}
1010
}
1111
],
1212
"ingredient": {
13-
"tag": "forge:ores/salt"
13+
"tag": "forge:ores/saltpeter"
1414
},
1515
"outputs": [
1616
{

‎src/main/java/mods/railcraft/data/RailcraftBlockTagsProvider.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -256,6 +256,7 @@ protected void addTags(HolderLookup.Provider provider) {
256256
RailcraftTags.Blocks.SULFUR_ORE,
257257
RailcraftTags.Blocks.TIN_ORE,
258258
RailcraftTags.Blocks.ZINC_ORE,
259+
RailcraftTags.Blocks.SALTPETER_ORE,
259260
RailcraftTags.Blocks.POST,
260261
RailcraftTags.Blocks.STRENGTHENED_GLASS,
261262
RailcraftTags.Blocks.IRON_TANK_GAUGE,
@@ -273,8 +274,7 @@ protected void addTags(HolderLookup.Provider provider) {
273274
.add(RailcraftBlocks.QUARRIED_BRICK_STAIRS.get())
274275
.add(RailcraftBlocks.QUARRIED_PAVER_STAIRS.get())
275276
.add(RailcraftBlocks.QUARRIED_BRICK_SLAB.get())
276-
.add(RailcraftBlocks.QUARRIED_PAVER_SLAB.get())
277-
.add(RailcraftBlocks.SALTPETER_ORE.get());
277+
.add(RailcraftBlocks.QUARRIED_PAVER_SLAB.get());
278278

279279
this.tag(BlockTags.NEEDS_DIAMOND_TOOL)
280280
.add(RailcraftBlocks.FIRESTONE_ORE.get())

‎src/main/java/mods/railcraft/tags/RailcraftTags.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ public static class Items {
137137
public static final TagKey<Item> SULFUR_ORE = oresTag("sulfur");
138138
public static final TagKey<Item> TIN_ORE = oresTag("tin");
139139
public static final TagKey<Item> ZINC_ORE = oresTag("zinc");
140-
public static final TagKey<Item> SALTPETER_ORE = oresTag("salt");
140+
public static final TagKey<Item> SALTPETER_ORE = oresTag("saltpeter");
141141

142142
public static final TagKey<Item> TIN_RAW = rawMaterialsTag("tin");
143143
public static final TagKey<Item> ZINC_RAW = rawMaterialsTag("zinc");
@@ -241,7 +241,7 @@ public static class Blocks {
241241
public static final TagKey<Block> SULFUR_ORE = forgeTag("ores/sulfur");
242242
public static final TagKey<Block> TIN_ORE = forgeTag("ores/tin");
243243
public static final TagKey<Block> ZINC_ORE = forgeTag("ores/zinc");
244-
public static final TagKey<Block> SALTPETER_ORE = forgeTag("ores/salt");
244+
public static final TagKey<Block> SALTPETER_ORE = forgeTag("ores/saltpeter");
245245

246246
private static TagKey<Block> tag(String name) {
247247
return BlockTags.create(RailcraftConstants.rl(name));

0 commit comments

Comments
 (0)