Jordy/Tinkering-Abnormally
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 6 Wiki Activity

Add sanguine modifier and bump version to 1.5

Browse Source
This commit is contained in:
Jordy Goodridge 2024-06-05 00:13:29 -07:00
parent 0509f312b6
commit baede36f82
17 changed files with 101 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gradle.properties
View File

@ -42,7 +42,7 @@ mod_name=Tinkering Abnormally
# The license of the mod. Review your options at https://choosealicense.com/. All Rights Reserved is the default.
mod_license=MIT
# The mod version. See https://semver.org/
mod_version=1.4
mod_version=1.5
# The group ID for the mod. It is only important when publishing as an artifact to a Maven repository.
# This should match the base package used for the mod sources.
# See https://maven.apache.org/guides/mini/guide-naming-conventions.html

4
src/generated/resources/assets/tinkering_abnormally/tinkering/materials/sanguine.json
View File

@ -1,4 +0,0 @@
{
"color": "FFFFFFFF",
"luminosity": 0
}

10
src/generated/resources/data/tinkering_abnormally/recipes/tools/modifiers/salvage/upgrade/sanguine.json Normal file
View File

@ -0,0 +1,10 @@
{
"type": "tconstruct:modifier_salvage",
"modifier": "tinkering_abnormally:sanguine",
"slots": {
"upgrades": 1
},
"tools": {
"tag": "tconstruct:modifiable/armor/worn"
}
}

18
src/generated/resources/data/tinkering_abnormally/recipes/tools/modifiers/upgrade/sanguine.json Normal file
View File

@ -0,0 +1,18 @@
{
"type": "tconstruct:modifier",
"allow_crystal": true,
"inputs": [
{
"amount_needed": 6,
"item": "caverns_and_chasms:sanguine_plating"
}
],
"level": 1,
"result": "tinkering_abnormally:sanguine",
"slots": {
"upgrades": 1
},
"tools": {
"tag": "tconstruct:modifiable/armor/worn"
}
}

22
src/generated/resources/data/tinkering_abnormally/tinkering/modifiers/sanguine.json Normal file
View File

@ -0,0 +1,22 @@
{
"type": "tconstruct:composable",
"level_display": "tconstruct:default",
"modules": [
{
"type": "tconstruct:attribute",
"attribute": "caverns_and_chasms:lifesteal",
"flat": 0.05,
"operation": "multiply_base",
"slots": [
"mainhand",
"offhand",
"feet",
"legs",
"chest",
"head"
],
"unique": "tinkering_abnormally.modifier.sanguine"
}
],
"tooltip_display": "always"
}

1
src/main/java/moe/hazu/tinkeringabnormally/data/ModifierIds.java
View File

@ -6,6 +6,7 @@ import slimeknights.tconstruct.library.modifiers.ModifierId;
public class ModifierIds {
public static final ModifierId spinel = id("spinel");
public static final ModifierId necromium = id("necromium");
public static final ModifierId sanguine = id("sanguine");
private static ModifierId id(String name) {
return new ModifierId(TinkeringAbnormally.MODID, name);

1
src/main/java/moe/hazu/tinkeringabnormally/data/ModifierProvider.java
View File

@ -47,6 +47,7 @@ public class ModifierProvider extends AbstractModifierProvider implements ICondi
// melee harvest
.addModule(MobEffectModule.builder(MobEffects.MOVEMENT_SLOWDOWN).level(RandomLevelingValue.flat(2)).time(RandomLevelingValue.flat(100)).build())
.addModule(SetStatModule.set(ToolStats.HARVEST_TIER).value(TinkeringAbnormally.NECROMIUM));
buildModifier(ModifierIds.sanguine).addModule(AttributeModule.builder(CCAttributes.LIFESTEAL.get(), AttributeModifier.Operation.MULTIPLY_BASE).uniqueFrom(ModifierIds.sanguine).flat(0.05f));
}
@Override

7
src/main/java/moe/hazu/tinkeringabnormally/data/ModifierRecipeProvider.java
View File

@ -60,6 +60,13 @@ public class ModifierRecipeProvider extends RecipeProvider implements ICondition
.setSlots(SlotType.UPGRADE, 1)
.saveSalvage(consumer, prefix(ModifierIds.necromium, upgradeSalvage))
.save(consumer, prefix(ModifierIds.necromium, upgradeFolder));
ModifierRecipeBuilder.modifier(ModifierIds.sanguine)
.setTools(TinkerTags.Items.WORN_ARMOR)
.addInput(CCItems.SANGUINE_PLATING.get(), 6)
.setMaxLevel(1)
.setSlots(SlotType.UPGRADE, 1)
.saveSalvage(consumer, prefix(ModifierIds.sanguine, upgradeSalvage))
.save(consumer, prefix(ModifierIds.sanguine, upgradeFolder));
}
private void addTextureRecipes(Consumer<FinishedRecipe> consumer) {

4
src/main/java/moe/hazu/tinkeringabnormally/data/material/MaterialIds.java
View File

@ -7,10 +7,6 @@ import slimeknights.tconstruct.library.materials.definition.MaterialVariantId;
import static slimeknights.tconstruct.library.materials.definition.MaterialVariantId.create;
public final class MaterialIds {
public static final MaterialId spinel = id("spinel");
public static final MaterialId necromium = id("necromium");
public static final MaterialId sanguine = id("sanguine");
public static final MaterialVariantId willow = create(slimeknights.tconstruct.tools.data.material.MaterialIds.wood, "willow");
public static final MaterialVariantId pine = create(slimeknights.tconstruct.tools.data.material.MaterialIds.wood, "pine");
public static final MaterialVariantId cherry = create(slimeknights.tconstruct.tools.data.material.MaterialIds.wood, "cherry");

1
src/main/java/moe/hazu/tinkeringabnormally/data/material/MaterialRenderInfoProvider.java
View File

@ -12,7 +12,6 @@ public class MaterialRenderInfoProvider extends AbstractMaterialRenderInfoProvid
@Override
protected void addMaterialRenderInfo() {
buildRenderInfo(MaterialIds.sanguine);
buildRenderInfo(MaterialIds.willow);
buildRenderInfo(MaterialIds.pine);
buildRenderInfo(MaterialIds.cherry);

13
src/main/resources/assets/tconstruct/book/encyclopedia/en_us/upgrades/armor/general/tinkering_abnormally_sanguine.json Normal file
View File

@ -0,0 +1,13 @@
{
"modifier_id": "tinkering_abnormally:sanguine",
"text": [
{
"text": "Attacking when worn gives +5% lifesteal per level."
}
],
"more_text_space": true,
"effects": [
"Maximum of 1 level",
"Requires 1 upgrade slot"
]
}

13
src/main/resources/assets/tconstruct/book/puny_smelting/en_us/upgrades/armor/general/tinkering_abnormally_sanguine.json Normal file
View File

@ -0,0 +1,13 @@
{
"modifier_id": "tinkering_abnormally:sanguine",
"text": [
{
"text": "It's already pretty clear that silver has some interesting properties. Combine it with some flesh of the undead and tears of the damned and maybe...?"
}
],
"effects": [
"Gives your attacks lifesteal",
"Single Level",
"Requires 1 upgrade slot"
]
}

3
src/main/resources/assets/tinkering_abnormally/lang/en_us.json
View File

@ -31,6 +31,9 @@
"modifier.tinkering_abnormally.necromium.flavor": "Sabotage!",
"modifier.tinkering_abnormally.necromium.description": "Though not as powerful as netherite, necromium has an aura that slows and weakens opponents.",
"modifier.tinkering_abnormally.necromium.requirements": "Necromium requires a gem first to be applied",
"modifier.tinkering_abnormally.sanguine": "Sanguine",
"modifier.tinkering_abnormally.sanguine.flavor": "Draining!",
"modifier.tinkering_abnormally.sanguine.description": "All of your attacks are imbued with lifesteal.",
"stat.tconstruct.harvest_tier.caverns_and_chasms.necromium": "Necromium"
}

3
src/main/resources/assets/tinkering_abnormally/mantle/colors.json
View File

@ -1,7 +1,8 @@
{
"modifier.tinkering_abnormally": {
"spinel": "#BC5186",
"necromium": "#566666"
"necromium": "#566666",
"sanguine": "#723b43"
},
"material.tconstruct": {

3
src/main/resources/assets/tinkering_abnormally/tinkering/modifier_icons.json
View File

@ -1,4 +1,5 @@
{
"tinkering_abnormally:spinel": ["caverns_and_chasms:item/spinel", "tconstruct:gui/modifiers/tier"],
"tinkering_abnormally:necromium": ["caverns_and_chasms:item/necromium_ingot", "tconstruct:gui/modifiers/tier"]
"tinkering_abnormally:necromium": ["caverns_and_chasms:item/necromium_ingot", "tconstruct:gui/modifiers/tier"],
"tinkering_abnormally:sanguine": ["caverns_and_chasms:item/sanguine_plating", "tconstruct:gui/modifiers/book"]
}

3
src/main/resources/assets/tinkering_abnormally/tinkering/modifiers.json
View File

@ -1,4 +1,5 @@
{
"tinkering_abnormally:spinel": "tconstruct:normal",
"tinkering_abnormally:necromium": "tconstruct:normal"
"tinkering_abnormally:necromium": "tconstruct:normal",
"tinkering_abnormally:sanguine": "tconstruct:normal"
}

6
src/main/resources/data/tconstruct/tinkering/tags/modifiers/upgrades/armor/general.json Normal file
View File

@ -0,0 +1,6 @@
{
"values": [
"tinkering_abnormally:sanguine"
],
"replace": false
}