Skip to content

Commit

Permalink
Update to 23w17a.
Browse files Browse the repository at this point in the history
- Update to 23w17a
- Audit map colors and block sounds
  • Loading branch information
gniftygnome committed Apr 29, 2023
1 parent 965c2fd commit 2697cf0
Show file tree
Hide file tree
Showing 5 changed files with 37 additions and 46 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,7 @@
import net.fabricmc.api.EnvType;
import net.fabricmc.api.Environment;
import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
import net.minecraft.block.Block;
import net.minecraft.block.BlockState;
import net.minecraft.block.Blocks;
import net.minecraft.block.ShapeContext;
import net.minecraft.block.*;
import net.minecraft.particle.ParticleTypes;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.Vec3d;
Expand All @@ -17,7 +14,7 @@

public class CrystiniumBlock extends CinderscapesNetherPlantBlock {
public CrystiniumBlock() {
super(FabricBlockSettings.copy(Blocks.WARPED_ROOTS), (state) -> Block.createCuboidShape(2.0, 0.0, 2.0, 14.0, 12.0, 14.0));
super(FabricBlockSettings.copy(Blocks.WARPED_ROOTS).mapColor(MapColor.YELLOW), (state) -> Block.createCuboidShape(2.0, 0.0, 2.0, 14.0, 12.0, 14.0));
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,7 @@

import com.terraformersmc.cinderscapes.init.CinderscapesBlocks;
import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
import net.minecraft.block.Block;
import net.minecraft.block.BlockState;
import net.minecraft.block.Blocks;
import net.minecraft.block.Fertilizable;
import net.minecraft.block.TallPlantBlock;
import net.minecraft.block.*;
import net.minecraft.server.world.ServerWorld;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.random.Random;
Expand All @@ -16,7 +12,7 @@
public class PhotofernBlock extends CinderscapesNetherPlantBlock implements Fertilizable {

public PhotofernBlock() {
super(FabricBlockSettings.copy(Blocks.WARPED_ROOTS), (state) -> Block.createCuboidShape(2.0, 0.0, 2.0, 14.0, 12.0, 14.0));
super(FabricBlockSettings.copy(Blocks.WARPED_ROOTS).mapColor(MapColor.PURPLE), (state) -> Block.createCuboidShape(2.0, 0.0, 2.0, 14.0, 12.0, 14.0));
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,7 @@
import net.fabricmc.api.EnvType;
import net.fabricmc.api.Environment;
import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
import net.minecraft.block.Block;
import net.minecraft.block.BlockState;
import net.minecraft.block.Blocks;
import net.minecraft.block.ShapeContext;
import net.minecraft.block.*;
import net.minecraft.particle.ParticleTypes;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.Vec3d;
Expand All @@ -17,7 +14,7 @@

public class PyracinthBlock extends CinderscapesNetherPlantBlock {
public PyracinthBlock() {
super(FabricBlockSettings.copy(Blocks.WARPED_ROOTS), (state) -> Block.createCuboidShape(5.0, 0.0, 5.0, 11.0, 16.0, 11.0));
super(FabricBlockSettings.copy(Blocks.WARPED_ROOTS).mapColor(MapColor.ORANGE), (state) -> Block.createCuboidShape(5.0, 0.0, 5.0, 11.0, 16.0, 11.0));
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -74,15 +74,15 @@ public class CinderscapesBlocks {
public static final TerraformWallHangingSignBlock SCORCHED_WALL_HANGING_SIGN = add("scorched_wall_hanging_sign", new TerraformWallHangingSignBlock(SCORCHED_HANGING_SIGN_TEXTURE, SCORCHED_HANGING_SIGN_GUI_TEXTURE, FabricBlockSettings.copyOf(Blocks.CRIMSON_WALL_HANGING_SIGN).mapColor(MapColor.LIGHT_GRAY)));
public static final HangingSignItem SCORCHED_HANGING_SIGN_ITEM = CinderscapesItems.add("scorched_hanging_sign", new HangingSignItem(SCORCHED_HANGING_SIGN, SCORCHED_WALL_HANGING_SIGN, new Item.Settings().maxCount(16)));

public static final Block SCORCHED_SHRUB = withItem("scorched_shrub", new CinderscapesNetherPlantBlock(FabricBlockSettings.copyOf(Blocks.DEAD_BUSH), (state) -> Block.createCuboidShape(2.0, 0.0, 2.0, 14.0, 14.0, 14.0)));
public static final Block SCORCHED_SHRUB = withItem("scorched_shrub", new CinderscapesNetherPlantBlock(FabricBlockSettings.copyOf(Blocks.DEAD_BUSH).mapColor(MapColor.TERRACOTTA_GRAY), (state) -> Block.createCuboidShape(2.0, 0.0, 2.0, 14.0, 14.0, 14.0)));
public static final Block POTTED_SCORCHED_SHRUB = add("potted_scorched_shrub", new FlowerPotBlock(SCORCHED_SHRUB, FabricBlockSettings.copyOf(Blocks.POTTED_DEAD_BUSH)));

public static final Block SCORCHED_SPROUTS = withItem("scorched_sprouts", new CinderscapesNetherPlantBlock(FabricBlockSettings.copyOf(Blocks.NETHER_SPROUTS), (state) -> Block.createCuboidShape(2.0, 0.0, 2.0, 14.0, 3.0, 14.0)));
public static final Block SCORCHED_TENDRILS = withItem("scorched_tendrils", new CinderscapesNetherPlantBlock(FabricBlockSettings.copyOf(Blocks.CRIMSON_ROOTS), (state) -> Block.createCuboidShape(2.0, 0.0, 2.0, 14.0, 12.0, 14.0)));
public static final Block SCORCHED_SPROUTS = withItem("scorched_sprouts", new CinderscapesNetherPlantBlock(FabricBlockSettings.copyOf(Blocks.NETHER_SPROUTS).mapColor(MapColor.GRAY), (state) -> Block.createCuboidShape(2.0, 0.0, 2.0, 14.0, 3.0, 14.0)));
public static final Block SCORCHED_TENDRILS = withItem("scorched_tendrils", new CinderscapesNetherPlantBlock(FabricBlockSettings.copyOf(Blocks.CRIMSON_ROOTS).mapColor(MapColor.GRAY), (state) -> Block.createCuboidShape(2.0, 0.0, 2.0, 14.0, 12.0, 14.0)));
public static final Block POTTED_SCORCHED_TENDRILS = add("potted_scorched_tendrils", new FlowerPotBlock(SCORCHED_TENDRILS, FabricBlockSettings.copyOf(Blocks.POTTED_CRIMSON_ROOTS)));

public static final Block ASH = withItem("ash", new AshLayerBlock(FabricBlockSettings.copyOf(Blocks.SNOW)));
public static final Block ASH_BLOCK = withItem("ash_block", new Block(FabricBlockSettings.copyOf(Blocks.SNOW_BLOCK)));
public static final Block ASH = withItem("ash", new AshLayerBlock(FabricBlockSettings.copyOf(Blocks.SNOW).mapColor(MapColor.GRAY)));
public static final Block ASH_BLOCK = withItem("ash_block", new Block(FabricBlockSettings.copyOf(Blocks.SNOW_BLOCK).mapColor(MapColor.GRAY)));

public static final Block PYRACINTH = withItem("pyracinth", new PyracinthBlock());
public static final Block POTTED_PYRACINTH = add("potted_pyracinth", new PottedPyracinthBlock());
Expand Down Expand Up @@ -129,28 +129,28 @@ public class CinderscapesBlocks {

// Other

public static final Block TWILIGHT_VINE_BLOCK = withItem("twilight_vine_block", new Block(FabricBlockSettings.of(Material.GENERIC).strength(1.0F).sounds(BlockSoundGroup.NETHER_STEM)));
public static final Block TWILIGHT_TENDRILS = withItem("twilight_tendrils", new CinderscapesNetherPlantBlock(FabricBlockSettings.copy(Blocks.WARPED_ROOTS).luminance((state) -> 15), (state) -> Block.createCuboidShape(2.0, 0.0, 2.0, 14.0, 12.0, 14.0)));
public static final Block TWILIGHT_VINE_BLOCK = withItem("twilight_vine_block", new Block(FabricBlockSettings.of().mapColor(MapColor.DARK_AQUA).instrument(Instrument.BASS).strength(1.0F).sounds(BlockSoundGroup.NETHER_STEM)));
public static final Block TWILIGHT_TENDRILS = withItem("twilight_tendrils", new CinderscapesNetherPlantBlock(FabricBlockSettings.copyOf(Blocks.WARPED_ROOTS).mapColor(MapColor.PALE_PURPLE).luminance((state) -> 15), (state) -> Block.createCuboidShape(2.0, 0.0, 2.0, 14.0, 12.0, 14.0)));
public static final Block POTTED_TWILIGHT_TENDRILS = add("potted_twilight_tendrils", new FlowerPotBlock(TWILIGHT_TENDRILS, FabricBlockSettings.copyOf(Blocks.POTTED_WARPED_ROOTS).luminance((state) -> 15)));
public static final Block TWILIGHT_FESCUES = withItem("twilight_fescues", new CinderscapesNetherPlantBlock(FabricBlockSettings.copy(Blocks.NETHER_SPROUTS), (state) -> Block.createCuboidShape(2.0, 0.0, 2.0, 14.0, 5.0, 14.0)));
public static final Block TWILIGHT_FESCUES = withItem("twilight_fescues", new CinderscapesNetherPlantBlock(FabricBlockSettings.copyOf(Blocks.NETHER_SPROUTS).mapColor(MapColor.PURPLE), (state) -> Block.createCuboidShape(2.0, 0.0, 2.0, 14.0, 5.0, 14.0)));

public static Block PHOTOFERN = withItem("photofern", new PhotofernBlock());
public static final Block POTTED_PHOTOFERN = add("potted_photofern", new FlowerPotBlock(PHOTOFERN, FabricBlockSettings.copyOf(Blocks.POTTED_FERN)));

public static final Block TALL_PHOTOFERN = withItem("tall_photofern", new CinderscapesNetherTallPlantBlock(FabricBlockSettings.copy(Blocks.WARPED_ROOTS), (state) -> Block.createCuboidShape(2.0, 0, 2.0, 14.0, 16.0, 14.0)));
public static final Block TALL_PHOTOFERN = withItem("tall_photofern", new CinderscapesNetherTallPlantBlock(FabricBlockSettings.copyOf(Blocks.WARPED_ROOTS).mapColor(MapColor.PURPLE), (state) -> Block.createCuboidShape(2.0, 0, 2.0, 14.0, 16.0, 14.0)));

public static final Block LUMINOUS_POD = withItem("luminous_pod", new CinderscapesNetherTallPlantBlock(FabricBlockSettings.copy(Blocks.WARPED_ROOTS).luminance((state) -> 15), (state) -> Block.createCuboidShape(2.0, 0, 2.0, 14.0, 16.0, 14.0)));
public static final Block LUMINOUS_POD = withItem("luminous_pod", new CinderscapesNetherTallPlantBlock(FabricBlockSettings.copyOf(Blocks.WARPED_ROOTS).mapColor(MapColor.PALE_GREEN).luminance((state) -> 15), (state) -> Block.createCuboidShape(2.0, 0, 2.0, 14.0, 16.0, 14.0)));
public static final Block POTTED_LUMINOUS_POD = add("potted_luminous_pod", new FlowerPotBlock(LUMINOUS_POD, FabricBlockSettings.copyOf(Blocks.POTTED_WARPED_ROOTS).luminance((state) -> 15)));
public static final Block GHASTLY_ECTOPLASM = withItem("ghastly_ectoplasm", new GhastlyEctoplasmBlock(FabricBlockSettings.of(Material.PLANT).noCollision().breakInstantly().sounds(BlockSoundGroup.ROOTS)));
public static final Block GHASTLY_ECTOPLASM = withItem("ghastly_ectoplasm", new GhastlyEctoplasmBlock(FabricBlockSettings.copyOf(Blocks.WEEPING_VINES_PLANT).mapColor(MapColor.OFF_WHITE).sounds(BlockSoundGroup.ROOTS)));

///////////
// Other //
///////////

public static final Block SULFUR_BLOCK = withItem("sulfur_block", new Block(FabricBlockSettings.of(Material.GENERIC).method_51368(Instrument.SNARE).strength(0.5F, 0.5f).sounds(BlockSoundGroup.GRAVEL)));
public static final Block SULFUR_BLOCK = withItem("sulfur_block", new Block(FabricBlockSettings.of().mapColor(MapColor.YELLOW).instrument(Instrument.SNARE).strength(0.5F, 0.5f).sounds(BlockSoundGroup.GRAVEL)));
public static final Block SULFUR_ORE = addOre("sulfur_ore", 2, MapColor.YELLOW);

public static final Block BRAMBLE_BERRY_BUSH = add("bramble_berry_bush", new BrambleBerryBushBlock(FabricBlockSettings.copyOf(Blocks.SWEET_BERRY_BUSH)));
public static final Block BRAMBLE_BERRY_BUSH = add("bramble_berry_bush", new BrambleBerryBushBlock(FabricBlockSettings.copyOf(Blocks.SWEET_BERRY_BUSH).mapColor(MapColor.TERRACOTTA_BLACK)));
public static final BlockItem BRAMBLE_BERRIES = CinderscapesItems.add("bramble_berries", new AliasedBlockItem(CinderscapesBlocks.BRAMBLE_BERRY_BUSH, new Item.Settings().food(new FoodComponent.Builder().hunger(2).saturationModifier(0.1F).alwaysEdible().snack().statusEffect(new StatusEffectInstance(StatusEffects.FIRE_RESISTANCE, 600, 0), 0.8F).build())));

///////////////////
Expand All @@ -166,9 +166,6 @@ public class CinderscapesBlocks {

// Sulfur Quartz

public static final Block POLYPITE_SULFUR_QUARTZ = withItem("polypite_sulfur_quartz", new PolypiteQuartzBlock(FabricBlockSettings.copyOf(POLYPITE_QUARTZ).mapColor(MapColor.YELLOW)));
public static final Block POTTED_POLYPITE_SULFUR_QUARTZ = add("potted_polypite_sulfur_quartz", new FlowerPotBlock(POLYPITE_SULFUR_QUARTZ, FabricBlockSettings.copyOf(Blocks.FLOWER_POT)));

public static final Block SULFUR_QUARTZ_ORE = addOre("sulfur_quartz_ore", 1, MapColor.YELLOW);
public static final Block SULFUR_QUARTZ_BLOCK = withItem("sulfur_quartz_block", new Block(FabricBlockSettings.copyOf(Blocks.QUARTZ_BLOCK).mapColor(MapColor.YELLOW)));
public static final Block CHISELED_SULFUR_QUARTZ_BLOCK = withItem("chiseled_sulfur_quartz_block", new Block(FabricBlockSettings.copyOf(Blocks.QUARTZ_BLOCK).mapColor(MapColor.YELLOW)));
Expand All @@ -179,13 +176,13 @@ public class CinderscapesBlocks {
public static final Block SMOOTH_SULFUR_QUARTZ_STAIRS = withItem("smooth_sulfur_quartz_stairs", new StairsBlock(SMOOTH_SULFUR_QUARTZ.getDefaultState(), FabricBlockSettings.copyOf(Blocks.SMOOTH_QUARTZ_STAIRS).mapColor(MapColor.YELLOW)));
public static final Block SMOOTH_SULFUR_QUARTZ_SLAB = withItem("smooth_sulfur_quartz_slab", new SlabBlock(FabricBlockSettings.copyOf(Blocks.SMOOTH_QUARTZ_SLAB).mapColor(MapColor.YELLOW)));
public static final Block SULFUR_QUARTZ_BRICKS = withItem("sulfur_quartz_bricks", new Block(FabricBlockSettings.copyOf(Blocks.QUARTZ_BRICKS).mapColor(MapColor.YELLOW)));

public static final Block CRYSTALLINE_SULFUR_QUARTZ = withItem("crystalline_sulfur_quartz", new CinderscapesTransparentBlock(FabricBlockSettings.copyOf(CRYSTALLINE_QUARTZ).mapColor(MapColor.YELLOW)));
public static final Block POLYPITE_SULFUR_QUARTZ = withItem("polypite_sulfur_quartz", new PolypiteQuartzBlock(FabricBlockSettings.copyOf(CRYSTALLINE_SULFUR_QUARTZ)));
public static final Block POTTED_POLYPITE_SULFUR_QUARTZ = add("potted_polypite_sulfur_quartz", new FlowerPotBlock(POLYPITE_SULFUR_QUARTZ, FabricBlockSettings.copyOf(Blocks.FLOWER_POT)));

// Rose Quartz

public static final Block POLYPITE_ROSE_QUARTZ = withItem("polypite_rose_quartz", new PolypiteQuartzBlock(FabricBlockSettings.copyOf(POLYPITE_QUARTZ).mapColor(MapColor.PINK)));
public static final Block POTTED_POLYPITE_ROSE_QUARTZ = add("potted_polypite_rose_quartz", new FlowerPotBlock(POLYPITE_ROSE_QUARTZ, FabricBlockSettings.copyOf(Blocks.FLOWER_POT)));

public static final Block ROSE_QUARTZ_ORE = addOre("rose_quartz_ore", 1, MapColor.PINK);
public static final Block ROSE_QUARTZ_BLOCK = withItem("rose_quartz_block", new Block(FabricBlockSettings.copyOf(Blocks.QUARTZ_BLOCK).mapColor(MapColor.PINK)));
public static final Block CHISELED_ROSE_QUARTZ_BLOCK = withItem("chiseled_rose_quartz_block", new Block(FabricBlockSettings.copyOf(Blocks.QUARTZ_BLOCK).mapColor(MapColor.PINK)));
Expand All @@ -196,13 +193,13 @@ public class CinderscapesBlocks {
public static final Block SMOOTH_ROSE_QUARTZ_STAIRS = withItem("smooth_rose_quartz_stairs", new StairsBlock(SMOOTH_ROSE_QUARTZ.getDefaultState(), FabricBlockSettings.copyOf(Blocks.SMOOTH_QUARTZ_STAIRS).mapColor(MapColor.PINK)));
public static final Block SMOOTH_ROSE_QUARTZ_SLAB = withItem("smooth_rose_quartz_slab", new SlabBlock(FabricBlockSettings.copyOf(Blocks.SMOOTH_QUARTZ_SLAB).mapColor(MapColor.PINK)));
public static final Block ROSE_QUARTZ_BRICKS = withItem("rose_quartz_bricks", new Block(FabricBlockSettings.copyOf(Blocks.QUARTZ_BRICKS).mapColor(MapColor.PINK)));

public static final Block CRYSTALLINE_ROSE_QUARTZ = withItem("crystalline_rose_quartz", new CinderscapesTransparentBlock(FabricBlockSettings.copyOf(CRYSTALLINE_QUARTZ).mapColor(MapColor.PINK)));
public static final Block POLYPITE_ROSE_QUARTZ = withItem("polypite_rose_quartz", new PolypiteQuartzBlock(FabricBlockSettings.copyOf(CRYSTALLINE_ROSE_QUARTZ)));
public static final Block POTTED_POLYPITE_ROSE_QUARTZ = add("potted_polypite_rose_quartz", new FlowerPotBlock(POLYPITE_ROSE_QUARTZ, FabricBlockSettings.copyOf(Blocks.FLOWER_POT)));

// Smoky Quartz

public static final Block POLYPITE_SMOKY_QUARTZ = withItem("polypite_smoky_quartz", new PolypiteQuartzBlock(FabricBlockSettings.copyOf(POLYPITE_QUARTZ).mapColor(MapColor.GRAY)));
public static final Block POTTED_POLYPITE_SMOKY_QUARTZ = add("potted_polypite_smoky_quartz", new FlowerPotBlock(POLYPITE_SMOKY_QUARTZ, FabricBlockSettings.copyOf(Blocks.FLOWER_POT)));

public static final Block SMOKY_QUARTZ_ORE = addOre("smoky_quartz_ore", 1, MapColor.GRAY);
public static final Block SMOKY_QUARTZ_BLOCK = withItem("smoky_quartz_block", new Block(FabricBlockSettings.copyOf(Blocks.QUARTZ_BLOCK).mapColor(MapColor.GRAY)));
public static final Block CHISELED_SMOKY_QUARTZ_BLOCK = withItem("chiseled_smoky_quartz_block", new Block(FabricBlockSettings.copyOf(Blocks.QUARTZ_BLOCK).mapColor(MapColor.GRAY)));
Expand All @@ -213,7 +210,10 @@ public class CinderscapesBlocks {
public static final Block SMOOTH_SMOKY_QUARTZ_STAIRS = withItem("smooth_smoky_quartz_stairs", new StairsBlock(SMOOTH_SMOKY_QUARTZ.getDefaultState(), FabricBlockSettings.copyOf(Blocks.SMOOTH_QUARTZ_STAIRS).mapColor(MapColor.GRAY)));
public static final Block SMOOTH_SMOKY_QUARTZ_SLAB = withItem("smooth_smoky_quartz_slab", new SlabBlock(FabricBlockSettings.copyOf(Blocks.SMOOTH_QUARTZ_SLAB).mapColor(MapColor.GRAY)));
public static final Block SMOKY_QUARTZ_BRICKS = withItem("smoky_quartz_bricks", new Block(FabricBlockSettings.copyOf(Blocks.QUARTZ_BRICKS).mapColor(MapColor.GRAY)));

public static final Block CRYSTALLINE_SMOKY_QUARTZ = withItem("crystalline_smoky_quartz", new CinderscapesTransparentBlock(FabricBlockSettings.copyOf(CRYSTALLINE_QUARTZ).mapColor(MapColor.GRAY)));
public static final Block POLYPITE_SMOKY_QUARTZ = withItem("polypite_smoky_quartz", new PolypiteQuartzBlock(FabricBlockSettings.copyOf(CRYSTALLINE_SMOKY_QUARTZ)));
public static final Block POTTED_POLYPITE_SMOKY_QUARTZ = add("potted_polypite_smoky_quartz", new FlowerPotBlock(POLYPITE_SMOKY_QUARTZ, FabricBlockSettings.copyOf(Blocks.FLOWER_POT)));

public static final Block NODZOL = withItem("nodzol", new Block(FabricBlockSettings.copyOf(Blocks.NETHERRACK).mapColor(MapColor.BROWN)));

Expand Down
17 changes: 9 additions & 8 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,16 @@ fabric.loom.multiProjectOptimisation=true
maven_group=com.terraformersmc
archive_name=cinderscapes

minecraft_version=23w16a
yarn_mappings=23w16a+build.4
minecraft_version=23w17a
yarn_mappings=23w17a+build.9
loader_version=0.14.19
fabric_version=0.78.1+1.20
fabric_version=0.79.2+1.20

# Terraform modules
terraform_biome_remapper_api_version=7.0.0-alpha.4
terraform_shapes_api_version=7.0.0-alpha.4
terraform_surfaces_api_version=7.0.0-alpha.4
terraform_wood_api_version=7.0.0-alpha.4
terraform_biome_remapper_api_version=7.0.0-alpha.5
terraform_shapes_api_version=7.0.0-alpha.5
terraform_surfaces_api_version=7.0.0-alpha.5
terraform_wood_api_version=7.0.0-alpha.5

# Biolith for worldgen module and testing
biolith_version=0.0.1-alpha.8
Expand Down Expand Up @@ -44,8 +44,9 @@ curseforge_optional_dependencies=
# Modrinth Metadata
modrinth_slug=cinderscapes
modrinth_id=QC4wcUXZ
modrinth_game_versions=23w16a
modrinth_game_versions=23w17a
modrinth_mod_loaders=fabric
#modrinth_embedded_dependencies=biolith

# Mod Loader Metadata
loader_icon=https://fabricmc.net/assets/logo.png
Expand Down

0 comments on commit 2697cf0

Please sign in to comment.