diff --git a/common/src/main/java/net/cmr/jurassicrevived/block/ModBlocks.java b/common/src/main/java/net/cmr/jurassicrevived/block/ModBlocks.java index 5aa6562..8ac8e70 100644 --- a/common/src/main/java/net/cmr/jurassicrevived/block/ModBlocks.java +++ b/common/src/main/java/net/cmr/jurassicrevived/block/ModBlocks.java @@ -31,6 +31,15 @@ public class ModBlocks { public static final RegistrySupplier BENCH = registerBlock("bench", () -> new BenchBlock(BlockBehaviour.Properties.of().noOcclusion())); + public static final RegistrySupplier SANDSTONE_PATH = registerBlock("sandstone_path", + () -> new Block(BlockBehaviour.Properties.of().noOcclusion())); + public static final RegistrySupplier CHISELED_BRICK_PATH = registerBlock("chiseled_brick_path", + () -> new Block(BlockBehaviour.Properties.of().noOcclusion())); + public static final RegistrySupplier CONCRETE_PATH = registerBlock("concrete_path", + () -> new Block(BlockBehaviour.Properties.of().noOcclusion())); + public static final RegistrySupplier LIGHT_GRAY_TERRACOTTA_PATH = registerBlock("light_gray_terracotta_path", + () -> new Block(BlockBehaviour.Properties.of().noOcclusion())); + public static final RegistrySupplier CHARRED_TERRACOTTA = registerBlock("charred_terracotta", () -> new Block(BlockBehaviour.Properties.of().noOcclusion())); diff --git a/common/src/main/java/net/cmr/jurassicrevived/datagen/ModBlockLootTableProvider.java b/common/src/main/java/net/cmr/jurassicrevived/datagen/ModBlockLootTableProvider.java index 0a38590..bee7370 100755 --- a/common/src/main/java/net/cmr/jurassicrevived/datagen/ModBlockLootTableProvider.java +++ b/common/src/main/java/net/cmr/jurassicrevived/datagen/ModBlockLootTableProvider.java @@ -2,17 +2,9 @@ package net.cmr.jurassicrevived.datagen; import net.cmr.jurassicrevived.block.ModBlocks; import net.cmr.jurassicrevived.item.ModItems; -import net.minecraft.core.HolderLookup; -import net.minecraft.core.registries.Registries; import net.minecraft.world.item.Item; -import net.minecraft.world.item.enchantment.Enchantment; -import net.minecraft.world.item.enchantment.Enchantments; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.storage.loot.LootTable; -import net.minecraft.world.level.storage.loot.entries.LootItem; -import net.minecraft.world.level.storage.loot.functions.ApplyBonusCount; -import net.minecraft.world.level.storage.loot.functions.SetItemCountFunction; -import net.minecraft.world.level.storage.loot.providers.number.UniformGenerator; public class ModBlockLootTableProvider { @@ -62,6 +54,10 @@ public class ModBlockLootTableProvider { helper.dropSelf(ModBlocks.ITEM_PIPE.get()); helper.dropSelf(ModBlocks.FLUID_PIPE.get()); helper.dropSelf(ModBlocks.POWER_PIPE.get()); + helper.dropSelf(ModBlocks.SANDSTONE_PATH.get()); + helper.dropSelf(ModBlocks.CHISELED_BRICK_PATH.get()); + helper.dropSelf(ModBlocks.CONCRETE_PATH.get()); + helper.dropSelf(ModBlocks.LIGHT_GRAY_TERRACOTTA_PATH.get()); helper.add(ModBlocks.GYPSUM_STONE.get(), helper.createMultipleOreDrops(ModBlocks.GYPSUM_STONE.get(), ModBlocks.GYPSUM_COBBLESTONE.get().asItem(),1, 1)); diff --git a/common/src/main/java/net/cmr/jurassicrevived/datagen/ModBlockStateProvider.java b/common/src/main/java/net/cmr/jurassicrevived/datagen/ModBlockStateProvider.java index e67791e..ef1d9c3 100755 --- a/common/src/main/java/net/cmr/jurassicrevived/datagen/ModBlockStateProvider.java +++ b/common/src/main/java/net/cmr/jurassicrevived/datagen/ModBlockStateProvider.java @@ -4,13 +4,9 @@ import net.cmr.jurassicrevived.Constants; import net.cmr.jurassicrevived.block.ModBlocks; import net.cmr.jurassicrevived.block.custom.FencePoleBlock; import net.cmr.jurassicrevived.block.custom.FenceWireBlock; -import net.cmr.jurassicrevived.block.custom.PipeBlock; -import net.minecraft.core.Direction; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.level.block.*; -import net.minecraft.world.level.block.state.properties.BlockStateProperties; import net.minecraft.world.level.block.state.properties.BooleanProperty; -import net.minecraft.world.level.block.state.properties.EnumProperty; import java.util.List; @@ -156,6 +152,10 @@ public class ModBlockStateProvider { helper.horizontalFacingWithItem(ModBlocks.TRASH_CAN.get()); helper.horizontalFacingWithItem(ModBlocks.BENCH.get()); helper.blockWithItem(ModBlocks.CHARRED_TERRACOTTA.get()); + helper.blockWithItem(ModBlocks.SANDSTONE_PATH.get()); + helper.blockWithItem(ModBlocks.CHISELED_BRICK_PATH.get()); + helper.blockWithItem(ModBlocks.CONCRETE_PATH.get()); + helper.blockWithItem(ModBlocks.LIGHT_GRAY_TERRACOTTA_PATH.get()); helper.stairsBlock((StairBlock) ModBlocks.CHARRED_TERRACOTTA_STAIRS.get(), modLoc("block/" + ModBlocks.CHARRED_TERRACOTTA.getId().getPath())); helper.slabBlock((SlabBlock) ModBlocks.CHARRED_TERRACOTTA_SLAB.get(), modLoc("block/" + ModBlocks.CHARRED_TERRACOTTA.getId().getPath()), modLoc("block/" + ModBlocks.CHARRED_TERRACOTTA.getId().getPath())); diff --git a/common/src/main/java/net/cmr/jurassicrevived/datagen/ModBlockTagProvider.java b/common/src/main/java/net/cmr/jurassicrevived/datagen/ModBlockTagProvider.java index ac1e028..ad11be8 100755 --- a/common/src/main/java/net/cmr/jurassicrevived/datagen/ModBlockTagProvider.java +++ b/common/src/main/java/net/cmr/jurassicrevived/datagen/ModBlockTagProvider.java @@ -17,6 +17,10 @@ public class ModBlockTagProvider { ModBlocks.CAT_PLUSHIE.get(), ModBlocks.TRASH_CAN.get(), ModBlocks.BENCH.get(), + ModBlocks.SANDSTONE_PATH.get(), + ModBlocks.CHISELED_BRICK_PATH.get(), + ModBlocks.CONCRETE_PATH.get(), + ModBlocks.LIGHT_GRAY_TERRACOTTA_PATH.get(), ModBlocks.CHARRED_TERRACOTTA.get(), ModBlocks.CHARRED_TERRACOTTA_STAIRS.get(), ModBlocks.CHARRED_TERRACOTTA_SLAB.get(), diff --git a/common/src/main/java/net/cmr/jurassicrevived/datagen/ModRecipeProvider.java b/common/src/main/java/net/cmr/jurassicrevived/datagen/ModRecipeProvider.java index 13591b3..029c9e2 100755 --- a/common/src/main/java/net/cmr/jurassicrevived/datagen/ModRecipeProvider.java +++ b/common/src/main/java/net/cmr/jurassicrevived/datagen/ModRecipeProvider.java @@ -93,6 +93,11 @@ public class ModRecipeProvider { helper.buildShaped(RecipeCategory.MISC, ModBlocks.FENCE_LIGHT.get(), 1, new String[]{"A", "B"}, 'A', Blocks.GLOWSTONE, 'B', Items.IRON_INGOT); helper.buildShaped(RecipeCategory.MISC, ModBlocks.LIGHT_POST.get(), 1, new String[]{"A", "B"}, 'A', Blocks.GLOWSTONE, 'B', ModBlocks.GYPSUM_STONE.get()); + helper.buildShaped(RecipeCategory.MISC, ModBlocks.SANDSTONE_PATH.get(), 4, new String[]{"AA", "AA"}, 'A', Blocks.SANDSTONE); + helper.buildShaped(RecipeCategory.MISC, ModBlocks.CHISELED_BRICK_PATH.get(), 4, new String[]{"AA", "AA"}, 'A', Blocks.BRICKS); + helper.buildShaped(RecipeCategory.MISC, ModBlocks.CONCRETE_PATH.get(), 4, new String[]{"AA", "AA"}, 'A', Blocks.GRAY_CONCRETE); + helper.buildShaped(RecipeCategory.MISC, ModBlocks.LIGHT_GRAY_TERRACOTTA_PATH.get(), 4, new String[]{"AA", "AA"}, 'A', Blocks.LIGHT_GRAY_TERRACOTTA); + helper.buildShaped(RecipeCategory.MISC, ModItems.TEST_TUBE.get(), 3, new String[]{" A", " B ", "B "}, 'A', Items.IRON_INGOT, 'B', Blocks.GLASS); helper.buildShaped(RecipeCategory.MISC, ModItems.SYRINGE.get(), 3, new String[]{" A", " B ", "C "}, 'A', Items.IRON_INGOT, 'B', Blocks.GLASS, 'C', Items.IRON_NUGGET); helper.buildShaped(RecipeCategory.MISC, ModItems.CABLE.get(), 4, new String[]{" BA", "BAB", "AB "}, 'A', Items.COPPER_INGOT, 'B', Items.IRON_NUGGET); diff --git a/common/src/main/java/net/cmr/jurassicrevived/item/ModCreativeTabs.java b/common/src/main/java/net/cmr/jurassicrevived/item/ModCreativeTabs.java index 473c9d5..0a93766 100755 --- a/common/src/main/java/net/cmr/jurassicrevived/item/ModCreativeTabs.java +++ b/common/src/main/java/net/cmr/jurassicrevived/item/ModCreativeTabs.java @@ -48,6 +48,11 @@ public class ModCreativeTabs { output.accept(ModBlocks.TRASH_CAN.get()); output.accept(ModBlocks.BENCH.get()); + output.accept(ModBlocks.SANDSTONE_PATH.get()); + output.accept(ModBlocks.CHISELED_BRICK_PATH.get()); + output.accept(ModBlocks.CONCRETE_PATH.get()); + output.accept(ModBlocks.LIGHT_GRAY_TERRACOTTA_PATH.get()); + output.accept(ModBlocks.CHARRED_TERRACOTTA.get()); output.accept(ModBlocks.CHARRED_TERRACOTTA_STAIRS.get()); output.accept(ModBlocks.CHARRED_TERRACOTTA_SLAB.get()); diff --git a/common/src/main/resources/assets/jurassicrevived/lang/en_us.json b/common/src/main/resources/assets/jurassicrevived/lang/en_us.json index db2a248..8fc25f7 100755 --- a/common/src/main/resources/assets/jurassicrevived/lang/en_us.json +++ b/common/src/main/resources/assets/jurassicrevived/lang/en_us.json @@ -202,6 +202,11 @@ "block.jurassicrevived.smooth_gypsum_stone_slab": "Smooth Gypsum Stone Slab", "block.jurassicrevived.smooth_gypsum_stone_wall": "Smooth Gypsum Stone Wall", + "block.jurassicrevived.sandstone_path": "Sandstone Path", + "block.jurassicrevived.chiseled_brick_path": "Chiseled Brick Path", + "block.jurassicrevived.concrete_path": "Concrete Path", + "block.jurassicrevived.light_gray_terracotta_path": "Light Gray Terracotta Path", + "block.jurassicrevived.reinforced_stone": "Reinforced Stone", "block.jurassicrevived.reinforced_stone_bricks": "Reinforced Stone Bricks", "block.jurassicrevived.chiseled_reinforced_stone": "Chiseled Reinforced Stone", diff --git a/common/src/main/resources/assets/jurassicrevived/textures/block/chiseled_brick_path.png b/common/src/main/resources/assets/jurassicrevived/textures/block/chiseled_brick_path.png new file mode 100644 index 0000000..a276def Binary files /dev/null and b/common/src/main/resources/assets/jurassicrevived/textures/block/chiseled_brick_path.png differ diff --git a/common/src/main/resources/assets/jurassicrevived/textures/block/concrete_path.png b/common/src/main/resources/assets/jurassicrevived/textures/block/concrete_path.png new file mode 100644 index 0000000..a65ae7e Binary files /dev/null and b/common/src/main/resources/assets/jurassicrevived/textures/block/concrete_path.png differ diff --git a/common/src/main/resources/assets/jurassicrevived/textures/block/light_gray_terracotta_path.png b/common/src/main/resources/assets/jurassicrevived/textures/block/light_gray_terracotta_path.png new file mode 100644 index 0000000..dbada18 Binary files /dev/null and b/common/src/main/resources/assets/jurassicrevived/textures/block/light_gray_terracotta_path.png differ diff --git a/common/src/main/resources/assets/jurassicrevived/textures/block/sandstone_path.png b/common/src/main/resources/assets/jurassicrevived/textures/block/sandstone_path.png new file mode 100644 index 0000000..b6c35d0 Binary files /dev/null and b/common/src/main/resources/assets/jurassicrevived/textures/block/sandstone_path.png differ diff --git a/gradle.properties b/gradle.properties index eb92d21..4d5e5a6 100755 --- a/gradle.properties +++ b/gradle.properties @@ -10,7 +10,7 @@ fabric.loom.multiProjectOptimisation=true mod.name=Jurassic Revived mod.id=jurassicrevived mod.group=net.cmr.jurassicrevived -mod.version=0.223.0 +mod.version=0.224.0 mod.author=CMR Team, Eli Gibbs mod.description=A Minecraft mod that brings dinosaurs back to life using ancient DNA and modern technology\nBreed, study, and build your own prehistoric park with a wide variety of creatures... mod.license=CC-BY-ND-4.0