get everything I can done before deadline

Author: LemmaEOF

README.md

@@ -1,16 +1,16 @@
 <img src="icon.png" align="right" width="180px"/>
 
-# Mycoturge
+# Mycoturgy
 
 
-[>> Downloads <<](https://github.com/Boundarybreaker/Mycoturge/releases)
+[>> Downloads <<](https://github.com/Boundarybreaker/Mycoturgy/releases)
 
-*Purify yourself!*
+*Grow mushrooms, save the world!*
 
 **This mod is open source and under a permissive license.** As such, it can be included in any modpack on any platform without prior permission. We appreciate hearing about people using our mods, but you do not need to ask to use them. See the [LICENSE file](LICENSE) for more details.
 
-Mycoturge is a Minecraft mod for Minecraft 1.16 and above, made for ModFest 1.16. It adds various witching equipment based off of SPorebrush, a symbiotic system between a plant and a magical fungus.
+Mycoturgy is a story-focused Minecraft mod for Minecraft 1.16 and above, made for ModFest 1.16. It adds various witching equipment based off of Sporebrush, a symbiotic system between a plant and a magical fungus.
 
 Asset credits:
-Sporebrush item - @Coda#1552 on discord
+Sporebrush item and Haustor Sequester block - @Coda#1552 on discord
 Spore bundle and sporebrush ash items - edited from assets in ["RPG Items - Retro Pack"](https://emberheartgames.itch.io/rpg-items-retro-pack) by Emberheart Games

gradle.properties

@@ -8,7 +8,7 @@ yarn_build=4
 loader_version=0.8.8+build.202
 
 # Mod Properties
-mod_version = 1.0.0
+mod_version = 0.1.0
 maven_group = space.bbkr
 archives_base_name = mycoturgy
 

src/main/java/space/bbkr/mycoturgy/MycoturgyClient.java

@@ -24,7 +24,7 @@ public class MycoturgyClient implements ClientModInitializer {
 
 	@Override
 	public void onInitializeClient() {
-		BlockRenderLayerMap.INSTANCE.putBlocks(RenderLayer.getCutout(), MycoturgyBlocks.SPOREBRUSH_CROP, MycoturgyBlocks.HAUSTOR_SEQUESTER);
+		BlockRenderLayerMap.INSTANCE.putBlocks(RenderLayer.getCutout(), MycoturgyBlocks.SPOREBRUSH_CROP, MycoturgyBlocks.HAUSTOR_SEQUESTER, MycoturgyBlocks.SCATTERED_ASHES);
 		BlockRenderLayerMap.INSTANCE.putBlocks(RenderLayer.getTranslucent(), MycoturgyBlocks.MASON_JAR);
 		//TODO: change color if ashes in jar?
 		ColorProviderRegistry.BLOCK.register((state, world, pos, index) -> FluidRenderHandlerRegistry.INSTANCE.get(Fluids.WATER).getFluidColor(world, pos, Fluids.WATER.getDefaultState()), MycoturgyBlocks.MASON_JAR);

src/main/java/space/bbkr/mycoturgy/block/MasonJarBlock.java

@@ -20,6 +20,8 @@
 import net.minecraft.potion.Potion;
 import net.minecraft.potion.PotionUtil;
 import net.minecraft.potion.Potions;
+import net.minecraft.sound.SoundCategory;
+import net.minecraft.sound.SoundEvents;
 import net.minecraft.state.StateManager;
 import net.minecraft.state.property.BooleanProperty;
 import net.minecraft.text.TranslatableText;
@@ -54,20 +56,23 @@ public ActionResult onUse(BlockState state, World world, BlockPos pos, PlayerEnt
 			Potion pot = PotionUtil.getPotion(stack);
 			if (pot == Potions.WATER) {
 				world.setBlockState(pos, state.with(FILLED, true), 2);
+				world.playSound(null, pos, SoundEvents.ITEM_BOTTLE_EMPTY, SoundCategory.BLOCKS, 1f, 1f);
 				if (!player.isCreative()) {
 					player.setStackInHand(hand, new ItemStack(Items.GLASS_BOTTLE));
 				}
 				return ActionResult.SUCCESS;
 			}
 		} else if (stack.getItem() == Items.GLASS_BOTTLE && state.get(FILLED)) {
 			world.setBlockState(pos, state.with(FILLED, false), 2);
+			world.playSound(null, pos, SoundEvents.ITEM_BOTTLE_FILL, SoundCategory.BLOCKS, 1f, 1f);
 			ItemUsage.method_30012(stack, player, PotionUtil.setPotion(new ItemStack(Items.POTION), Potions.WATER));
 			return ActionResult.SUCCESS;
 		} else if (stack.getItem() == MycoturgyItems.SPOREBRUSH_ASH) {
 			BlockEntity be = world.getBlockEntity(pos);
 			if (be instanceof MasonJarBlockEntity) {
 				MasonJarBlockEntity jar = (MasonJarBlockEntity)be;
 				if (jar.getAshes() <= 12) {
+					world.playSound(null, pos, SoundEvents.ITEM_CROP_PLANT, SoundCategory.BLOCKS, 1f, 1f);
 					jar.addAshes();
 					if (!player.isCreative()) {
 						player.getStackInHand(hand).decrement(1);

src/main/java/space/bbkr/mycoturgy/block/ScatteredAshesBlock.java

@@ -9,23 +9,36 @@
 import space.bbkr.mycoturgy.component.HaustorComponent;
 import space.bbkr.mycoturgy.init.MycoturgyItems;
 
+import net.minecraft.advancement.Advancement;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockState;
 import net.minecraft.block.Blocks;
 import net.minecraft.block.MushroomPlantBlock;
 import net.minecraft.block.ShapeContext;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.item.ItemStack;
+import net.minecraft.server.MinecraftServer;
+import net.minecraft.server.network.ServerPlayerEntity;
 import net.minecraft.server.world.ServerWorld;
+import net.minecraft.sound.SoundCategory;
+import net.minecraft.sound.SoundEvents;
 import net.minecraft.util.ActionResult;
 import net.minecraft.util.Hand;
+import net.minecraft.util.Identifier;
 import net.minecraft.util.hit.BlockHitResult;
 import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.Direction;
 import net.minecraft.util.shape.VoxelShape;
 import net.minecraft.world.BlockView;
 import net.minecraft.world.World;
+import net.minecraft.world.WorldAccess;
+import net.minecraft.world.WorldView;
+import net.minecraft.world.gen.feature.ConfiguredFeature;
+import net.minecraft.world.gen.feature.DefaultBiomeFeatures;
+import net.minecraft.world.gen.feature.Feature;
 
 public class ScatteredAshesBlock extends Block {
+	public static final Identifier CAST_SPELL = new Identifier(Mycoturgy.MODID, "research/cast_spell");
 	public static final VoxelShape SHAPE = Block.createCuboidShape(0.0D, 0.0D, 0.0D, 16.0D, 2D, 16.0D);
 	public static final Map<Block, Spell> SPELLS = new HashMap<>();
 
@@ -47,30 +60,56 @@ public ActionResult onUse(BlockState state, World world, BlockPos pos, PlayerEnt
 			if (SPELLS.containsKey(down.getBlock())) {
 				Spell spell = SPELLS.get(down.getBlock());
 				if (spell.perform(down, (ServerWorld)world, pos.down(), player, Mycoturgy.HAUSTOR_COMPONENT.get(world.getChunk(pos)))) {
+					world.playSound(null, pos, SoundEvents.ITEM_FIRECHARGE_USE, SoundCategory.BLOCKS, 1f, 1f);
 					if (world.getBlockState(pos).equals(state)) world.breakBlock(pos, false);
+					MinecraftServer server = player.world.getServer();
+					Advancement advancement = server.getAdvancementLoader().get(CAST_SPELL);
+					server.getPlayerManager().getAdvancementTracker((ServerPlayerEntity)player).grantCriterion(advancement, "cast_spell");
 					return ActionResult.SUCCESS;
 				}
 			}
 		}
 		return super.onUse(state, world, pos, player, hand, hit);
 	}
 
+	@Override
+	public BlockState getStateForNeighborUpdate(BlockState state, Direction direction, BlockState newState, WorldAccess world, BlockPos pos, BlockPos posFrom) {
+		return direction == Direction.DOWN && !state.canPlaceAt(world, pos) ? Blocks.AIR.getDefaultState() : super.getStateForNeighborUpdate(state, direction, newState, world, pos, posFrom);
+	}
+
+	@Override
+	public boolean canPlaceAt(BlockState state, WorldView world, BlockPos pos) {
+		BlockPos blockPos = pos.down();
+		return hasTopRim(world, blockPos) || sideCoversSmallSquare(world, blockPos, Direction.UP);
+	}
+
 	public interface Spell {
 		boolean perform(BlockState state, ServerWorld world, BlockPos pos, PlayerEntity caster, HaustorComponent component);
 	}
 
 	static {
-		SPELLS.put(Blocks.MYCELIUM, (state, world, pos, caster, component) -> {
+		SPELLS.put(Blocks.PODZOL, (state, world, pos, caster, component) -> {
 			Random random = new Random();
 			if (component.getHypha() >= 10) {
-				component.spawnLamella(2);
 				BlockPos upPos = pos.up();
-				world.setBlockState(upPos, random.nextBoolean()? Blocks.RED_MUSHROOM.getDefaultState() : Blocks.BROWN_MUSHROOM.getDefaultState());
-				BlockState mushState = world.getBlockState(upPos);
-				if (((MushroomPlantBlock)state.getBlock()).trySpawningBigMushroom(world, upPos, mushState, random)) {
-					component.spawnLamella(3);
+				BlockState upState = world.getBlockState(upPos);
+				world.setBlockState(upPos, Blocks.AIR.getDefaultState());
+				System.out.println(world.getBlockState(upPos));
+				ConfiguredFeature<?, ?> feature = random.nextBoolean()? Feature.HUGE_BROWN_MUSHROOM.configure(DefaultBiomeFeatures.HUGE_BROWN_MUSHROOM_CONFIG) : Feature.HUGE_RED_MUSHROOM.configure(DefaultBiomeFeatures.HUGE_RED_MUSHROOM_CONFIG);
+				if (feature.generate(world, world.getStructureAccessor(), world.getChunkManager().getChunkGenerator(), random, upPos)) {
+					world.setBlockState(pos, Blocks.MYCELIUM.getDefaultState());
+					for (int i = -2; i <=2; i++) {
+						for (int j = -2; j <= 2; j++) {
+							BlockPos newPos = pos.add(i, 0, j);
+							if (Feature.isSoil(world, newPos)) {
+								world.setBlockState(newPos, Blocks.MYCELIUM.getDefaultState());
+							}
+						}
+					}
+					component.spawnLamella(5);
 					return true;
 				}
+				world.setBlockState(upPos, upState);
 			}
 			return false;
 		});

src/main/java/space/bbkr/mycoturgy/block/entity/HaustorSequesterBlockEntity.java

@@ -1,6 +1,5 @@
 package space.bbkr.mycoturgy.block.entity;
 
-import space.bbkr.mycoturgy.Mycoturgy;
 import space.bbkr.mycoturgy.init.MycoturgyBlocks;
 
 import net.minecraft.block.entity.BlockEntity;

src/main/java/space/bbkr/mycoturgy/block/entity/MasonJarBlockEntity.java

@@ -1,6 +1,7 @@
 package space.bbkr.mycoturgy.block.entity;
 
 import java.util.Optional;
+import java.util.Random;
 
 import space.bbkr.mycoturgy.Mycoturgy;
 import space.bbkr.mycoturgy.block.MasonJarBlock;
@@ -14,9 +15,15 @@
 import net.minecraft.block.entity.BlockEntity;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.CompoundTag;
+import net.minecraft.particle.ParticleEffect;
+import net.minecraft.particle.ParticleTypes;
 import net.minecraft.recipe.Recipe;
+import net.minecraft.server.world.ServerWorld;
+import net.minecraft.sound.SoundCategory;
+import net.minecraft.sound.SoundEvents;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.Tickable;
+import net.minecraft.util.math.Vec3d;
 
 import net.fabricmc.fabric.api.block.entity.BlockEntityClientSerializable;
 import net.fabricmc.fabric.api.util.NbtType;
@@ -41,7 +48,10 @@ public void tick() {
 			potentialRecipe.ifPresent(jarBrewingRecipe -> currentRecipe = jarBrewingRecipe);
 		} else {
 			if (currentRecipe.matches(inv, world)) {
+				Vec3d jarPos = new Vec3d(pos.getX() + 0.5, pos.getY(), pos.getZ() + 0.5).add(getCachedState().getModelOffset(world, pos));
+				Random random = new Random();
 				processTime++;
+				if (processTime % 10 == 0) ((ServerWorld)world).spawnParticles(ParticleTypes.BUBBLE, jarPos.x + random.nextDouble() * (1/8D) * (double)(random.nextBoolean() ? 1 : -1), jarPos.y + random.nextDouble() * (3/8D), jarPos.z + random.nextDouble() * (1/8D) * (double)(random.nextBoolean() ? 1 : -1), random.nextInt(5), 0.0, 0.1, 0.0, 0.1);
 				if (processTime >= currentRecipe.getTime()) {
 					HaustorComponent component = Mycoturgy.HAUSTOR_COMPONENT.get(world.getChunk(this.pos));
 					component.changeHypha(currentRecipe.getHyphaCost() * -1);
@@ -53,6 +63,8 @@ public void tick() {
 					currentRecipe = null;
 					ashes--;
 					if (ashes < 0) ashes = 0;
+					world.playSound(null, pos, SoundEvents.ENTITY_WITCH_DRINK, SoundCategory.BLOCKS, 1f, 1f);
+					((ServerWorld)world).spawnParticles(ParticleTypes.SPLASH, jarPos.x + random.nextDouble() * (3/16D) * (double)(random.nextBoolean() ? 1 : -1), jarPos.y + random.nextDouble() * (1/2D), jarPos.z + random.nextDouble() * (3/16D) * (double)(random.nextBoolean() ? 1 : -1), 30, 0.0, 0.7, 0.0, 0.7);
 					world.setBlockState(pos, getCachedState().with(MasonJarBlock.FILLED, false));
 				}
 				markDirty();

src/main/java/space/bbkr/mycoturgy/init/MycoturgyBlocks.java

@@ -17,6 +17,7 @@
 import net.minecraft.block.entity.BlockEntityType;
 import net.minecraft.item.BlockItem;
 import net.minecraft.item.Item;
+import net.minecraft.sound.BlockSoundGroup;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.registry.Registry;
 
@@ -36,7 +37,7 @@ public static void init() {
 		SPOREBRUSH_CROP = register("sporebrush", new CustomCropBlock(FabricBlockSettings.copyOf(Blocks.WHEAT).breakByHand(true)));
 		HAUSTOR_SEQUESTER = register("haustor_sequester", new HaustorSequesterBlock(FabricBlockSettings.copyOf(Blocks.GRASS).breakByHand(true)), new Item.Settings().group(MycoturgyItems.MYCOTURGY_GROUP));
 		MASON_JAR = register("mason_jar", new MasonJarBlock(FabricBlockSettings.of(Material.GLASS).breakByTool(FabricToolTags.PICKAXES).nonOpaque()), new Item.Settings().group(MycoturgyItems.MYCOTURGY_GROUP));
-		SCATTERED_ASHES = register("scattered_ashes", new ScatteredAshesBlock(FabricBlockSettings.of(Material.SUPPORTED).breakByHand(true).nonOpaque()));
+		SCATTERED_ASHES = register("scattered_ashes", new ScatteredAshesBlock(FabricBlockSettings.of(Material.SUPPORTED).breakByHand(true).breakInstantly().nonOpaque().noCollision().sounds(BlockSoundGroup.SAND)));
 
 		HAUSTOR_SEQUESTER_BLOCK_ENTITY = register("haustor_sequester", HaustorSequesterBlockEntity::new, HAUSTOR_SEQUESTER);
 		MASON_JAR_BLOCK_ENTITY = register("mason_jar", MasonJarBlockEntity::new, MASON_JAR);

src/main/java/space/bbkr/mycoturgy/init/MycoturgyItems.java

@@ -9,6 +9,7 @@
 import net.minecraft.item.ItemStack;
 import net.minecraft.tag.Tag;
 import net.minecraft.util.Identifier;
+import net.minecraft.util.Rarity;
 import net.minecraft.util.registry.Registry;
 
 import net.fabricmc.fabric.api.client.itemgroup.FabricItemGroupBuilder;
@@ -30,8 +31,9 @@ public static void init() {
 		SPORE_BUNDLE = register("spore_bundle", new Item(new Item.Settings().group(MYCOTURGY_GROUP)));
 		SPOREBRUSH = register("sporebrush", new Item(new Item.Settings().group(MYCOTURGY_GROUP)));
 		GLITTERING_SPORES = register("glimmering_spores", new AliasedBlockItem(MycoturgyBlocks.SPOREBRUSH_CROP, new Item.Settings().group(MYCOTURGY_GROUP)));
-		SPOREBRUSH_ASH = register("sporebrush_ash", new Item(new Item.Settings().group(MYCOTURGY_GROUP)));
-		HAUSTORAL_BAND = register("haustoral_band", new HaustoralBandItem(new Item.Settings().maxCount(1).group(MYCOTURGY_GROUP)));
+		SPOREBRUSH_ASH = register("sporebrush_ash", new AliasedBlockItem(MycoturgyBlocks.SCATTERED_ASHES, new Item.Settings().group(MYCOTURGY_GROUP)));
+		HAUSTORAL_BAND = register("haustoral_band", new HaustoralBandItem(new Item.Settings().maxCount(1).rarity(Rarity.RARE).group(MYCOTURGY_GROUP)));
+
 		NETHERITE_COMPOSED = TagRegistry.item(new Identifier(Mycoturgy.MODID, "netherite_composed"));
 	}
 

src/main/resources/assets/mycoturgy/blockstates/scattered_ashes.json

@@ -0,0 +1,5 @@
+{
+  "variants": {
+    "": { "model": "mycoturgy:block/scattered_ashes" }
+  }
+}