Skip to content

Commit

Permalink
Clean
Browse files Browse the repository at this point in the history
  • Loading branch information
@CleverNucleus
CleverNucleus committed Aug 28, 2022
1 parent b6c5318 commit 925f9de
Show file tree
Hide file tree
Showing 7 changed files with 40 additions and 143 deletions.
10 changes: 1 addition & 9 deletions build.gradle
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import com.modrinth.minotaur.dependencies.ModDependency
import com.modrinth.minotaur.dependencies.VersionDependency

plugins {
id 'fabric-loom' version '0.12-SNAPSHOT'
Expand Down Expand Up @@ -116,18 +116,10 @@ modrinth {
gameVersions = ["${project.minecraft_version}"]
loaders = ["fabric"]
dependencies = [
<<<<<<< Updated upstream
new ModDependency("P7dR8mSH", "required"),
new ModDependency("9s6osm5g", "required"),
new ModDependency("wFyCClLQ", "required"),
new ModDependency("kD9Vl1lR", "embedded"),
new ModDependency("K01OU20C", "embedded")
=======
new VersionDependency("EsaWeELS", "required"),
new VersionDependency("fiwCOlq9", "required"),
new VersionDependency("hg9bSXT3", "required"),
new VersionDependency("tPfCTMiZ", "embedded"),
new VersionDependency("jtBdOsFq", "embedded")
>>>>>>> Stashed changes
]
}
8 changes: 1 addition & 7 deletions gradle.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,20 +4,14 @@ minecraft_version=1.19.2
yarn_mappings=1.19.2+build.1
loader_version=0.14.9

mod_version = 3.3.5
mod_version = 3.3.7
maven_group = com.github.clevernucleus
archives_base_name = playerex

fabric_api_version=0.59.0+1.19.2
<<<<<<< Updated upstream
data_attributes_version=1.2.4
opc_version=0.6.2
cardinal_components_version=5.0.1
=======
data_attributes_version=1.2.7
opc_version=0.6.4
cardinal_components_version=5.0.2
>>>>>>> Stashed changes
placeholder_api=2.0.0-beta.7+1.19
cloth_config_version=8.0.75
modmenu_version=4.0.6
72 changes: 1 addition & 71 deletions src/main/java/com/github/clevernucleus/playerex/client/gui/AttributesPageLayer.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -100,13 +100,10 @@ public void render(MatrixStack matrices, int mouseX, int mouseY, float delta) {

COMPONENTS.forEach(component -> component.renderText(this.client.player, matrices, this.textRenderer, this.x, this.y, scaleX.get(), scaleY.get()));

<<<<<<< Updated upstream
this.textRenderer.draw(matrices, Text.translatable("playerex.gui.page.attributes.text.vitality").formatted(Formatting.DARK_GRAY), (this.x + 105) / scaleX.get(), (this.y + 26) / scaleY.get(), 4210752);
this.textRenderer.draw(matrices, Text.translatable("playerex.gui.page.attributes.text.resistances").formatted(Formatting.DARK_GRAY), (this.x + 105) / scaleX.get(), (this.y + 81) / scaleY.get(), 4210752);
=======
this.textRenderer.draw(matrices, (Text.translatable("playerex.gui.page.attributes.text.vitality")).formatted(Formatting.DARK_GRAY), (this.x + 105) / scaleX.get(), (this.y + 26) / scaleY.get(), 4210752);
this.textRenderer.draw(matrices, (Text.translatable("playerex.gui.page.attributes.text.resistances")).formatted(Formatting.DARK_GRAY), (this.x + 105) / scaleX.get(), (this.y + 81) / scaleY.get(), 4210752);
>>>>>>> Stashed changes

matrices.pop();

Expand Down Expand Up @@ -178,43 +175,32 @@ protected void init() {
return Text.translatable("playerex.gui.page.attributes.text.level", Math.round(value)).formatted(Formatting.DARK_GRAY);
}, value -> {
List<Text> tooltip = new ArrayList<Text>();
<<<<<<< Updated upstream
tooltip.add((Text.translatable("playerex.gui.page.attributes.tooltip.level[0]")).formatted(Formatting.GRAY));
tooltip.add((Text.translatable("playerex.gui.page.attributes.tooltip.level[1]")).formatted(Formatting.GRAY));
tooltip.add(Text.empty());
tooltip.add((Text.translatable("playerex.gui.page.attributes.tooltip.level[2]", ExAPI.getConfig().skillPointsPerLevelUp())).formatted(Formatting.GRAY));
=======
tooltip.add(Text.translatable("playerex.gui.page.attributes.tooltip.level[0]").formatted(Formatting.GRAY));
tooltip.add(Text.translatable("playerex.gui.page.attributes.tooltip.level[1]").formatted(Formatting.GRAY));
tooltip.add(Text.empty());
tooltip.add(Text.translatable("playerex.gui.page.attributes.tooltip.level[2]", ExAPI.getConfig().skillPointsPerLevelUp()).formatted(Formatting.GRAY));
>>>>>>> Stashed changes

return tooltip;
}, 21, 26));
COMPONENTS.add(RenderComponent.of(entity -> {
return Text.translatable("playerex.gui.page.attributes.text.skill_points", ExAPI.PLAYER_DATA.get(entity).skillPoints()).formatted(Formatting.DARK_GRAY);
}, entity -> {
List<Text> tooltip = new ArrayList<Text>();
<<<<<<< Updated upstream
tooltip.add((Text.translatable("playerex.gui.page.attributes.tooltip.skill_points[0]")).formatted(Formatting.GRAY));
tooltip.add((Text.translatable("playerex.gui.page.attributes.tooltip.skill_points[1]")).formatted(Formatting.GRAY));
=======
tooltip.add(Text.translatable("playerex.gui.page.attributes.tooltip.skill_points[0]").formatted(Formatting.GRAY));
tooltip.add(Text.translatable("playerex.gui.page.attributes.tooltip.skill_points[1]").formatted(Formatting.GRAY));
>>>>>>> Stashed changes

return tooltip;
}, 21, 37));
COMPONENTS.add(RenderComponent.of(ExAPI.CONSTITUTION, value -> {
return Text.translatable("playerex.gui.page.attributes.text.constitution", Math.round(value)).formatted(Formatting.DARK_GRAY);
}, value -> {
List<Text> tooltip = new ArrayList<Text>();
<<<<<<< Updated upstream
tooltip.add((Text.translatable(ExAPI.CONSTITUTION.get().getTranslationKey())).formatted(Formatting.GRAY));
=======
tooltip.add(Text.translatable(ExAPI.CONSTITUTION.get().getTranslationKey()).formatted(Formatting.GRAY));
>>>>>>> Stashed changes
tooltip.add(Text.empty());

ClientUtil.appendChildrenToTooltip(tooltip, ExAPI.CONSTITUTION);
Expand All @@ -224,11 +210,8 @@ protected void init() {
return Text.translatable("playerex.gui.page.attributes.text.strength", Math.round(value)).formatted(Formatting.DARK_GRAY);
}, value -> {
List<Text> tooltip = new ArrayList<Text>();
<<<<<<< Updated upstream
tooltip.add((Text.translatable(ExAPI.STRENGTH.get().getTranslationKey())).formatted(Formatting.GRAY));
=======
tooltip.add(Text.translatable(ExAPI.STRENGTH.get().getTranslationKey()).formatted(Formatting.GRAY));
>>>>>>> Stashed changes
tooltip.add(Text.empty());

ClientUtil.appendChildrenToTooltip(tooltip, ExAPI.STRENGTH);
Expand All @@ -238,11 +221,8 @@ protected void init() {
return Text.translatable("playerex.gui.page.attributes.text.dexterity", Math.round(value)).formatted(Formatting.DARK_GRAY);
}, value -> {
List<Text> tooltip = new ArrayList<Text>();
<<<<<<< Updated upstream
tooltip.add((Text.translatable(ExAPI.DEXTERITY.get().getTranslationKey())).formatted(Formatting.GRAY));
=======
tooltip.add(Text.translatable(ExAPI.DEXTERITY.get().getTranslationKey()).formatted(Formatting.GRAY));
>>>>>>> Stashed changes
tooltip.add(Text.empty());

ClientUtil.appendChildrenToTooltip(tooltip, ExAPI.DEXTERITY);
Expand All @@ -252,11 +232,8 @@ protected void init() {
return Text.translatable("playerex.gui.page.attributes.text.intelligence", Math.round(value)).formatted(Formatting.DARK_GRAY);
}, value -> {
List<Text> tooltip = new ArrayList<Text>();
<<<<<<< Updated upstream
tooltip.add((Text.translatable(ExAPI.INTELLIGENCE.get().getTranslationKey())).formatted(Formatting.GRAY));
=======
tooltip.add(Text.translatable(ExAPI.INTELLIGENCE.get().getTranslationKey()).formatted(Formatting.GRAY));
>>>>>>> Stashed changes
tooltip.add(Text.empty());

ClientUtil.appendChildrenToTooltip(tooltip, ExAPI.INTELLIGENCE);
Expand All @@ -266,11 +243,8 @@ protected void init() {
return Text.translatable("playerex.gui.page.attributes.text.luckiness", Math.round(value)).formatted(Formatting.DARK_GRAY);
}, value -> {
List<Text> tooltip = new ArrayList<Text>();
<<<<<<< Updated upstream
tooltip.add((Text.translatable(ExAPI.LUCKINESS.get().getTranslationKey())).formatted(Formatting.GRAY));
=======
tooltip.add(Text.translatable(ExAPI.LUCKINESS.get().getTranslationKey()).formatted(Formatting.GRAY));
>>>>>>> Stashed changes
tooltip.add(Text.empty());

ClientUtil.appendChildrenToTooltip(tooltip, ExAPI.LUCKINESS);
Expand All @@ -281,80 +255,55 @@ protected void init() {
}, entity -> {
List<Text> tooltip = new ArrayList<Text>();
String formatted = ClientUtil.FORMATTING_3.format(20.0D * entity.getMovementSpeed());
<<<<<<< Updated upstream
tooltip.add((Text.translatable("playerex.gui.page.attributes.tooltip.movement_speed", formatted)).formatted(Formatting.GRAY));
=======
tooltip.add(Text.translatable("playerex.gui.page.attributes.tooltip.movement_speed", formatted).formatted(Formatting.GRAY));
>>>>>>> Stashed changes

return tooltip;
}, 21, 125));
COMPONENTS.add(RenderComponent.of(ExAPI.BREAKING_SPEED, value -> {
return Text.translatable("playerex.gui.page.attributes.text.breaking_speed", ClientUtil.FORMATTING_3.format(value)).formatted(Formatting.DARK_GRAY);
}, value -> {
List<Text> tooltip = new ArrayList<Text>();
<<<<<<< Updated upstream
tooltip.add((Text.translatable("playerex.gui.page.attributes.tooltip.breaking_speed")).formatted(Formatting.GRAY));
=======
tooltip.add(Text.translatable("playerex.gui.page.attributes.tooltip.breaking_speed").formatted(Formatting.GRAY));
>>>>>>> Stashed changes

return tooltip;
}, 21, 136));
COMPONENTS.add(RenderComponent.of(ExAPI.REACH_DISTANCE, value -> {
return Text.translatable("playerex.gui.page.attributes.text.reach_distance", ClientUtil.FORMATTING_2.format(4.5F + value)).formatted(Formatting.DARK_GRAY);
}, value -> {
List<Text> tooltip = new ArrayList<Text>();
<<<<<<< Updated upstream
tooltip.add((Text.translatable("playerex.gui.page.attributes.tooltip.reach_distance", ClientUtil.FORMATTING_2.format(4.5F + value))).formatted(Formatting.GRAY));
=======
tooltip.add(Text.translatable("playerex.gui.page.attributes.tooltip.reach_distance", ClientUtil.FORMATTING_2.format(4.5F + value)).formatted(Formatting.GRAY));
>>>>>>> Stashed changes

return tooltip;
}, 21, 147));
COMPONENTS.add(RenderComponent.of(entity -> {
String current = ClientUtil.FORMATTING_2.format(entity.getHealth());
String maximum = ClientUtil.FORMATTING_2.format(entity.getMaxHealth());

return Text.translatable("playerex.gui.page.attributes.text.health", current, maximum).formatted(Formatting.DARK_GRAY);
}, entity -> {
List<Text> tooltip = new ArrayList<Text>();
<<<<<<< Updated upstream
tooltip.add((Text.translatable("playerex.gui.page.attributes.tooltip.health")).formatted(Formatting.GRAY));
=======
tooltip.add(Text.translatable("playerex.gui.page.attributes.tooltip.health").formatted(Formatting.GRAY));
>>>>>>> Stashed changes

return tooltip;
}, 93, 37));
COMPONENTS.add(RenderComponent.of(ExAPI.HEALTH_REGENERATION, value -> {
return Text.translatable("playerex.gui.page.attributes.text.health_regeneration", ClientUtil.FORMATTING_3.format(value)).formatted(Formatting.DARK_GRAY);
}, value -> {
List<Text> tooltip = new ArrayList<Text>();
<<<<<<< Updated upstream
tooltip.add((Text.translatable("playerex.gui.page.attributes.tooltip.health_regeneration[0]")).formatted(Formatting.GRAY));
tooltip.add((Text.translatable("playerex.gui.page.attributes.tooltip.health_regeneration[1]")).formatted(Formatting.GRAY));
=======
tooltip.add(Text.translatable("playerex.gui.page.attributes.tooltip.health_regeneration[0]").formatted(Formatting.GRAY));
tooltip.add(Text.translatable("playerex.gui.page.attributes.tooltip.health_regeneration[1]").formatted(Formatting.GRAY));
>>>>>>> Stashed changes

return tooltip;
}, 93, 48));
COMPONENTS.add(RenderComponent.of(ExAPI.HEAL_AMPLIFICATION, value -> {
String displ = ClientUtil.FORMATTING_2.format(ClientUtil.displayValue(ExAPI.HEAL_AMPLIFICATION, value)).formatted(Formatting.DARK_GRAY);
return Text.translatable("playerex.gui.page.attributes.text.heal_amplification", displ).formatted(Formatting.DARK_GRAY);
}, value -> {
List<Text> tooltip = new ArrayList<Text>();
<<<<<<< Updated upstream
tooltip.add((Text.translatable("playerex.gui.page.attributes.tooltip.heal_amplification[0]")).formatted(Formatting.GRAY));
tooltip.add((Text.translatable("playerex.gui.page.attributes.tooltip.heal_amplification[1]")).formatted(Formatting.GRAY));
=======
tooltip.add(Text.translatable("playerex.gui.page.attributes.tooltip.heal_amplification[0]").formatted(Formatting.GRAY));
tooltip.add(Text.translatable("playerex.gui.page.attributes.tooltip.heal_amplification[1]").formatted(Formatting.GRAY));
>>>>>>> Stashed changes

return tooltip;
}, 93, 59));
COMPONENTS.add(RenderComponent.of(ExAPI.FIRE_RESISTANCE, value -> {
Expand All @@ -363,12 +312,8 @@ protected void init() {
}, value -> {
List<Text> tooltip = new ArrayList<Text>();
String displ = ClientUtil.FORMATTING_2.format(100.0F * value);
<<<<<<< Updated upstream
tooltip.add((Text.translatable("playerex.gui.page.attributes.tooltip.fire_resistance", displ)).formatted(Formatting.GRAY));
=======
tooltip.add(Text.translatable("playerex.gui.page.attributes.tooltip.fire_resistance", displ).formatted(Formatting.GRAY));
>>>>>>> Stashed changes

return tooltip;
}, 93, 92));
COMPONENTS.add(RenderComponent.of(ExAPI.FREEZE_RESISTANCE, value -> {
Expand All @@ -377,12 +322,8 @@ protected void init() {
}, value -> {
List<Text> tooltip = new ArrayList<Text>();
String displ = ClientUtil.FORMATTING_2.format(100.0F * value);
<<<<<<< Updated upstream
tooltip.add((Text.translatable("playerex.gui.page.attributes.tooltip.freeze_resistance", displ)).formatted(Formatting.GRAY));
=======
tooltip.add(Text.translatable("playerex.gui.page.attributes.tooltip.freeze_resistance", displ).formatted(Formatting.GRAY));
>>>>>>> Stashed changes

return tooltip;
}, 93, 103));
COMPONENTS.add(RenderComponent.of(ExAPI.LIGHTNING_RESISTANCE, value -> {
Expand All @@ -391,12 +332,8 @@ protected void init() {
}, value -> {
List<Text> tooltip = new ArrayList<Text>();
String displ = ClientUtil.FORMATTING_2.format(100.0F * value);
<<<<<<< Updated upstream
tooltip.add((Text.translatable("playerex.gui.page.attributes.tooltip.lightning_resistance", displ)).formatted(Formatting.GRAY));
=======
tooltip.add(Text.translatable("playerex.gui.page.attributes.tooltip.lightning_resistance", displ).formatted(Formatting.GRAY));
>>>>>>> Stashed changes

return tooltip;
}, 93, 114));
COMPONENTS.add(RenderComponent.of(ExAPI.POISON_RESISTANCE, value -> {
Expand All @@ -405,31 +342,24 @@ protected void init() {
}, value -> {
List<Text> tooltip = new ArrayList<Text>();
String displ = ClientUtil.FORMATTING_2.format(100.0F * value);
<<<<<<< Updated upstream
tooltip.add((Text.translatable("playerex.gui.page.attributes.tooltip.poison_resistance", displ)).formatted(Formatting.GRAY));
=======
tooltip.add(Text.translatable("playerex.gui.page.attributes.tooltip.poison_resistance", displ).formatted(Formatting.GRAY));
>>>>>>> Stashed changes

return tooltip;
}, 93, 125));
COMPONENTS.add(RenderComponent.of(ExAPI.WITHER_RESISTANCE, value -> {
<<<<<<< Updated upstream
String displ = ClientUtil.FORMATTING_2.format(ClientUtil.displayValue(ExAPI.WITHER_RESISTANCE, value)).formatted(Formatting.DARK_GRAY);
return Text.translatable("playerex.gui.page.attributes.text.wither_resistance", displ);
}, value -> {
List<Text> tooltip = new ArrayList<Text>();
String displ = ClientUtil.FORMATTING_2.format(100.0F * value);
tooltip.add((Text.translatable("playerex.gui.page.attributes.tooltip.wither_resistance", displ)).formatted(Formatting.GRAY));
=======

String displ = ClientUtil.FORMATTING_2.format(ClientUtil.displayValue(ExAPI.WITHER_RESISTANCE, value));
return Text.translatable("playerex.gui.page.attributes.text.wither_resistance", displ).formatted(Formatting.DARK_GRAY);
}, value -> {
List<Text> tooltip = new ArrayList<Text>();
String displ = ClientUtil.FORMATTING_2.format(100.0F * value);
tooltip.add(Text.translatable("playerex.gui.page.attributes.tooltip.wither_resistance", displ).formatted(Formatting.GRAY));
>>>>>>> Stashed changes

return tooltip;
}, 93, 136));
}
Expand Down
Loading

0 comments on commit 925f9de

Please sign in to comment.