minecraft/quickiefabric
1
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

first official 1.19.3 version

Browse Source
This commit is contained in:
Jottyfan 2022-12-15 22:01:36 +01:00
parent 553c8c23c8
commit 2bba55471c
24 changed files with 245 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockOreDeepslateSulphor.java Normal file
View File

@ -0,0 +1,29 @@
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.ExperienceDroppingBlock;
import net.minecraft.block.Material;
import net.minecraft.item.ItemStack;
import net.minecraft.loot.context.LootContext.Builder;
/**
*
* @author jotty
*
*/
public class BlockOreDeepslateSulphor extends ExperienceDroppingBlock {
public BlockOreDeepslateSulphor() {
super(FabricBlockSettings.of(Material.STONE).hardness(1.9f).requiresTool());
}
@Override
public List<ItemStack> getDroppedStacks(BlockState state, Builder builder) {
return Arrays.asList(new ItemStack[] { new ItemStack(QuickieItems.SULPHOR, 4) });
}
}

1
src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/QuickieBlocks.java
View File

@ -11,6 +11,7 @@ public class QuickieBlocks {
public static final BlockOreSalpeter ORE_SALPETER = new BlockOreSalpeter();
public static final BlockOreSandSalpeter ORE_SAND_SALPETER = new BlockOreSandSalpeter();
public static final BlockOreSulphor ORE_SULPHOR = new BlockOreSulphor();
public static final BlockOreDeepslateSulphor ORE_DEEPSLATESULPHOR = new BlockOreDeepslateSulphor();
public static final BlockSandSalpeter SAND_SALPETER = new BlockSandSalpeter();
public static final BlockLavahoarder LAVAHOARDER = new BlockLavahoarder();
public static final BlockEmptyLavahoarder EMPTYLAVAHOARDER = new BlockEmptyLavahoarder();

18
src/main/java/de/jottyfan/minecraft/quickiefabric/init/FeaturesManager.java
View File

@ -19,16 +19,22 @@ import net.minecraft.world.gen.feature.PlacedFeature;
public class FeaturesManager {
public static final RegistryKey<ConfiguredFeature<?, ?>> CF_ORESULFUR = genCf("oresulphor");
public static final RegistryKey<ConfiguredFeature<?, ?>> CF_OREDEEPSLATESULFUR = genCf("oredepslatesulphor");
public static final RegistryKey<ConfiguredFeature<?, ?>> CF_ORESALPETER = genCf("oresalpeter");
public static final RegistryKey<ConfiguredFeature<?, ?>> CF_ORENETHERSULPHOR = genCf("orenethersulphore");
public static final RegistryKey<ConfiguredFeature<?, ?>> CF_BLOCKSULPHOR = genCf("blocksulphore");
// TODO: CF_DIRTSALPETER, CF_SANDSALPETER, CF_ORESANDSALPETER, also the json files for that
public static final RegistryKey<ConfiguredFeature<?, ?>> CF_BLOCKSULPHOR = genCf("blocksulphor");
public static final RegistryKey<ConfiguredFeature<?, ?>> CF_DIRTSALPETER = genCf("dirtsalpeter");
public static final RegistryKey<ConfiguredFeature<?, ?>> CF_SANDSALPETER = genCf("sandsalpeter");
public static final RegistryKey<ConfiguredFeature<?, ?>> CF_ORESANDSALPETER = genCf("oresandsalpeter");
public static final RegistryKey<PlacedFeature> PF_ORESULPHOR = genPf("oresulphor");
public static final RegistryKey<PlacedFeature> PF_OREDEEPSLATESULPHOR = genPf("oredeepslatesulphor");
public static final RegistryKey<PlacedFeature> PF_ORESALPETER = genPf("oresalpeter");
public static final RegistryKey<PlacedFeature> PF_ORENETHERSULPHOR = genPf("orenethersulphor");
public static final RegistryKey<PlacedFeature> PF_BLOCKSULPHOR = genPf("blocksulphor");
// TODO: PF_DIRTSALPETER, PF_SANDSALPETER, PF_ORESANDSALPETER, also the json files for that
public static final RegistryKey<PlacedFeature> PF_DIRTSALPETER = genPf("dirtsalpeter");
public static final RegistryKey<PlacedFeature> PF_SANDSALPETER = genPf("sandsalpeter");
public static final RegistryKey<PlacedFeature> PF_ORESANDSALPETER = genPf("oresandsalpeter");
private static final RegistryKey<ConfiguredFeature<?, ?>> genCf(String name) {
return RegistryKey.of(RegistryKeys.CONFIGURED_FEATURE, new Identifier(RegistryManager.QUICKIEFABRIC, name));
@ -40,8 +46,12 @@ public class FeaturesManager {
protected static final BiConsumer<BiomeSelectionContext, BiomeModificationContext> overworldOres() {
return (bsc, bmc) -> {
bmc.getGenerationSettings().addFeature(GenerationStep.Feature.UNDERGROUND_ORES, PF_ORESALPETER);
bmc.getGenerationSettings().addFeature(GenerationStep.Feature.UNDERGROUND_ORES, PF_ORESULPHOR);
bmc.getGenerationSettings().addFeature(GenerationStep.Feature.UNDERGROUND_ORES, PF_ORESALPETER);
bmc.getGenerationSettings().addFeature(GenerationStep.Feature.UNDERGROUND_ORES, PF_DIRTSALPETER);
bmc.getGenerationSettings().addFeature(GenerationStep.Feature.UNDERGROUND_ORES, PF_SANDSALPETER);
bmc.getGenerationSettings().addFeature(GenerationStep.Feature.UNDERGROUND_ORES, PF_ORESANDSALPETER);
bmc.getGenerationSettings().addFeature(GenerationStep.Feature.UNDERGROUND_ORES, PF_OREDEEPSLATESULPHOR);
};
}

2
src/main/java/de/jottyfan/minecraft/quickiefabric/init/RegistryManager.java
View File

@ -105,6 +105,7 @@ public class RegistryManager {
stacks.add(new ItemStack(QuickieBlocks.ORE_SALPETER));
stacks.add(new ItemStack(QuickieBlocks.ORE_SAND_SALPETER));
stacks.add(new ItemStack(QuickieBlocks.ORE_SULPHOR));
stacks.add(new ItemStack(QuickieBlocks.ORE_DEEPSLATESULPHOR));
stacks.add(new ItemStack(QuickieBlocks.SAND_SALPETER));
stacks.add(new ItemStack(QuickieBlocks.LAVAHOARDER));
stacks.add(new ItemStack(QuickieBlocks.EMPTYLAVAHOARDER));
@ -180,6 +181,7 @@ public class RegistryManager {
registerBlock(QuickieBlocks.ORE_SALPETER, "oresalpeter");
registerBlock(QuickieBlocks.ORE_SAND_SALPETER, "oresandsalpeter");
registerBlock(QuickieBlocks.ORE_SULPHOR, "oresulphor");
registerBlock(QuickieBlocks.ORE_DEEPSLATESULPHOR, "oredeepslatesulphor");
registerBlock(QuickieBlocks.SAND_SALPETER, "sandsalpeter");
registerBlock(QuickieBlocks.LAVAHOARDER, "lavahoarder");
registerBlock(QuickieBlocks.EMPTYLAVAHOARDER, "emptylavahoarder");

7
src/main/resources/assets/quickiefabric/blockstates/oredeepslatesulphor.json Normal file
View File

@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "quickiefabric:block/oredeepslatesulphor"
}
}
}

1
src/main/resources/assets/quickiefabric/lang/de_de.json
View File

@ -39,6 +39,7 @@
"block.quickiefabric.oresalpeter": "Salpetererz",
"block.quickiefabric.oresandsalpeter": "Salpetergestein",
"block.quickiefabric.oresulphor": "Schwefelgestein",
"block.quickiefabric.oredeepslatesulphor": "Schwefeltiefengestein",
"block.quickiefabric.dirtsalpeter": "Salpetererde",
"block.quickiefabric.sandsalpeter": "Salpetersand",
"block.quickiefabric.constructionborder": "Bauplangrenzblock",

1
src/main/resources/assets/quickiefabric/lang/en_us.json
View File

@ -39,6 +39,7 @@
"block.quickiefabric.oresalpeter": "salpeter ore",
"block.quickiefabric.oresandsalpeter": "salpeter stone",
"block.quickiefabric.oresulphor": "sulfur stone",
"block.quickiefabric.oredeepslatesulphor": "deepslate sulfur stone",
"block.quickiefabric.dirtsalpeter": "salpeter dirt",
"block.quickiefabric.sandsalpeter": "salpeter sand",
"block.quickiefabric.constructionborder": "building plan border block",

6
src/main/resources/assets/quickiefabric/models/block/oredeepslatesulphor.json Normal file
View File

@ -0,0 +1,6 @@
{
"parent": "block/cube_all",
"textures": {
"all": "quickiefabric:block/oredeepslatesulphor"
}
}

10
src/main/resources/assets/quickiefabric/models/item/oredeepslatesulphor.json Normal file
View File

@ -0,0 +1,10 @@
{
"parent": "quickiefabric:block/oredeepslatesulphor",
"display": {
"thirdperson": {
"rotation": [ 10, -45, 170 ],
"translation": [ 0, 1.5, -2.75 ],
"scale": [ 0.375, 0.375, 0.375 ]
}
}
}

BIN
src/main/resources/assets/quickiefabric/textures/block/oredeepslatesulphor.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 6.2 KiB

1
src/main/resources/data/minecraft/tags/blocks/mineable/pickaxe.json
View File

@ -2,6 +2,7 @@
"replace": false,
"values": [
"quickiefabric:oresulphor",
"quickiefabric:oredeepslatesulphor",
"quickiefabric:orenethersulphor",
"quickiefabric:oresalpeter",
"quickiefabric:oresandsalpeter",

18
src/main/resources/data/quickiefabric/worldgen/configured_feature/dirtsalpeter.json Normal file
View File

@ -0,0 +1,18 @@
{
"type": "minecraft:ore",
"config": {
"discard_chance_on_air_exposure": 0.0,
"size": 4,
"targets": [
{
"state": {
"Name": "quickiefabric:dirtsalpeter"
},
"target": {
"predicate_type": "minecraft:block_match",
"block": "minecraft:dirt"
}
}
]
}
}

18
src/main/resources/data/quickiefabric/worldgen/configured_feature/oredeepslatesulphor.json Normal file
View File

@ -0,0 +1,18 @@
{
"type": "minecraft:ore",
"config": {
"discard_chance_on_air_exposure": 0.0,
"size": 20,
"targets": [
{
"state": {
"Name": "quickiefabric:oredeepslatesulphor"
},
"target": {
"predicate_type": "minecraft:tag_match",
"tag": "minecraft:deepslate_ore_replaceables"
}
}
]
}
}

9
src/main/resources/data/quickiefabric/worldgen/configured_feature/oresalpeter.json
View File

@ -12,15 +12,6 @@
"predicate_type": "minecraft:tag_match",
"tag": "minecraft:stone_ore_replaceables"
}
},
{
"state": {
"Name": "quickiefabric:oresalpeter"
},
"target": {
"predicate_type": "minecraft:tag_match",
"tag": "minecraft:deepslate_ore_replaceables"
}
}
]
}

18
src/main/resources/data/quickiefabric/worldgen/configured_feature/oresandsalpeter.json Normal file
View File

@ -0,0 +1,18 @@
{
"type": "minecraft:ore",
"config": {
"discard_chance_on_air_exposure": 0.0,
"size": 6,
"targets": [
{
"state": {
"Name": "quickiefabric:oresandsalpeter"
},
"target": {
"predicate_type": "minecraft:block_match",
"block": "minecraft:sandstone"
}
}
]
}
}

11
src/main/resources/data/quickiefabric/worldgen/configured_feature/oresulphor.json
View File

@ -2,7 +2,7 @@
"type": "minecraft:ore",
"config": {
"discard_chance_on_air_exposure": 0.0,
"size": 20,
"size": 10,
"targets": [
{
"state": {
@ -12,15 +12,6 @@
"predicate_type": "minecraft:tag_match",
"tag": "minecraft:stone_ore_replaceables"
}
},
{
"state": {
"Name": "quickiefabric:oresulphor"
},
"target": {
"predicate_type": "minecraft:tag_match",
"tag": "minecraft:deepslate_ore_replaceables"
}
}
]
}

18
src/main/resources/data/quickiefabric/worldgen/configured_feature/sandsalpeter.json Normal file
View File

@ -0,0 +1,18 @@
{
"type": "minecraft:ore",
"config": {
"discard_chance_on_air_exposure": 0.0,
"size": 8,
"targets": [
{
"state": {
"Name": "quickiefabric:sandsalpeter"
},
"target": {
"predicate_type": "minecraft:block_match",
"block": "minecraft:sand"
}
}
]
}
}

2
src/main/resources/data/quickiefabric/worldgen/placed_feature/blocksulphor.json
View File

@ -1,5 +1,5 @@
{
"feature": "quickiefabric:oresulphor",
"feature": "quickiefabric:blocksulphor",
"placement": [
{
"type": "minecraft:count",

24
src/main/resources/data/quickiefabric/worldgen/placed_feature/dirtsalpeter.json Normal file
View File

@ -0,0 +1,24 @@
{
"feature": "quickiefabric: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
}
}
}
]
}

24
src/main/resources/data/quickiefabric/worldgen/placed_feature/oredeepslatesulphor.json Normal file
View File

@ -0,0 +1,24 @@
{
"feature": "quickiefabric:oredeepslatesulphor",
"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
}
}
}
]
}

2
src/main/resources/data/quickiefabric/worldgen/placed_feature/orenethersulphor.json
View File

@ -1,5 +1,5 @@
{
"feature": "quickiefabric:oresulphor",
"feature": "quickiefabric:orenethersulphor",
"placement": [
{
"type": "minecraft:count",

24
src/main/resources/data/quickiefabric/worldgen/placed_feature/oresandsalpeter.json Normal file
View File

@ -0,0 +1,24 @@
{
"feature": "quickiefabric: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
}
}
}
]
}

4
src/main/resources/data/quickiefabric/worldgen/placed_feature/oresulphor.json
View File

@ -3,7 +3,7 @@
"placement": [
{
"type": "minecraft:count",
"count": 15
"count": 9
},
{
"type": "minecraft:in_square"
@ -16,7 +16,7 @@
"absolute": 64
},
"min_inclusive": {
"absolute": -125
"absolute": 0
}
}
}

24
src/main/resources/data/quickiefabric/worldgen/placed_feature/sandsalpeter.json Normal file
View File

@ -0,0 +1,24 @@
{
"feature": "quickiefabric: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
}
}
}
]
}