Anvilcraft/DimDoors
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Did various datapack work with limbo decay and added proper versioning for new gradle backend. Also bumped to 5.2.0

Browse source
This commit is contained in:
Waterpicker 2023-07-22 10:20:34 -05:00
parent 23d19cc8a1
commit 5450fd9844
9 changed files with 121 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
common/src/main/java/org/dimdev/dimdoors/block/ModBlocks.java
View file

@ -162,7 +162,6 @@ public final class ModBlocks {
public static final RegistrySupplier<Block> CLOD_BLOCK = register("clod_block", () -> new Block(of(Material.AMETHYST)));
public static final RegistrySupplier<Block> GRAVEL_FENCE = registerFence("gravel_fence", GRAVEL);
public static final RegistrySupplier<Block> GRAVEL_GATE = registerFenceGate("gravel_gate", GRAVEL);
public static final RegistrySupplier<Block> GRAVEL_BUTTON = registerButton("gravel_button", GRAVEL);
public static final RegistrySupplier<Block> GRAVEL_SLAB = registerSlab("gravel_slab", GRAVEL);
public static final RegistrySupplier<Block> GRAVEL_STAIRS = registerStairs("gravel_stairs", GRAVEL);
@ -170,7 +169,6 @@ public final class ModBlocks {
public static final RegistrySupplier<Block> DARK_SAND = register("dark_sand", () -> new Block(of(Material.SAND, MaterialColor.COLOR_BLACK).strength(0.5F).sound(SoundType.SAND)));
public static final RegistrySupplier<Block> DARK_SAND_FENCE = registerFence("dark_sand_fence", DARK_SAND);
public static final RegistrySupplier<Block> DARK_SAND_GATE = registerFenceGate("dark_sand_gate", DARK_SAND);
public static final RegistrySupplier<Block> DARK_SAND_BUTTON = registerButton("dark_sand_button", DARK_SAND);
public static final RegistrySupplier<Block> DARK_SAND_SLAB = registerSlab("dark_sand_slab", DARK_SAND);
public static final RegistrySupplier<Block> DARK_SAND_STAIRS = registerStairs("dark_sand_stairs", DARK_SAND);
@ -182,6 +180,8 @@ public final class ModBlocks {
public static final RegistrySupplier<Block> CLAY_SLAB = registerSlab("clay_slab", CLAY);
public static final RegistrySupplier<Block> CLAY_STAIRS = registerStairs("clay_stairs", CLAY);
public static final RegistrySupplier<Block> CLAY_WALL = registerWall("clay_wall", CLAY);
public static final RegistrySupplier<Block> MUD_FENCE = registerFence("mud_fence", MUD);
public static final RegistrySupplier<Block> MUD_GATE = registerFenceGate("mud_gate", MUD);
public static final RegistrySupplier<Block> MUD_BUTTON = registerButton("mud_button", MUD);

3
common/src/main/java/org/dimdev/dimdoors/tag/ModBlockTags.java
View file

@ -4,6 +4,7 @@ import net.minecraft.core.registries.Registries;
import net.minecraft.tags.TagKey;
import net.minecraft.world.level.block.Block;
import org.dimdev.dimdoors.DimensionalDoors;
import org.dimdev.dimdoors.block.ModBlocks;
public class ModBlockTags {
public static final TagKey<Block> MINOR_PLANTS = of("minor_plants");
@ -43,7 +44,6 @@ public class ModBlockTags {
public static final TagKey<Block> DECAY_TO_DRIFTWOOD_BUTTON = of("decay_to_driftwood_button");
public static final TagKey<Block> DECAY_TO_DRIFTWOOD_SLAB = of("decay_to_driftwood_slab");
public static final TagKey<Block> DECAY_TO_DRIFTWOOD_STAIRS = of("decay_to_driftwood_stairs");
public static final TagKey<Block> DECAY_TO_CHEST = of("decay_to_chest");
public static final TagKey<Block> DECAY_TO_SKELETON_SKULL = of("decay_to_skeleton_skull");
public static final TagKey<Block> DECAY_TO_SKELETON_WALL_SKULL = of("decay_to_skeleton_wall_skull");
@ -121,6 +121,7 @@ public class ModBlockTags {
public static final TagKey<Block> DECAY_TOSTONE_BRICK_STAIRS = of("decay_tostone_brick_stairs");
public static final TagKey<Block> DECAY_TOSTONE_BRICK_WALL = of("decay_tostone_brick_wall");
public static final TagKey<Block> DECAY_TO_DRIFTWOOD_LOG = of("decay_to_driftwood_log");
public static final TagKey<Block> DECAY_TO_UNRAVELED_FABRIC = of("decay_to_unraveled_fabric");
private static TagKey<Block> of(String id) {
return TagKey.create(Registries.BLOCK, DimensionalDoors.id(id));

2
fabric/build.gradle
View file

@ -104,7 +104,7 @@ remapJar {
injectAccessWidener = true
input.set shadowJar.archiveFile
dependsOn shadowJar
classifier null
classifier "fabric"
}
jar {

2
fabric/src/main/datagen/org/dimdev/dimdoors/datagen/BlockStateProvider.java
View file

@ -68,7 +68,6 @@ public class BlockStateProvider extends FabricModelProvider {
generator.family(Blocks.GRAVEL)
.fence(ModBlocks.GRAVEL_FENCE.get())
.button(ModBlocks.GRAVEL_BUTTON.get())
.fenceGate(ModBlocks.GRAVEL_GATE.get())
.slab(ModBlocks.GRAVEL_SLAB.get())
.stairs(ModBlocks.GRAVEL_STAIRS.get())
.wall(ModBlocks.GRAVEL_WALL.get());
@ -76,7 +75,6 @@ public class BlockStateProvider extends FabricModelProvider {
generator.family(ModBlocks.DARK_SAND.get())
.fence(ModBlocks.DARK_SAND_FENCE.get())
.button(ModBlocks.DARK_SAND_BUTTON.get())
.fenceGate(ModBlocks.DARK_SAND_GATE.get())
.slab(ModBlocks.DARK_SAND_SLAB.get())
.stairs(ModBlocks.DARK_SAND_STAIRS.get())
.wall(ModBlocks.DARK_SAND_WALL.get());

116
fabric/src/main/datagen/org/dimdev/dimdoors/datagen/BlockTagProvider.java
View file

@ -1,5 +1,6 @@
package org.dimdev.dimdoors.datagen;
import dev.architectury.platform.Mod;
import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput;
import net.fabricmc.fabric.api.datagen.v1.provider.FabricTagProvider;
import net.minecraft.core.Holder;
@ -9,6 +10,7 @@ import net.minecraft.tags.BlockTags;
import net.minecraft.tags.TagKey;
import net.minecraft.world.level.block.Block;
import net.minecraft.world.level.block.Blocks;
import net.minecraft.world.level.block.state.BlockState;
import org.dimdev.dimdoors.block.ModBlocks;
import org.dimdev.dimdoors.tag.ModBlockTags;
@ -37,7 +39,8 @@ public class BlockTagProvider extends FabricTagProvider.BlockTagProvider {
ModBlocks.DRIFTWOOD_TRAPDOOR.get(),
Blocks.RAIL,
ModBlocks.RUST.get(),
ModBlocks.UNRAVELED_SPIKE.get());
ModBlocks.UNRAVELED_SPIKE.get(),
Blocks.WITHER_ROSE);
add(ModBlockTags.DECAY_TO_RAIL,
Blocks.ACTIVATOR_RAIL,
Blocks.DETECTOR_RAIL,
@ -60,10 +63,7 @@ public class BlockTagProvider extends FabricTagProvider.BlockTagProvider {
ModBlocks.CLAY_FENCE.get(),
ModBlocks.DARK_SAND_FENCE.get()
);
add(ModBlockTags.DECAY_UNRAVELED_GATE,
ModBlocks.CLAY_GATE.get(),
ModBlocks.DARK_SAND_GATE.get()
);
add(ModBlockTags.DECAY_UNRAVELED_BUTTON,
ModBlocks.CLAY_BUTTON.get(),
ModBlocks.DARK_SAND_BUTTON.get()
@ -128,12 +128,14 @@ public class BlockTagProvider extends FabricTagProvider.BlockTagProvider {
ModBlocks.MUD_BUTTON.get()
);
add(ModBlockTags.DECAY_CLAY_SLAB,
ModBlocks.CLAY_SLAB.get(),
ModBlocks.MUD_SLAB.get()
Blocks.BRICK_SLAB,
ModBlocks.MUD_SLAB.get(),
ModBlocks.AMALGAM_SLAB.get()
);
add(ModBlockTags.DECAY_CLAY_STAIRS,
ModBlocks.CLAY_STAIRS.get(),
ModBlocks.MUD_STAIRS.get()
Blocks.BRICK_STAIRS,
ModBlocks.MUD_STAIRS.get(),
ModBlocks.AMALGAM_STAIRS.get()
);
add(ModBlockTags.DECAY_TO_DARK_SAND,
Blocks.AMETHYST_BLOCK,
@ -143,10 +145,104 @@ public class BlockTagProvider extends FabricTagProvider.BlockTagProvider {
Blocks.SAND,
Blocks.SOUL_SAND
);
add(ModBlockTags.DECAY_TO_UNRAVELED_FABRIC,
ModBlocks.DARK_SAND.get(),
Blocks.CLAY);
add(ModBlockTags.DECAY_TO_MUD,
Blocks.DIRT,
Blocks.GRASS,
Blocks.PODZOL,
Blocks.MYCELIUM,
ModBlocks.DRIFTWOOD_PLANKS.get(),
Blocks.COAL_BLOCK,
Blocks.COMPOSTER,
Blocks.CHEST,
Blocks.BONE_BLOCK,
Blocks.SKELETON_SKULL,
Blocks.SKELETON_WALL_SKULL,
Blocks.WITHER_SKELETON_SKULL,
Blocks.WITHER_SKELETON_WALL_SKULL,
Blocks.DRAGON_HEAD,
Blocks.DRAGON_WALL_HEAD,
Blocks.CACTUS,
Blocks.COCOA,
Blocks.PUMPKIN,
Blocks.MELON,
Blocks.HAY_BLOCK,
Blocks.MOSS_BLOCK,
Blocks.SLIME_BLOCK,
Blocks.HONEYCOMB_BLOCK,
Blocks.LECTERN,
Blocks.PURPUR_BLOCK,
Blocks.DRIED_KELP_BLOCK,
Blocks.NETHER_WART_BLOCK,
Blocks.PACKED_MUD);
add(ModBlockTags.DECAY_TO_NETHERWART_BLOCK,
Blocks.BROWN_MUSHROOM_BLOCK,
Blocks.RED_MUSHROOM_BLOCK);
add(ModBlockTags.DECAY_TO_GLASS,
Blocks.TINTED_GLASS,
Blocks.REDSTONE_BLOCK,
Blocks.GRAY_STAINED_GLASS,
Blocks.BLACK_STAINED_GLASS,
Blocks.ORANGE_STAINED_GLASS,
Blocks.BLUE_STAINED_GLASS,
Blocks.BROWN_STAINED_GLASS,
Blocks.CYAN_STAINED_GLASS,
Blocks.GREEN_STAINED_GLASS,
Blocks.LIGHT_BLUE_STAINED_GLASS,
Blocks.LIGHT_GRAY_STAINED_GLASS,
Blocks.LIME_STAINED_GLASS,
Blocks.MAGENTA_STAINED_GLASS,
Blocks.PINK_STAINED_GLASS,
Blocks.PURPLE_STAINED_GLASS,
Blocks.RED_STAINED_GLASS,
Blocks.WHITE_STAINED_GLASS,
Blocks.YELLOW_STAINED_GLASS);
add(ModBlockTags.DECAY_TO_GRAVEL,
ModBlocks.AMALGAM_BLOCK.get(),
ModBlocks.CLOD_ORE.get(),
Blocks.COBBLESTONE);
add(ModBlockTags.DECAY_TO_AMALGAM_ORE, Blocks.RAW_COPPER_BLOCK, Blocks.COPPER_ORE, Blocks.DEEPSLATE_COPPER_ORE, Blocks.RAW_IRON_BLOCK, Blocks.DEEPSLATE_IRON_ORE, Blocks.IRON_ORE, Blocks.RAW_GOLD_BLOCK, Blocks.GOLD_ORE, Blocks.NETHER_GOLD_ORE, Blocks.DEEPSLATE_GOLD_ORE);
add(ModBlockTags.DECAY_TO_CLOD_ORE, Blocks.COAL_ORE, Blocks.DEEPSLATE_COAL_ORE, Blocks.EMERALD_ORE, Blocks.DEEPSLATE_EMERALD_ORE, Blocks.LAPIS_ORE, Blocks.DEEPSLATE_LAPIS_ORE, Blocks.NETHER_QUARTZ_ORE);
add(ModBlockTags.DECAY_TO_COBBLESTONE,
Blocks.ANDESITE,
Blocks.BASALT,
Blocks.BLACKSTONE,
Blocks.CALCITE,
Blocks.DEEPSLATE,
Blocks.DIORITE,
Blocks.DRIPSTONE_BLOCK,
Blocks.END_STONE,
Blocks.FURNACE,
Blocks.GRANITE,
Blocks.NETHERRACK,
Blocks.PRISMARINE,
Blocks.STONE,
Blocks.TUFF);
add(ModBlockTags.DECAY_TO_COBBLESTONE_SLAB, Blocks.STONE_SLAB, Blocks.STONECUTTER);
add(ModBlockTags.DECAY_TO_STONE, ModBlocks.CLOD_BLOCK.get(), Blocks.CRACKED_STONE_BRICKS, Blocks.GLOWSTONE, Blocks.OBSIDIAN, Blocks.REDSTONE_BLOCK);
// tag(ModBlockTags.DECAY_DARK_SAND_SLAB);
// tag(ModBlockTags.DECAY_DARK_SAND_STAIRS);
// tag(ModBlockTags.DECAY_DARK_SAND_WALL);
// tag(ModBlockTags.DECAY_TO_AMALGAM);
tag(ModBlockTags.DECAY_TO_AMALGAM)
.add(Blocks.IRON_BLOCK.builtInRegistryHolder().key())
.add(Blocks.COPPER_BLOCK.builtInRegistryHolder().key())
.add(Blocks.CUT_COPPER.builtInRegistryHolder().key())
.add(Blocks.GOLD_BLOCK.builtInRegistryHolder().key());
}
private TagAppender<Block> add(TagKey<Block> tag, Block... blocks) {

15
fabric/src/main/datagen/org/dimdev/dimdoors/datagen/LimboDecayProvider.java
View file

@ -73,9 +73,9 @@ public class LimboDecayProvider implements DataProvider {
createPatterData(DimensionalDoors.id("gritty_stone"), ModBlockTags.DECAY_TO_GRITTY_STONE, ModBlocks.GRITTY_STONE.get()).run(consumer);
createPatterData(DimensionalDoors.id("leak"), Fluids.WATER, ModBlocks.LEAK.get()).run(consumer);
createPatterData(DimensionalDoors.id("solid_static"), ModBlockTags.DECAY_TO_SOLID_STATIC, ModBlocks.SOLID_STATIC.get()).run(consumer);
createPatterData(DimensionalDoors.id("unraveled_fabric"), Blocks.CLAY, ModBlocks.UNRAVELLED_BLOCK.get()).run(consumer);
createPatterData(DimensionalDoors.id("unraveled_fabric"), ModBlockTags.DECAY_TO_UNRAVELED_FABRIC, ModBlocks.UNRAVELLED_FABRIC.get()).run(consumer);
createPatterData(DimensionalDoors.id("unraveled_fence"), ModBlockTags.DECAY_UNRAVELED_FENCE, ModBlocks.UNRAVELED_FENCE.get()).run(consumer);
createPatterData(DimensionalDoors.id("unraveled_gate"), ModBlockTags.DECAY_UNRAVELED_GATE, ModBlocks.UNRAVELED_GATE.get()).run(consumer);
createPatterData(DimensionalDoors.id("unraveled_gate"), ModBlocks.UNRAVELED_GATE, ModBlocks.UNRAVELED_GATE.get()).run(consumer);
createPatterData(DimensionalDoors.id("unraveled_button"), ModBlockTags.DECAY_UNRAVELED_BUTTON, ModBlocks.UNRAVELED_BUTTON.get()).run(consumer);
createPatterData(DimensionalDoors.id("unraveled_slab"), ModBlockTags.DECAY_UNRAVELED_SLAB, ModBlocks.UNRAVELED_SLAB.get()).run(consumer);
createPatterData(DimensionalDoors.id("unraveled_stairs"), ModBlockTags.DECAY_UNRAVELED_STAIRS, ModBlocks.UNRAVELED_STAIRS.get()).run(consumer);
@ -94,13 +94,13 @@ public class LimboDecayProvider implements DataProvider {
createPatterData(DimensionalDoors.id("water"), Blocks.SNOW, Fluids.WATER).run(consumer);
createPatterData(DimensionalDoors.id("clay"), ModBlockTags.DECAY_TO_CLAY, Blocks.CLAY).run(consumer);
createPatterData(DimensionalDoors.id("clay_fence"), ModBlockTags.DECAY_CLAY_FENCE, ModBlocks.CLAY_FENCE.get()).run(consumer);
createPatterData(DimensionalDoors.id("clay_gate"), ModBlockTags.DECAY_CLAY_GATE, ModBlocks.CLAY_GATE.get()).run(consumer);
createPatterData(DimensionalDoors.id("clay_button"), ModBlockTags.DECAY_CLAY_BUTTON, ModBlocks.CLAY_BUTTON.get()).run(consumer);
createPatterData(DimensionalDoors.id("clay_slab"), ModBlockTags.DECAY_CLAY_SLAB, ModBlocks.CLAY_SLAB.get()).run(consumer);
createPatterData(DimensionalDoors.id("clay_gate"), ModBlocks.MUD_GATE, ModBlocks.CLAY_GATE.get()).run(consumer);
createPatterData(DimensionalDoors.id("clay_wall"), Blocks.BRICK_WALL, ModBlocks.CLAY_WALL).run(consumer);
createPatterData(DimensionalDoors.id("clay_button"), ModBlocks.CLAY_BUTTON, ModBlocks.CLAY_BUTTON.get()).run(consumer);
createPatterData(DimensionalDoors.id("clay_slab"), ModBlocks.CLAY_SLAB, ModBlocks.CLAY_SLAB.get()).run(consumer);
createPatterData(DimensionalDoors.id("clay_stairs"), ModBlockTags.DECAY_CLAY_STAIRS, ModBlocks.CLAY_STAIRS.get()).run(consumer);
createPatterData(DimensionalDoors.id("dark_sand"), ModBlockTags.DECAY_TO_DARK_SAND, ModBlocks.DARK_SAND.get()).run(consumer);
createPatterData(DimensionalDoors.id("dark_sand_fence"), ModBlockTags.DECAY_DARK_SAND_FENCE, ModBlocks.DARK_SAND_FENCE.get()).run(consumer);
createPatterData(DimensionalDoors.id("dark_sand_gate"), ModBlockTags.DECAY_DARK_SAND_GATE, ModBlocks.DARK_SAND_GATE.get()).run(consumer);
createPatterData(DimensionalDoors.id("dark_sand_fence"), ModBlocks.GRAVEL_FENCE, ModBlocks.DARK_SAND_FENCE.get()).run(consumer);
createPatterData(DimensionalDoors.id("dark_sand_button"), ModBlockTags.DECAY_DARK_SAND_BUTTON, ModBlocks.DARK_SAND_BUTTON.get()).run(consumer);
createPatterData(DimensionalDoors.id("dark_sand_slab"), ModBlockTags.DECAY_DARK_SAND_SLAB, ModBlocks.DARK_SAND_SLAB.get()).run(consumer);
createPatterData(DimensionalDoors.id("dark_sand_stairs"), ModBlockTags.DECAY_DARK_SAND_STAIRS, ModBlocks.DARK_SAND_STAIRS.get()).run(consumer);
@ -124,7 +124,6 @@ public class LimboDecayProvider implements DataProvider {
createPatterData(DimensionalDoors.id("glass"), ModBlockTags.DECAY_TO_GLASS, Blocks.GLASS).run(consumer);
createPatterData(DimensionalDoors.id("gravel"), ModBlockTags.DECAY_TO_GRAVEL, Blocks.GRAVEL).run(consumer);
createPatterData(DimensionalDoors.id("gravel_fence"), ModBlockTags.DECAY_TO_GRAVEL_FENCE, ModBlocks.GRAVEL_FENCE.get()).run(consumer);
createPatterData(DimensionalDoors.id("gravel_gate"), ModBlockTags.DECAY_TO_GRAVEL_GATE, ModBlocks.GRAVEL_GATE.get()).run(consumer);
createPatterData(DimensionalDoors.id("gravel_button"), ModBlockTags.DECAY_TO_GRAVEL_BUTTON, ModBlocks.GRAVEL_BUTTON.get()).run(consumer);
createPatterData(DimensionalDoors.id("gravel_slab"), ModBlockTags.DECAY_TO_GRAVEL_SLAB, ModBlocks.GRAVEL_SLAB.get()).run(consumer);
createPatterData(DimensionalDoors.id("gravel_stairs"), ModBlockTags.DECAY_TO_GRAVEL_STAIRS, ModBlocks.GRAVEL_STAIRS.get()).run(consumer);

2
forge/build.gradle
View file

@ -84,7 +84,7 @@ shadowJar {
remapJar {
input.set shadowJar.archiveFile
dependsOn shadowJar
classifier null
classifier "forge"
}
jar {

2
gradle.properties
View file

@ -4,7 +4,7 @@ minecraft_version=1.19.4
enabled_platforms=fabric,forge
archives_base_name=dimdoors
mod_version=1.0.0
mod_version=5.2.0
maven_group=org.dimdev
architectury_version=8.1.79

2
settings.gradle
View file

@ -11,4 +11,4 @@ include("common")
include("fabric")
include("forge")
rootProject.name = "dimdoors"
rootProject.name = "DimDoors"