-
Notifications
You must be signed in to change notification settings - Fork 95
Use new NeoForge attribute API for quantum armor, quantum sword and gravichestplate #985
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
Merged
Merged
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
63 changes: 63 additions & 0 deletions
63
src/main/java/aztech/modern_industrialization/attributes/DisplayNamedAttribute.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,63 @@ | ||
| /* | ||
| * MIT License | ||
| * | ||
| * Copyright (c) 2020 Azercoco & Technici4n | ||
| * | ||
| * Permission is hereby granted, free of charge, to any person obtaining a copy | ||
| * of this software and associated documentation files (the "Software"), to deal | ||
| * in the Software without restriction, including without limitation the rights | ||
| * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | ||
| * copies of the Software, and to permit persons to whom the Software is | ||
| * furnished to do so, subject to the following conditions: | ||
| * | ||
| * The above copyright notice and this permission notice shall be included in all | ||
| * copies or substantial portions of the Software. | ||
| * | ||
| * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
| * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
| * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||
| * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
| * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||
| * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE | ||
| * SOFTWARE. | ||
| */ | ||
| package aztech.modern_industrialization.attributes; | ||
|
|
||
| import net.minecraft.ChatFormatting; | ||
| import net.minecraft.network.chat.Component; | ||
| import net.minecraft.network.chat.MutableComponent; | ||
| import net.minecraft.world.entity.ai.attributes.Attribute; | ||
| import net.minecraft.world.entity.ai.attributes.AttributeModifier; | ||
| import net.minecraft.world.item.TooltipFlag; | ||
|
|
||
| public abstract class DisplayNamedAttribute extends Attribute { | ||
| protected DisplayNamedAttribute(String descriptionId, double defaultValue) { | ||
| super(descriptionId, defaultValue); | ||
| } | ||
|
|
||
| /** | ||
| * Translation key to use in tooltips, thanks to our override of {@link #toComponent(AttributeModifier, TooltipFlag)}. | ||
| * {@link #getDescriptionId()} is still used in /attribute commands and other contexts. | ||
| */ | ||
| public abstract String getTooltipDescriptionId(); | ||
|
|
||
| /* | ||
| * The below methods is copied from IAttributeExtension and uses DisplayAttribute#getDisplayDescriptionId so that Attribute#getDescriptionId | ||
| * can return the MIText.AttributeQuantumArmor description id. This is desirable because when using the /attribute command it will display the | ||
| * attribute name as "Quantum Armor" instead of just "Armor" like it does when using "attribute.name.generic.armor" as the description id (or | ||
| * "Infinite Damage" instead of just "Damage" for the InfiniteDamageAttribute). | ||
| */ | ||
|
|
||
| @Override | ||
| public MutableComponent toComponent(AttributeModifier modif, TooltipFlag flag) { | ||
| double value = modif.amount(); | ||
| String key = value > 0 ? "neoforge.modifier.plus" : "neoforge.modifier.take"; | ||
| ChatFormatting color = this.getStyle(value > 0); | ||
|
|
||
| Component attrDesc = Component.translatable(this.getTooltipDescriptionId()); | ||
| Component valueComp = this.toValueComponent(modif.operation(), value, flag); | ||
| MutableComponent comp = Component.translatable(key, valueComp, attrDesc).withStyle(color); | ||
|
|
||
| return comp.append(this.getDebugInfo(modif, flag)); | ||
| } | ||
| } |
73 changes: 73 additions & 0 deletions
73
src/main/java/aztech/modern_industrialization/attributes/InfiniteDamageAttribute.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,73 @@ | ||
| /* | ||
| * MIT License | ||
| * | ||
| * Copyright (c) 2020 Azercoco & Technici4n | ||
| * | ||
| * Permission is hereby granted, free of charge, to any person obtaining a copy | ||
| * of this software and associated documentation files (the "Software"), to deal | ||
| * in the Software without restriction, including without limitation the rights | ||
| * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | ||
| * copies of the Software, and to permit persons to whom the Software is | ||
| * furnished to do so, subject to the following conditions: | ||
| * | ||
| * The above copyright notice and this permission notice shall be included in all | ||
| * copies or substantial portions of the Software. | ||
| * | ||
| * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
| * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
| * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||
| * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
| * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||
| * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE | ||
| * SOFTWARE. | ||
| */ | ||
| package aztech.modern_industrialization.attributes; | ||
|
|
||
| import aztech.modern_industrialization.MIText; | ||
| import aztech.modern_industrialization.items.tools.QuantumSword; | ||
| import net.minecraft.ChatFormatting; | ||
| import net.minecraft.network.chat.Component; | ||
| import net.minecraft.network.chat.MutableComponent; | ||
| import net.minecraft.resources.ResourceLocation; | ||
| import net.minecraft.util.Mth; | ||
| import net.minecraft.world.entity.ai.attributes.AttributeModifier; | ||
| import net.minecraft.world.item.TooltipFlag; | ||
|
|
||
| public class InfiniteDamageAttribute extends DisplayNamedAttribute { | ||
| private static final String INFINITY = "\u221e"; | ||
|
|
||
| public InfiniteDamageAttribute() { | ||
| super(MIText.AttributeInfiniteDamage.getTranslationKey(), 0); | ||
| } | ||
|
|
||
| // Allows a modifier with the base id to render green with the effective value. | ||
| // Other modifiers still render blue with the additional value. | ||
| @Override | ||
| public ResourceLocation getBaseId() { | ||
| return QuantumSword.BASE_INFINITE_DAMAGE; | ||
| } | ||
|
|
||
| @Override | ||
| public MutableComponent toValueComponent(AttributeModifier.Operation operation, double value, TooltipFlag flag) { | ||
| return Component.literal(INFINITY); | ||
| } | ||
|
|
||
| @Override | ||
| public MutableComponent toBaseComponent(double value, double entityBase, boolean merged, TooltipFlag flag) { | ||
| String stringValue = value > Mth.EPSILON ? INFINITY : FORMAT.format(0); | ||
| MutableComponent comp = Component.translatable("attribute.modifier.equals.0", stringValue, | ||
| Component.translatable(this.getTooltipDescriptionId())); | ||
| if (flag.isAdvanced() && !merged) { | ||
| Component debugInfo = Component.literal(" ") | ||
| .append(Component.translatable("neoforge.attribute.debug.base", FORMAT.format(entityBase), FORMAT.format(value - entityBase)) | ||
| .withStyle(ChatFormatting.GRAY)); | ||
| comp.append(debugInfo); | ||
| } | ||
| return comp; | ||
| } | ||
|
|
||
| @Override | ||
| public String getTooltipDescriptionId() { | ||
| return "attribute.name.generic.attack_damage"; | ||
| } | ||
| } |
46 changes: 46 additions & 0 deletions
46
src/main/java/aztech/modern_industrialization/attributes/QuantumArmorAttribute.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,46 @@ | ||
| /* | ||
| * MIT License | ||
| * | ||
| * Copyright (c) 2020 Azercoco & Technici4n | ||
| * | ||
| * Permission is hereby granted, free of charge, to any person obtaining a copy | ||
| * of this software and associated documentation files (the "Software"), to deal | ||
| * in the Software without restriction, including without limitation the rights | ||
| * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | ||
| * copies of the Software, and to permit persons to whom the Software is | ||
| * furnished to do so, subject to the following conditions: | ||
| * | ||
| * The above copyright notice and this permission notice shall be included in all | ||
| * copies or substantial portions of the Software. | ||
| * | ||
| * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
| * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
| * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||
| * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
| * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||
| * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE | ||
| * SOFTWARE. | ||
| */ | ||
| package aztech.modern_industrialization.attributes; | ||
|
|
||
| import aztech.modern_industrialization.MIText; | ||
| import net.minecraft.network.chat.Component; | ||
| import net.minecraft.network.chat.MutableComponent; | ||
| import net.minecraft.world.entity.ai.attributes.AttributeModifier; | ||
| import net.minecraft.world.item.TooltipFlag; | ||
|
|
||
| public class QuantumArmorAttribute extends DisplayNamedAttribute { | ||
| public QuantumArmorAttribute() { | ||
| super(MIText.AttributeQuantumArmor.getTranslationKey(), 0); | ||
| } | ||
|
|
||
| @Override | ||
| public MutableComponent toValueComponent(AttributeModifier.Operation operation, double value, TooltipFlag flag) { | ||
| return Component.literal("\u00B9\u2044\u2084 |\u221E> + \u00B3\u2044\u2084 |0>"); | ||
| } | ||
|
|
||
| @Override | ||
| public String getTooltipDescriptionId() { | ||
| return "attribute.name.generic.armor"; | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.