Skip to content

Commit

Permalink
Merge branch 'refs/heads/main' into kt/chat
Browse files Browse the repository at this point in the history
  • Loading branch information
@ItsEmpa
ItsEmpa committed Jul 6, 2024
2 parents 6f21338 + 5364686 commit 4cda5a0
Show file tree
Hide file tree
Showing 21 changed files with 452 additions and 216 deletions.
2 changes: 2 additions & 0 deletions CREDITS.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@ Discord and GitHub information for all contributors.

- @salamibrod ([@DerGruenkohl](https://github.com/DerGruenkohl))

- @empa_ ([@ItsEmpa](https://github.com/ItsEmpa/))

## Artists

The FurfSky team does all textures labeled FurfSky. This includes:
Expand Down
108 changes: 54 additions & 54 deletions ...rtlysanestudios/partlysaneskies/features/dungeons/party/partymanager/PartyManagerGui.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -107,41 +107,41 @@ public void createPartyManagementButtons(UIComponent topBarBlock, float scaleFac
new PSSButton(new Color(255, 0, 0))
.setX(new PixelConstraint(10f * scaleFactor))
.setY(new PixelConstraint(10f * scaleFactor))
.setWidth(75f * scaleFactor)
.setHeight(55f * scaleFactor)
.setWidth(new PixelConstraint(75f * scaleFactor))
.setHeight(new PixelConstraint(55f * scaleFactor))
.setChildOf(topBarBlock)
.setText("Disband")
.setTextScale(1.5f)
.setTextScale(new PixelConstraint(1.5f))
.onMouseClickConsumer(event -> PartlySaneSkies.Companion.getMinecraft().thePlayer.sendChatMessage("/party disband"));

new PSSButton()
.setX(new PixelConstraint(95f * scaleFactor))
.setY(new PixelConstraint(10 * scaleFactor))
.setWidth(75f * scaleFactor)
.setHeight(55f * scaleFactor)
.setWidth(new PixelConstraint(75f * scaleFactor))
.setHeight(new PixelConstraint(55f * scaleFactor))
.setChildOf(topBarBlock)
.setText("Kick Offline")
.setTextScale(1.25f)
.setTextScale(new PixelConstraint(1.25f))
.onMouseClickConsumer(event -> PartlySaneSkies.Companion.getMinecraft().thePlayer.sendChatMessage("/party kickoffline"));

new PSSButton()
.setX(new PixelConstraint(205f * scaleFactor))
.setY(new PixelConstraint(10 * scaleFactor))
.setWidth(100f * scaleFactor)
.setHeight(55f * scaleFactor)
.setWidth(new PixelConstraint(100f * scaleFactor))
.setHeight(new PixelConstraint(55f * scaleFactor))
.setChildOf(topBarBlock)
.setText("Reparty")
.setTextScale(1.5f)
.setTextScale(new PixelConstraint(1.5f))
.onMouseClickConsumer(event -> PartyManager.reparty(partyMembers));

new PSSButton()
.setX(new PixelConstraint(315f * scaleFactor))
.setY(new PixelConstraint(10 * scaleFactor))
.setWidth(100f * scaleFactor)
.setHeight(55f * scaleFactor)
.setWidth(new PixelConstraint(100f * scaleFactor))
.setHeight(new PixelConstraint(55f * scaleFactor))
.setChildOf(topBarBlock)
.setText("Ask if ready")
.setTextScale(1.25f)
.setTextScale(new PixelConstraint(1.25f))
.onMouseClickConsumer(event -> PartlySaneSkies.Companion.getMinecraft().thePlayer.sendChatMessage("/pc Ready?"));

String partyBreakdown = "Party Size: " + partyMembers.size() + "\n";
Expand Down Expand Up @@ -197,142 +197,142 @@ public void createJoinFloorButtons(UIComponent topBarBlock, float scaleFactor) {
new PSSButton()
.setX(new PixelConstraint(265f * scaleFactor))
.setY(new PixelConstraint(100 * scaleFactor))
.setWidth(35f * scaleFactor)
.setHeight(35f * scaleFactor)
.setWidth(new PixelConstraint(35f * scaleFactor))
.setHeight(new PixelConstraint(35f * scaleFactor))
.setChildOf(topBarBlock)
.setText("F1")
.setTextScale(scaleFactor)
.setTextScale(new PixelConstraint(scaleFactor))
.onMouseClickConsumer(event -> PartlySaneSkies.Companion.getMinecraft().thePlayer.sendChatMessage("/joindungeon CATACOMBS_FLOOR_ONE"));

new PSSButton()
.setX(new PixelConstraint(315f * scaleFactor))
.setY(new PixelConstraint(100 * scaleFactor))
.setWidth(35f * scaleFactor)
.setHeight(35f * scaleFactor)
.setWidth(new PixelConstraint(35f * scaleFactor))
.setHeight(new PixelConstraint(35f * scaleFactor))
.setChildOf(topBarBlock)
.setText("F2")
.setTextScale(scaleFactor)
.setTextScale(new PixelConstraint(scaleFactor))
.onMouseClickConsumer(event -> PartlySaneSkies.Companion.getMinecraft().thePlayer.sendChatMessage("/joindungeon CATACOMBS_FLOOR_TWO"));

new PSSButton()
.setX(new PixelConstraint(365f * scaleFactor))
.setY(new PixelConstraint(100 * scaleFactor))
.setWidth(35f * scaleFactor)
.setHeight(35f * scaleFactor)
.setWidth(new PixelConstraint(35f * scaleFactor))
.setHeight(new PixelConstraint(35f * scaleFactor))
.setChildOf(topBarBlock)
.setText("F3")
.setTextScale(scaleFactor)
.setTextScale(new PixelConstraint(scaleFactor))
.onMouseClickConsumer(event -> PartlySaneSkies.Companion.getMinecraft().thePlayer.sendChatMessage("/joindungeon CATACOMBS_FLOOR_THREE"));

new PSSButton()
.setX(new PixelConstraint(415f * scaleFactor))
.setY(new PixelConstraint(100 * scaleFactor))
.setWidth(35f * scaleFactor)
.setHeight(35f * scaleFactor)
.setWidth(new PixelConstraint(35f * scaleFactor))
.setHeight(new PixelConstraint(35f * scaleFactor))
.setChildOf(topBarBlock)
.setText("F4")
.setTextScale(scaleFactor)
.setTextScale(new PixelConstraint(scaleFactor))
.onMouseClickConsumer(event -> PartlySaneSkies.Companion.getMinecraft().thePlayer.sendChatMessage("/joindungeon CATACOMBS_FLOOR_FOUR"));

new PSSButton()
.setX(new PixelConstraint(465f * scaleFactor))
.setY(new PixelConstraint(100 * scaleFactor))
.setWidth(35f * scaleFactor)
.setHeight(35f * scaleFactor)
.setWidth(new PixelConstraint(35f * scaleFactor))
.setHeight(new PixelConstraint(35f * scaleFactor))
.setChildOf(topBarBlock)
.setText("F5")
.setTextScale(scaleFactor)
.setTextScale(new PixelConstraint(scaleFactor))
.onMouseClickConsumer(event -> PartlySaneSkies.Companion.getMinecraft().thePlayer.sendChatMessage("/joindungeon CATACOMBS_FLOOR_FIVE"));

new PSSButton()
.setX(new PixelConstraint(515f * scaleFactor))
.setY(new PixelConstraint(100 * scaleFactor))
.setWidth(35f * scaleFactor)
.setHeight(35f * scaleFactor)
.setWidth(new PixelConstraint(35f * scaleFactor))
.setHeight(new PixelConstraint(35f * scaleFactor))
.setChildOf(topBarBlock)
.setText("F6")
.setTextScale(scaleFactor)
.setTextScale(new PixelConstraint(scaleFactor))
.onMouseClickConsumer(event -> PartlySaneSkies.Companion.getMinecraft().thePlayer.sendChatMessage("/joindungeon CATACOMBS_FLOOR_SIX"));

new PSSButton()
.setX(new PixelConstraint(565f * scaleFactor))
.setY(new PixelConstraint(100 * scaleFactor))
.setWidth(35f * scaleFactor)
.setHeight(35f * scaleFactor)
.setWidth(new PixelConstraint(35f * scaleFactor))
.setHeight(new PixelConstraint(35f * scaleFactor))
.setChildOf(topBarBlock)
.setText("F7")
.setTextScale(scaleFactor)
.setTextScale(new PixelConstraint(scaleFactor))
.onMouseClickConsumer(event -> PartlySaneSkies.Companion.getMinecraft().thePlayer.sendChatMessage("/joindungeon CATACOMBS_FLOOR_SEVEN"));


new PSSButton()
.setX(new PixelConstraint(615f * scaleFactor))
.setY(new PixelConstraint(100 * scaleFactor))
.setWidth(35f * scaleFactor)
.setHeight(35f * scaleFactor)
.setWidth(new PixelConstraint(35f * scaleFactor))
.setHeight(new PixelConstraint(35f * scaleFactor))
.setChildOf(topBarBlock)
.setText("M1")
.setTextScale(scaleFactor)
.setTextScale(new PixelConstraint(scaleFactor))
.onMouseClickConsumer(event -> PartlySaneSkies.Companion.getMinecraft().thePlayer.sendChatMessage("/joindungeon MASTER_CATACOMBS_FLOOR_ONE"));

new PSSButton()
.setX(new PixelConstraint(665f * scaleFactor))
.setY(new PixelConstraint(100 * scaleFactor))
.setWidth(35f * scaleFactor)
.setHeight(35f * scaleFactor)
.setWidth(new PixelConstraint(35f * scaleFactor))
.setHeight(new PixelConstraint(35f * scaleFactor))
.setChildOf(topBarBlock)
.setText("M2")
.setTextScale(scaleFactor)
.setTextScale(new PixelConstraint(scaleFactor))
.onMouseClickConsumer(event -> PartlySaneSkies.Companion.getMinecraft().thePlayer.sendChatMessage("/joindungeon MASTER_CATACOMBS_FLOOR_TWO"));

new PSSButton()
.setX(new PixelConstraint(715f * scaleFactor))
.setY(new PixelConstraint(100 * scaleFactor))
.setWidth(35f * scaleFactor)
.setHeight(35f * scaleFactor)
.setWidth(new PixelConstraint(35f * scaleFactor))
.setHeight(new PixelConstraint(35f * scaleFactor))
.setChildOf(topBarBlock)
.setText("M3")
.setTextScale(scaleFactor)
.setTextScale(new PixelConstraint(scaleFactor))
.onMouseClickConsumer(event -> PartlySaneSkies.Companion.getMinecraft().thePlayer.sendChatMessage("/joindungeon MASTER_CATACOMBS_FLOOR_THREE"));

new PSSButton()
.setX(new PixelConstraint(765f * scaleFactor))
.setY(new PixelConstraint(100 * scaleFactor))
.setWidth(35f * scaleFactor)
.setHeight(35f * scaleFactor)
.setWidth(new PixelConstraint(35f * scaleFactor))
.setHeight(new PixelConstraint(35f * scaleFactor))
.setChildOf(topBarBlock)
.setText("M4")
.setTextScale(scaleFactor)
.setTextScale(new PixelConstraint(scaleFactor))
.onMouseClickConsumer(event -> PartlySaneSkies.Companion.getMinecraft().thePlayer.sendChatMessage("/joindungeon MASTER_CATACOMBS_FLOOR_FOUR"));

new PSSButton()
.setX(new PixelConstraint(815f * scaleFactor))
.setY(new PixelConstraint(100 * scaleFactor))
.setWidth(35f * scaleFactor)
.setHeight(35f * scaleFactor)
.setWidth(new PixelConstraint(35f * scaleFactor))
.setHeight(new PixelConstraint(35f * scaleFactor))
.setChildOf(topBarBlock)
.setText("M5")
.setTextScale(scaleFactor)
.setTextScale(new PixelConstraint(scaleFactor))
.onMouseClickConsumer(event -> PartlySaneSkies.Companion.getMinecraft().thePlayer.sendChatMessage("/joindungeon MASTER_CATACOMBS_FLOOR_FIVE"));

new PSSButton()
.setX(new PixelConstraint(865f * scaleFactor))
.setY(new PixelConstraint(100 * scaleFactor))
.setWidth(35f * scaleFactor)
.setHeight(35f * scaleFactor)
.setWidth(new PixelConstraint(35f * scaleFactor))
.setHeight(new PixelConstraint(35f * scaleFactor))
.setChildOf(topBarBlock)
.setText("M6")
.setTextScale(scaleFactor)
.setTextScale(new PixelConstraint(scaleFactor))
.onMouseClickConsumer(event -> PartlySaneSkies.Companion.getMinecraft().thePlayer.sendChatMessage("/joindungeon MASTER_CATACOMBS_FLOOR_SIX"));

new PSSButton()
.setX(new PixelConstraint(915f * scaleFactor))
.setY(new PixelConstraint(100 * scaleFactor))
.setWidth(35f * scaleFactor)
.setHeight(35f * scaleFactor)
.setWidth(new PixelConstraint(35f * scaleFactor))
.setHeight(new PixelConstraint(35f * scaleFactor))
.setChildOf(topBarBlock)
.setText("M7")
.setTextScale(scaleFactor)
.setTextScale(new PixelConstraint(scaleFactor))
.onMouseClickConsumer(event -> PartlySaneSkies.Companion.getMinecraft().thePlayer.sendChatMessage("/joindungeon MASTER_CATACOMBS_FLOOR_SEVEN"));
}

Expand Down
20 changes: 10 additions & 10 deletions ...e/partlysanestudios/partlysaneskies/features/dungeons/party/partymanager/PartyMember.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -436,31 +436,31 @@ private void createMemberBlockColumnFive(UIComponent memberBlock, float scaleFac
new PSSButton()
.setX(new PixelConstraint(800 * scaleFactor))
.setY(new PixelConstraint(15 * scaleFactor))
.setWidth(125f * scaleFactor)
.setHeight(55f * scaleFactor)
.setWidth(new PixelConstraint(125f * scaleFactor))
.setHeight(new PixelConstraint(55f * scaleFactor))
.setChildOf(memberBlock)
.setText("Kick")
.setTextScale(scaleFactor)
.setTextScale(new PixelConstraint(scaleFactor))
.onMouseClickConsumer(event -> PartlySaneSkies.Companion.getMinecraft().thePlayer.sendChatMessage("/party kick " + this.username));

new PSSButton()
.setX(new PixelConstraint(800 * scaleFactor))
.setY(new PixelConstraint(75 * scaleFactor))
.setWidth(125f * scaleFactor)
.setHeight(55f * scaleFactor)
.setWidth(new PixelConstraint(125f * scaleFactor))
.setHeight(new PixelConstraint(55f * scaleFactor))
.setChildOf(memberBlock)
.setText("Promote")
.setTextScale(scaleFactor)
.setTextScale(new PixelConstraint(scaleFactor))
.onMouseClickConsumer(event -> PartlySaneSkies.Companion.getMinecraft().thePlayer.sendChatMessage("/party promote " + this.username));

new PSSButton()
.setX(new PixelConstraint(800 * scaleFactor))
.setY(new PixelConstraint(135 * scaleFactor))
.setWidth(125f * scaleFactor)
.setHeight(55f * scaleFactor)
.setWidth(new PixelConstraint(125f * scaleFactor))
.setHeight(new PixelConstraint(55f * scaleFactor))
.setChildOf(memberBlock)
.setText("Transfer")
.setTextScale(scaleFactor)
.setTextScale(new PixelConstraint(scaleFactor))
.onMouseClickConsumer(event -> PartlySaneSkies.Companion.getMinecraft().thePlayer.sendChatMessage("/party transfer " + this.username));

UIComponent refreshButton = new UIRoundedRectangle(10f)
Expand All @@ -471,7 +471,7 @@ private void createMemberBlockColumnFive(UIComponent memberBlock, float scaleFac
.setColor(new Color(60, 222, 79))
.setChildOf(memberBlock);

ElementaUtils.INSTANCE.uiImageFromResourceLocation(new ResourceLocation("partlysaneskies", "textures/gui/party_finder/refresh.png"))
ElementaUtils.INSTANCE.getUiImage(new ResourceLocation("partlysaneskies", "textures/gui/party_finder/refresh.png"))
.setX(new CenterConstraint())
.setY(new CenterConstraint())
.setWidth(new PixelConstraint(20f * scaleFactor))
Expand Down
18 changes: 9 additions & 9 deletions ...sanestudios/partlysaneskies/features/economy/minioncalculator/ProfitMinionCalculator.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -207,8 +207,8 @@ public HashMap<String, PSSToggle> addFuelButtons() {
PSSButton fuelContainer = new PSSButton()
.setX(fromWidthScaleFactor(10))
.setY(new PixelConstraint(yPos))
.setWidth(leftBar.getLeft() - mainTextScrollComponent.getLeft() - fromWidthScaleFactor(20).getValue())
.setHeight(fromWidthScaleFactor(40).getValue())
.setWidth(new PixelConstraint(leftBar.getLeft() - mainTextScrollComponent.getLeft() - fromWidthScaleFactor(20).getValue()))
.setHeight(fromWidthScaleFactor(40))
.setChildOf(mainTextScrollComponent);

PSSToggle toggle = new PSSToggle()
Expand Down Expand Up @@ -263,8 +263,8 @@ public HashMap<MinionData.Minion.Upgrade, PSSToggle> addMinionUpgradeButtons() {
PSSButton upgradeContainer = new PSSButton()
.setX(new PixelConstraint(rightBar.getRight() - rightBar.getWidth() - mainTextScrollComponent.getLeft() + fromWidthScaleFactor(10).getValue()))
.setY(new PixelConstraint(yPos))
.setWidth(mainTextScrollComponent.getRight() - rightBar.getRight() - rightBar.getWidth() - fromWidthScaleFactor(20).getValue())
.setHeight(fromWidthScaleFactor(40).getValue())
.setWidth(new PixelConstraint(mainTextScrollComponent.getRight() - rightBar.getRight() - rightBar.getWidth() - fromWidthScaleFactor(20).getValue()))
.setHeight(fromWidthScaleFactor(40))
.setChildOf(mainTextScrollComponent);

PSSToggle toggle = new PSSToggle()
Expand Down Expand Up @@ -309,8 +309,8 @@ public void addCategories() {
PSSButton button = new PSSButton()
.setX(new PixelConstraint(xPos))
.setY(new CenterConstraint())
.setWidth(blockWidth)
.setHeight(categoriesBar.getHeight() * .9f)
.setWidth(new PixelConstraint(blockWidth))
.setHeight(new PixelConstraint(categoriesBar.getHeight() * .9f))
.setChildOf(categoriesBar);

button.setText(categoriesColorMap.get(category) + StringUtils.INSTANCE.titleCase(category));
Expand Down Expand Up @@ -361,10 +361,10 @@ public void addBestMinionCalculator() {
PSSButton button = new PSSButton(Color.green)
.setX(fromWidthScaleFactor(180))
.setY(new CenterConstraint())
.setHeight(fromWidthScaleFactor(60).getValue())
.setWidth(fromWidthScaleFactor(100).getValue())
.setHeight(fromWidthScaleFactor(60))
.setWidth(fromWidthScaleFactor(100))
.setText("Calculate Best Minion")
.setTextScale(fromWidthScaleFactor(1).getValue())
.setTextScale(fromWidthScaleFactor(1))

.setChildOf(bestMinionBar);

Expand Down
Loading

0 comments on commit 4cda5a0

Please sign in to comment.