v2.3.0.0

.github/workflows/build_release.yml

@@ -140,4 +140,4 @@ jobs:
           webhook_token: ${{ secrets.DISCORD_TOKEN }}
           color: "#088c7d"
           username: "Maykr Bot"
-          message: "**:package: ${{ needs.changelog.outputs.tag }}**\n\n**Download**\n${{ fromJSON(steps.create_release.outputs.assets)[0].browser_download_url }}\n\n**Changelog**\n${{ steps.create_release.outputs.url }}"
+          message: "**:package: ${{ needs.changelog.outputs.tag }}**\n\n**Download**\n${{ fromJSON(steps.create_release.outputs.assets)[1].browser_download_url }}\n\n**Changelog**\n${{ steps.create_release.outputs.url }}"

.github/workflows/gh_release.yml

@@ -148,4 +148,4 @@ jobs:
           webhook_token: ${{ secrets.DISCORD_TOKEN }}
           color: "#088c7d"
           username: "Maykr Bot"
-          message: "**:package: ${{ needs.changelog.outputs.tag }}**\n\n**Download**\n${{ fromJSON(steps.create_release.outputs.assets)[0].browser_download_url }}\n\n**Changelog**\n${{ steps.create_release.outputs.url }}"
+          message: "**:package: ${{ needs.changelog.outputs.tag }}**\n\n**Download**\n${{ fromJSON(steps.create_release.outputs.assets)[1].browser_download_url }}\n\n**Changelog**\n${{ steps.create_release.outputs.url }}"

README.md

@@ -32,7 +32,7 @@ style.
 * [Download]
 * [Discord]
 * [Wiki]
-* [Trello]
+* [Github Project]
 
 ## Tech Stack
 
@@ -73,7 +73,7 @@ the [Creative Commons Attribution-NonCommercial 4.0 International License](http:
 
 ### Maven
 
-Atm there is no dedicated maven, you can use https://www.cursemaven.com/ to include the mod as a dependency.
+Atm there is no dedicated maven, you can use [cursemaven](https://www.cursemaven.com/) or [Modrinth Maven](https://docs.modrinth.com/maven) to include the mod as a dependency.
 
 ### Contributing
 
@@ -84,7 +84,7 @@ request to join the dev team.<br>
 This will give you access to the private mod development channels and resources such as the biomancy design document and
 concept board.
 
-You can track the development progress via our [Trello Board][Trello].
+You can track the development progress via our [Dev Board][Github Project].
 
 This project uses **Conventional Commits Messages** (https://www.conventionalcommits.org/en/v1.0.0/) to automatically
 genereate
@@ -96,16 +96,17 @@ If you need help feel free to [join our Discord][Discord].
 ## User Guide
 The mod provides no ingame guide book but uses tooltip descriptions & flavor texts instead. If you need further information you can read the github [Wiki].
 
-Read the [Getting Started Guide](https://github.com/Elenterius/Biomancy/wiki/v2/Getting-Started) section if you don't know what to do at all.
+Read the [Getting Started Guide](https://github.com/Elenterius/Biomancy/wiki/Biomancy-2-Getting-Started) section if you don't know what to do at all.
 
 ### Recipes
 To conveniently look up recipes ingame I recommend the use of the [JEI] mod.
 
 
 [Download]: https://www.curseforge.com/minecraft/mc-mods/biomancy
 [Discord]: https://discord.gg/424awTDdJJ
-[Wiki]: https://github.com/Elenterius/Biomancy/wiki/v2
-[Trello]: https://trello.com/b/GUKjOSAl
-[JitPack]: https://jitpack.io/#Elenterius/Biomancy
+
+[Wiki]: https://github.com/Elenterius/Biomancy/wiki/Biomancy-2
+
+[Github Project]: https://github.com/orgs/Creative-Chasm/projects/2/
 
 [JEI]:https://www.curseforge.com/minecraft/mc-mods/jei

build.gradle

@@ -6,6 +6,8 @@ plugins {
 	id 'org.spongepowered.mixin' version '0.7-SNAPSHOT'
 }
 
+jarJar.enable()
+
 import groovy.json.JsonSlurper
 
 import java.util.concurrent.TimeUnit
@@ -34,6 +36,7 @@ sourceSets {
 	main {
 		resources {
 			srcDir 'src/generated/resources' // Include resources generated by data generators
+			exclude '.cache/'
 		}
 	}
 	test {}
@@ -65,6 +68,10 @@ minecraft {
 			// Comma-separated list of namespaces to load gametests from. Empty = all namespaces.
 			property 'forge.enabledGameTestNamespaces', 'biomancy'
 
+			// Hot-Swapping via JBR, includes schema changes
+			// Guide: https://forge.gemwire.uk/wiki/Hotswap#Applying_schema_changes
+			jvmArgs '-XX:+IgnoreUnrecognizedVMOptions', '-XX:+AllowEnhancedClassRedefinition'
+
 			mods {
 				biomancy {
 					source sourceSets.main
@@ -78,13 +85,6 @@ minecraft {
 			args '--username', 'Dev2'
 		}
 
-		// Hot-Swapping via JBR, includes schema changes
-		// Guide: https://forge.gemwire.uk/wiki/Hotswap#Applying_schema_changes
-		clientWithJBR {
-			parent runs.client
-			jvmArg '-XX:+AllowEnhancedClassRedefinition'
-		}
-
 		server {
 			workingDirectory project.file('run')
 
@@ -180,8 +180,10 @@ repositories {
 	maven { url = 'https://dl.cloudsmith.io/public/geckolib3/geckolib/maven/' }
 	maven { url = 'https://maven.blamejared.com' }
 	maven {
-		name = "KliKli Maven (Modnomicon)"
-		url = "https://repo.repsy.io/mvn/klikli-dev/mods"
+		url "https://dl.cloudsmith.io/public/klikli-dev/mods/maven/"
+		content {
+			includeGroup "com.klikli_dev"
+		}
 	}
 	maven {
 		name = 'tterrag maven'
@@ -206,8 +208,12 @@ dependencies {
 	implementation fg.deobf("software.bernie.geckolib:geckolib-forge-1.19:3.1.40")
 	datagenImplementation fg.deobf("software.bernie.geckolib:geckolib-forge-1.19:3.1.40")
 
-	implementation fg.deobf("com.klikli_dev:modonomicon:1.19.2-1.30.2")
-	datagenImplementation fg.deobf("com.klikli_dev:modonomicon:1.19.2-1.30.2")
+	//https://h2database.com/html/mvstore.html
+	minecraftLibrary(group: "com.h2database", name: "h2-mvstore", version: "2.2.224")
+	jarJar(group: "com.h2database", name: "h2-mvstore", version: "[2.2.220,3.0.0)")
+
+	implementation fg.deobf("com.klikli_dev:modonomicon-${mc_version}:1.34.0")
+	datagenImplementation fg.deobf("com.klikli_dev:modonomicon-${mc_version}:1.34.0")
 
 	compileOnly fg.deobf("mezz.jei:jei-${mc_version}-common-api:${jei_version}")
 	compileOnly fg.deobf("mezz.jei:jei-${mc_version}-forge-api:${jei_version}") // compile against the JEI API but do not include it at runtime
@@ -230,6 +236,8 @@ dependencies {
 //	implementation fg.deobf("se.mickelus.mutil:mutil:1.19.2-5.1.0")
 	compileOnly fg.deobf("curse.maven:tetra-289712:4738567") // 1.19.2-5.5.0
 
+//	runtimeOnly fg.deobf("maven.modrinth:nerb:ANmCMdMt") //NERB 0.3
+
 	//TODO: Morph Mod Integration?
 //    implementation fg.deobf("curse.maven:identity-391390:3807264") // https://www.curseforge.com/minecraft/mc-mods/identity
 //    runtimeOnly fg.deobf("curse.maven:architectury-419699:4040966")
@@ -240,7 +248,6 @@ dependencies {
 }
 
 processResources {
-	exclude '.cache'
 	exclude '**/*.psd'
 	exclude '**/*.bbmodel'
 	exclude '**/*.pdn'
@@ -263,7 +270,14 @@ void minifyJsons(String fdir) {
 	printf "%7s sec, %s ms \n", (int) (ms / 1000), ms % 1000
 }
 
+tasks.jarJar {
+	archiveClassifier = ''
+	from sourceSets.api.output
+	from { ["CREDITS.md", "LICENSE.txt"] } //copy files from the repository root into the jar
+}
+
 jar {
+	archiveClassifier = "slim"
 	from sourceSets.api.output
 
 	// manifest properties for reading on runtime
@@ -281,10 +295,13 @@ jar {
 	from { ["CREDITS.md", "LICENSE.txt"] } //copy files from the repository root into the jar
 }
 
-// This is the preferred method to reobfuscate your jar file
-jar.finalizedBy('reobfJar')
-// However if you are in a multi-project build, dev time needs unobfed jar files, so you can delay the obfuscation until publishing by doing
-//publish.dependsOn('reobfJar')
+reobf {
+	jarJar {}
+}
+
+//jar.finalizedBy('reobfJar')
+tasks.build.dependsOn tasks.jarJar
+jar.finalizedBy('reobfJarJar')
 
 publishing {
 	publications {

mod_version.json

@@ -1,4 +1,4 @@
 {
   "major": "2",
-  "semantic": "2.0.0"
+  "semantic": "2.9.0"
 }

src/datagen/java/com/github/elenterius/biomancy/datagen/DataGenerators.java

@@ -60,7 +60,7 @@ public static void gatherData(final GatherDataEvent event) {
 		generator.addProvider(true, new ModAdvancementProvider(generator, existingFileHelper, translationProvider));
 
 		//guide book
-		generator.addProvider(false, new GuideBookProvider(generator, translationProvider)); //TODO: re-enable when ready
+		generator.addProvider(true, new GuideBookProvider(generator, translationProvider)); //TODO: re-enable when ready
 
 		generator.addProvider(true, translationProvider);
 	}

src/datagen/java/com/github/elenterius/biomancy/datagen/ModSoundProvider.java

@@ -35,6 +35,12 @@ public void registerSounds() {
 		addSimpleSounds(ModSoundEvents.FLESH_BLOCK_BREAK, 4);
 		addSimpleSounds(ModSoundEvents.FLESH_BLOCK_FALL, 3);
 
+		addSimpleRedirects(ModSoundEvents.BONY_FLESH_BLOCK_HIT, ModSoundEvents.FLESH_BLOCK_HIT.get(), SoundEvents.BONE_BLOCK_HIT);
+		addSimpleRedirects(ModSoundEvents.BONY_FLESH_BLOCK_PLACE, ModSoundEvents.FLESH_BLOCK_PLACE.get(), SoundEvents.BONE_BLOCK_PLACE);
+		addSimpleRedirects(ModSoundEvents.BONY_FLESH_BLOCK_STEP, ModSoundEvents.FLESH_BLOCK_STEP.get(), SoundEvents.BONE_BLOCK_STEP);
+		addSimpleRedirects(ModSoundEvents.BONY_FLESH_BLOCK_BREAK, ModSoundEvents.FLESH_BLOCK_BREAK.get(), SoundEvents.BONE_BLOCK_BREAK);
+		addSimpleRedirects(ModSoundEvents.BONY_FLESH_BLOCK_FALL, ModSoundEvents.FLESH_BLOCK_FALL.get(), SoundEvents.BONE_BLOCK_FALL);
+
 		addSimpleSounds(ModSoundEvents.FLESH_DOOR_OPEN, 2);
 		addSimpleSounds(ModSoundEvents.FLESH_DOOR_CLOSE, 2);
 
@@ -82,7 +88,7 @@ public void registerSounds() {
 		addSimpleRedirect(ModSoundEvents.DIGESTER_CRAFTING_COMPLETED, SoundEvents.PLAYER_BURP, 1f, 1.25f);
 
 		addSimpleRedirect(ModSoundEvents.FLESH_BLOB_JUMP, SoundEvents.SLIME_JUMP);
-		addSimpleRedirect(ModSoundEvents.FLESH_BLOB_HURT, ModSoundEvents.FLESH_BLOCK_BREAK.get(), 0.8f, 0.9f);
+		addSimpleRedirect(ModSoundEvents.FLESH_BLOB_HURT, ModSoundEvents.FLESH_BLOCK_BREAK, 0.8f, 0.9f);
 		addSimpleRedirect(ModSoundEvents.FLESH_BLOB_DEATH, SoundEvents.GENERIC_DEATH);
 		addSimpleSounds(ModSoundEvents.FLESH_BLOB_AMBIENT, 3, 0.8f, 0.9f);
 		addSimpleSound(ModSoundEvents.GENERIC_MEW_PURR, 0.7f, 0.45f);
@@ -169,4 +175,13 @@ protected void addSimpleRedirect(RegistryObject<SoundEvent> soundHolder, Registr
 		);
 	}
 
+	protected void addSimpleRedirects(RegistryObject<SoundEvent> soundHolder, SoundEvent... redirectTargets) {
+		SoundDefinition soundDefinition = definition().subtitle(translationKey(soundHolder));
+
+		for (SoundEvent redirectTarget : redirectTargets) {
+			soundDefinition.with().with(sound(redirectTarget.getLocation(), SoundDefinition.SoundType.EVENT));
+		}
+
+		add(soundHolder, soundDefinition);
+	}
 }

src/datagen/java/com/github/elenterius/biomancy/datagen/advancements/AdvancementBuilder.java

@@ -1,7 +1,7 @@
 package com.github.elenterius.biomancy.datagen.advancements;
 
-import com.github.elenterius.biomancy.chat.ComponentUtil;
 import com.github.elenterius.biomancy.datagen.lang.LangProvider;
+import com.github.elenterius.biomancy.util.ComponentUtil;
 import net.minecraft.advancements.Advancement;
 import net.minecraft.advancements.CriterionTriggerInstance;
 import net.minecraft.advancements.FrameType;

src/datagen/java/com/github/elenterius/biomancy/datagen/lang/EnglishLangProvider.java

@@ -160,6 +160,7 @@ protected void addTranslations() {
 
 		addItemTranslations();
 		addBlockTranslations();
+		addFluidTranslations();
 		addEntityTranslations();
 		addEnchantmentTranslations();
 		addStatusEffectTranslations();
@@ -169,6 +170,7 @@ protected void addTranslations() {
 		addTooltip("empty", "Empty");
 		addTooltip("contains", "Contains: %1$s");
 		addTooltip("nutrients_fuel", "Nutrients");
+		addTooltip("primal_energy", "Primal Energy");
 		addTooltip("nutrients_consumes", "Consumes %1$s u");
 		addTooltip("consumption", "Consumption");
 		addTooltip("bile_fuel", "Bile");
@@ -252,6 +254,12 @@ private void addSoundTranslations() {
 		addSound(ModSoundEvents.FLESH_BLOCK_BREAK, "Break Fleshy Block");
 		addSound(ModSoundEvents.FLESH_BLOCK_FALL, "Fall on Fleshy Block");
 
+		addSound(ModSoundEvents.BONY_FLESH_BLOCK_HIT, "Hit Bony Flesh Block");
+		addSound(ModSoundEvents.BONY_FLESH_BLOCK_PLACE, "Place Bony Flesh Block");
+		addSound(ModSoundEvents.BONY_FLESH_BLOCK_STEP, "Step on Bony Flesh Block");
+		addSound(ModSoundEvents.BONY_FLESH_BLOCK_BREAK, "Break Bony Flesh Block");
+		addSound(ModSoundEvents.BONY_FLESH_BLOCK_FALL, "Fall on Bony Flesh Block");
+
 		addSound(ModSoundEvents.FLESH_DOOR_OPEN, "Open Fleshy Door");
 		addSound(ModSoundEvents.FLESH_DOOR_CLOSE, "Close Fleshy Door");
 
@@ -361,6 +369,7 @@ private void addItemTranslations() {
 		addItem(ModItems.NUTRIENTS, "Nutrients", "Very hard pellets rich in energy that almost look like vitamin pills.");
 		addItem(ModItems.NUTRIENT_PASTE, "Nutrient Paste", "Nutrients combined with Biotic Matter to moisten the hard pellets, producing a paste.\nIt almost looks like yellowish cake, and is a convenient source of energy.");
 		addItem(ModItems.NUTRIENT_BAR, "Nutrient Bar", "Nutrient Paste compressed into the shape of a bar. Looks edible, if a bit bland.");
+		addItem(ModItems.BLOOMBERRY, "Bloomberry", "An exotic delicacy which has a bioluminescent sheen and grants random potion effects when eaten.");
 
 		addItem(ModItems.REGENERATIVE_FLUID, "Regenerative Fluid", "A fluid with regenerative properties, used to concoct healing additives.");
 		addItem(ModItems.WITHERING_OOZE, "Withering Ooze", "A corrosive extract. It likely has uses in bio-alchemy.");
@@ -388,6 +397,7 @@ private void addItemTranslations() {
 				Looks like some objects are wrapped in an organic layer of skin. Might be filled with items or toxin if your language is set to German.
 
 				Right Click the Sac to retrieve the Items.""");
+		addItem(ModItems.ACID_BUCKET, "Acid Bucket");
 
 		addItem(ModItems.RAVENOUS_CLAWS, "Ravenous Claws", """
 				Extremely hungry and vicious Claws forged by starving living flesh and grafting claws onto it.
@@ -480,12 +490,16 @@ private void addBlockTranslations() {
 		addBlock(ModBlocks.FLESH_LADDER, "Flesh Ladder", "Ladder mainly made of bones and a little bit of flesh...");
 		addBlock(ModBlocks.YELLOW_BIO_LANTERN, "Yellow Bio-Lantern", "A bioluminescent light source that is energy-efficient and environmentally friendly.");
 		addBlock(ModBlocks.BLUE_BIO_LANTERN, "Blue Bio-Lantern", "A bioluminescent light source. This one is blue!");
-		addBlock(ModBlocks.PRIMORDIAL_BIO_LANTERN, "Primordial Bio-Lantern", "A primal light source. This one is magenta!");
+		addBlock(ModBlocks.PRIMORDIAL_BIO_LANTERN, "Bloom-Lantern", "A magenta light source made from a bioluminescent berry.");
+		addBlock(ModBlocks.BLOOMLIGHT, "Bloomlight", "A malignant light source. This one is magenta as well!");
 		addBlock(ModBlocks.TENDON_CHAIN, "Tendon Chain", "A chain made of tendons.");
 		addBlock(ModBlocks.VIAL_HOLDER, "Vial Holder", "Display and organize your serums.");
 		addBlock(ModBlocks.IMPERMEABLE_MEMBRANE, "Impermeable Membrane", "Gelatinous-like membrane reinforced with elastic fibers.");
 		addBlock(ModBlocks.BABY_PERMEABLE_MEMBRANE, "Baby-Permeable Membrane", "Gelatinous-like membrane reinforced with elastic fibers.\n\nBaby mobs can diffuse through the membrane.");
 		addBlock(ModBlocks.ADULT_PERMEABLE_MEMBRANE, "Adult-Permeable Membrane", "Gelatinous-like membrane reinforced with elastic fibers.\n\nAdult mobs can diffuse through the membrane.");
+		addBlock(ModBlocks.PRIMAL_PERMEABLE_MEMBRANE, "Primal Membrane", "Gelatinous-like membrane reinforced with elastic fibers.\n\nOnly mobs that are alive can diffuse through the membrane.");
+		addBlock(ModBlocks.UNDEAD_PERMEABLE_MEMBRANE, "Phantom Membrane", "Gelatinous-like membrane reinforced with elastic fibers.\n\nOnly mobs that are undead can diffuse through the membrane.");
+		//addBlock(ModBlocks.NEURAL_INTERCEPTOR, "Neural Interceptor", "A psychic node that prevents natural mob spawning in a 48 block radius.");
 
 		addBlock(ModBlocks.PRIMAL_FLESH, "Primal Flesh Block", "Primitive and pure, you better not touch this with your dirty mitts.");
 		addBlock(ModBlocks.PRIMAL_FLESH_SLAB, "Primal Flesh Slab", "Primitive and pure, you better not touch this with your dirty mitts.");
@@ -496,6 +510,10 @@ private void addBlockTranslations() {
 		addBlock(ModBlocks.MALIGNANT_FLESH_STAIRS, "Malignant Flesh Stairs", "Stairs made of malignant flesh.\nLooks diseased...");
 		addBlock(ModBlocks.MALIGNANT_FLESH_WALL, "Malignant Flesh Wall", "Wall of malignant flesh.\nIt's coming for you! ;)");
 		addBlock(ModBlocks.MALIGNANT_FLESH_VEINS, "Malignant Flesh Veins", "They look almost feral...\nyou better not touch them.");
+		addBlock(ModBlocks.MALIGNANT_BLOOM, "Primal Bloom", "An exotic flower of primordial beauty.\n\nIt will spread itself by launching it's ripe berry into the air.\nOn impact the berry explodes and spreads malignant veins as well.");
+		addBlock(ModBlocks.PRIMAL_ORIFICE, "Primal Orifice", "A primitive piece full of holes. It seems to leak an acidic substance.");
+
+		addBlock(ModBlocks.ACID_FLUID_BLOCK, "Acid");
 	}
 
 	private void addEntityTranslations() {
@@ -506,4 +524,7 @@ private void addEntityTranslations() {
 		addEntityType(ModEntityTypes.PRIMORDIAL_HUNGRY_FLESH_BLOB, "Primordial Hungry Flesh Blob");
 	}
 
+	private void addFluidTranslations() {
+		addFluidType(ModFluids.ACID_TYPE, "Acid");
+	}
 }