more salpeter

This commit is contained in:
Jottyfan 2022-12-13 19:15:05 +01:00
parent cca9c78e95
commit 78017263ca
12 changed files with 85 additions and 16 deletions

View File

@ -9,7 +9,7 @@
loader_version=0.14.9
# Mod Properties
mod_version = 1.19.2.6
mod_version = 1.19.2.7
maven_group = de.jottyfan.minecraft
archives_base_name = quickiefabric

View File

@ -10,6 +10,7 @@ import net.minecraft.block.Material;
import net.minecraft.block.OreBlock;
import net.minecraft.item.ItemStack;
import net.minecraft.loot.context.LootContext.Builder;
import net.minecraft.util.math.random.Random;
/**
*
@ -24,11 +25,6 @@ public class BlockOreSalpeter extends OreBlock {
@Override
public List<ItemStack> getDroppedStacks(BlockState state, Builder builder) {
return Arrays.asList(new ItemStack[] { new ItemStack(QuickieItems.SALPETER) });
return Arrays.asList(new ItemStack[] { new ItemStack(QuickieItems.SALPETER, 2 + Random.create().nextInt(3)) });
}
// @Override
// protected int getExperienceWhenMined(Random random) {
// return random.nextInt(3);
// }
}

View File

@ -11,6 +11,7 @@ import net.minecraft.block.Material;
import net.minecraft.block.OreBlock;
import net.minecraft.item.ItemStack;
import net.minecraft.loot.context.LootContext.Builder;
import net.minecraft.util.math.random.Random;
/**
*
@ -25,11 +26,6 @@ public class BlockOreSandSalpeter extends OreBlock {
@Override
public List<ItemStack> getDroppedStacks(BlockState state, Builder builder) {
return Arrays.asList(new ItemStack[] { new ItemStack(QuickieItems.SALPETER), new ItemStack(Blocks.SAND) });
return Arrays.asList(new ItemStack[] { new ItemStack(QuickieItems.SALPETER, 7 + Random.create().nextInt(4)), new ItemStack(Blocks.SAND) });
}
// @Override
// protected int getExperienceWhenMined(Random random) {
// return random.nextInt(3);
// }
}

View File

@ -11,6 +11,7 @@ import net.minecraft.block.GravelBlock;
import net.minecraft.block.Material;
import net.minecraft.item.ItemStack;
import net.minecraft.loot.context.LootContext.Builder;
import net.minecraft.util.math.random.Random;
/**
*
@ -25,6 +26,6 @@ public class BlockSandSalpeter extends GravelBlock {
@Override
public List<ItemStack> getDroppedStacks(BlockState state, Builder builder) {
return Arrays.asList(new ItemStack[] { new ItemStack(QuickieItems.SALPETER), new ItemStack(Blocks.SAND) });
return Arrays.asList(new ItemStack[] { new ItemStack(QuickieItems.SALPETER, 3 + Random.create().nextInt(2)), new ItemStack(Blocks.SAND) });
}
}

View File

@ -3,6 +3,7 @@ package de.jottyfan.minecraft.quickiefabric.blocks;
import java.util.Arrays;
import java.util.List;
import de.jottyfan.minecraft.quickiefabric.items.QuickieItems;
import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
import net.minecraft.block.BlockState;
import net.minecraft.block.Material;
@ -23,6 +24,6 @@ public class BlockSulphor extends OreBlock {
@Override
public List<ItemStack> getDroppedStacks(BlockState state, Builder builder) {
return Arrays.asList(new ItemStack[] { new ItemStack(QuickieBlocks.BLOCKSULPHOR) });
return Arrays.asList(new ItemStack[] { new ItemStack(QuickieItems.SULPHOR, 9) });
}
}

View File

@ -23,6 +23,7 @@ import de.jottyfan.minecraft.quickiefabric.container.BlockStackerScreenHandler;
import de.jottyfan.minecraft.quickiefabric.event.BreakBlockCallback;
import de.jottyfan.minecraft.quickiefabric.event.EventBlockBreak;
import de.jottyfan.minecraft.quickiefabric.items.QuickieItems;
import de.jottyfan.minecraft.quickiefabric.loot.LootHelper;
import de.jottyfan.minecraft.quickiefabric.tools.QuickieTools;
import net.fabricmc.fabric.api.biome.v1.BiomeModifications;
import net.fabricmc.fabric.api.biome.v1.BiomeSelectionContext;
@ -96,6 +97,10 @@ public class RegistryManager {
public static final ConfiguredFeature<?, ?> CF_ORESANDSALPETER = new ConfiguredFeature(Feature.REPLACE_SINGLE_BLOCK,
new EmeraldOreFeatureConfig(Blocks.SANDSTONE.getDefaultState(),
QuickieBlocks.ORE_SAND_SALPETER.getDefaultState()));
@SuppressWarnings("unchecked")
public static final ConfiguredFeature<?, ?> CF_BLOCKSULFOR = new ConfiguredFeature(Feature.REPLACE_SINGLE_BLOCK,
new EmeraldOreFeatureConfig(Blocks.LAVA.getDefaultState(),
QuickieBlocks.BLOCKSULPHOR.getDefaultState()));
public static final PlacedFeature PF_ORESULPHOR = new PlacedFeature(RegistryEntry.of(CF_ORESULPHOR),
Arrays.asList(CountPlacementModifier.of(7), SquarePlacementModifier.of(),
@ -115,6 +120,10 @@ public class RegistryManager {
public static final PlacedFeature PF_ORESANDSALPETER = new PlacedFeature(RegistryEntry.of(CF_ORESANDSALPETER),
Arrays.asList(CountPlacementModifier.of(50), SquarePlacementModifier.of(),
HeightRangePlacementModifier.uniform(YOffset.aboveBottom(0), YOffset.belowTop(0))));
public static final PlacedFeature PF_BLOCKSULFOR = new PlacedFeature(RegistryEntry.of(CF_BLOCKSULFOR),
Arrays.asList(CountPlacementModifier.of(16), SquarePlacementModifier.of(),
HeightRangePlacementModifier.uniform(YOffset.aboveBottom(0), YOffset.belowTop(0))));
public static final ItemGroup QUICKIEFABRIC_GROUP = FabricItemGroupBuilder
.create(new Identifier(QUICKIEFABRIC, "all")).icon(() -> new ItemStack(QuickieItems.SPEEDPOWDER))
@ -342,6 +351,7 @@ public class RegistryManager {
registerFeature("feature_dirtsalpeter", CF_DIRTSALPETER, PF_DIRTSALPETER, overworld);
registerFeature("feature_sandsalpeter", CF_SANDSALPETER, PF_SANDSALPETER, overworld);
registerFeature("feature_oresandsalpeter", CF_ORESANDSALPETER, PF_ORESANDSALPETER, overworld);
registerFeature("feature_blocksulfor", CF_BLOCKSULFOR, PF_BLOCKSULFOR, nether);
}
public static final void registerLootings() {

View File

@ -1,4 +1,4 @@
package de.jottyfan.minecraft.quickiefabric.init;
package de.jottyfan.minecraft.quickiefabric.loot;
import net.minecraft.item.Item;
import net.minecraft.loot.LootPool;

View File

@ -0,0 +1,13 @@
{
"type": "minecraft:blasting",
"group": "ores",
"ingredient": [
{
"item": "minecraft:dead_brain_coral_block"
}
],
"result": "quickiefabric:salpeter",
"count": 3,
"experience": 0.5,
"cookingtime": 200
}

View File

@ -0,0 +1,13 @@
{
"type": "minecraft:blasting",
"group": "ores",
"ingredient": [
{
"item": "minecraft:dead_bubble_coral_block"
}
],
"result": "quickiefabric:salpeter",
"count": 3,
"experience": 0.5,
"cookingtime": 200
}

View File

@ -0,0 +1,13 @@
{
"type": "minecraft:blasting",
"group": "ores",
"ingredient": [
{
"item": "minecraft:dead_fire_coral_block"
}
],
"result": "quickiefabric:salpeter",
"count": 3,
"experience": 0.5,
"cookingtime": 200
}

View File

@ -0,0 +1,13 @@
{
"type": "minecraft:blasting",
"group": "ores",
"ingredient": [
{
"item": "minecraft:dead_horn_coral_block"
}
],
"result": "quickiefabric:salpeter",
"count": 3,
"experience": 0.5,
"cookingtime": 200
}

View File

@ -0,0 +1,13 @@
{
"type": "minecraft:blasting",
"group": "ores",
"ingredient": [
{
"item": "minecraft:dead_tube_coral_block"
}
],
"result": "quickiefabric:salpeter",
"count": 3,
"experience": 0.5,
"cookingtime": 200
}