Skip to content

Commit

Permalink
0.0.10 pre release 1
Browse files Browse the repository at this point in the history
  • Loading branch information
@warior456
warior456 committed Feb 9, 2024
1 parent f5e1f65 commit edfcc75
Show file tree
Hide file tree
Showing 10 changed files with 225 additions and 28 deletions.
2 changes: 1 addition & 1 deletion gradle.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ org.gradle.parallel=true
loader_version=0.14.21

# Mod Properties
mod_version = 0.0.10-dev
mod_version = 0.0.10-pre1
maven_group = net.ugi.sculk_depths
archives_base_name = sculk_depths

Expand Down
44 changes: 44 additions & 0 deletions src/main/generated/data/minecraft/tags/blocks/mineable/axe.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
{
"replace": false,
"values": [
"sculk_depths:valtrox_log",
"sculk_depths:valtrox_wood",
"sculk_depths:stripped_valtrox_log",
"sculk_depths:stripped_valtrox_wood",
"sculk_depths:valtrox_planks",
"sculk_depths:valtrox_stairs",
"sculk_depths:valtrox_slab",
"sculk_depths:valtrox_fence",
"sculk_depths:valtrox_fence_gate",
"sculk_depths:valtrox_door",
"sculk_depths:valtrox_trapdoor",
"sculk_depths:valtrox_pressure_plate",
"sculk_depths:valtrox_button",
"sculk_depths:coated_valtrox_log",
"sculk_depths:coated_valtrox_wood",
"sculk_depths:coated_stripped_valtrox_log",
"sculk_depths:coated_stripped_valtrox_wood",
"sculk_depths:coated_valtrox_planks",
"sculk_depths:coated_valtrox_stairs",
"sculk_depths:coated_valtrox_slab",
"sculk_depths:coated_valtrox_fence",
"sculk_depths:coated_valtrox_fence_gate",
"sculk_depths:coated_valtrox_door",
"sculk_depths:coated_valtrox_trapdoor",
"sculk_depths:coated_valtrox_pressure_plate",
"sculk_depths:coated_valtrox_button",
"sculk_depths:dried_valtrox_log",
"sculk_depths:dried_valtrox_wood",
"sculk_depths:stripped_dried_valtrox_log",
"sculk_depths:stripped_dried_valtrox_wood",
"sculk_depths:dried_valtrox_planks",
"sculk_depths:dried_valtrox_stairs",
"sculk_depths:dried_valtrox_slab",
"sculk_depths:dried_valtrox_fence",
"sculk_depths:dried_valtrox_fence_gate",
"sculk_depths:dried_valtrox_door",
"sculk_depths:dried_valtrox_trapdoor",
"sculk_depths:dried_valtrox_pressure_plate",
"sculk_depths:dried_valtrox_button"
]
}
48 changes: 48 additions & 0 deletions src/main/generated/data/minecraft/tags/blocks/mineable/pickaxe.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
{
"replace": false,
"values": [
"sculk_depths:amalgamite",
"sculk_depths:umbrusk",
"sculk_depths:umbrusk_stairs",
"sculk_depths:umbrusk_slab",
"sculk_depths:umbrusk_wall",
"sculk_depths:umbrusk_bricks",
"sculk_depths:umbrusk_brick_stairs",
"sculk_depths:umbrusk_brick_slab",
"sculk_depths:umbrusk_brick_wall",
"sculk_depths:flumrock",
"sculk_depths:flumrock_cauldron",
"sculk_depths:quazarith_block",
"sculk_depths:quazarith_ore",
"sculk_depths:petrified_valtrox_log",
"sculk_depths:petrified_valtrox_wood",
"sculk_depths:stripped_petrified_valtrox_log",
"sculk_depths:stripped_petrified_valtrox_wood",
"sculk_depths:petrified_valtrox_slates",
"sculk_depths:petrified_valtrox_stairs",
"sculk_depths:petrified_valtrox_slab",
"sculk_depths:petrified_valtrox_wall",
"sculk_depths:petrified_valtrox_wall_gate",
"sculk_depths:petrified_valtrox_door",
"sculk_depths:petrified_valtrox_trapdoor",
"sculk_depths:petrified_valtrox_pressure_plate",
"sculk_depths:petrified_valtrox_button",
"sculk_depths:zygrin",
"sculk_depths:zygrin_stairs",
"sculk_depths:zygrin_slab",
"sculk_depths:zygrin_wall",
"sculk_depths:zygrin_light",
"sculk_depths:zygrin_flowblock",
"sculk_depths:polished_zygrin",
"sculk_depths:polished_zygrin_stairs",
"sculk_depths:polished_zygrin_slab",
"sculk_depths:polished_zygrin_wall",
"sculk_depths:zygrin_bricks",
"sculk_depths:zygrin_brick_stairs",
"sculk_depths:zygrin_brick_slab",
"sculk_depths:zygrin_brick_wall",
"sculk_depths:zygrin_pillar",
"sculk_depths:chiseled_zygrin",
"sculk_depths:larguth"
]
}
20 changes: 20 additions & 0 deletions src/main/generated/data/sculk_depths/loot_tables/blocks/amalgamite.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{
"type": "minecraft:block",
"pools": [
{
"bonus_rolls": 0.0,
"conditions": [
{
"condition": "minecraft:survives_explosion"
}
],
"entries": [
{
"type": "minecraft:item",
"name": "sculk_depths:amalgamite"
}
],
"rolls": 1.0
}
]
}
14 changes: 8 additions & 6 deletions src/main/java/net/ugi/sculk_depths/block/ModBlocks.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,11 +45,11 @@ public class ModBlocks {
public static final Block SOUL_FIRE = registerBlockWithoutBlockItem("soul_fire", new SoulFireBlock(FabricBlockSettings.copyOf(Blocks.SOUL_FIRE)), ModItemGroup.SCULK_DEPTHS);

public static final Block AMALGAMITE = registerBlock("amalgamite",
new Block(FabricBlockSettings.copyOf(Blocks.DEEPSLATE).strength(5.0f,8f).requiresTool()), ModItemGroup.SCULK_DEPTHS);
new Block(FabricBlockSettings.copyOf(Blocks.DEEPSLATE).strength(3.0f, 6.0f).requiresTool()), ModItemGroup.SCULK_DEPTHS);
public static final Block LARGUTH = registerBlock("larguth",
new Block(FabricBlockSettings.copyOf(Blocks.OBSIDIAN).strength(40.0f,1000f).requiresTool()), ModItemGroup.SCULK_DEPTHS);

public static final Block FURNACE = registerBlock("furnace",
public static final Block FURNACE = registerBlockWithoutBlockItem("furnace", //TODO RETURN TO NORMAL BLOCK AFTER 0.0.10 release
new ModFurnaceBlock(FabricBlockSettings.copyOf(Blocks.FURNACE).strength(10.0f,10f).requiresTool()), ModItemGroup.SCULK_DEPTHS);


Expand Down Expand Up @@ -364,10 +364,12 @@ public class ModBlocks {
new Block(FabricBlockSettings.copyOf(ModBlocks.ZYGRIN).strength(4.5f,8.0f).requiresTool()), ModItemGroup.SCULK_DEPTHS);

//crystals
public static final Block WHITE_CRYSTAL_BLOCK = registerBlock("white_crystal_block", ModBlocks.createCrystalBlock(DyeColor.WHITE), ModItemGroup.SCULK_DEPTHS);
public static final Block BLUE_CRYSTAL_BLOCK = registerBlock("blue_crystal_block", ModBlocks.createCrystalBlock(DyeColor.BLUE), ModItemGroup.SCULK_DEPTHS);
public static final Block ORANGE_CRYSTAL_BLOCK = registerBlock("orange_crystal_block", ModBlocks.createCrystalBlock(DyeColor.ORANGE), ModItemGroup.SCULK_DEPTHS);
public static final Block LIME_CRYSTAL_BLOCK = registerBlock("lime_crystal_block", ModBlocks.createCrystalBlock(DyeColor.LIME), ModItemGroup.SCULK_DEPTHS);

//TODO RETURN ALL OF THESE BACK TO NORMAL BLOCK AFTER 0.0.10 release
public static final Block WHITE_CRYSTAL_BLOCK = registerBlockWithoutBlockItem("white_crystal_block", ModBlocks.createCrystalBlock(DyeColor.WHITE), ModItemGroup.SCULK_DEPTHS);
public static final Block BLUE_CRYSTAL_BLOCK = registerBlockWithoutBlockItem("blue_crystal_block", ModBlocks.createCrystalBlock(DyeColor.BLUE), ModItemGroup.SCULK_DEPTHS);
public static final Block ORANGE_CRYSTAL_BLOCK = registerBlockWithoutBlockItem("orange_crystal_block", ModBlocks.createCrystalBlock(DyeColor.ORANGE), ModItemGroup.SCULK_DEPTHS);
public static final Block LIME_CRYSTAL_BLOCK = registerBlockWithoutBlockItem("lime_crystal_block", ModBlocks.createCrystalBlock(DyeColor.LIME), ModItemGroup.SCULK_DEPTHS);

//penebrium
public static final Block PENEBRIUM_SHROOM = registerBlock("penebrium_shroom",
Expand Down
119 changes: 101 additions & 18 deletions src/main/java/net/ugi/sculk_depths/datagen/ModBlockTagProvider.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,26 +18,109 @@ public ModBlockTagProvider(FabricDataOutput output, CompletableFuture<RegistryWr

@Override
protected void configure(RegistryWrapper.WrapperLookup arg) {
/*
getOrCreateTagBuilder(ModTags.Blocks.METAL_DETECTOR_DETECTABLE_BLOCKS)
.add(ModBlocks.RUBY_ORE)
.forceAddTag(BlockTags.GOLD_ORES)
.forceAddTag(BlockTags.EMERALD_ORES)
.forceAddTag(BlockTags.REDSTONE_ORES)
.forceAddTag(BlockTags.LAPIS_ORES)
.forceAddTag(BlockTags.DIAMOND_ORES)
.forceAddTag(BlockTags.IRON_ORES)
.forceAddTag(BlockTags.COPPER_ORES)
.forceAddTag(BlockTags.COAL_ORES);

getOrCreateTagBuilder(BlockTags.PICKAXE_MINEABLE)
.add(ModBlocks.RAW_RUBY_BLOCK)
.add(ModBlocks.RUBY_BLOCK)
.add(ModBlocks.RUBY_ORE)
.add(ModBlocks.DEEPSLATE_RUBY_ORE)
.add(ModBlocks.NETHER_RUBY_ORE)
.add(ModBlocks.END_STONE_RUBY_ORE)
.add(ModBlocks.SOUND_BLOCK);
.add(ModBlocks.AMALGAMITE)

.add(ModBlocks.UMBRUSK)
.add(ModBlocks.UMBRUSK_STAIRS)
.add(ModBlocks.UMBRUSK_SLAB)
.add(ModBlocks.UMBRUSK_WALL)

.add(ModBlocks.UMBRUSK_BRICKS)
.add(ModBlocks.UMBRUSK_BRICK_STAIRS)
.add(ModBlocks.UMBRUSK_BRICK_SLAB)
.add(ModBlocks.UMBRUSK_BRICK_WALL)

.add(ModBlocks.FLUMROCK)
.add(ModBlocks.FLUMROCK_CAULDRON)

.add(ModBlocks.QUAZARITH_BLOCK)
.add(ModBlocks.QUAZARITH_ORE)

.add(ModBlocks.PETRIFIED_VALTROX_LOG)
.add(ModBlocks.PETRIFIED_VALTROX_WOOD)
.add(ModBlocks.STRIPPED_PETRIFIED_VALTROX_LOG)
.add(ModBlocks.STRIPPED_PETRIFIED_VALTROX_WOOD)
.add(ModBlocks.PETRIFIED_VALTROX_SLATES)
.add(ModBlocks.PETRIFIED_VALTROX_STAIRS)
.add(ModBlocks.PETRIFIED_VALTROX_SLAB)
.add(ModBlocks.PETRIFIED_VALTROX_WALL)
.add(ModBlocks.PETRIFIED_VALTROX_WALL_GATE)
.add(ModBlocks.PETRIFIED_VALTROX_DOOR)
.add(ModBlocks.PETRIFIED_VALTROX_TRAPDOOR)
.add(ModBlocks.PETRIFIED_VALTROX_PRESSURE_PLATE)
.add(ModBlocks.PETRIFIED_VALTROX_BUTTON)

.add(ModBlocks.ZYGRIN)
.add(ModBlocks.ZYGRIN_STAIRS)
.add(ModBlocks.ZYGRIN_SLAB)
.add(ModBlocks.ZYGRIN_WALL)
.add(ModBlocks.ZYGRIN_LIGHT)
.add(ModBlocks.ZYGRIN_FLOWBLOCK)

.add(ModBlocks.POLISHED_ZYGRIN)
.add(ModBlocks.POLISHED_ZYGRIN_STAIRS)
.add(ModBlocks.POLISHED_ZYGRIN_SLAB)
.add(ModBlocks.POLISHED_ZYGRIN_WALL)

.add(ModBlocks.ZYGRIN_BRICKS)
.add(ModBlocks.ZYGRIN_BRICK_STAIRS)
.add(ModBlocks.ZYGRIN_BRICK_SLAB)
.add(ModBlocks.ZYGRIN_BRICK_WALL)

.add(ModBlocks.ZYGRIN_PILLAR)
.add(ModBlocks.CHISELED_ZYGRIN)

.add(ModBlocks.LARGUTH);

getOrCreateTagBuilder(BlockTags.AXE_MINEABLE)
.add(ModBlocks.VALTROX_LOG)
.add(ModBlocks.VALTROX_WOOD)
.add(ModBlocks.STRIPPED_VALTROX_LOG)
.add(ModBlocks.STRIPPED_VALTROX_WOOD)
.add(ModBlocks.VALTROX_PLANKS)
.add(ModBlocks.VALTROX_STAIRS)
.add(ModBlocks.VALTROX_SLAB)
.add(ModBlocks.VALTROX_FENCE)
.add(ModBlocks.VALTROX_FENCE_GATE)
.add(ModBlocks.VALTROX_DOOR)
.add(ModBlocks.VALTROX_TRAPDOOR)
.add(ModBlocks.VALTROX_PRESSURE_PLATE)
.add(ModBlocks.VALTROX_BUTTON)


.add(ModBlocks.COATED_VALTROX_LOG)
.add(ModBlocks.COATED_VALTROX_WOOD)
.add(ModBlocks.COATED_STRIPPED_VALTROX_LOG)
.add(ModBlocks.COATED_STRIPPED_VALTROX_WOOD)
.add(ModBlocks.COATED_VALTROX_PLANKS)
.add(ModBlocks.COATED_VALTROX_STAIRS)
.add(ModBlocks.COATED_VALTROX_SLAB)
.add(ModBlocks.COATED_VALTROX_FENCE)
.add(ModBlocks.COATED_VALTROX_FENCE_GATE)
.add(ModBlocks.COATED_VALTROX_DOOR)
.add(ModBlocks.COATED_VALTROX_TRAPDOOR)
.add(ModBlocks.COATED_VALTROX_PRESSURE_PLATE)
.add(ModBlocks.COATED_VALTROX_BUTTON)

.add(ModBlocks.DRIED_VALTROX_LOG)
.add(ModBlocks.DRIED_VALTROX_WOOD)
.add(ModBlocks.STRIPPED_DRIED_VALTROX_LOG)
.add(ModBlocks.STRIPPED_DRIED_VALTROX_WOOD)
.add(ModBlocks.DRIED_VALTROX_PLANKS)
.add(ModBlocks.DRIED_VALTROX_STAIRS)
.add(ModBlocks.DRIED_VALTROX_SLAB)
.add(ModBlocks.DRIED_VALTROX_FENCE)
.add(ModBlocks.DRIED_VALTROX_FENCE_GATE)
.add(ModBlocks.DRIED_VALTROX_DOOR)
.add(ModBlocks.DRIED_VALTROX_TRAPDOOR)
.add(ModBlocks.DRIED_VALTROX_PRESSURE_PLATE)
.add(ModBlocks.DRIED_VALTROX_BUTTON);

/*
getOrCreateTagBuilder(BlockTags.NEEDS_DIAMOND_TOOL)
.add(ModBlocks.DEEPSLATE_RUBY_ORE);
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/net/ugi/sculk_depths/datagen/ModLootTableProvider.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ public void generate() {
addDrop(ModBlocks.STRIPPED_VALTROX_WOOD, ModBlocks.STRIPPED_VALTROX_WOOD.asItem());
addDrop(ModBlocks.STRIPPED_DRIED_VALTROX_WOOD, ModBlocks.STRIPPED_DRIED_VALTROX_WOOD.asItem());
addDrop(ModBlocks.STRIPPED_PETRIFIED_VALTROX_WOOD, ModBlocks.STRIPPED_PETRIFIED_VALTROX_WOOD.asItem());

addDrop(ModBlocks.AMALGAMITE, ModBlocks.AMALGAMITE.asItem());
}

public LootTable.Builder copperLikeOreDrops(Block drop, Item item) {
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/net/ugi/sculk_depths/item/ModItems.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -140,10 +140,10 @@ public static void addItemsToItemGroup() {
addToItemGroup(ModItemGroup.SCULK_DEPTHS, CHOMPER_COLOSSUS_SPAWN_EGG);

addToItemGroup(ModItemGroup.SCULK_DEPTHS, CRUX);
addToItemGroup(ModItemGroup.SCULK_DEPTHS, WHITE_CRYSTAL);
/* addToItemGroup(ModItemGroup.SCULK_DEPTHS, WHITE_CRYSTAL); //TODO UNCOMMENT AFTER 0.0.10 release
addToItemGroup(ModItemGroup.SCULK_DEPTHS, BLUE_CRYSTAL);
addToItemGroup(ModItemGroup.SCULK_DEPTHS, ORANGE_CRYSTAL);
addToItemGroup(ModItemGroup.SCULK_DEPTHS, LIME_CRYSTAL);
addToItemGroup(ModItemGroup.SCULK_DEPTHS, LIME_CRYSTAL);*/
addToItemGroup(ModItemGroup.SCULK_DEPTHS, PENEBRIUM_SPORE_BUCKET);

addToItemGroup(ModItemGroup.SCULK_DEPTHS, QUAZARITH_INGOT);
Expand Down
0 ...a/minecraft/tags/blocks/mineable/axe.json → ...ks/mineable/axe_use_datagen_not_this.json
View file
File renamed without changes.
0 ...necraft/tags/blocks/mineable/pickaxe.json → ...ineable/pickaxe_use_datagen_not_this.json
View file
File renamed without changes.

0 comments on commit edfcc75

Please sign in to comment.