diff --git a/src/main/java/de/jottyfan/minecraft/block/BlockOre.java b/src/main/java/de/jottyfan/minecraft/block/BlockOre.java index ea89a6b..1030080 100644 --- a/src/main/java/de/jottyfan/minecraft/block/BlockOre.java +++ b/src/main/java/de/jottyfan/minecraft/block/BlockOre.java @@ -22,9 +22,9 @@ import net.minecraft.world.phys.BlockHitResult; public class BlockOre extends Block { private SoundEvent soundEvent; - private ItemStack dropItems; + private ItemStack[] dropItems; - public BlockOre(Properties properties, SoundEvent soundEvent, ItemStack dropItems) { + public BlockOre(Properties properties, SoundEvent soundEvent, ItemStack... dropItems) { super(properties.requiresCorrectToolForDrops()); this.soundEvent = soundEvent; this.dropItems = dropItems; @@ -32,8 +32,8 @@ public class BlockOre extends Block { @Override protected List getDrops(BlockState state, Builder builder) { - ItemStack droppable = dropItems == null ? new ItemStack(this.asItem()) : dropItems; - return Arrays.asList(new ItemStack[] { droppable }); + ItemStack[] droppable = dropItems == null ? new ItemStack[] { new ItemStack(this.asItem()) } : dropItems; + return Arrays.asList(droppable); } @Override diff --git a/src/main/java/de/jottyfan/minecraft/block/QuicklyBlocks.java b/src/main/java/de/jottyfan/minecraft/block/QuicklyBlocks.java index deeec29..048b145 100644 --- a/src/main/java/de/jottyfan/minecraft/block/QuicklyBlocks.java +++ b/src/main/java/de/jottyfan/minecraft/block/QuicklyBlocks.java @@ -3,10 +3,6 @@ package de.jottyfan.minecraft.block; import java.util.function.Function; import de.jottyfan.minecraft.Quickly; -import de.jottyfan.minecraft.blockentity.QuicklyBlockEntity; -import de.jottyfan.minecraft.blockentity.BlockStackerEntity; -import de.jottyfan.minecraft.blockentity.DrillBlockEntity; -import de.jottyfan.minecraft.blockentity.ItemHoarderBlockEntity; import de.jottyfan.minecraft.item.QuicklyItems; import de.jottyfan.minecraft.tab.QuicklyTab; import net.fabricmc.fabric.api.itemgroup.v1.ItemGroupEvents; @@ -19,10 +15,10 @@ import net.minecraft.sounds.SoundEvents; import net.minecraft.world.item.BlockItem; import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.Items; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.Blocks; import net.minecraft.world.level.block.SoundType; -import net.minecraft.world.level.block.entity.BlockEntityType; import net.minecraft.world.level.block.state.BlockBehaviour.Properties; /** @@ -57,10 +53,17 @@ public class QuicklyBlocks { public static final Block ITEMHOARDER = registerBlock("itemhoarder", properties -> new Itemhoarder(properties)); public static final Block DRILL = registerBlock("drill", properties -> new BlockDrill(properties)); public static final Block STACKER = registerBlock("blockstacker", properties -> new BlockStacker(properties.strength(2.5f))); + public static final Block DIRTSALPETER = registerBlock("dirtsalpeter", properties -> new BlockOre(properties.strength(2.2f), null, new ItemStack(QuicklyItems.SALPETER, 1), new ItemStack(Items.DIRT))); + public static final Block SANDSALPETER = registerBlock("sandsalpeter", properties -> new BlockOre(properties.strength(1.5f), null, new ItemStack(QuicklyItems.SALPETER, 2), new ItemStack(Items.SAND))); + public static final Block OREDEEPSLATESULFOR = registerBlock("oredeepslatesulfor", properties -> new BlockOre(properties.strength(2.0f), null, new ItemStack(QuicklyItems.SULFOR, 4))); + public static final Block ORENETHERSULFOR = registerBlock("orenethersulfor", properties -> new BlockOre(properties.strength(2.0f), null, new ItemStack(QuicklyItems.SULFOR))); + public static final Block ORESALPETER = registerBlock("oresalpeter", properties -> new BlockOre(properties.strength(1.9f), null, new ItemStack(QuicklyItems.SALPETER, 2))); + public static final Block ORESANDSALPETER = registerBlock("oresandsalpeter", properties -> new BlockOre(properties.strength(1.5f), null, new ItemStack(QuicklyItems.SALPETER, 7))); + public static final Block ORESULFOR = registerBlock("oresulfor", properties -> new BlockOre(properties.strength(1.9f), null, new ItemStack(QuicklyItems.SULFOR))); + public static final Block ORESPEEDPOWDER = registerBlock("orespeedpowder", properties -> new BlockOre(properties.strength(2.0f), null, new ItemStack(QuicklyItems.SPEEDPOWDER))); + public static final Block OREDEEPSLATESPEEDPOWDER = registerBlock("oredeepslatespeedpowder", properties -> new BlockOre(properties.strength(2.1f), null, new ItemStack(QuicklyItems.SPEEDPOWDER, 2))); - // TODO: add salpeter ore, sulfor ore // TODO: merge lavahoarder and emptylavahoarder into one block using a BooleanProperty for the lava fill state - // TODO: repair block stacker bugs; transport seems to only use the max container size slot private static final Block registerBlock(String name, Properties properties) { return QuicklyBlocks.registerBlock(name, properties, p -> new Block(p)); @@ -84,8 +87,17 @@ public class QuicklyBlocks { ItemGroupEvents.modifyEntriesEvent(QuicklyTab.QUICKLY_TAB).register(block -> { block.accept(KELPBUNDLE); block.accept(TURQUOISEBLOCK); + block.accept(DIRTSALPETER); + block.accept(SANDSALPETER); + block.accept(ORESALPETER); + block.accept(ORESULFOR); block.accept(ORETURQUOISE); + block.accept(ORESPEEDPOWDER); + block.accept(ORESANDSALPETER); block.accept(OREDEEPSLATETURQUOISE); + block.accept(OREDEEPSLATESULFOR); + block.accept(OREDEEPSLATESPEEDPOWDER); + block.accept(ORENETHERSULFOR); block.accept(EMPTYLAVAHOARDER); block.accept(SPEEDPOWDER); block.accept(QUICKIEPOWDER); diff --git a/src/main/java/de/jottyfan/minecraft/feature/QuicklyFeatures.java b/src/main/java/de/jottyfan/minecraft/feature/QuicklyFeatures.java index 7db8e36..48e903e 100644 --- a/src/main/java/de/jottyfan/minecraft/feature/QuicklyFeatures.java +++ b/src/main/java/de/jottyfan/minecraft/feature/QuicklyFeatures.java @@ -17,7 +17,24 @@ import net.minecraft.world.level.levelgen.placement.PlacedFeature; */ public class QuicklyFeatures { public static final ResourceKey> CF_ORETURQUOISE = genCf("oreturquoise"); + public static final ResourceKey> CF_ORESULFOR = genCf("oresulfor"); + public static final ResourceKey> CF_OREDEEPSLATESULFUR = genCf("oredepslatesulfor"); + public static final ResourceKey> CF_ORESALPETER = genCf("oresalpeter"); + public static final ResourceKey> CF_ORENETHERSULFOR = genCf("orenethersulfor"); + public static final ResourceKey> CF_DIRTSALPETER = genCf("dirtsalpeter"); + public static final ResourceKey> CF_SANDSALPETER = genCf("sandsalpeter"); + public static final ResourceKey> CF_ORESANDSALPETER = genCf("oresandsalpeter"); + public static final ResourceKey> CF_ORESPEEDPOWDER = genCf("orespeedpowder"); + public static final ResourceKey PF_ORETURQUOISE = genPf("oreturquoise"); + public static final ResourceKey PF_ORESULFOR = genPf("oresulfor"); + public static final ResourceKey PF_OREDEEPSLATESULFOR = genPf("oredeepslatesulfor"); + public static final ResourceKey PF_ORESALPETER = genPf("oresalpeter"); + public static final ResourceKey PF_ORENETHERSULFOR = genPf("orenethersulfor"); + public static final ResourceKey PF_DIRTSALPETER = genPf("dirtsalpeter"); + public static final ResourceKey PF_SANDSALPETER = genPf("sandsalpeter"); + public static final ResourceKey PF_ORESANDSALPETER = genPf("oresandsalpeter"); + public static final ResourceKey PF_ORESPEEDPOWDER = genPf("orespeedpowder"); private static final ResourceKey> genCf(String name) { return ResourceKey.create(Registries.CONFIGURED_FEATURE, Identifier.fromNamespaceAndPath(Quickly.MOD_ID, name)); @@ -29,5 +46,14 @@ public class QuicklyFeatures { public static final void registerFeatures() { BiomeModifications.addFeature(BiomeSelectors.foundInOverworld(), GenerationStep.Decoration.UNDERGROUND_ORES, PF_ORETURQUOISE); + BiomeModifications.addFeature(BiomeSelectors.foundInOverworld(), GenerationStep.Decoration.UNDERGROUND_ORES, PF_ORESULFOR); + BiomeModifications.addFeature(BiomeSelectors.foundInOverworld(), GenerationStep.Decoration.UNDERGROUND_ORES, PF_ORESALPETER); + BiomeModifications.addFeature(BiomeSelectors.foundInOverworld(), GenerationStep.Decoration.UNDERGROUND_ORES, PF_DIRTSALPETER); + BiomeModifications.addFeature(BiomeSelectors.foundInOverworld(), GenerationStep.Decoration.UNDERGROUND_ORES, PF_SANDSALPETER); + BiomeModifications.addFeature(BiomeSelectors.foundInOverworld(), GenerationStep.Decoration.UNDERGROUND_ORES, PF_ORESANDSALPETER); + BiomeModifications.addFeature(BiomeSelectors.foundInOverworld(), GenerationStep.Decoration.UNDERGROUND_ORES, PF_OREDEEPSLATESULFOR); + BiomeModifications.addFeature(BiomeSelectors.foundInOverworld(), GenerationStep.Decoration.UNDERGROUND_ORES, PF_ORESPEEDPOWDER); + + BiomeModifications.addFeature(BiomeSelectors.foundInTheNether(), GenerationStep.Decoration.UNDERGROUND_ORES, PF_ORENETHERSULFOR); } } diff --git a/src/main/java/de/jottyfan/minecraft/item/QuicklyItems.java b/src/main/java/de/jottyfan/minecraft/item/QuicklyItems.java index 35a5139..f0cfdd4 100644 --- a/src/main/java/de/jottyfan/minecraft/item/QuicklyItems.java +++ b/src/main/java/de/jottyfan/minecraft/item/QuicklyItems.java @@ -44,8 +44,9 @@ public class QuicklyItems { public static final Item SPEEDINGOT = registerItem("speedingot"); public static final Item QUICKIEINGOT = registerItem("quickieingot"); public static final Item MAGNIFIER = registerItem("magnifier"); + public static final Item SALPETER = registerItem("salpeter"); + public static final Item SULFOR = registerItem("sulfor"); - // TODO: salpeter, sulfor // TODO: carrot stack // TODO: tools @@ -99,6 +100,8 @@ public class QuicklyItems { item.accept(COPPERSTRING); item.accept(COPPERSTICK); item.accept(COPPERSTUB); + item.accept(SALPETER); + item.accept(SULFOR); item.accept(MAGNIFIER); item.accept(ARMOR_TURQUOISE_HELMET); item.accept(ARMOR_TURQUOISE_CHESTPLATE); diff --git a/src/main/resources/assets/quickly/blockstates/blocksalpeter.json b/src/main/resources/assets/quickly/blockstates/blocksalpeter.json new file mode 100644 index 0000000..658b0ca --- /dev/null +++ b/src/main/resources/assets/quickly/blockstates/blocksalpeter.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "quickly:block/blocksalpeter" + } + } +} diff --git a/src/main/resources/assets/quickly/blockstates/dirtsalpeter.json b/src/main/resources/assets/quickly/blockstates/dirtsalpeter.json new file mode 100644 index 0000000..737a6e4 --- /dev/null +++ b/src/main/resources/assets/quickly/blockstates/dirtsalpeter.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "quickly:block/dirtsalpeter" + } + } +} diff --git a/src/main/resources/assets/quickly/blockstates/oredeepslatespeedpowder.json b/src/main/resources/assets/quickly/blockstates/oredeepslatespeedpowder.json new file mode 100644 index 0000000..e9bc023 --- /dev/null +++ b/src/main/resources/assets/quickly/blockstates/oredeepslatespeedpowder.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "quickly:block/oredeepslatespeedpowder" + } + } +} diff --git a/src/main/resources/assets/quickly/blockstates/oredeepslatesulfor.json b/src/main/resources/assets/quickly/blockstates/oredeepslatesulfor.json new file mode 100644 index 0000000..b046334 --- /dev/null +++ b/src/main/resources/assets/quickly/blockstates/oredeepslatesulfor.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "quickly:block/oredeepslatesulfor" + } + } +} diff --git a/src/main/resources/assets/quickly/blockstates/orenethersulfor.json b/src/main/resources/assets/quickly/blockstates/orenethersulfor.json new file mode 100644 index 0000000..f98c56a --- /dev/null +++ b/src/main/resources/assets/quickly/blockstates/orenethersulfor.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "quickly:block/orenethersulfor" + } + } +} diff --git a/src/main/resources/assets/quickly/blockstates/oresalpeter.json b/src/main/resources/assets/quickly/blockstates/oresalpeter.json new file mode 100644 index 0000000..ed62522 --- /dev/null +++ b/src/main/resources/assets/quickly/blockstates/oresalpeter.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "quickly:block/oresalpeter" + } + } +} diff --git a/src/main/resources/assets/quickly/blockstates/oresandsalpeter.json b/src/main/resources/assets/quickly/blockstates/oresandsalpeter.json new file mode 100644 index 0000000..e88af19 --- /dev/null +++ b/src/main/resources/assets/quickly/blockstates/oresandsalpeter.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "quickly:block/oresandsalpeter" + } + } +} diff --git a/src/main/resources/assets/quickly/blockstates/orespeedpowder.json b/src/main/resources/assets/quickly/blockstates/orespeedpowder.json new file mode 100644 index 0000000..ea5e9e2 --- /dev/null +++ b/src/main/resources/assets/quickly/blockstates/orespeedpowder.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "quickly:block/orespeedpowder" + } + } +} diff --git a/src/main/resources/assets/quickly/blockstates/oresulfor.json b/src/main/resources/assets/quickly/blockstates/oresulfor.json new file mode 100644 index 0000000..120474d --- /dev/null +++ b/src/main/resources/assets/quickly/blockstates/oresulfor.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "quickly:block/oresulfor" + } + } +} diff --git a/src/main/resources/assets/quickly/blockstates/sandsalpeter.json b/src/main/resources/assets/quickly/blockstates/sandsalpeter.json new file mode 100644 index 0000000..5f214fe --- /dev/null +++ b/src/main/resources/assets/quickly/blockstates/sandsalpeter.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "quickly:block/sandsalpeter" + } + } +} diff --git a/src/main/resources/assets/quickly/items/dirtsalpeter.json b/src/main/resources/assets/quickly/items/dirtsalpeter.json new file mode 100644 index 0000000..0c12d37 --- /dev/null +++ b/src/main/resources/assets/quickly/items/dirtsalpeter.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "quickly:block/dirtsalpeter" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/quickly/items/oredeepslatespeedpowder.json b/src/main/resources/assets/quickly/items/oredeepslatespeedpowder.json new file mode 100644 index 0000000..da68b85 --- /dev/null +++ b/src/main/resources/assets/quickly/items/oredeepslatespeedpowder.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "quickly:block/oredeepslatespeedpowder" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/quickly/items/oredeepslatesulfor.json b/src/main/resources/assets/quickly/items/oredeepslatesulfor.json new file mode 100644 index 0000000..51f6692 --- /dev/null +++ b/src/main/resources/assets/quickly/items/oredeepslatesulfor.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "quickly:block/oredeepslatesulfor" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/quickly/items/orenethersulfor.json b/src/main/resources/assets/quickly/items/orenethersulfor.json new file mode 100644 index 0000000..3132cbb --- /dev/null +++ b/src/main/resources/assets/quickly/items/orenethersulfor.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "quickly:block/orenethersulfor" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/quickly/items/oresalpeter.json b/src/main/resources/assets/quickly/items/oresalpeter.json new file mode 100644 index 0000000..c9be9a1 --- /dev/null +++ b/src/main/resources/assets/quickly/items/oresalpeter.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "quickly:block/oresalpeter" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/quickly/items/oresandsalpeter.json b/src/main/resources/assets/quickly/items/oresandsalpeter.json new file mode 100644 index 0000000..1b65e41 --- /dev/null +++ b/src/main/resources/assets/quickly/items/oresandsalpeter.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "quickly:block/oresandsalpeter" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/quickly/items/orespeedpowder.json b/src/main/resources/assets/quickly/items/orespeedpowder.json new file mode 100644 index 0000000..b2fe59e --- /dev/null +++ b/src/main/resources/assets/quickly/items/orespeedpowder.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "quickly:block/orespeedpowder" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/quickly/items/oresulfor.json b/src/main/resources/assets/quickly/items/oresulfor.json new file mode 100644 index 0000000..287a6d1 --- /dev/null +++ b/src/main/resources/assets/quickly/items/oresulfor.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "quickly:block/oresulfor" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/quickly/items/salpeter.json b/src/main/resources/assets/quickly/items/salpeter.json new file mode 100644 index 0000000..5bfd029 --- /dev/null +++ b/src/main/resources/assets/quickly/items/salpeter.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "quickly:item/salpeter" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/quickly/items/sandsalpeter.json b/src/main/resources/assets/quickly/items/sandsalpeter.json new file mode 100644 index 0000000..b9bc273 --- /dev/null +++ b/src/main/resources/assets/quickly/items/sandsalpeter.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "quickly:block/sandsalpeter" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/quickly/items/sulfor.json b/src/main/resources/assets/quickly/items/sulfor.json new file mode 100644 index 0000000..f279cfc --- /dev/null +++ b/src/main/resources/assets/quickly/items/sulfor.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "quickly:item/sulfor" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/quickly/lang/de_de.json b/src/main/resources/assets/quickly/lang/de_de.json index 5a267ad..7ceedbb 100644 --- a/src/main/resources/assets/quickly/lang/de_de.json +++ b/src/main/resources/assets/quickly/lang/de_de.json @@ -3,7 +3,7 @@ "info.block.itemhoarder": "enthält: %s", "info.block.monsterhoarder": "Radius: %s, Brenndauer: %s Ticks", "item.quickly.blockcanolaplant": "Rapspflanze", - "item.quickly.blockcottonplant": "Baumwollpflanze", + "item.quickly.blockcottonplant": "Baumwollpflanze", "item.quickly.blockquickiepowder": "Eilpulverblock", "item.quickly.blockspeedpowder": "Fluchtpulverblock", "item.quickly.blockstacker": "Stapler", @@ -18,6 +18,7 @@ "item.quickly.copperstub": "Kupferstummel", "item.quickly.cotton": "Baumwolle", "item.quickly.cottonseed": "Baumwollsaat", + "item.quickly.dirtsalpeter": "Salpetererde", "item.quickly.drill": "Bohrer", "item.quickly.emptylavahoarder": "Lavasauger", "item.quickly.itemhoarder": "Itemsauger", @@ -25,16 +26,26 @@ "item.quickly.lavahoarder": "voller Lavasauger", "item.quickly.magnifier": "Lupe", "item.quickly.monsterhoarder": "Monstersauger", + "item.quickly.oredeepslatespeedpowder": "Eilpulvertiefengesteinerz", + "item.quickly.oredeepslatesulfor": "Schwefeltiefengestein", "item.quickly.oredeepslateturquoise": "Türkistiefenerz", + "item.quickly.orenethersulfor": "Nether-Schwefel", + "item.quickly.oresalpeter": "Salpetererz", + "item.quickly.oresandsalpeter": "Salpetergestein", + "item.quickly.orespeedpowder": "Eilpulvererz", + "item.quickly.oresulfor": "Schwefelgestein", "item.quickly.oreturquoise": "Türkiserz", "item.quickly.oxidizedcopperpowder": "oxidiertes Kupferpulver", "item.quickly.quickieingot": "Eilpulverbarren", "item.quickly.quickiepowder": "Eilpulver", "item.quickly.rawturquoise": "rohes Türkis", "item.quickly.rotten_flesh_stripes": "geschnittenes Gammelfleisch", + "item.quickly.salpeter": "Salpeter", + "item.quickly.sandsalpeter": "Salpetersand", "item.quickly.speedingot": "Fluchtpulverbarren", "item.quickly.speedpowder": "Fluchtpulver", "item.quickly.stub": "Stummel", + "item.quickly.sulfor": "Schwefel", "item.quickly.turquoise_boots": "Türkisschuhe", "item.quickly.turquoise_chestplate": "Türkisbrustpanzer", "item.quickly.turquoise_helmet": "Türkishelm", diff --git a/src/main/resources/assets/quickly/lang/en_us.json b/src/main/resources/assets/quickly/lang/en_us.json index 98bf0d3..9dcda37 100644 --- a/src/main/resources/assets/quickly/lang/en_us.json +++ b/src/main/resources/assets/quickly/lang/en_us.json @@ -4,7 +4,7 @@ "info.block.monsterhoarder": "radius: %s, burn ticks: %s", "item.quickly.blockcanolaplant": "canola plant", "item.quickly.blockcottonplant": "cotton plant", - "item.quickly.blockquickiepowder": "quickie powder block", + "item.quickly.blockquickiepowder": "quickie powder block", "item.quickly.blockspeedpowder": "speed powder block", "item.quickly.blockstacker": "stacker", "item.quickly.blockturquoise": "block of turquoise", @@ -18,6 +18,7 @@ "item.quickly.copperstub": "copper stub", "item.quickly.cotton": "cotton", "item.quickly.cottonseed": "cotton seed", + "item.quickly.dirtsalpeter": "salpeter dirt", "item.quickly.drill": "drill", "item.quickly.emptylavahoarder": "lava hoarder", "item.quickly.itemhoarder": "item hoarder", @@ -25,16 +26,26 @@ "item.quickly.lavahoarder": "filled lava hoarder", "item.quickly.magnifier": "magnifier", "item.quickly.monsterhoarder": "monster hoarder", + "item.quickly.oredeepslatespeedpowder": "speed poweder deepslate ore", + "item.quickly.oredeepslatesulfor": "sulfor deepslate stone", "item.quickly.oredeepslateturquoise": "turquoise deepslate ore", + "item.quickly.orenethersulfor": "nether sulfor", + "item.quickly.oresalpeter": "salpeter ore", + "item.quickly.oresandsalpeter": "salpeter sandstone", + "item.quickly.orespeedpowder": "speed powder ore", + "item.quickly.oresulfor": "sulfor stone", "item.quickly.oreturquoise": "turquoise ore", "item.quickly.oxidizedcopperpowder": "oxidized copper powder", "item.quickly.quickieingot": "quickie powder ingot", "item.quickly.quickiepowder": "quickie powder", "item.quickly.rawturquoise": "raw turquoise", "item.quickly.rotten_flesh_stripes": "rotton flesh stripes", + "item.quickly.salpeter": "salpeter", + "item.quickly.sandsalpeter": "salpeter sand", "item.quickly.speedingot": "speed powder ingot", "item.quickly.speedpowder": "speed powder", "item.quickly.stub": "stub", + "item.quickly.sulfor": "sulfor", "item.quickly.turquoise_boots": "turquoise boots", "item.quickly.turquoise_chestplate": "turquoise chestplate", "item.quickly.turquoise_helmet": "turquoise helmet", diff --git a/src/main/resources/assets/quickly/models/block/dirtsalpeter.json b/src/main/resources/assets/quickly/models/block/dirtsalpeter.json new file mode 100644 index 0000000..426dc16 --- /dev/null +++ b/src/main/resources/assets/quickly/models/block/dirtsalpeter.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "quickly:block/dirtsalpeter" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/quickly/models/block/oredeepslatespeedpowder.json b/src/main/resources/assets/quickly/models/block/oredeepslatespeedpowder.json new file mode 100644 index 0000000..b528dab --- /dev/null +++ b/src/main/resources/assets/quickly/models/block/oredeepslatespeedpowder.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "quickly:block/oredeepslatespeedpowder" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/quickly/models/block/oredeepslatesulfor.json b/src/main/resources/assets/quickly/models/block/oredeepslatesulfor.json new file mode 100644 index 0000000..ba32892 --- /dev/null +++ b/src/main/resources/assets/quickly/models/block/oredeepslatesulfor.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "quickly:block/oredeepslatesulfor" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/quickly/models/block/orenethersulfor.json b/src/main/resources/assets/quickly/models/block/orenethersulfor.json new file mode 100644 index 0000000..b2dbe96 --- /dev/null +++ b/src/main/resources/assets/quickly/models/block/orenethersulfor.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "quickly:block/orenethersulfor" + } +} diff --git a/src/main/resources/assets/quickly/models/block/oresalpeter.json b/src/main/resources/assets/quickly/models/block/oresalpeter.json new file mode 100644 index 0000000..359dce5 --- /dev/null +++ b/src/main/resources/assets/quickly/models/block/oresalpeter.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "quickly:block/oresalpeter" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/quickly/models/block/oresandsalpeter.json b/src/main/resources/assets/quickly/models/block/oresandsalpeter.json new file mode 100644 index 0000000..eb28b28 --- /dev/null +++ b/src/main/resources/assets/quickly/models/block/oresandsalpeter.json @@ -0,0 +1,7 @@ +{ + "parent": "block/cube_column", + "textures": { + "end" : "minecraft:block/sandstone_top", + "side": "quickly:block/oresandsalpeter" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/quickly/models/block/orespeedpowder.json b/src/main/resources/assets/quickly/models/block/orespeedpowder.json new file mode 100644 index 0000000..b98c1b2 --- /dev/null +++ b/src/main/resources/assets/quickly/models/block/orespeedpowder.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "quickly:block/orespeedpowder" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/quickly/models/block/oresulfor.json b/src/main/resources/assets/quickly/models/block/oresulfor.json new file mode 100644 index 0000000..ec3025b --- /dev/null +++ b/src/main/resources/assets/quickly/models/block/oresulfor.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "quickly:block/oresulfor" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/quickly/models/block/sandsalpeter.json b/src/main/resources/assets/quickly/models/block/sandsalpeter.json new file mode 100644 index 0000000..723e320 --- /dev/null +++ b/src/main/resources/assets/quickly/models/block/sandsalpeter.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "quickly:block/sandsalpeter" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/quickly/models/item/dirtsalpeter.json b/src/main/resources/assets/quickly/models/item/dirtsalpeter.json new file mode 100644 index 0000000..d695ee6 --- /dev/null +++ b/src/main/resources/assets/quickly/models/item/dirtsalpeter.json @@ -0,0 +1,10 @@ +{ + "parent": "quickly:block/dirtsalpeter", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/quickly/models/item/oredeepslatespeedpowder.json b/src/main/resources/assets/quickly/models/item/oredeepslatespeedpowder.json new file mode 100644 index 0000000..c2b69d7 --- /dev/null +++ b/src/main/resources/assets/quickly/models/item/oredeepslatespeedpowder.json @@ -0,0 +1,10 @@ +{ + "parent": "quickly:block/oredeepslatespeedpowder", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/quickly/models/item/oredeepslatesulfor.json b/src/main/resources/assets/quickly/models/item/oredeepslatesulfor.json new file mode 100644 index 0000000..82baff8 --- /dev/null +++ b/src/main/resources/assets/quickly/models/item/oredeepslatesulfor.json @@ -0,0 +1,10 @@ +{ + "parent": "quickly:block/oredeepslatesulfor", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/quickly/models/item/orenethersulfor.json b/src/main/resources/assets/quickly/models/item/orenethersulfor.json new file mode 100644 index 0000000..01b95fe --- /dev/null +++ b/src/main/resources/assets/quickly/models/item/orenethersulfor.json @@ -0,0 +1,10 @@ +{ + "parent": "quickly:block/orenethersulfor", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/quickly/models/item/oresalpeter.json b/src/main/resources/assets/quickly/models/item/oresalpeter.json new file mode 100644 index 0000000..2b6b60f --- /dev/null +++ b/src/main/resources/assets/quickly/models/item/oresalpeter.json @@ -0,0 +1,10 @@ +{ + "parent": "quickly:block/oresalpeter", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/quickly/models/item/oresandsalpeter.json b/src/main/resources/assets/quickly/models/item/oresandsalpeter.json new file mode 100644 index 0000000..96dc12f --- /dev/null +++ b/src/main/resources/assets/quickly/models/item/oresandsalpeter.json @@ -0,0 +1,10 @@ +{ + "parent": "quickly:block/oresandsalpeter", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/quickly/models/item/orespeedpowder.json b/src/main/resources/assets/quickly/models/item/orespeedpowder.json new file mode 100644 index 0000000..9bf5646 --- /dev/null +++ b/src/main/resources/assets/quickly/models/item/orespeedpowder.json @@ -0,0 +1,10 @@ +{ + "parent": "quickly:block/orespeedpowder", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/quickly/models/item/oresulfor.json b/src/main/resources/assets/quickly/models/item/oresulfor.json new file mode 100644 index 0000000..67c5c78 --- /dev/null +++ b/src/main/resources/assets/quickly/models/item/oresulfor.json @@ -0,0 +1,10 @@ +{ + "parent": "quickly:block/oresulfor", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/quickly/models/item/salpeter.json b/src/main/resources/assets/quickly/models/item/salpeter.json new file mode 100644 index 0000000..8be66f5 --- /dev/null +++ b/src/main/resources/assets/quickly/models/item/salpeter.json @@ -0,0 +1,6 @@ +{ + "parent": "item/coal", + "textures": { + "layer0": "quickly:item/salpeter" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/quickly/models/item/sandsalpeter.json b/src/main/resources/assets/quickly/models/item/sandsalpeter.json new file mode 100644 index 0000000..bea0d85 --- /dev/null +++ b/src/main/resources/assets/quickly/models/item/sandsalpeter.json @@ -0,0 +1,10 @@ +{ + "parent": "quickly:block/sandsalpeter", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/quickly/models/item/sulfor.json b/src/main/resources/assets/quickly/models/item/sulfor.json new file mode 100644 index 0000000..0f54092 --- /dev/null +++ b/src/main/resources/assets/quickly/models/item/sulfor.json @@ -0,0 +1,6 @@ +{ + "parent": "item/coal", + "textures": { + "layer0": "quickly:item/sulfor" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/quickly/textures/block/dirtsalpeter.png b/src/main/resources/assets/quickly/textures/block/dirtsalpeter.png new file mode 100644 index 0000000..c4ab012 Binary files /dev/null and b/src/main/resources/assets/quickly/textures/block/dirtsalpeter.png differ diff --git a/src/main/resources/assets/quickly/textures/block/oredeepslatespeedpowder.png b/src/main/resources/assets/quickly/textures/block/oredeepslatespeedpowder.png new file mode 100644 index 0000000..aa13b99 Binary files /dev/null and b/src/main/resources/assets/quickly/textures/block/oredeepslatespeedpowder.png differ diff --git a/src/main/resources/assets/quickly/textures/block/oredeepslatesulfor.png b/src/main/resources/assets/quickly/textures/block/oredeepslatesulfor.png new file mode 100644 index 0000000..da2828b Binary files /dev/null and b/src/main/resources/assets/quickly/textures/block/oredeepslatesulfor.png differ diff --git a/src/main/resources/assets/quickly/textures/block/orenethersulfor.png b/src/main/resources/assets/quickly/textures/block/orenethersulfor.png new file mode 100644 index 0000000..a2ea4fc Binary files /dev/null and b/src/main/resources/assets/quickly/textures/block/orenethersulfor.png differ diff --git a/src/main/resources/assets/quickly/textures/block/oresalpeter.png b/src/main/resources/assets/quickly/textures/block/oresalpeter.png new file mode 100644 index 0000000..0c46350 Binary files /dev/null and b/src/main/resources/assets/quickly/textures/block/oresalpeter.png differ diff --git a/src/main/resources/assets/quickly/textures/block/oresandsalpeter.png b/src/main/resources/assets/quickly/textures/block/oresandsalpeter.png new file mode 100644 index 0000000..db9326b Binary files /dev/null and b/src/main/resources/assets/quickly/textures/block/oresandsalpeter.png differ diff --git a/src/main/resources/assets/quickly/textures/block/orespeedpowder.png b/src/main/resources/assets/quickly/textures/block/orespeedpowder.png new file mode 100644 index 0000000..3910956 Binary files /dev/null and b/src/main/resources/assets/quickly/textures/block/orespeedpowder.png differ diff --git a/src/main/resources/assets/quickly/textures/block/oresulfor.png b/src/main/resources/assets/quickly/textures/block/oresulfor.png new file mode 100644 index 0000000..f408b21 Binary files /dev/null and b/src/main/resources/assets/quickly/textures/block/oresulfor.png differ diff --git a/src/main/resources/assets/quickly/textures/block/sandsalpeter.png b/src/main/resources/assets/quickly/textures/block/sandsalpeter.png new file mode 100644 index 0000000..0cbd907 Binary files /dev/null and b/src/main/resources/assets/quickly/textures/block/sandsalpeter.png differ diff --git a/src/main/resources/assets/quickly/textures/item/salpeter.png b/src/main/resources/assets/quickly/textures/item/salpeter.png new file mode 100644 index 0000000..cd765cc Binary files /dev/null and b/src/main/resources/assets/quickly/textures/item/salpeter.png differ diff --git a/src/main/resources/assets/quickly/textures/item/sulfor.png b/src/main/resources/assets/quickly/textures/item/sulfor.png new file mode 100644 index 0000000..8dc98aa Binary files /dev/null and b/src/main/resources/assets/quickly/textures/item/sulfor.png differ diff --git a/src/main/resources/data/minecraft/tags/block/mineable/pickaxe.json b/src/main/resources/data/minecraft/tags/block/mineable/pickaxe.json index b494550..5b88a5f 100644 --- a/src/main/resources/data/minecraft/tags/block/mineable/pickaxe.json +++ b/src/main/resources/data/minecraft/tags/block/mineable/pickaxe.json @@ -2,6 +2,15 @@ "replace": false, "values": [ "quickly:oreturquoise", - "quickly:oredeepslateturquoise" + "quickly:oredeepslateturquoise", + "quickly:oresulfor", + "quickly:oredeepslatesulfor", + "quickly:orenethersulfor", + "quickly:oresalpeter", + "quickly:oresandsalpeter", + "quickly:sandsalpeter", + "quickly:dirtsalpeter", + "quickly:orespeedpowder", + "quickly:oredeepslatespeedpowder" ] } \ No newline at end of file diff --git a/src/main/resources/data/quickly/tag/items/ores/oresalpeter.json b/src/main/resources/data/quickly/tag/items/ores/oresalpeter.json new file mode 100644 index 0000000..fd1aa09 --- /dev/null +++ b/src/main/resources/data/quickly/tag/items/ores/oresalpeter.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "quickly:oresalpeter" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/quickly/tag/items/ores/orespeedpowder.json b/src/main/resources/data/quickly/tag/items/ores/orespeedpowder.json new file mode 100644 index 0000000..69affb5 --- /dev/null +++ b/src/main/resources/data/quickly/tag/items/ores/orespeedpowder.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "quickly:orespeedpowder" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/quickly/tag/items/ores/oresulfor.json b/src/main/resources/data/quickly/tag/items/ores/oresulfor.json new file mode 100644 index 0000000..69c0563 --- /dev/null +++ b/src/main/resources/data/quickly/tag/items/ores/oresulfor.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "quickly:oresulfor" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/quickly/tags/block/mineable/pickaxe.json b/src/main/resources/data/quickly/tags/block/mineable/pickaxe.json index b494550..5b88a5f 100644 --- a/src/main/resources/data/quickly/tags/block/mineable/pickaxe.json +++ b/src/main/resources/data/quickly/tags/block/mineable/pickaxe.json @@ -2,6 +2,15 @@ "replace": false, "values": [ "quickly:oreturquoise", - "quickly:oredeepslateturquoise" + "quickly:oredeepslateturquoise", + "quickly:oresulfor", + "quickly:oredeepslatesulfor", + "quickly:orenethersulfor", + "quickly:oresalpeter", + "quickly:oresandsalpeter", + "quickly:sandsalpeter", + "quickly:dirtsalpeter", + "quickly:orespeedpowder", + "quickly:oredeepslatespeedpowder" ] } \ No newline at end of file diff --git a/src/main/resources/data/quickly/worldgen/configured_feature/dirtsalpeter.json b/src/main/resources/data/quickly/worldgen/configured_feature/dirtsalpeter.json new file mode 100644 index 0000000..bfebacd --- /dev/null +++ b/src/main/resources/data/quickly/worldgen/configured_feature/dirtsalpeter.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:ore", + "config": { + "discard_chance_on_air_exposure": 0.0, + "size": 4, + "targets": [ + { + "state": { + "Name": "quickly:dirtsalpeter" + }, + "target": { + "predicate_type": "minecraft:block_match", + "block": "minecraft:dirt" + } + } + ] + } +} \ No newline at end of file diff --git a/src/main/resources/data/quickly/worldgen/configured_feature/oredeepslatesulfor.json b/src/main/resources/data/quickly/worldgen/configured_feature/oredeepslatesulfor.json new file mode 100644 index 0000000..73d1031 --- /dev/null +++ b/src/main/resources/data/quickly/worldgen/configured_feature/oredeepslatesulfor.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:ore", + "config": { + "discard_chance_on_air_exposure": 0.0, + "size": 20, + "targets": [ + { + "state": { + "Name": "quickly:oredeepslatesulfor" + }, + "target": { + "predicate_type": "minecraft:tag_match", + "tag": "minecraft:deepslate_ore_replaceables" + } + } + ] + } +} \ No newline at end of file diff --git a/src/main/resources/data/quickly/worldgen/configured_feature/orenethersulfor.json b/src/main/resources/data/quickly/worldgen/configured_feature/orenethersulfor.json new file mode 100644 index 0000000..b57b6ff --- /dev/null +++ b/src/main/resources/data/quickly/worldgen/configured_feature/orenethersulfor.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:ore", + "config": { + "discard_chance_on_air_exposure": 0.0, + "size": 20, + "targets": [ + { + "state": { + "Name": "quickly:orenethersulfor" + }, + "target": { + "predicate_type": "minecraft:block_match", + "block": "minecraft:netherrack" + } + } + ] + } +} \ No newline at end of file diff --git a/src/main/resources/data/quickly/worldgen/configured_feature/oresalpeter.json b/src/main/resources/data/quickly/worldgen/configured_feature/oresalpeter.json new file mode 100644 index 0000000..f462b34 --- /dev/null +++ b/src/main/resources/data/quickly/worldgen/configured_feature/oresalpeter.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:ore", + "config": { + "discard_chance_on_air_exposure": 0.0, + "size": 12, + "targets": [ + { + "state": { + "Name": "quickly:oresalpeter" + }, + "target": { + "predicate_type": "minecraft:tag_match", + "tag": "minecraft:stone_ore_replaceables" + } + } + ] + } +} \ No newline at end of file diff --git a/src/main/resources/data/quickly/worldgen/configured_feature/oresandsalpeter.json b/src/main/resources/data/quickly/worldgen/configured_feature/oresandsalpeter.json new file mode 100644 index 0000000..4ec09cc --- /dev/null +++ b/src/main/resources/data/quickly/worldgen/configured_feature/oresandsalpeter.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:ore", + "config": { + "discard_chance_on_air_exposure": 0.0, + "size": 6, + "targets": [ + { + "state": { + "Name": "quickly:oresandsalpeter" + }, + "target": { + "predicate_type": "minecraft:block_match", + "block": "minecraft:sandstone" + } + } + ] + } +} \ No newline at end of file diff --git a/src/main/resources/data/quickly/worldgen/configured_feature/orespeedpowder.json b/src/main/resources/data/quickly/worldgen/configured_feature/orespeedpowder.json new file mode 100644 index 0000000..9992ca6 --- /dev/null +++ b/src/main/resources/data/quickly/worldgen/configured_feature/orespeedpowder.json @@ -0,0 +1,27 @@ +{ + "type": "minecraft:ore", + "config": { + "discard_chance_on_air_exposure": 0.0, + "size": 7, + "targets": [ + { + "state": { + "Name": "quickly:orespeedpowder" + }, + "target": { + "predicate_type": "minecraft:tag_match", + "tag": "minecraft:stone_ore_replaceables" + } + }, + { + "state": { + "Name": "quickly:oredeepslatespeedpowder" + }, + "target": { + "predicate_type": "minecraft:tag_match", + "tag": "minecraft:deepslate_ore_replaceables" + } + } + ] + } +} \ No newline at end of file diff --git a/src/main/resources/data/quickly/worldgen/configured_feature/oresulfor.json b/src/main/resources/data/quickly/worldgen/configured_feature/oresulfor.json new file mode 100644 index 0000000..6fe03e8 --- /dev/null +++ b/src/main/resources/data/quickly/worldgen/configured_feature/oresulfor.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:ore", + "config": { + "discard_chance_on_air_exposure": 0.0, + "size": 10, + "targets": [ + { + "state": { + "Name": "quickly:oresulfor" + }, + "target": { + "predicate_type": "minecraft:tag_match", + "tag": "minecraft:stone_ore_replaceables" + } + } + ] + } +} \ No newline at end of file diff --git a/src/main/resources/data/quickly/worldgen/configured_feature/sandsalpeter.json b/src/main/resources/data/quickly/worldgen/configured_feature/sandsalpeter.json new file mode 100644 index 0000000..a9fe7ab --- /dev/null +++ b/src/main/resources/data/quickly/worldgen/configured_feature/sandsalpeter.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:ore", + "config": { + "discard_chance_on_air_exposure": 0.0, + "size": 8, + "targets": [ + { + "state": { + "Name": "quickly:sandsalpeter" + }, + "target": { + "predicate_type": "minecraft:block_match", + "block": "minecraft:sand" + } + } + ] + } +} \ No newline at end of file diff --git a/src/main/resources/data/quickly/worldgen/placed_feature/dirtsalpeter.json b/src/main/resources/data/quickly/worldgen/placed_feature/dirtsalpeter.json new file mode 100644 index 0000000..8d55337 --- /dev/null +++ b/src/main/resources/data/quickly/worldgen/placed_feature/dirtsalpeter.json @@ -0,0 +1,27 @@ +{ + "feature": "quickly:dirtsalpeter", + "placement": [ + { + "type": "minecraft:count", + "count": 5 + }, + { + "type": "minecraft:in_square" + }, + { + "type": "minecraft:height_range", + "height": { + "type": "minecraft:trapezoid", + "max_inclusive": { + "absolute": 125 + }, + "min_inclusive": { + "absolute": 16 + } + } + }, + { + "type": "minecraft:biome" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/quickly/worldgen/placed_feature/oredeepslatesulfor.json b/src/main/resources/data/quickly/worldgen/placed_feature/oredeepslatesulfor.json new file mode 100644 index 0000000..fe59ea0 --- /dev/null +++ b/src/main/resources/data/quickly/worldgen/placed_feature/oredeepslatesulfor.json @@ -0,0 +1,27 @@ +{ + "feature": "quickly:oredeepslatesulfor", + "placement": [ + { + "type": "minecraft:count", + "count": 9 + }, + { + "type": "minecraft:in_square" + }, + { + "type": "minecraft:height_range", + "height": { + "type": "minecraft:trapezoid", + "max_inclusive": { + "absolute": 0 + }, + "min_inclusive": { + "absolute": -125 + } + } + }, + { + "type": "minecraft:biome" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/quickly/worldgen/placed_feature/orenethersulfor.json b/src/main/resources/data/quickly/worldgen/placed_feature/orenethersulfor.json new file mode 100644 index 0000000..fa4760a --- /dev/null +++ b/src/main/resources/data/quickly/worldgen/placed_feature/orenethersulfor.json @@ -0,0 +1,27 @@ +{ + "feature": "quickly:orenethersulfor", + "placement": [ + { + "type": "minecraft:count", + "count": 12 + }, + { + "type": "minecraft:in_square" + }, + { + "type": "minecraft:height_range", + "height": { + "type": "minecraft:trapezoid", + "max_inclusive": { + "absolute": 125 + }, + "min_inclusive": { + "absolute": 5 + } + } + }, + { + "type": "minecraft:biome" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/quickly/worldgen/placed_feature/oresalpeter.json b/src/main/resources/data/quickly/worldgen/placed_feature/oresalpeter.json new file mode 100644 index 0000000..36b8c70 --- /dev/null +++ b/src/main/resources/data/quickly/worldgen/placed_feature/oresalpeter.json @@ -0,0 +1,27 @@ +{ + "feature": "quickly:oresalpeter", + "placement": [ + { + "type": "minecraft:count", + "count": 10 + }, + { + "type": "minecraft:in_square" + }, + { + "type": "minecraft:height_range", + "height": { + "type": "minecraft:trapezoid", + "max_inclusive": { + "absolute": 125 + }, + "min_inclusive": { + "absolute": 0 + } + } + }, + { + "type": "minecraft:biome" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/quickly/worldgen/placed_feature/oresandsalpeter.json b/src/main/resources/data/quickly/worldgen/placed_feature/oresandsalpeter.json new file mode 100644 index 0000000..7a71b20 --- /dev/null +++ b/src/main/resources/data/quickly/worldgen/placed_feature/oresandsalpeter.json @@ -0,0 +1,27 @@ +{ + "feature": "quickly:oresandsalpeter", + "placement": [ + { + "type": "minecraft:count", + "count": 15 + }, + { + "type": "minecraft:in_square" + }, + { + "type": "minecraft:height_range", + "height": { + "type": "minecraft:trapezoid", + "max_inclusive": { + "absolute": 125 + }, + "min_inclusive": { + "absolute": 32 + } + } + }, + { + "type": "minecraft:biome" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/quickly/worldgen/placed_feature/orespeedpowder.json b/src/main/resources/data/quickly/worldgen/placed_feature/orespeedpowder.json new file mode 100644 index 0000000..4853f6a --- /dev/null +++ b/src/main/resources/data/quickly/worldgen/placed_feature/orespeedpowder.json @@ -0,0 +1,27 @@ +{ + "feature": "quickly:orespeedpowder", + "placement": [ + { + "type": "minecraft:count", + "count": 8 + }, + { + "type": "minecraft:in_square" + }, + { + "type": "minecraft:height_range", + "height": { + "type": "minecraft:trapezoid", + "max_inclusive": { + "absolute": 60 + }, + "min_inclusive": { + "absolute": -120 + } + } + }, + { + "type": "minecraft:biome" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/quickly/worldgen/placed_feature/oresulfor.json b/src/main/resources/data/quickly/worldgen/placed_feature/oresulfor.json new file mode 100644 index 0000000..e6cb8ed --- /dev/null +++ b/src/main/resources/data/quickly/worldgen/placed_feature/oresulfor.json @@ -0,0 +1,27 @@ +{ + "feature": "quickly:oresulfor", + "placement": [ + { + "type": "minecraft:count", + "count": 9 + }, + { + "type": "minecraft:in_square" + }, + { + "type": "minecraft:height_range", + "height": { + "type": "minecraft:trapezoid", + "max_inclusive": { + "absolute": 64 + }, + "min_inclusive": { + "absolute": 0 + } + } + }, + { + "type": "minecraft:biome" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/quickly/worldgen/placed_feature/sandsalpeter.json b/src/main/resources/data/quickly/worldgen/placed_feature/sandsalpeter.json new file mode 100644 index 0000000..d20d339 --- /dev/null +++ b/src/main/resources/data/quickly/worldgen/placed_feature/sandsalpeter.json @@ -0,0 +1,27 @@ +{ + "feature": "quickly:sandsalpeter", + "placement": [ + { + "type": "minecraft:count", + "count": 10 + }, + { + "type": "minecraft:in_square" + }, + { + "type": "minecraft:height_range", + "height": { + "type": "minecraft:trapezoid", + "max_inclusive": { + "absolute": 125 + }, + "min_inclusive": { + "absolute": 32 + } + } + }, + { + "type": "minecraft:biome" + } + ] +} \ No newline at end of file