Skip to content

Commit

Permalink
Add pickaxe minable tags.
Browse files Browse the repository at this point in the history
  • Loading branch information
covers1624 committed Aug 25, 2022
1 parent 9daaafd commit 8d25d6c
Show file tree
Hide file tree
Showing 5 changed files with 34 additions and 7 deletions.
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// 1.19 2022-06-22T22:47:06.915539118 EnderStorage Item models
// 1.19 2022-07-18T14:06:30.26837892 EnderStorage Item models
a163c9ce1e63e428f3fa804b66e491b455f18540 assets/enderstorage/models/item/ender_chest.json
a163c9ce1e63e428f3fa804b66e491b455f18540 assets/enderstorage/models/item/ender_pouch.json
a163c9ce1e63e428f3fa804b66e491b455f18540 assets/enderstorage/models/item/ender_tank.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// 1.19 2022-06-22T22:47:06.91448628 EnderStorage BlockStates
// 1.19 2022-07-18T14:06:30.266321842 EnderStorage BlockStates
31ae921e4029b7a18bfc63f7cee5e5bf4ce92828 assets/enderstorage/blockstates/ender_chest.json
31ae921e4029b7a18bfc63f7cee5e5bf4ce92828 assets/enderstorage/blockstates/ender_tank.json
f105c225def5c2a406cab5c02f6b08774a37e9de assets/enderstorage/models/block/dummy.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
// 1.19 2022-07-18T14:06:30.268126447 Tags for minecraft:block
5b2130f55986594660c630dadb50eede58d67c12 data/minecraft/tags/blocks/mineable/pickaxe.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"values": [
"enderstorage:ender_chest",
"enderstorage:ender_tank"
]
}
29 changes: 24 additions & 5 deletions src/main/java/codechicken/enderstorage/init/DataGenerators.java
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,20 @@

import codechicken.lib.datagen.ItemModelProvider;
import net.minecraft.data.DataGenerator;
import net.minecraft.data.tags.BlockTagsProvider;
import net.minecraft.tags.BlockTags;
import net.minecraftforge.client.model.generators.BlockStateProvider;
import net.minecraftforge.client.model.generators.ModelFile;
import net.minecraftforge.common.data.ExistingFileHelper;
import net.minecraftforge.data.event.GatherDataEvent;
import net.minecraftforge.eventbus.api.SubscribeEvent;
import net.minecraftforge.fml.common.Mod;
import org.jetbrains.annotations.Nullable;

import javax.annotation.Nonnull;

import static codechicken.enderstorage.EnderStorage.MOD_ID;
import static codechicken.enderstorage.init.EnderStorageModContent.*;

/**
* Created by covers1624 on 4/25/20.
Expand All @@ -25,6 +29,7 @@ public static void gatherDataGenerators(GatherDataEvent event) {
ExistingFileHelper files = event.getExistingFileHelper();
gen.addProvider(event.includeClient(), new BlockStates(gen, files));
gen.addProvider(event.includeClient(), new ItemModels(gen, files));
gen.addProvider(event.includeServer(), new BlockTagGen(gen, files));
}

private static class ItemModels extends ItemModelProvider {
Expand All @@ -35,9 +40,9 @@ public ItemModels(DataGenerator generator, ExistingFileHelper existingFileHelper

@Override
protected void registerModels() {
generated(EnderStorageModContent.ENDER_CHEST_ITEM).noTexture();
generated(EnderStorageModContent.ENDER_TANK_ITEM).noTexture();
generated(EnderStorageModContent.ENDER_POUCH).noTexture();
generated(ENDER_CHEST_ITEM).noTexture();
generated(ENDER_TANK_ITEM).noTexture();
generated(ENDER_POUCH).noTexture();
}

@Override
Expand All @@ -63,8 +68,22 @@ protected void registerStatesAndModels() {
ModelFile model = models()
.withExistingParent("dummy", "block")
.texture("particle", "minecraft:block/obsidian");
simpleBlock(EnderStorageModContent.ENDER_CHEST_BLOCK.get(), model);
simpleBlock(EnderStorageModContent.ENDER_TANK_BLOCK.get(), model);
simpleBlock(ENDER_CHEST_BLOCK.get(), model);
simpleBlock(ENDER_TANK_BLOCK.get(), model);
}
}

private static class BlockTagGen extends BlockTagsProvider {

public BlockTagGen(DataGenerator gen, @Nullable ExistingFileHelper existingFileHelper) {
super(gen, MOD_ID, existingFileHelper);
}

@Override
protected void addTags() {
tag(BlockTags.MINEABLE_WITH_PICKAXE)
.add(ENDER_CHEST_BLOCK.get())
.add(ENDER_TANK_BLOCK.get());
}
}
}

0 comments on commit 8d25d6c

Please sign in to comment.