Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

main to portal #75

Merged
merged 85 commits into from
Jan 12, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
85 commits
Select commit Hold shift + click to select a range
93535fb
Add files via upload
Garnetuniverse Oct 12, 2024
d81c912
Update ModBlocks.java
Garnetuniverse Oct 12, 2024
0537721
auric vines block models 1
Garnetuniverse Oct 12, 2024
267868c
auric vines item model
Garnetuniverse Oct 12, 2024
70f1b59
Merge pull request #2 from Garnetuniverse/auric-vines-item-model
Garnetuniverse Oct 12, 2024
124f434
Merge pull request #1 from Garnetuniverse/Auric-Vines-Textures
Garnetuniverse Oct 12, 2024
d4c023d
here are the classes for them
Garnetuniverse Oct 12, 2024
68be63b
auric vines blockstates
Garnetuniverse Oct 12, 2024
5b06b76
Delete src/main/java/net/ugi/sculk_depths/block/custom/Auric_VinesBlo…
Garnetuniverse Oct 12, 2024
3740b5c
Delete src/main/java/net/ugi/sculk_depths/block/custom/Auric_Vines_En…
Garnetuniverse Oct 12, 2024
63f0fd1
fixed underscore naming problem
Garnetuniverse Oct 12, 2024
1206cf8
Update en_us.json
Garnetuniverse Oct 15, 2024
cafb8b5
Update ModBlocks.java
Garnetuniverse Oct 15, 2024
9aab1fd
Delete src/main/resources/assets/sculk_depths/textures/block/umbrusk5…
Garnetuniverse Oct 16, 2024
80c1ead
Delete src/main/resources/assets/sculk_depths/textures/block/umbrusk5…
Garnetuniverse Oct 16, 2024
226480d
Delete src/main/resources/assets/sculk_depths/textures/block/umbrusk4…
Garnetuniverse Oct 16, 2024
07ae062
Delete src/main/resources/assets/sculk_depths/textures/block/umbrusk4…
Garnetuniverse Oct 16, 2024
dc68bb5
Delete src/main/resources/assets/sculk_depths/textures/block/umbrusk3…
Garnetuniverse Oct 16, 2024
431135e
Delete src/main/resources/assets/sculk_depths/textures/block/umbrusk3…
Garnetuniverse Oct 16, 2024
5b5e595
Delete src/main/resources/assets/sculk_depths/textures/block/umbrusk2…
Garnetuniverse Oct 17, 2024
a9ad69f
Delete src/main/resources/assets/sculk_depths/textures/block/umbrusk2…
Garnetuniverse Oct 17, 2024
43b8c7c
Delete src/main/resources/assets/sculk_depths/textures/block/umbrusk1…
Garnetuniverse Oct 17, 2024
29a11ba
Delete src/main/resources/assets/sculk_depths/textures/block/umbrusk1…
Garnetuniverse Oct 17, 2024
33fa7a5
new umbrusk textures
Garnetuniverse Oct 17, 2024
dc6133b
Delete src/main/resources/assets/sculk_depths/textures/block/quazarit…
Garnetuniverse Oct 17, 2024
0a210a3
Delete src/main/resources/assets/sculk_depths/textures/block/quazarit…
Garnetuniverse Oct 17, 2024
f6ee253
Delete src/main/resources/assets/sculk_depths/textures/block/quazarit…
Garnetuniverse Oct 17, 2024
878823f
Delete src/main/resources/assets/sculk_depths/textures/block/quazarit…
Garnetuniverse Oct 17, 2024
63d657b
Delete src/main/resources/assets/sculk_depths/textures/block/quazarit…
Garnetuniverse Oct 17, 2024
caf05eb
Delete src/main/resources/assets/sculk_depths/textures/block/quazarit…
Garnetuniverse Oct 17, 2024
8ebf787
Delete src/main/resources/assets/sculk_depths/textures/block/quazarit…
Garnetuniverse Oct 17, 2024
8236062
Delete src/main/resources/assets/sculk_depths/textures/block/quazarit…
Garnetuniverse Oct 17, 2024
607c3c8
Delete src/main/resources/assets/sculk_depths/textures/block/quazarit…
Garnetuniverse Oct 17, 2024
faa340f
Delete src/main/resources/assets/sculk_depths/textures/block/quazarit…
Garnetuniverse Oct 17, 2024
20df756
quazarith ore changes
Garnetuniverse Oct 17, 2024
62efcca
Delete src/main/resources/assets/sculk_depths/textures/block/quazarit…
Garnetuniverse Oct 19, 2024
92b8383
Delete src/main/resources/assets/sculk_depths/textures/block/quazarit…
Garnetuniverse Oct 19, 2024
b9205f7
Delete src/main/resources/assets/sculk_depths/textures/block/quazarit…
Garnetuniverse Oct 19, 2024
2e7639c
Delete src/main/resources/assets/sculk_depths/textures/block/quazarit…
Garnetuniverse Oct 19, 2024
bbc60d0
Delete src/main/resources/assets/sculk_depths/textures/block/quazarit…
Garnetuniverse Oct 19, 2024
6264119
Delete src/main/resources/assets/sculk_depths/textures/block/quazarit…
Garnetuniverse Oct 19, 2024
4654c66
Delete src/main/resources/assets/sculk_depths/textures/block/quazarit…
Garnetuniverse Oct 19, 2024
89b52b0
Delete src/main/resources/assets/sculk_depths/textures/block/quazarit…
Garnetuniverse Oct 19, 2024
1c96bdc
Delete src/main/resources/assets/sculk_depths/textures/block/quazarit…
Garnetuniverse Oct 19, 2024
d7c9bea
Delete src/main/resources/assets/sculk_depths/textures/block/quazarit…
Garnetuniverse Oct 19, 2024
2ce44d7
Add files via upload
Garnetuniverse Oct 19, 2024
bdac949
Add files via upload
Garnetuniverse Oct 19, 2024
5607d2c
Merge pull request #67 from Garnetuniverse/main
warior456 Oct 25, 2024
47163cd
Add files via upload
Garnetuniverse Oct 26, 2024
7cdea54
Update petrified_valtrox_slab_from_petrified_valtrox_log_stonecutting…
Garnetuniverse Oct 26, 2024
415770d
Update petrified_valtrox_slates_stonecutting.json
Garnetuniverse Oct 26, 2024
76e858b
Update petrified_valtrox_stairs_from_petrified_valtrox_log_stonecutti…
Garnetuniverse Oct 26, 2024
38b1fbc
Update petrified_valtrox_wall_from_petrified_valtrox_log_stonecutting…
Garnetuniverse Oct 26, 2024
3537010
Update petrified_valtrox_wood_stonecutting.json
Garnetuniverse Oct 26, 2024
803f622
Update polished_zygrin_slab_from_zygrin_stonecutting.json
Garnetuniverse Oct 26, 2024
51e7895
Update petrified_valtrox_slab_stonecutting.json
Garnetuniverse Oct 26, 2024
598ff03
Update umbrusk_brick_slab_from_umbrusk_stonecutting.json
Garnetuniverse Oct 26, 2024
b57c089
Update umbrusk_brick_slab_stonecutting.json
Garnetuniverse Oct 26, 2024
be452ac
Update umbrusk_slab_stonecutting.json
Garnetuniverse Oct 26, 2024
466238f
Update zygrin_brick_slab_from_polished_zygrin_stonecutting.json
Garnetuniverse Oct 26, 2024
6a824f1
Update zygrin_brick_slab_from_zygrin_stonecutting.json
Garnetuniverse Oct 26, 2024
8e7ff5f
Update zygrin_brick_slab_stonecutting.json
Garnetuniverse Oct 26, 2024
335a3cf
Update zygrin_slab_stonecutting.json
Garnetuniverse Oct 26, 2024
bbfb274
chiseled amalgamite modelo
Garnetuniverse Oct 26, 2024
a2e872a
chiseled_amalgamite_item_model
Garnetuniverse Oct 26, 2024
16a297a
amalgamite recipe fixes and chiseled amalgamite
Garnetuniverse Oct 26, 2024
7e47f0e
Delete src/main/resources/data/sculk_depths/recipe/amalgamite_brick_s…
Garnetuniverse Dec 24, 2024
e355087
Delete src/main/resources/data/sculk_depths/recipe/amalgamite_brick_s…
Garnetuniverse Dec 24, 2024
478bf3f
Delete src/main/resources/data/sculk_depths/recipe/amalgamite_brick_s…
Garnetuniverse Dec 24, 2024
3277873
Delete src/main/resources/data/sculk_depths/recipe/amalgamite_brick_s…
Garnetuniverse Dec 24, 2024
b051c13
Delete src/main/resources/data/sculk_depths/recipe/amalgamite_brick_s…
Garnetuniverse Dec 24, 2024
a92be0a
Delete src/main/resources/data/sculk_depths/recipe/amalgamite_brick_w…
Garnetuniverse Dec 24, 2024
dc1fe4c
Delete src/main/resources/data/sculk_depths/recipe/amalgamite_brick_w…
Garnetuniverse Dec 24, 2024
90c9a26
Delete src/main/resources/data/sculk_depths/recipe/amalgamite_brick_w…
Garnetuniverse Dec 24, 2024
eb1f857
Delete src/main/resources/data/sculk_depths/recipe/amalgamite_bricks.…
Garnetuniverse Dec 24, 2024
7a81fe3
Delete src/main/resources/data/sculk_depths/recipe/amalgamite_bricks_…
Garnetuniverse Dec 24, 2024
b7e8c92
Delete src/main/resources/data/sculk_depths/recipe/chiseled_amalgamit…
Garnetuniverse Dec 24, 2024
dd42c1a
Delete src/main/resources/data/sculk_depths/recipe/chiseled_amalgamit…
Garnetuniverse Dec 24, 2024
8f434c9
Delete src/main/resources/assets/sculk_depths/models/block/chiseled_a…
Garnetuniverse Jan 8, 2025
06ffcfa
Delete src/main/resources/assets/sculk_depths/models/item/chiseled_am…
Garnetuniverse Jan 8, 2025
581959e
Merge pull request #74 from Garnetuniverse/main
warior456 Jan 8, 2025
611d17e
fix wind sounds not playing
warior456 Jan 10, 2025
d6d03b3
Update README.md
warior456 Jan 12, 2025
785fce8
Merge branch 'portal' into main
warior456 Jan 12, 2025
08bdbd5
Merge pull request #73 from warior456/infected-columns
warior456 Jan 12, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions src/client/java/net/ugi/sculk_depths/SculkDepthsClient.java
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,4 @@ public void onStartTick(MinecraftClient client) {
player = client.player;
}

public PlayerEntity getPlayer(){
return player;
}

}
2 changes: 2 additions & 0 deletions src/main/java/net/ugi/sculk_depths/SculkDepths.java
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
7 changes: 7 additions & 0 deletions src/main/java/net/ugi/sculk_depths/block/ModBlocks.java
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
Original file line number Diff line number Diff line change
@@ -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<? extends AbstractPlantBlock> 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;
}
}
Original file line number Diff line number Diff line change
@@ -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<? extends AbstractPlantStemBlock> 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);
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "sculk_depths:block/auric_vines"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "sculk_depths:block/auric_vines_end"
}
}
}
4 changes: 3 additions & 1 deletion src/main/resources/assets/sculk_depths/lang/en_us.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",

Expand Down Expand Up @@ -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"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:block/tinted_cross",
"textures": {
"cross": "sculk_depths:block/auric_vines"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:block/tinted_cross",
"textures": {
"cross": "sculk_depths:block/auric_vines_end"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "sculk_depths:block/auric_vines"
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading