diff --git a/README.md b/README.md index 4b22f76e..2d6a6a63 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # Sculk Depths -#### looking for a third main dev with a similar vision as us to help keep the project alive and updated -#### Interested? join our discord: https://discord.gg/dxANwW23Ub +#### Want to play the latest test builds? Or want to help development and give ideas? +#### -> join our discord: https://discord.gg/dxANwW23Ub # Important Notes - Upgrading from alpha to beta isn't recommended because of portal logic changes diff --git a/src/client/java/net/ugi/sculk_depths/SculkDepthsClient.java b/src/client/java/net/ugi/sculk_depths/SculkDepthsClient.java index fe708e77..022c1016 100644 --- a/src/client/java/net/ugi/sculk_depths/SculkDepthsClient.java +++ b/src/client/java/net/ugi/sculk_depths/SculkDepthsClient.java @@ -36,8 +36,8 @@ public void onInitializeClient() { //CrystalUpgrade.tooltipAdd(); SculkDepths.LOGGER.info("Registering clientSounds for " + SculkDepths.MOD_ID); -/* ClientTickEvents.START_WORLD_TICK.register(new ConditionalSoundPlayerClient()); - ClientTickEvents.START_CLIENT_TICK.register(new SoundPlayerGetterClient());*/ + ClientTickEvents.START_WORLD_TICK.register(new ConditionalSoundPlayerClient()); + ClientTickEvents.START_CLIENT_TICK.register(new SoundPlayerGetterClient()); FluidRenderHandlerRegistry.INSTANCE.register(ModFluids.KRYSLUM_STILL, ModFluids.KRYSLUM_FLOWING, diff --git a/src/client/java/net/ugi/sculk_depths/sound/SoundPlayerGetterClient.java b/src/client/java/net/ugi/sculk_depths/sound/SoundPlayerGetterClient.java index 99727527..92a553b6 100644 --- a/src/client/java/net/ugi/sculk_depths/sound/SoundPlayerGetterClient.java +++ b/src/client/java/net/ugi/sculk_depths/sound/SoundPlayerGetterClient.java @@ -12,8 +12,4 @@ public void onStartTick(MinecraftClient client) { player = client.player; } - public PlayerEntity getPlayer(){ - return player; - } - } diff --git a/src/main/java/net/ugi/sculk_depths/SculkDepths.java b/src/main/java/net/ugi/sculk_depths/SculkDepths.java index f8e75e5c..8936a83a 100644 --- a/src/main/java/net/ugi/sculk_depths/SculkDepths.java +++ b/src/main/java/net/ugi/sculk_depths/SculkDepths.java @@ -94,9 +94,11 @@ public void onInitialize() { ServerTickEvents.START_WORLD_TICK.register(new CheckInvForCrystalItems()); ServerTickEvents.START_WORLD_TICK.register(new ModBiomeEffects()); + //registerCustomPOI(); CruxResonator.registerAndGetDefault(Registries.POINT_OF_INTEREST_TYPE); //register(Registries.POINT_OF_INTEREST_TYPE, Q_LODESTONE, getStatesOfBlock(ModBlocks.QUAZARITH_LODESTONE), 0, 1); + //ServerTickEvents.START_WORLD_TICK.register(new ConditionalSoundPlayer()); CauldronFluidContent.registerCauldron(ModBlocks.KRYSLUM_FLUMROCK_CAULDRON, ModFluids.KRYSLUM_STILL, FluidConstants.BUCKET, ModProperties.KRYSLUM_LEVEL); //support for mods to see how much fluid is in it (doesn't work for create pipes) diff --git a/src/main/java/net/ugi/sculk_depths/block/ModBlocks.java b/src/main/java/net/ugi/sculk_depths/block/ModBlocks.java index 7312b76e..6a08fccb 100644 --- a/src/main/java/net/ugi/sculk_depths/block/ModBlocks.java +++ b/src/main/java/net/ugi/sculk_depths/block/ModBlocks.java @@ -415,6 +415,13 @@ public class ModBlocks { new PedestalBlock(AbstractBlock.Settings.create().strength(-1f, 3600000.0f).pistonBehavior(PistonBehavior.BLOCK)), ModItemGroup.SCULK_DEPTHS_BLOCKS); //auric //TODO check blocksettings + + + public static final Block AURIC_VINES = registerBlockWithoutBlockItem("auric_vines", + new AuricVinesBlock(AbstractBlock.Settings.create().pistonBehavior(PistonBehavior.DESTROY).ticksRandomly().noCollision().breakInstantly().sounds(BlockSoundGroup.WEEPING_VINES_LOW_PITCH)), ModItemGroup.SCULK_DEPTHS); + public static final Block AURIC_VINES_END = registerBlock("auric_vines_end", + new AuricVinesEndBlock(AbstractBlock.Settings.create().pistonBehavior(PistonBehavior.DESTROY).ticksRandomly().noCollision().breakInstantly().sounds(BlockSoundGroup.WEEPING_VINES_LOW_PITCH)), ModItemGroup.SCULK_DEPTHS); + public static final Block AURIC_SPORE_BLOCK = registerBlock("auric_spore_block", new ShroomBlock(AbstractBlock.Settings.create().strength(0.3f).sounds(BlockSoundGroup.MOSS_BLOCK)), ModItemGroup.SCULK_DEPTHS_BLOCKS); diff --git a/src/main/java/net/ugi/sculk_depths/block/custom/AuricVinesBlock.java b/src/main/java/net/ugi/sculk_depths/block/custom/AuricVinesBlock.java new file mode 100644 index 00000000..4b51cbad --- /dev/null +++ b/src/main/java/net/ugi/sculk_depths/block/custom/AuricVinesBlock.java @@ -0,0 +1,23 @@ +package net.ugi.sculk_depths.block.custom; + +import com.mojang.serialization.MapCodec; +import net.minecraft.block.*; +import net.minecraft.util.math.Direction; +import net.minecraft.util.shape.VoxelShape; +import net.ugi.sculk_depths.block.ModBlocks; + +public class AuricVinesBlock extends AbstractPlantBlock { + @Override + protected MapCodec getCodec() { + return null; + } + public static final VoxelShape SHAPE = Block.createCuboidShape(1.0, 0.0, 1.0, 15.0, 16.0, 15.0); + + public AuricVinesBlock(AbstractBlock.Settings settings) { + super(settings, Direction.DOWN, SHAPE, false); + } + + protected AbstractPlantStemBlock getStem() { + return (AbstractPlantStemBlock) ModBlocks.AURIC_VINES_END; + } +} \ No newline at end of file diff --git a/src/main/java/net/ugi/sculk_depths/block/custom/AuricVinesEndBlock.java b/src/main/java/net/ugi/sculk_depths/block/custom/AuricVinesEndBlock.java new file mode 100644 index 00000000..25f7389c --- /dev/null +++ b/src/main/java/net/ugi/sculk_depths/block/custom/AuricVinesEndBlock.java @@ -0,0 +1,37 @@ +package net.ugi.sculk_depths.block.custom; + + +import com.mojang.serialization.MapCodec; +import net.minecraft.block.AbstractPlantStemBlock; +import net.minecraft.block.Block; +import net.minecraft.block.BlockState; +import net.minecraft.block.VineLogic; +import net.minecraft.util.math.Direction; +import net.minecraft.util.math.random.Random; +import net.minecraft.util.shape.VoxelShape; +import net.ugi.sculk_depths.block.ModBlocks; + +public class AuricVinesEndBlock extends AbstractPlantStemBlock { + @Override + protected MapCodec getCodec() { + return null; + } + + protected static final VoxelShape SHAPE = Block.createCuboidShape(1.0, 0.0, 1.0, 15.0, 16.0, 15.0); + + public AuricVinesEndBlock(Settings settings) { + super(settings, Direction.DOWN, SHAPE, false, 0.1); + } + + protected int getGrowthLength(Random random) { + return VineLogic.getGrowthLength(random); + } + + protected Block getPlant() { + return ModBlocks.AURIC_VINES; + } + + protected boolean chooseStemState(BlockState state) { + return VineLogic.isValidForWeepingStem(state); + } +} diff --git a/src/main/resources/assets/sculk_depths/blockstates/auric_vines.json b/src/main/resources/assets/sculk_depths/blockstates/auric_vines.json new file mode 100644 index 00000000..1a35b19c --- /dev/null +++ b/src/main/resources/assets/sculk_depths/blockstates/auric_vines.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "sculk_depths:block/auric_vines" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/sculk_depths/blockstates/auric_vines_end.json b/src/main/resources/assets/sculk_depths/blockstates/auric_vines_end.json new file mode 100644 index 00000000..e6c224d9 --- /dev/null +++ b/src/main/resources/assets/sculk_depths/blockstates/auric_vines_end.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "sculk_depths:block/auric_vines_end" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/sculk_depths/lang/en_us.json b/src/main/resources/assets/sculk_depths/lang/en_us.json index fa1a82f0..33d1fd81 100644 --- a/src/main/resources/assets/sculk_depths/lang/en_us.json +++ b/src/main/resources/assets/sculk_depths/lang/en_us.json @@ -159,6 +159,8 @@ "block.sculk_depths.auric_spore_block": "Auric Spore Block", "block.sculk_depths.auric_spore_layer": "Auric Spore Layer", "block.sculk_depths.auric_shroom_stem": "Auric Shroom Stem", + "block.sculk_depths.auric_vines": "Auric Vines", + "block.sculk_depths.auric_vines_end": "Auric Vines", "block.sculk_depths.kryslum_enriched_soil": "Kryslum Enriched Soil", @@ -201,4 +203,4 @@ "tooltip.sculk_depths.crystal_upgrade.crystal.\"orange\"": " Orange Crystal", "tooltip.sculk_depths.crystal_upgrade.crystal.\"blue\"": " Blue Crystal", "tooltip.sculk_depths.crystal_upgrade.crystal.\"lime\"": " Lime Crystal" -} \ No newline at end of file +} diff --git a/src/main/resources/assets/sculk_depths/models/block/auric_vines.json b/src/main/resources/assets/sculk_depths/models/block/auric_vines.json new file mode 100644 index 00000000..ea5c4cc1 --- /dev/null +++ b/src/main/resources/assets/sculk_depths/models/block/auric_vines.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/tinted_cross", + "textures": { + "cross": "sculk_depths:block/auric_vines" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/sculk_depths/models/block/auric_vines_end.json b/src/main/resources/assets/sculk_depths/models/block/auric_vines_end.json new file mode 100644 index 00000000..a5ac2efa --- /dev/null +++ b/src/main/resources/assets/sculk_depths/models/block/auric_vines_end.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/tinted_cross", + "textures": { + "cross": "sculk_depths:block/auric_vines_end" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/sculk_depths/models/item/auric_vines_end.json b/src/main/resources/assets/sculk_depths/models/item/auric_vines_end.json new file mode 100644 index 00000000..14de9605 --- /dev/null +++ b/src/main/resources/assets/sculk_depths/models/item/auric_vines_end.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "sculk_depths:block/auric_vines" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/sculk_depths/textures/block/auric_vines.png b/src/main/resources/assets/sculk_depths/textures/block/auric_vines.png new file mode 100644 index 00000000..70314983 Binary files /dev/null and b/src/main/resources/assets/sculk_depths/textures/block/auric_vines.png differ diff --git a/src/main/resources/assets/sculk_depths/textures/block/auric_vines_end.png b/src/main/resources/assets/sculk_depths/textures/block/auric_vines_end.png new file mode 100644 index 00000000..6493de0d Binary files /dev/null and b/src/main/resources/assets/sculk_depths/textures/block/auric_vines_end.png differ