Skip to content

Commit

Permalink
make vigil candle tag entries optional to work without dye_depot present
Browse files Browse the repository at this point in the history
  • Loading branch information
@PssbleTrngle
PssbleTrngle committed Nov 2, 2024
1 parent 9f0f97c commit c6bb5db
Show file tree
Hide file tree
Showing 4 changed files with 271 additions and 69 deletions.
4 changes: 2 additions & 2 deletions src/generated/resources/.cache/5bb646c3cee204f41a1b59a2c0d9083b5f7155b0
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// 1.20.1 2024-10-31T10:50:07.0060003 Oreganized Block Tags
// 1.20.1 2024-11-02T14:18:49.5565406 Oreganized Block Tags
25423f94c07158f094e4e9733efc1d1814551369 data/doom_and_gloom/tags/blocks/burial_dirt_convertible.json
589cbf5d60b97fd78f711d832bfddf03263777f2 data/doom_and_gloom/tags/blocks/gravetender_lightables.json
09f2b6ffb4a23fce3358928616260d7ffaa73074 data/doom_and_gloom/tags/blocks/vigil_candles.json
09179ee35f10c7ec1195c36e87d885a1e70fe485 data/doom_and_gloom/tags/blocks/vigil_candles.json
01bff27953e934409d6d1175c4932c12a6f535c7 data/minecraft/tags/blocks/candles.json
6e91c0be5e5b3d50cf0d1a8dec3e23c0ee042c05 data/minecraft/tags/blocks/dirt.json
734c9c36a0d0f32caf72e941b2f0d14e9f0b5b6d data/minecraft/tags/blocks/mineable/pickaxe.json
Expand Down
165 changes: 132 additions & 33 deletions src/generated/resources/data/doom_and_gloom/tags/blocks/vigil_candles.json
View file
Original file line number Diff line number Diff line change
@@ -1,37 +1,136 @@
{
"values": [
"doom_and_gloom:vigil_candle",
"doom_and_gloom:white_vigil_candle",
"doom_and_gloom:orange_vigil_candle",
"doom_and_gloom:magenta_vigil_candle",
"doom_and_gloom:light_blue_vigil_candle",
"doom_and_gloom:yellow_vigil_candle",
"doom_and_gloom:lime_vigil_candle",
"doom_and_gloom:pink_vigil_candle",
"doom_and_gloom:gray_vigil_candle",
"doom_and_gloom:light_gray_vigil_candle",
"doom_and_gloom:cyan_vigil_candle",
"doom_and_gloom:purple_vigil_candle",
"doom_and_gloom:blue_vigil_candle",
"doom_and_gloom:brown_vigil_candle",
"doom_and_gloom:green_vigil_candle",
"doom_and_gloom:red_vigil_candle",
"doom_and_gloom:black_vigil_candle",
"doom_and_gloom:maroon_vigil_candle",
"doom_and_gloom:rose_vigil_candle",
"doom_and_gloom:coral_vigil_candle",
"doom_and_gloom:indigo_vigil_candle",
"doom_and_gloom:navy_vigil_candle",
"doom_and_gloom:slate_vigil_candle",
"doom_and_gloom:olive_vigil_candle",
"doom_and_gloom:amber_vigil_candle",
"doom_and_gloom:beige_vigil_candle",
"doom_and_gloom:teal_vigil_candle",
"doom_and_gloom:mint_vigil_candle",
"doom_and_gloom:aqua_vigil_candle",
"doom_and_gloom:verdant_vigil_candle",
"doom_and_gloom:forest_vigil_candle",
"doom_and_gloom:ginger_vigil_candle",
"doom_and_gloom:tan_vigil_candle"
{
"id": "doom_and_gloom:vigil_candle",
"required": false
},
{
"id": "doom_and_gloom:white_vigil_candle",
"required": false
},
{
"id": "doom_and_gloom:orange_vigil_candle",
"required": false
},
{
"id": "doom_and_gloom:magenta_vigil_candle",
"required": false
},
{
"id": "doom_and_gloom:light_blue_vigil_candle",
"required": false
},
{
"id": "doom_and_gloom:yellow_vigil_candle",
"required": false
},
{
"id": "doom_and_gloom:lime_vigil_candle",
"required": false
},
{
"id": "doom_and_gloom:pink_vigil_candle",
"required": false
},
{
"id": "doom_and_gloom:gray_vigil_candle",
"required": false
},
{
"id": "doom_and_gloom:light_gray_vigil_candle",
"required": false
},
{
"id": "doom_and_gloom:cyan_vigil_candle",
"required": false
},
{
"id": "doom_and_gloom:purple_vigil_candle",
"required": false
},
{
"id": "doom_and_gloom:blue_vigil_candle",
"required": false
},
{
"id": "doom_and_gloom:brown_vigil_candle",
"required": false
},
{
"id": "doom_and_gloom:green_vigil_candle",
"required": false
},
{
"id": "doom_and_gloom:red_vigil_candle",
"required": false
},
{
"id": "doom_and_gloom:black_vigil_candle",
"required": false
},
{
"id": "doom_and_gloom:maroon_vigil_candle",
"required": false
},
{
"id": "doom_and_gloom:rose_vigil_candle",
"required": false
},
{
"id": "doom_and_gloom:coral_vigil_candle",
"required": false
},
{
"id": "doom_and_gloom:indigo_vigil_candle",
"required": false
},
{
"id": "doom_and_gloom:navy_vigil_candle",
"required": false
},
{
"id": "doom_and_gloom:slate_vigil_candle",
"required": false
},
{
"id": "doom_and_gloom:olive_vigil_candle",
"required": false
},
{
"id": "doom_and_gloom:amber_vigil_candle",
"required": false
},
{
"id": "doom_and_gloom:beige_vigil_candle",
"required": false
},
{
"id": "doom_and_gloom:teal_vigil_candle",
"required": false
},
{
"id": "doom_and_gloom:mint_vigil_candle",
"required": false
},
{
"id": "doom_and_gloom:aqua_vigil_candle",
"required": false
},
{
"id": "doom_and_gloom:verdant_vigil_candle",
"required": false
},
{
"id": "doom_and_gloom:forest_vigil_candle",
"required": false
},
{
"id": "doom_and_gloom:ginger_vigil_candle",
"required": false
},
{
"id": "doom_and_gloom:tan_vigil_candle",
"required": false
}
]
}
165 changes: 132 additions & 33 deletions src/generated/resources/data/doom_and_gloom/tags/items/vigil_candles.json
View file
Original file line number Diff line number Diff line change
@@ -1,37 +1,136 @@
{
"values": [
"doom_and_gloom:vigil_candle",
"doom_and_gloom:white_vigil_candle",
"doom_and_gloom:orange_vigil_candle",
"doom_and_gloom:magenta_vigil_candle",
"doom_and_gloom:light_blue_vigil_candle",
"doom_and_gloom:yellow_vigil_candle",
"doom_and_gloom:lime_vigil_candle",
"doom_and_gloom:pink_vigil_candle",
"doom_and_gloom:gray_vigil_candle",
"doom_and_gloom:light_gray_vigil_candle",
"doom_and_gloom:cyan_vigil_candle",
"doom_and_gloom:purple_vigil_candle",
"doom_and_gloom:blue_vigil_candle",
"doom_and_gloom:brown_vigil_candle",
"doom_and_gloom:green_vigil_candle",
"doom_and_gloom:red_vigil_candle",
"doom_and_gloom:black_vigil_candle",
"doom_and_gloom:maroon_vigil_candle",
"doom_and_gloom:rose_vigil_candle",
"doom_and_gloom:coral_vigil_candle",
"doom_and_gloom:indigo_vigil_candle",
"doom_and_gloom:navy_vigil_candle",
"doom_and_gloom:slate_vigil_candle",
"doom_and_gloom:olive_vigil_candle",
"doom_and_gloom:amber_vigil_candle",
"doom_and_gloom:beige_vigil_candle",
"doom_and_gloom:teal_vigil_candle",
"doom_and_gloom:mint_vigil_candle",
"doom_and_gloom:aqua_vigil_candle",
"doom_and_gloom:verdant_vigil_candle",
"doom_and_gloom:forest_vigil_candle",
"doom_and_gloom:ginger_vigil_candle",
"doom_and_gloom:tan_vigil_candle"
{
"id": "doom_and_gloom:vigil_candle",
"required": false
},
{
"id": "doom_and_gloom:white_vigil_candle",
"required": false
},
{
"id": "doom_and_gloom:orange_vigil_candle",
"required": false
},
{
"id": "doom_and_gloom:magenta_vigil_candle",
"required": false
},
{
"id": "doom_and_gloom:light_blue_vigil_candle",
"required": false
},
{
"id": "doom_and_gloom:yellow_vigil_candle",
"required": false
},
{
"id": "doom_and_gloom:lime_vigil_candle",
"required": false
},
{
"id": "doom_and_gloom:pink_vigil_candle",
"required": false
},
{
"id": "doom_and_gloom:gray_vigil_candle",
"required": false
},
{
"id": "doom_and_gloom:light_gray_vigil_candle",
"required": false
},
{
"id": "doom_and_gloom:cyan_vigil_candle",
"required": false
},
{
"id": "doom_and_gloom:purple_vigil_candle",
"required": false
},
{
"id": "doom_and_gloom:blue_vigil_candle",
"required": false
},
{
"id": "doom_and_gloom:brown_vigil_candle",
"required": false
},
{
"id": "doom_and_gloom:green_vigil_candle",
"required": false
},
{
"id": "doom_and_gloom:red_vigil_candle",
"required": false
},
{
"id": "doom_and_gloom:black_vigil_candle",
"required": false
},
{
"id": "doom_and_gloom:maroon_vigil_candle",
"required": false
},
{
"id": "doom_and_gloom:rose_vigil_candle",
"required": false
},
{
"id": "doom_and_gloom:coral_vigil_candle",
"required": false
},
{
"id": "doom_and_gloom:indigo_vigil_candle",
"required": false
},
{
"id": "doom_and_gloom:navy_vigil_candle",
"required": false
},
{
"id": "doom_and_gloom:slate_vigil_candle",
"required": false
},
{
"id": "doom_and_gloom:olive_vigil_candle",
"required": false
},
{
"id": "doom_and_gloom:amber_vigil_candle",
"required": false
},
{
"id": "doom_and_gloom:beige_vigil_candle",
"required": false
},
{
"id": "doom_and_gloom:teal_vigil_candle",
"required": false
},
{
"id": "doom_and_gloom:mint_vigil_candle",
"required": false
},
{
"id": "doom_and_gloom:aqua_vigil_candle",
"required": false
},
{
"id": "doom_and_gloom:verdant_vigil_candle",
"required": false
},
{
"id": "doom_and_gloom:forest_vigil_candle",
"required": false
},
{
"id": "doom_and_gloom:ginger_vigil_candle",
"required": false
},
{
"id": "doom_and_gloom:tan_vigil_candle",
"required": false
}
]
}
6 changes: 5 additions & 1 deletion src/main/java/galena/doom_and_gloom/data/OBlockTags.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import galena.doom_and_gloom.DoomAndGloom;
import galena.doom_and_gloom.index.OBlocks;
import net.minecraft.core.HolderLookup;
import net.minecraft.core.registries.BuiltInRegistries;
import net.minecraft.core.registries.Registries;
import net.minecraft.data.PackOutput;
import net.minecraft.data.tags.IntrinsicHolderTagsProvider;
Expand Down Expand Up @@ -41,7 +42,10 @@ protected void addTags(HolderLookup.Provider provider) {

var vigilCandles = tag(VIGIL_CANDLES);

OBlocks.vigilCandles().forEach(block -> vigilCandles.add(block.get()));
OBlocks.vigilCandles().forEach(block -> {
var id = BuiltInRegistries.BLOCK.getKey(block.get());
vigilCandles.addOptional(id);
});

tag(BlockTags.CANDLES).addTags(VIGIL_CANDLES);
tag(BlockTags.MINEABLE_WITH_PICKAXE).addTags(VIGIL_CANDLES);
Expand Down

0 comments on commit c6bb5db

Please sign in to comment.