Merge pull request #1 from Elenterius/dev

beta.2 update

README.md

@@ -1,115 +1,27 @@
 <img src="media/biomancy.png" alt="Biomancy" width="30%" style="image-rendering: crisp-edges;"/>
 
-[![Biomancy Version](https://img.shields.io/badge/Biomancy-1.0.0--beta.1-yellow)](https://github.com/Elenterius/Biomancy)
+[![Biomancy Version](https://img.shields.io/badge/Biomancy-1.0.0--beta.2-yellow)](https://github.com/Elenterius/Biomancy)
 [![Forge Version](https://img.shields.io/badge/Minecraft%20Forge-1.16.5--36.1.4-orange)](https://files.minecraftforge.net/maven/net/minecraftforge/forge/index_1.16.5.html)
 
 Biomancy is a Biopunk inspired Mod and themed around flesh magic and bio-manipulation.
 
 **Mod Integrations**
 
 - [x] JEI
-- [ ] Patchouli WIP
+- [ ] Patchouli WIP, use the [Wiki](https://github.com/Elenterius/Biomancy/wiki) instead
 
-## Features
+## Mod Download
+https://www.curseforge.com/minecraft/mc-mods/biomancy
 
-### Items
-
-- Claws
-    - Leech Claw: reduced attack distance but leaches enemy health
-    - Long Range Claw: features greater attack distance on critical hit, aoe harvest for blocks
-- Blighbringer Axe: reduces max health of enemies if your health is below 75% of the max health of the enemy
-- Fleshborn Tools: feature 3x3 aoe harvest (sneak to disable) and adapts to the block they are harvesting
-- Enchantable Guns (accept some Bow/Crossbow enchantments)
-    - Tooth Gun: eats nutrient paste to reload ammo
-    - Withershot: eats wither skulls to reload ammo
-- Item Storage Bag (4k of a single item):
-    - on sneak click takes/put items from/in offhand
-    - Devour Mode: take items from player inventory and store them; on right click of a block with an inventory extract items from it
-    - Replenish Mode: refill items in player main/off-hand; on right click of a block with an inventory fill it with items
-- Entity Storage Bag
-- Injection Device:
-    - force inject Mobs or Blocks with reagents (**some reagents can't be injected into everything**)
-    - loaded/unloaded via glass-vials/reagents in offhand and sneak clicking
-    - when empty it can extract blood from entities
-- Boomling-nade (heat seeking potion)
-    - combine with splash potion in crafting table
-    - sneak click to pick back up once thrown
-
-#### Reagents
-
-- Insomnia Cure (resets the last slept time, no need for sleep)
-- Breeding Stimulant (reset in love timer)
-- Blood Sample (contains genetic material, inject a flesh blob with it and inject ample mutagen)
-- Mutagen Serum (induces mutations in flesh blobs and some other mobs (Villagers, Animals, Guardians))
-- Rejuvenation Serum (reverse growth)
-- Growth Serum (induce growth, even for reeds, cactus & nether wart)
-- Cleansing Serum (removes all potion effects, removes genetic material from flesh blobs)
-- Decay Serum (strongly affects zombies)
-
-#### Enchantments
-
-- Millipedes (for boots; spider climbing)
-- Copepod's Leap (for pants; sneak+jump to riptide jump without water; free elytra launch boost)
-- Attuning Bane (attunes to the killed entity type and becomes Bane of x)
-- Quick Shot (for gun; decreases shoot delay)
-- Max Ammo (for gun; increases max ammo)
-
-### Blocks
-
-- Flesh (Blocks, Slabs, Stairs)
-- Ownable
-    - Fleshborn Door
-    - Trapdoor, Pressure Plate (sneak click to change mode)
-
-#### Machines
-
-- Chewer (uses Nutrient Paste/Bar or Cooked Meat as Fuel)
-- Digester (uses Water as fuel)
-- Decomposer (uses Nutrient Paste/Bar or Cooked Meat as Fuel)
-- Evolution Pool (uses Mutagenic Bile as fuel)
-
-#### Storage
-
-- Flesh Chest (large chest, keeps inventory)
-- Deep Gulge (32k of a single item, keeps inventory)
-
-### Entities
-
-- Flesh Blob (can grow and drops flesh blocks)
-    - can be injected with genetic material of several creatures
-- Fleshkin (Pet; created using humanoid blood)
-    - equips armor and weapons
-    - sneak click to change mode
-- Boomling (Pet; created using spider & creeper blood)
-
-## Recipes
+## Recipes & Guide Book
 
 Some things aren't yet balanced and require more play testing.<br>
 That's why some items may be too expensive to craft.<br>
 
-ATM I recommended the use of JEI to look up recipes.
-
-### Getting Started
-
-Things you need to craft your first flesh block:
-
-- 5x raw meat food
-- 1x bone meal
-- 1x healing potion
-
-Click an empty cauldron with raw meat and fill it up. Add the bone meal and as the last step add the healing potion.
-![flesh block recipe](media/flesh_block_recipe.gif)
-
-#### Evolution Pool Construction
+ATM I recommended the use of JEI to look up recipes and the github [Wiki](https://github.com/Elenterius/Biomancy/wiki) to understand things.
 
-The evolution pool is a multi-block and is built from 2x2 flesh stairs forming a well.
+[Getting Started](https://github.com/Elenterius/Biomancy/wiki/Getting-Started)
 
-<table>
-<tr>
-<td><img src="media/evolution_pool_setup.png" alt="evolution pool setup"/></td>
-<td><img src="media/evolution_pool.png" alt="evolution pool"/></td>
-</tr>
-</table>
 
 
 

build.gradle

@@ -77,7 +77,17 @@ minecraft {
     }
 }
 
+//The mixin annotation processor doesn't have an obfuscation mapping when run through the IntelliJ compiler
+if (System.getProperty("idea.sync.active") == "true") {
+    afterEvaluate {
+        tasks.withType(JavaCompile).all {
+            it.options.annotationProcessorPath = files()
+        }
+    }
+}
+
 mixin {
+//    defaultObfuscationEnv "searge"
     add sourceSets.main, "mixins.biomancy.refmap.json"
 }
 

gradle.properties

@@ -4,4 +4,4 @@ org.gradle.jvmargs=-Xmx3G
 org.gradle.daemon=false
 mc_version=1.16.5
 forge_version=36.1.4
-mod_version=1.0.0-beta.1
+mod_version=1.0.0-beta.2

src/generated/resources/data/biomancy/advancements/recipes/biomancy/bolus_from_mc_cactus_chewing.json → src/generated/resources/data/biomancy/advancements/recipes/biomancy/bolus_from_average_biomass_chewing.json

@@ -2,30 +2,30 @@
   "parent": "minecraft:recipes/root",
   "rewards": {
     "recipes": [
-      "biomancy:bolus_from_mc_cactus_chewing"
+      "biomancy:bolus_from_average_biomass_chewing"
     ]
   },
   "criteria": {
-    "has_raw_biomass": {
+    "has_biomass": {
       "trigger": "minecraft:inventory_changed",
       "conditions": {
         "items": [
           {
-            "tag": "biomancy:raw_biomass"
+            "tag": "biomancy:biomass"
           }
         ]
       }
     },
     "has_the_recipe": {
       "trigger": "minecraft:recipe_unlocked",
       "conditions": {
-        "recipe": "biomancy:bolus_from_mc_cactus_chewing"
+        "recipe": "biomancy:bolus_from_average_biomass_chewing"
       }
     }
   },
   "requirements": [
     [
-      "has_raw_biomass",
+      "has_biomass",
       "has_the_recipe"
     ]
   ]

src/generated/resources/data/biomancy/advancements/recipes/biomancy/bolus_from_mc_kelp_chewing.json → src/generated/resources/data/biomancy/advancements/recipes/biomancy/bolus_from_good_biomass_chewing.json

@@ -2,30 +2,30 @@
   "parent": "minecraft:recipes/root",
   "rewards": {
     "recipes": [
-      "biomancy:bolus_from_mc_kelp_chewing"
+      "biomancy:bolus_from_good_biomass_chewing"
     ]
   },
   "criteria": {
-    "has_raw_biomass": {
+    "has_biomass": {
       "trigger": "minecraft:inventory_changed",
       "conditions": {
         "items": [
           {
-            "tag": "biomancy:raw_biomass"
+            "tag": "biomancy:biomass"
           }
         ]
       }
     },
     "has_the_recipe": {
       "trigger": "minecraft:recipe_unlocked",
       "conditions": {
-        "recipe": "biomancy:bolus_from_mc_kelp_chewing"
+        "recipe": "biomancy:bolus_from_good_biomass_chewing"
       }
     }
   },
   "requirements": [
     [
-      "has_raw_biomass",
+      "has_biomass",
       "has_the_recipe"
     ]
   ]