mirror of
https://github.com/Ellpeck/NaturesAura.git
synced 2024-11-22 19:58:34 +01:00
added ingot of the depths
This commit is contained in:
parent
4af1787320
commit
81ff2a4140
22 changed files with 222 additions and 50 deletions
|
@ -0,0 +1,7 @@
|
||||||
|
{
|
||||||
|
"variants": {
|
||||||
|
"": {
|
||||||
|
"model": "naturesaura:block/depth_ingot_block"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,7 @@
|
||||||
|
{
|
||||||
|
"variants": {
|
||||||
|
"": {
|
||||||
|
"model": "naturesaura:block/sky_ingot_block"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,6 @@
|
||||||
|
{
|
||||||
|
"parent": "minecraft:block/cube_all",
|
||||||
|
"textures": {
|
||||||
|
"all": "naturesaura:block/depth_ingot_block"
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,6 @@
|
||||||
|
{
|
||||||
|
"parent": "minecraft:block/cube_all",
|
||||||
|
"textures": {
|
||||||
|
"all": "naturesaura:block/sky_ingot_block"
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,6 @@
|
||||||
|
{
|
||||||
|
"parent": "minecraft:item/generated",
|
||||||
|
"textures": {
|
||||||
|
"layer0": "naturesaura:item/depth_ingot"
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,3 @@
|
||||||
|
{
|
||||||
|
"parent": "naturesaura:block/depth_ingot_block"
|
||||||
|
}
|
|
@ -0,0 +1,3 @@
|
||||||
|
{
|
||||||
|
"parent": "naturesaura:block/sky_ingot_block"
|
||||||
|
}
|
|
@ -1,15 +1,15 @@
|
||||||
{
|
{
|
||||||
"values": [
|
"values": [
|
||||||
|
"naturesaura:ancient_bark",
|
||||||
"naturesaura:ancient_log",
|
"naturesaura:ancient_log",
|
||||||
|
"naturesaura:ancient_planks",
|
||||||
"naturesaura:ancient_slab",
|
"naturesaura:ancient_slab",
|
||||||
|
"naturesaura:ancient_stairs",
|
||||||
|
"naturesaura:auto_crafter",
|
||||||
|
"naturesaura:flower_generator",
|
||||||
"naturesaura:nether_wart_mushroom",
|
"naturesaura:nether_wart_mushroom",
|
||||||
"naturesaura:oak_generator",
|
"naturesaura:oak_generator",
|
||||||
"naturesaura:auto_crafter",
|
"naturesaura:offering_table",
|
||||||
"naturesaura:ancient_bark",
|
"naturesaura:wood_stand"
|
||||||
"naturesaura:ancient_planks",
|
|
||||||
"naturesaura:ancient_stairs",
|
|
||||||
"naturesaura:flower_generator",
|
|
||||||
"naturesaura:wood_stand",
|
|
||||||
"naturesaura:offering_table"
|
|
||||||
]
|
]
|
||||||
}
|
}
|
|
@ -1,47 +1,49 @@
|
||||||
{
|
{
|
||||||
"values": [
|
"values": [
|
||||||
"naturesaura:gold_brick",
|
|
||||||
"naturesaura:spring",
|
|
||||||
"naturesaura:infused_stairs",
|
|
||||||
"naturesaura:potion_generator",
|
|
||||||
"naturesaura:infused_brick_stairs",
|
|
||||||
"naturesaura:aura_detector",
|
|
||||||
"naturesaura:spawn_lamp",
|
|
||||||
"naturesaura:animal_container",
|
"naturesaura:animal_container",
|
||||||
"naturesaura:powder_placer",
|
|
||||||
"naturesaura:weather_changer",
|
|
||||||
"naturesaura:grated_chute",
|
|
||||||
"naturesaura:crushing_catalyst",
|
|
||||||
"naturesaura:ender_crate",
|
|
||||||
"naturesaura:firework_generator",
|
|
||||||
"naturesaura:tainted_gold_block",
|
|
||||||
"naturesaura:placer",
|
|
||||||
"naturesaura:blast_furnace_booster",
|
|
||||||
"naturesaura:lower_limiter",
|
|
||||||
"naturesaura:animal_generator",
|
"naturesaura:animal_generator",
|
||||||
"naturesaura:nether_grass",
|
|
||||||
"naturesaura:infused_iron_block",
|
|
||||||
"naturesaura:snow_creator",
|
|
||||||
"naturesaura:infused_stone",
|
|
||||||
"naturesaura:field_creator",
|
|
||||||
"naturesaura:nature_altar",
|
|
||||||
"naturesaura:gold_nether_brick",
|
|
||||||
"naturesaura:aura_timer",
|
|
||||||
"naturesaura:chunk_loader",
|
|
||||||
"naturesaura:animal_spawner",
|
"naturesaura:animal_spawner",
|
||||||
|
"naturesaura:aura_detector",
|
||||||
|
"naturesaura:aura_timer",
|
||||||
|
"naturesaura:blast_furnace_booster",
|
||||||
"naturesaura:chorus_generator",
|
"naturesaura:chorus_generator",
|
||||||
"naturesaura:infused_brick_slab",
|
"naturesaura:chunk_loader",
|
||||||
"naturesaura:projectile_generator",
|
|
||||||
"naturesaura:furnace_heater",
|
|
||||||
"naturesaura:moss_generator",
|
|
||||||
"naturesaura:rf_converter",
|
|
||||||
"naturesaura:item_distributor",
|
|
||||||
"naturesaura:time_changer",
|
|
||||||
"naturesaura:conversion_catalyst",
|
"naturesaura:conversion_catalyst",
|
||||||
"naturesaura:hopper_upgrade",
|
"naturesaura:crushing_catalyst",
|
||||||
"naturesaura:pickup_stopper",
|
"naturesaura:depth_ingot_block",
|
||||||
"naturesaura:infused_brick",
|
"naturesaura:ender_crate",
|
||||||
|
"naturesaura:field_creator",
|
||||||
|
"naturesaura:firework_generator",
|
||||||
|
"naturesaura:furnace_heater",
|
||||||
"naturesaura:generator_limit_remover",
|
"naturesaura:generator_limit_remover",
|
||||||
"naturesaura:infused_slab"
|
"naturesaura:gold_brick",
|
||||||
|
"naturesaura:gold_nether_brick",
|
||||||
|
"naturesaura:grated_chute",
|
||||||
|
"naturesaura:hopper_upgrade",
|
||||||
|
"naturesaura:infused_brick",
|
||||||
|
"naturesaura:infused_brick_slab",
|
||||||
|
"naturesaura:infused_brick_stairs",
|
||||||
|
"naturesaura:infused_iron_block",
|
||||||
|
"naturesaura:infused_slab",
|
||||||
|
"naturesaura:infused_stairs",
|
||||||
|
"naturesaura:infused_stone",
|
||||||
|
"naturesaura:item_distributor",
|
||||||
|
"naturesaura:lower_limiter",
|
||||||
|
"naturesaura:moss_generator",
|
||||||
|
"naturesaura:nature_altar",
|
||||||
|
"naturesaura:nether_grass",
|
||||||
|
"naturesaura:pickup_stopper",
|
||||||
|
"naturesaura:placer",
|
||||||
|
"naturesaura:potion_generator",
|
||||||
|
"naturesaura:powder_placer",
|
||||||
|
"naturesaura:projectile_generator",
|
||||||
|
"naturesaura:rf_converter",
|
||||||
|
"naturesaura:sky_ingot_block",
|
||||||
|
"naturesaura:snow_creator",
|
||||||
|
"naturesaura:spawn_lamp",
|
||||||
|
"naturesaura:spring",
|
||||||
|
"naturesaura:tainted_gold_block",
|
||||||
|
"naturesaura:time_changer",
|
||||||
|
"naturesaura:weather_changer"
|
||||||
]
|
]
|
||||||
}
|
}
|
|
@ -0,0 +1,20 @@
|
||||||
|
{
|
||||||
|
"type": "minecraft:block",
|
||||||
|
"pools": [
|
||||||
|
{
|
||||||
|
"bonus_rolls": 0.0,
|
||||||
|
"conditions": [
|
||||||
|
{
|
||||||
|
"condition": "minecraft:survives_explosion"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"entries": [
|
||||||
|
{
|
||||||
|
"type": "minecraft:item",
|
||||||
|
"name": "naturesaura:depth_ingot_block"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"rolls": 1.0
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
|
@ -0,0 +1,20 @@
|
||||||
|
{
|
||||||
|
"type": "minecraft:block",
|
||||||
|
"pools": [
|
||||||
|
{
|
||||||
|
"bonus_rolls": 0.0,
|
||||||
|
"conditions": [
|
||||||
|
{
|
||||||
|
"condition": "minecraft:survives_explosion"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"entries": [
|
||||||
|
{
|
||||||
|
"type": "minecraft:item",
|
||||||
|
"name": "naturesaura:sky_ingot_block"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"rolls": 1.0
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
|
@ -2,6 +2,7 @@ package de.ellpeck.naturesaura.data;
|
||||||
|
|
||||||
import de.ellpeck.naturesaura.NaturesAura;
|
import de.ellpeck.naturesaura.NaturesAura;
|
||||||
import de.ellpeck.naturesaura.blocks.ModBlocks;
|
import de.ellpeck.naturesaura.blocks.ModBlocks;
|
||||||
|
import de.ellpeck.naturesaura.reg.IModItem;
|
||||||
import de.ellpeck.naturesaura.reg.ModRegistry;
|
import de.ellpeck.naturesaura.reg.ModRegistry;
|
||||||
import net.minecraft.data.DataGenerator;
|
import net.minecraft.data.DataGenerator;
|
||||||
import net.minecraft.data.tags.BlockTagsProvider;
|
import net.minecraft.data.tags.BlockTagsProvider;
|
||||||
|
@ -14,6 +15,8 @@ import net.minecraft.world.level.material.Material;
|
||||||
import net.minecraftforge.common.data.ExistingFileHelper;
|
import net.minecraftforge.common.data.ExistingFileHelper;
|
||||||
import org.jetbrains.annotations.Nullable;
|
import org.jetbrains.annotations.Nullable;
|
||||||
|
|
||||||
|
import java.util.Comparator;
|
||||||
|
|
||||||
public class BlockTagProvider extends BlockTagsProvider {
|
public class BlockTagProvider extends BlockTagsProvider {
|
||||||
|
|
||||||
public static final TagKey<Block> ALTAR_WOOD = BlockTags.create(new ResourceLocation(NaturesAura.MOD_ID, "altar_wood"));
|
public static final TagKey<Block> ALTAR_WOOD = BlockTags.create(new ResourceLocation(NaturesAura.MOD_ID, "altar_wood"));
|
||||||
|
@ -40,15 +43,14 @@ public class BlockTagProvider extends BlockTagsProvider {
|
||||||
this.tag(BlockTagProvider.ALTAR_GOLD_BRICK).add(ModBlocks.GOLD_BRICK, ModBlocks.GOLD_NETHER_BRICK);
|
this.tag(BlockTagProvider.ALTAR_GOLD_BRICK).add(ModBlocks.GOLD_BRICK, ModBlocks.GOLD_NETHER_BRICK);
|
||||||
this.tag(BlockTagProvider.ALTAR_FANCY_BRICK).add(Blocks.RED_NETHER_BRICKS, Blocks.CHISELED_STONE_BRICKS);
|
this.tag(BlockTagProvider.ALTAR_FANCY_BRICK).add(Blocks.RED_NETHER_BRICKS, Blocks.CHISELED_STONE_BRICKS);
|
||||||
|
|
||||||
for (var item : ModRegistry.ALL_ITEMS) {
|
// sort these so that they don't change the json every time we run data (because it's a set)
|
||||||
if (!(item instanceof Block b))
|
ModRegistry.ALL_ITEMS.stream().sorted(Comparator.comparing(IModItem::getBaseName)).filter(i -> i instanceof Block).map(i -> (Block) i).forEach(b -> {
|
||||||
continue;
|
|
||||||
var material = b.defaultBlockState().getMaterial();
|
var material = b.defaultBlockState().getMaterial();
|
||||||
if (material == Material.STONE || material == Material.METAL) {
|
if (material == Material.STONE || material == Material.METAL) {
|
||||||
this.tag(BlockTags.MINEABLE_WITH_PICKAXE).add(b);
|
this.tag(BlockTags.MINEABLE_WITH_PICKAXE).add(b);
|
||||||
} else if (material == Material.WOOD) {
|
} else if (material == Material.WOOD) {
|
||||||
this.tag(BlockTags.MINEABLE_WITH_AXE).add(b);
|
this.tag(BlockTags.MINEABLE_WITH_AXE).add(b);
|
||||||
}
|
}
|
||||||
}
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -134,7 +134,9 @@ public final class ModRegistry {
|
||||||
new BlockWeatherChanger(),
|
new BlockWeatherChanger(),
|
||||||
new BlockRFConverter(),
|
new BlockRFConverter(),
|
||||||
new BlockChunkLoader(),
|
new BlockChunkLoader(),
|
||||||
new BlockLowerLimiter()
|
new BlockLowerLimiter(),
|
||||||
|
new BlockImpl("sky_ingot_block", Block.Properties.of(Material.METAL).sound(SoundType.METAL).strength(4F)),
|
||||||
|
new BlockImpl("depth_ingot_block", Block.Properties.of(Material.METAL).sound(SoundType.METAL).strength(6F))
|
||||||
);
|
);
|
||||||
Helper.populateObjectHolders(ModBlocks.class, event.getForgeRegistry());
|
Helper.populateObjectHolders(ModBlocks.class, event.getForgeRegistry());
|
||||||
});
|
});
|
||||||
|
@ -209,7 +211,8 @@ public final class ModRegistry {
|
||||||
new ItemBreakPrevention(),
|
new ItemBreakPrevention(),
|
||||||
new ItemPetReviver(),
|
new ItemPetReviver(),
|
||||||
new ItemNetheriteFinder(),
|
new ItemNetheriteFinder(),
|
||||||
new ItemImpl("vacuum_bottle")
|
new ItemImpl("vacuum_bottle"),
|
||||||
|
new ItemImpl("depth_ingot")
|
||||||
);
|
);
|
||||||
Helper.populateObjectHolders(ModItems.class, event.getForgeRegistry());
|
Helper.populateObjectHolders(ModItems.class, event.getForgeRegistry());
|
||||||
});
|
});
|
||||||
|
|
|
@ -79,6 +79,8 @@
|
||||||
"block.naturesaura.spring": "Everlasting Spring",
|
"block.naturesaura.spring": "Everlasting Spring",
|
||||||
"block.naturesaura.weather_changer": "Cloudshifter",
|
"block.naturesaura.weather_changer": "Cloudshifter",
|
||||||
"block.naturesaura.lower_limiter": "Aura Imbalance Ward",
|
"block.naturesaura.lower_limiter": "Aura Imbalance Ward",
|
||||||
|
"block.naturesaura.sky_ingot_block": "Block of the Skies",
|
||||||
|
"block.naturesaura.depth_ingot_block": "Block of the Depths",
|
||||||
"item.naturesaura.eye": "Environmental Eye",
|
"item.naturesaura.eye": "Environmental Eye",
|
||||||
"item.naturesaura.eye_improved": "Environmental Ocular",
|
"item.naturesaura.eye_improved": "Environmental Ocular",
|
||||||
"item.naturesaura.gold_fiber": "Brilliant Fiber",
|
"item.naturesaura.gold_fiber": "Brilliant Fiber",
|
||||||
|
@ -103,6 +105,7 @@
|
||||||
"item.naturesaura.farming_stencil": "Farming Stencil",
|
"item.naturesaura.farming_stencil": "Farming Stencil",
|
||||||
"item.naturesaura.bottle_two_the_rebottling": "Bottle and Cork",
|
"item.naturesaura.bottle_two_the_rebottling": "Bottle and Cork",
|
||||||
"item.naturesaura.sky_ingot": "Ingot of the Skies",
|
"item.naturesaura.sky_ingot": "Ingot of the Skies",
|
||||||
|
"item.naturesaura.depth_ingot": "Ingot of the Depths",
|
||||||
"item.naturesaura.sky_pickaxe": "Skyseeker's Pickaxe",
|
"item.naturesaura.sky_pickaxe": "Skyseeker's Pickaxe",
|
||||||
"item.naturesaura.sky_axe": "Skyseeker's Handaxe",
|
"item.naturesaura.sky_axe": "Skyseeker's Handaxe",
|
||||||
"item.naturesaura.sky_shovel": "Skyseeker's Shovel",
|
"item.naturesaura.sky_shovel": "Skyseeker's Shovel",
|
||||||
|
|
Binary file not shown.
After Width: | Height: | Size: 451 B |
Binary file not shown.
After Width: | Height: | Size: 550 B |
Binary file not shown.
After Width: | Height: | Size: 422 B |
15
src/main/resources/data/naturesaura/recipes/depth_ingot.json
Normal file
15
src/main/resources/data/naturesaura/recipes/depth_ingot.json
Normal file
|
@ -0,0 +1,15 @@
|
||||||
|
{
|
||||||
|
"type": "minecraft:crafting_shaped",
|
||||||
|
"pattern": [
|
||||||
|
"I"
|
||||||
|
],
|
||||||
|
"key": {
|
||||||
|
"I": {
|
||||||
|
"item": "naturesaura:depth_ingot_block"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"result": {
|
||||||
|
"item": "naturesaura:depth_ingot",
|
||||||
|
"count": 9
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,16 @@
|
||||||
|
{
|
||||||
|
"type": "minecraft:crafting_shaped",
|
||||||
|
"pattern": [
|
||||||
|
"III",
|
||||||
|
"III",
|
||||||
|
"III"
|
||||||
|
],
|
||||||
|
"key": {
|
||||||
|
"I": {
|
||||||
|
"item": "naturesaura:depth_ingot"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"result": {
|
||||||
|
"item": "naturesaura:depth_ingot_block"
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,22 @@
|
||||||
|
{
|
||||||
|
"type": "minecraft:crafting_shaped",
|
||||||
|
"pattern": [
|
||||||
|
"SGS",
|
||||||
|
"GIG",
|
||||||
|
"SGS"
|
||||||
|
],
|
||||||
|
"key": {
|
||||||
|
"I": {
|
||||||
|
"item": "naturesaura:sky_ingot"
|
||||||
|
},
|
||||||
|
"S": {
|
||||||
|
"item": "minecraft:netherite_scrap"
|
||||||
|
},
|
||||||
|
"G": {
|
||||||
|
"item": "naturesaura:tainted_gold"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"result": {
|
||||||
|
"item": "naturesaura:depth_ingot"
|
||||||
|
}
|
||||||
|
}
|
15
src/main/resources/data/naturesaura/recipes/sky_ingot.json
Normal file
15
src/main/resources/data/naturesaura/recipes/sky_ingot.json
Normal file
|
@ -0,0 +1,15 @@
|
||||||
|
{
|
||||||
|
"type": "minecraft:crafting_shaped",
|
||||||
|
"pattern": [
|
||||||
|
"I"
|
||||||
|
],
|
||||||
|
"key": {
|
||||||
|
"I": {
|
||||||
|
"item": "naturesaura:sky_ingot_block"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"result": {
|
||||||
|
"item": "naturesaura:sky_ingot",
|
||||||
|
"count": 9
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,16 @@
|
||||||
|
{
|
||||||
|
"type": "minecraft:crafting_shaped",
|
||||||
|
"pattern": [
|
||||||
|
"III",
|
||||||
|
"III",
|
||||||
|
"III"
|
||||||
|
],
|
||||||
|
"key": {
|
||||||
|
"I": {
|
||||||
|
"item": "naturesaura:sky_ingot"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"result": {
|
||||||
|
"item": "naturesaura:sky_ingot_block"
|
||||||
|
}
|
||||||
|
}
|
Loading…
Reference in a new issue