Ellpeck/NaturesAura
1
0
Fork 0
mirror of https://github.com/Ellpeck/NaturesAura.git synced 2024-05-17 22:18:44 +02:00
Code Issues Projects Releases Wiki Activity

added ingot of the depths

Browse source
This commit is contained in:
Ell 2023-02-17 11:10:06 +01:00
parent 4af1787320
commit 81ff2a4140
22 changed files with 222 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/generated/resources/assets/naturesaura/blockstates/depth_ingot_block.json Normal file
View file

@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "naturesaura:block/depth_ingot_block"
}
}
}

7
src/generated/resources/assets/naturesaura/blockstates/sky_ingot_block.json Normal file
View file

@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "naturesaura:block/sky_ingot_block"
}
}
}

6
src/generated/resources/assets/naturesaura/models/block/depth_ingot_block.json Normal file
View file

@ -0,0 +1,6 @@
{
"parent": "minecraft:block/cube_all",
"textures": {
"all": "naturesaura:block/depth_ingot_block"
}
}

6
src/generated/resources/assets/naturesaura/models/block/sky_ingot_block.json Normal file
View file

@ -0,0 +1,6 @@
{
"parent": "minecraft:block/cube_all",
"textures": {
"all": "naturesaura:block/sky_ingot_block"
}
}

6
src/generated/resources/assets/naturesaura/models/item/depth_ingot.json Normal file
View file

@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "naturesaura:item/depth_ingot"
}
}

3
src/generated/resources/assets/naturesaura/models/item/depth_ingot_block.json Normal file
View file

@ -0,0 +1,3 @@
{
"parent": "naturesaura:block/depth_ingot_block"
}

3
src/generated/resources/assets/naturesaura/models/item/sky_ingot_block.json Normal file
View file

@ -0,0 +1,3 @@
{
"parent": "naturesaura:block/sky_ingot_block"
}

14
src/generated/resources/data/minecraft/tags/blocks/mineable/axe.json
View file

@ -1,15 +1,15 @@
{
"values": [
"naturesaura:ancient_bark",
"naturesaura:ancient_log",
"naturesaura:ancient_planks",
"naturesaura:ancient_slab",
"naturesaura:ancient_stairs",
"naturesaura:auto_crafter",
"naturesaura:flower_generator",
"naturesaura:nether_wart_mushroom",
"naturesaura:oak_generator",
"naturesaura:auto_crafter",
"naturesaura:ancient_bark",
"naturesaura:ancient_planks",
"naturesaura:ancient_stairs",
"naturesaura:flower_generator",
"naturesaura:wood_stand",
"naturesaura:offering_table"
"naturesaura:offering_table",
"naturesaura:wood_stand"
]
}

76
src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json
View file

@ -1,47 +1,49 @@
{
"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: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: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:aura_detector",
"naturesaura:aura_timer",
"naturesaura:blast_furnace_booster",
"naturesaura:chorus_generator",
"naturesaura:infused_brick_slab",
"naturesaura:projectile_generator",
"naturesaura:furnace_heater",
"naturesaura:moss_generator",
"naturesaura:rf_converter",
"naturesaura:item_distributor",
"naturesaura:time_changer",
"naturesaura:chunk_loader",
"naturesaura:conversion_catalyst",
"naturesaura:hopper_upgrade",
"naturesaura:pickup_stopper",
"naturesaura:infused_brick",
"naturesaura:crushing_catalyst",
"naturesaura:depth_ingot_block",
"naturesaura:ender_crate",
"naturesaura:field_creator",
"naturesaura:firework_generator",
"naturesaura:furnace_heater",
"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"
]
}

20
src/generated/resources/data/naturesaura/loot_tables/blocks/depth_ingot_block.json Normal file
View file

@ -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
}
]
}

20
src/generated/resources/data/naturesaura/loot_tables/blocks/sky_ingot_block.json Normal file
View file

@ -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
}
]
}

10
src/main/java/de/ellpeck/naturesaura/data/BlockTagProvider.java
View file

@ -2,6 +2,7 @@ package de.ellpeck.naturesaura.data;
import de.ellpeck.naturesaura.NaturesAura;
import de.ellpeck.naturesaura.blocks.ModBlocks;
import de.ellpeck.naturesaura.reg.IModItem;
import de.ellpeck.naturesaura.reg.ModRegistry;
import net.minecraft.data.DataGenerator;
import net.minecraft.data.tags.BlockTagsProvider;
@ -14,6 +15,8 @@ import net.minecraft.world.level.material.Material;
import net.minecraftforge.common.data.ExistingFileHelper;
import org.jetbrains.annotations.Nullable;
import java.util.Comparator;
public class BlockTagProvider extends BlockTagsProvider {
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_FANCY_BRICK).add(Blocks.RED_NETHER_BRICKS, Blocks.CHISELED_STONE_BRICKS);
for (var item : ModRegistry.ALL_ITEMS) {
if (!(item instanceof Block b))
continue;
// sort these so that they don't change the json every time we run data (because it's a set)
ModRegistry.ALL_ITEMS.stream().sorted(Comparator.comparing(IModItem::getBaseName)).filter(i -> i instanceof Block).map(i -> (Block) i).forEach(b -> {
var material = b.defaultBlockState().getMaterial();
if (material == Material.STONE || material == Material.METAL) {
this.tag(BlockTags.MINEABLE_WITH_PICKAXE).add(b);
} else if (material == Material.WOOD) {
this.tag(BlockTags.MINEABLE_WITH_AXE).add(b);
}
}
});
}
}

7
src/main/java/de/ellpeck/naturesaura/reg/ModRegistry.java
View file

@ -134,7 +134,9 @@ public final class ModRegistry {
new BlockWeatherChanger(),
new BlockRFConverter(),
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());
});
@ -209,7 +211,8 @@ public final class ModRegistry {
new ItemBreakPrevention(),
new ItemPetReviver(),
new ItemNetheriteFinder(),
new ItemImpl("vacuum_bottle")
new ItemImpl("vacuum_bottle"),
new ItemImpl("depth_ingot")
);
Helper.populateObjectHolders(ModItems.class, event.getForgeRegistry());
});

3
src/main/resources/assets/naturesaura/lang/en_us.json
View file

@ -79,6 +79,8 @@
"block.naturesaura.spring": "Everlasting Spring",
"block.naturesaura.weather_changer": "Cloudshifter",
"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_improved": "Environmental Ocular",
"item.naturesaura.gold_fiber": "Brilliant Fiber",
@ -103,6 +105,7 @@
"item.naturesaura.farming_stencil": "Farming Stencil",
"item.naturesaura.bottle_two_the_rebottling": "Bottle and Cork",
"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_axe": "Skyseeker's Handaxe",
"item.naturesaura.sky_shovel": "Skyseeker's Shovel",

BIN
src/main/resources/assets/naturesaura/textures/block/depth_ingot_block.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 451 B

BIN
src/main/resources/assets/naturesaura/textures/block/sky_ingot_block.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 550 B

BIN
src/main/resources/assets/naturesaura/textures/item/depth_ingot.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 422 B

15
src/main/resources/data/naturesaura/recipes/depth_ingot.json Normal file
View 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
}
}

16
src/main/resources/data/naturesaura/recipes/depth_ingot_block.json Normal file
View file

@ -0,0 +1,16 @@
{
"type": "minecraft:crafting_shaped",
"pattern": [
"III",
"III",
"III"
],
"key": {
"I": {
"item": "naturesaura:depth_ingot"
}
},
"result": {
"item": "naturesaura:depth_ingot_block"
}
}

22
src/main/resources/data/naturesaura/recipes/depth_ingot_creation.json Normal file
View file

@ -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
View 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
}
}

16
src/main/resources/data/naturesaura/recipes/sky_ingot_block.json Normal file
View file

@ -0,0 +1,16 @@
{
"type": "minecraft:crafting_shaped",
"pattern": [
"III",
"III",
"III"
],
"key": {
"I": {
"item": "naturesaura:sky_ingot"
}
},
"result": {
"item": "naturesaura:sky_ingot_block"
}
}