Ajout des Shops Joueur#724
Draft
gab4000 wants to merge 45 commits into
Draft
Conversation
This was
linked to
issues
Aug 29, 2025
Open
iambibi
added
🔄 Changement
Member
|
ça avance bien? (attention, je dis pas du sens "Oh faut se depecher", je demande juste si tout se passe bien) |
Contributor
Author
|
Ouais bah jusqu'à la j'ai surtout fait du rework donc j'ai réorganisé les fichiers, suppr des lignes inutiles etc |
Contributor
Author
|
Je bosse pas trop ces derniers temps là dessus, et ça va pas reprendre tout de suite, j'aimerai ajouter le kangoo des que le modèle est fini |
# Conflicts: # src/main/java/fr/openmc/core/CommandsManager.java # src/main/java/fr/openmc/core/ListenersManager.java # src/main/java/fr/openmc/core/OMCPlugin.java # src/main/java/fr/openmc/core/disabled/corporation/CompanyManager.java.bak # src/main/java/fr/openmc/core/disabled/corporation/company/Company.java.bak # src/main/java/fr/openmc/core/disabled/corporation/listener/ShopListener.java # src/main/java/fr/openmc/core/disabled/corporation/manager/PlayerShopManager.java # src/main/java/fr/openmc/core/disabled/corporation/menu/shop/ShopSearchMenu.java # src/main/java/fr/openmc/core/disabled/corporation/shops/Shop.java # src/main/java/fr/openmc/core/features/corporation/models/ShopSupplier.java # src/main/java/fr/openmc/core/utils/database/DatabaseManager.java
iambibi
added
📦 Feature
7 tasks
Member
|
oublie pas de te mettre ds les crédits :) |
Contributor
Author
|
Je pense que je ferai une interface avec des grands boutons tel que le menu des villes pour l'interface principale |
Member
|
comme tu veux mais commence deja la requete graphisme stp |
Member
|
PR doit passé ces components en #1161. |
# Conflicts: # src/main/java/fr/openmc/core/CommandsManager.java # src/main/java/fr/openmc/core/ListenersManager.java # src/main/java/fr/openmc/core/OMCPlugin.java # src/main/java/fr/openmc/core/disabled/corporation/commands/ShopCommand.java.bak # src/main/java/fr/openmc/core/disabled/corporation/menu/shop/ShopMenu.java.bak # src/main/java/fr/openmc/core/disabled/corporation/menu/shop/ShopSearchMenu.java.bak # src/main/java/fr/openmc/core/disabled/corporation/menu/shop/ShopStocksMenu.java.bak # src/main/java/fr/openmc/core/disabled/corporation/shops/Shop.java.bak # src/main/java/fr/openmc/core/disabled/corporation/shops/ShopItem.java.bak # src/main/java/fr/openmc/core/registry/items/CustomItem.java # src/main/java/fr/openmc/core/utils/database/DatabaseManager.java # src/main/java/fr/openmc/core/utils/world/WorldUtils.java
Member
Je suis un peu bête, c'est uniquement disponible sur la branche v2.5 |
# Conflicts: # src/main/java/fr/openmc/core/CommandsManager.java # src/main/java/fr/openmc/core/features/city/conditions/CityCreateConditions.java
iambibi
requested changes
May 10, 2026
| public @NotNull String getName() { | ||
| return "Menu du shop "; | ||
| public @NotNull Component getName() { | ||
| return Component.text("Menu du shop "); |
Member
There was a problem hiding this comment.
Oublie pas de mettre les clé de translations hein
Member
There was a problem hiding this comment.
fin moi je serais toi je metterais directement les clé au début dans des fichiers comme shop.properties et j'appelle les clé.
Au lieu de faire ça a la fin et de devoir tester si TOUT les affichages sont bien fait
# Conflicts: # src/main/java/fr/openmc/core/disabled/corporation/menu/shop/ShopCatalogueMenu.java.bak # src/main/java/fr/openmc/core/disabled/corporation/menu/shop/ShopMenu.java.bak # src/main/java/fr/openmc/core/disabled/corporation/menu/shop/ShopSalesMenu.java.bak # src/main/java/fr/openmc/core/disabled/corporation/menu/shop/ShopSearchMenu.java.bak # src/main/java/fr/openmc/core/disabled/corporation/menu/shop/ShopStocksMenu.java.bak
# Conflicts: # src/main/resources/contents/omc_company/textures/sell_shop_menu.png # src/main/resources/contents/omc_company/textures/shop_menu.png
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Petit résumé de la PR:
Rework des shops pour retirer les entreprises + optimiser
Étape nécessaire afin que la PR soit fini (si PR en draft)
Decrivez vos changements