Merge many fixes from GreenSurvivors #381

addstar · 2024-02-22T06:44:48Z

Purpose

This pulls in changes from two "fixes" branches made by GreenSurvivors:

feuerFixes
paperMerged2

Reason

We've discovered a bunch of bugs and issues with the our codebase, which have already been fixed in https://github.com/GreenSurvivors/GreenMinigames/. Since dev in our code/repo has been pretty dead for a long time, we wanted to bring in the "fixes" from these two branches and adjust if necessary.

@FireInstall @joshi1999 Thank you for these changes! 😀 Do you think there would be any issue with us just bringing these commits into ours?

@Reed022: Can you also review and see if there's anything we might be concerned about?

Offhand can now be placed without errors

Adding new 1.16 materials and prevent outdating through new materials.

Fixing not visible tool-points

- Change RegionDisplay to Barrier and imporved performance issues, when many and big regions were displayed

Action "Take Item" had another name in the gui -> "Give Item"

Several translation string were missed or were not correctly used.

- TakeFlagTrigger wasn't triggered - Only Oak-Signs worked as Flags - Broadcasts wasn't working - CTF-Broadcasts are now a seperate option - Flag Home-Returns were announced, even though broadcasts were disabled

Severall Bugfixes for gui and game elements; Adding some new Game Elements like, potionFriendlyFire and gameTickTriggers.

…o dev

* Fixed reset of Blocks in Minigames.

RegenRegions can now be splittet into several smaller regions. This allows to be more flexible: Big Regions with eg. 4 million blocks are crashing the server. If only small fitting regions are set, there is no need for 4 million blocks to regen. Also a block limit is implemented to ensure that a crash is not going to happen. This limit can be changed within the minigames config file and is default set to 300k.

Co-authored-by: joshi1999 <[email protected]>

# Conflicts: # Minigames/src/main/java/au/com/mineauz/minigames/MinigameTimer.java # Minigames/src/main/java/au/com/mineauz/minigames/objects/MinigamePlayer.java # Regions/src/main/java/au/com/mineauz/minigamesregions/commands/SetNodeCommand.java # Regions/src/main/java/au/com/mineauz/minigamesregions/commands/SetRegionCommand.java

# Conflicts: # Minigames/src/main/java/au/com/mineauz/minigames/MinigameTimer.java # Minigames/src/main/java/au/com/mineauz/minigames/Minigames.java # Minigames/src/main/java/au/com/mineauz/minigames/backend/BackendManager.java # Minigames/src/main/java/au/com/mineauz/minigames/backend/mysql/MySQLBackend.java # Minigames/src/main/java/au/com/mineauz/minigames/backend/mysql/MySQLStatLoader.java # Minigames/src/main/java/au/com/mineauz/minigames/backend/sqlite/SQLiteBackend.java # Minigames/src/main/java/au/com/mineauz/minigames/backend/sqlite/SQLiteStatLoader.java # Minigames/src/main/java/au/com/mineauz/minigames/commands/BackendCommand.java # Minigames/src/main/java/au/com/mineauz/minigames/commands/DeleteCommand.java # Minigames/src/main/java/au/com/mineauz/minigames/commands/ScoreboardCommand.java # Minigames/src/main/java/au/com/mineauz/minigames/commands/set/SetTimerCommand.java # Minigames/src/main/java/au/com/mineauz/minigames/menu/MenuItemEnum.java # Minigames/src/main/java/au/com/mineauz/minigames/minigame/Minigame.java # Minigames/src/main/java/au/com/mineauz/minigames/minigame/ScoreboardDisplay.java # Minigames/src/main/java/au/com/mineauz/minigames/minigame/Team.java # Minigames/src/main/java/au/com/mineauz/minigames/minigame/modules/LoadoutModule.java # Minigames/src/main/java/au/com/mineauz/minigames/minigame/modules/TeamsModule.java # Minigames/src/main/java/au/com/mineauz/minigames/minigame/reward/scheme/HierarchyRewardScheme.java # Minigames/src/main/java/au/com/mineauz/minigames/minigame/reward/scheme/RewardSchemes.java # Minigames/src/main/java/au/com/mineauz/minigames/recorder/RecorderData.java # Minigames/src/main/java/au/com/mineauz/minigames/stats/StoredGameStats.java # Minigames/src/main/resources/plugin.yml # Regions/src/main/java/au/com/mineauz/minigamesregions/Region.java # Regions/src/main/java/au/com/mineauz/minigamesregions/RegionDisplayManager.java # Regions/src/main/java/au/com/mineauz/minigamesregions/RegionNodeEditToolMode.java # Regions/src/main/java/au/com/mineauz/minigamesregions/actions/MessageAction.java # Regions/src/main/java/au/com/mineauz/minigamesregions/actions/TakeItemAction.java # Regions/src/main/java/au/com/mineauz/minigamesregions/menuitems/MenuItemAction.java

Menus start

Code clean MenuItems rework Triggers

# Conflicts: # Minigames/src/main/java/au/com/mineauz/minigames/MinigameTimer.java # Minigames/src/main/java/au/com/mineauz/minigames/PlayerLoadout.java # Minigames/src/main/java/au/com/mineauz/minigames/commands/BackendCommand.java # Minigames/src/main/java/au/com/mineauz/minigames/commands/ScoreboardCommand.java # Minigames/src/main/java/au/com/mineauz/minigames/config/BooleanFlag.java # Minigames/src/main/java/au/com/mineauz/minigames/config/IntegerFlag.java # Minigames/src/main/java/au/com/mineauz/minigames/config/MaterialFlag.java # Minigames/src/main/java/au/com/mineauz/minigames/config/StringFlag.java # Minigames/src/main/java/au/com/mineauz/minigames/menu/MenuItem.java # Minigames/src/main/java/au/com/mineauz/minigames/menu/MenuItemAddFlag.java # Minigames/src/main/java/au/com/mineauz/minigames/menu/MenuItemAddTeam.java # Minigames/src/main/java/au/com/mineauz/minigames/menu/MenuItemAddWhitelistBlock.java # Minigames/src/main/java/au/com/mineauz/minigames/menu/MenuItemBack.java # Minigames/src/main/java/au/com/mineauz/minigames/menu/MenuItemBlockData.java # Minigames/src/main/java/au/com/mineauz/minigames/menu/MenuItemDecimal.java # Minigames/src/main/java/au/com/mineauz/minigames/menu/MenuItemDisplayLoadout.java # Minigames/src/main/java/au/com/mineauz/minigames/menu/MenuItemDisplayPotions.java # Minigames/src/main/java/au/com/mineauz/minigames/menu/MenuItemDisplayRewards.java # Minigames/src/main/java/au/com/mineauz/minigames/menu/MenuItemDisplayWhitelist.java # Minigames/src/main/java/au/com/mineauz/minigames/menu/MenuItemEnum.java # Minigames/src/main/java/au/com/mineauz/minigames/menu/MenuItemFlag.java # Minigames/src/main/java/au/com/mineauz/minigames/menu/MenuItemList.java # Minigames/src/main/java/au/com/mineauz/minigames/menu/MenuItemLoadoutAdd.java # Minigames/src/main/java/au/com/mineauz/minigames/menu/MenuItemMaterial.java # Minigames/src/main/java/au/com/mineauz/minigames/menu/MenuItemPage.java # Minigames/src/main/java/au/com/mineauz/minigames/menu/MenuItemPotion.java # Minigames/src/main/java/au/com/mineauz/minigames/menu/MenuItemPotionAdd.java # Minigames/src/main/java/au/com/mineauz/minigames/menu/MenuItemRewardGroup.java # Minigames/src/main/java/au/com/mineauz/minigames/menu/MenuItemSaveLoadout.java # Minigames/src/main/java/au/com/mineauz/minigames/menu/MenuItemSaveMinigame.java # Minigames/src/main/java/au/com/mineauz/minigames/menu/MenuItemScoreboardSave.java # Minigames/src/main/java/au/com/mineauz/minigames/menu/MenuItemStatisticsSettings.java # Minigames/src/main/java/au/com/mineauz/minigames/menu/MenuItemString.java # Minigames/src/main/java/au/com/mineauz/minigames/menu/MenuItemTeam.java # Minigames/src/main/java/au/com/mineauz/minigames/menu/MenuItemTime.java # Minigames/src/main/java/au/com/mineauz/minigames/menu/MenuItemToolTeam.java # Minigames/src/main/java/au/com/mineauz/minigames/menu/MenuItemWhitelistBlock.java # Minigames/src/main/java/au/com/mineauz/minigames/minigame/Minigame.java # Minigames/src/main/java/au/com/mineauz/minigames/minigame/modules/LoadoutModule.java # Minigames/src/main/java/au/com/mineauz/minigames/minigame/modules/WeatherTimeModule.java # Minigames/src/main/java/au/com/mineauz/minigames/minigame/reward/ItemReward.java # Minigames/src/main/java/au/com/mineauz/minigames/minigame/reward/scheme/HierarchyRewardScheme.java # Minigames/src/main/java/au/com/mineauz/minigames/minigame/reward/scheme/RewardSchemes.java # Minigames/src/main/resources/messages.properties # Regions/src/main/java/au/com/mineauz/minigamesregions/Node.java # Regions/src/main/java/au/com/mineauz/minigamesregions/Region.java # Regions/src/main/java/au/com/mineauz/minigamesregions/RegionEvents.java # Regions/src/main/java/au/com/mineauz/minigamesregions/RegionModule.java # Regions/src/main/java/au/com/mineauz/minigamesregions/actions/ActionInterface.java # Regions/src/main/java/au/com/mineauz/minigamesregions/actions/Actions.java # Regions/src/main/java/au/com/mineauz/minigamesregions/actions/AddScoreAction.java # Regions/src/main/java/au/com/mineauz/minigamesregions/actions/AddTeamScoreAction.java # Regions/src/main/java/au/com/mineauz/minigamesregions/actions/ApplyEffectAction.java # Regions/src/main/java/au/com/mineauz/minigamesregions/actions/BarrierAction.java # Regions/src/main/java/au/com/mineauz/minigamesregions/actions/BroadcastAction.java # Regions/src/main/java/au/com/mineauz/minigamesregions/actions/CheckpointAction.java # Regions/src/main/java/au/com/mineauz/minigamesregions/actions/EndAction.java # Regions/src/main/java/au/com/mineauz/minigamesregions/actions/EquipLoadoutAction.java # Regions/src/main/java/au/com/mineauz/minigamesregions/actions/ExecuteCommandAction.java # Regions/src/main/java/au/com/mineauz/minigamesregions/actions/ExplodeAction.java # Regions/src/main/java/au/com/mineauz/minigamesregions/actions/FallingBlockAction.java # Regions/src/main/java/au/com/mineauz/minigamesregions/actions/FlightAction.java # Regions/src/main/java/au/com/mineauz/minigamesregions/actions/GiveItemAction.java # Regions/src/main/java/au/com/mineauz/minigamesregions/actions/HealAction.java # Regions/src/main/java/au/com/mineauz/minigamesregions/actions/KillAction.java # Regions/src/main/java/au/com/mineauz/minigamesregions/actions/LightningAction.java # Regions/src/main/java/au/com/mineauz/minigamesregions/actions/MemorySwapBlockAction.java # Regions/src/main/java/au/com/mineauz/minigamesregions/actions/MessageAction.java # Regions/src/main/java/au/com/mineauz/minigamesregions/actions/PlaySoundAction.java # Regions/src/main/java/au/com/mineauz/minigamesregions/actions/PulseRedstoneAction.java # Regions/src/main/java/au/com/mineauz/minigamesregions/actions/QuitAction.java # Regions/src/main/java/au/com/mineauz/minigamesregions/actions/RandomFillingAction.java # Regions/src/main/java/au/com/mineauz/minigamesregions/actions/ReequipLoadoutAction.java # Regions/src/main/java/au/com/mineauz/minigamesregions/actions/RegionSwapAction.java # Regions/src/main/java/au/com/mineauz/minigamesregions/actions/ResetTriggerCountAction.java # Regions/src/main/java/au/com/mineauz/minigamesregions/actions/RevertAction.java # Regions/src/main/java/au/com/mineauz/minigamesregions/actions/ScoreAction.java # Regions/src/main/java/au/com/mineauz/minigamesregions/actions/SetBlockAction.java # Regions/src/main/java/au/com/mineauz/minigamesregions/actions/SetEnabledAction.java # Regions/src/main/java/au/com/mineauz/minigamesregions/actions/SetLivesAction.java # Regions/src/main/java/au/com/mineauz/minigamesregions/actions/SetScoreAction.java # Regions/src/main/java/au/com/mineauz/minigamesregions/actions/SetTeamScoreAction.java # Regions/src/main/java/au/com/mineauz/minigamesregions/actions/SpawnEntityAction.java # Regions/src/main/java/au/com/mineauz/minigamesregions/actions/SwapBlockAction.java # Regions/src/main/java/au/com/mineauz/minigamesregions/actions/SwitchTeamAction.java # Regions/src/main/java/au/com/mineauz/minigamesregions/actions/TakeItemAction.java # Regions/src/main/java/au/com/mineauz/minigamesregions/actions/TeleportAction.java # Regions/src/main/java/au/com/mineauz/minigamesregions/actions/TimedTriggerAction.java # Regions/src/main/java/au/com/mineauz/minigamesregions/actions/TriggerNodeAction.java # Regions/src/main/java/au/com/mineauz/minigamesregions/actions/TriggerRandomAction.java # Regions/src/main/java/au/com/mineauz/minigamesregions/actions/TriggerRegionAction.java # Regions/src/main/java/au/com/mineauz/minigamesregions/actions/VelocityAction.java # Regions/src/main/java/au/com/mineauz/minigamesregions/conditions/ACondition.java # Regions/src/main/java/au/com/mineauz/minigamesregions/conditions/Conditions.java # Regions/src/main/java/au/com/mineauz/minigamesregions/conditions/ContainsEntityCondition.java # Regions/src/main/java/au/com/mineauz/minigamesregions/conditions/MatchBlockCondition.java # Regions/src/main/java/au/com/mineauz/minigamesregions/conditions/MinigameTimerCondition.java # Regions/src/main/java/au/com/mineauz/minigamesregions/conditions/PlayerHasItemCondition.java # Regions/src/main/java/au/com/mineauz/minigamesregions/conditions/TeamPlayerCountCondition.java # Regions/src/main/java/au/com/mineauz/minigamesregions/conditions/TeamScoreRangeCondition.java # Regions/src/main/java/au/com/mineauz/minigamesregions/menuitems/MenuItemAction.java # Regions/src/main/java/au/com/mineauz/minigamesregions/menuitems/MenuItemActionAdd.java # Regions/src/main/java/au/com/mineauz/minigamesregions/menuitems/MenuItemCondition.java # Regions/src/main/java/au/com/mineauz/minigamesregions/menuitems/MenuItemConditionAdd.java # Regions/src/main/java/au/com/mineauz/minigamesregions/menuitems/MenuItemNodeExecutor.java # Regions/src/main/java/au/com/mineauz/minigamesregions/menuitems/MenuItemRegionExecutor.java # Regions/src/main/java/au/com/mineauz/minigamesregions/menuitems/MenuItemTrigger.java

# Conflicts: # Minigames/src/main/java/au/com/mineauz/minigames/backend/mysql/MySQLBackend.java # Minigames/src/main/java/au/com/mineauz/minigames/backend/sqlite/SQLiteBackend.java # Minigames/src/main/java/au/com/mineauz/minigames/commands/ScoreboardCommand.java # Minigames/src/main/java/au/com/mineauz/minigames/commands/set/SetBlockWhitelistCommand.java # Minigames/src/main/java/au/com/mineauz/minigames/commands/set/SetFloorDegeneratorCommand.java # Minigames/src/main/java/au/com/mineauz/minigames/commands/set/SetTimerCommand.java # Minigames/src/main/java/au/com/mineauz/minigames/managers/language/langkeys/MgMenuLangKey.java # Minigames/src/main/java/au/com/mineauz/minigames/menu/MenuItemBoolean.java # Minigames/src/main/java/au/com/mineauz/minigames/menu/MenuItemComponent.java # Minigames/src/main/java/au/com/mineauz/minigames/menu/MenuItemCustom.java # Minigames/src/main/java/au/com/mineauz/minigames/menu/MenuItemDisplayEffects.java # Minigames/src/main/java/au/com/mineauz/minigames/menu/MenuItemDisplayLoadout.java # Minigames/src/main/java/au/com/mineauz/minigames/menu/MenuItemDisplayWhitelist.java # Minigames/src/main/java/au/com/mineauz/minigames/menu/MenuItemEnum.java # Minigames/src/main/java/au/com/mineauz/minigames/menu/MenuItemInteger.java # Minigames/src/main/java/au/com/mineauz/minigames/menu/MenuItemList.java # Minigames/src/main/java/au/com/mineauz/minigames/menu/MenuItemLong.java # Minigames/src/main/java/au/com/mineauz/minigames/menu/MenuItemModifyStatSetting.java # Minigames/src/main/java/au/com/mineauz/minigames/menu/MenuItemNewLine.java # Minigames/src/main/java/au/com/mineauz/minigames/menu/MenuItemRewardAdd.java # Minigames/src/main/java/au/com/mineauz/minigames/menu/MenuItemRewardGroup.java # Minigames/src/main/java/au/com/mineauz/minigames/menu/MenuItemSaveMinigame.java # Minigames/src/main/java/au/com/mineauz/minigames/menu/MenuItemString.java # Minigames/src/main/java/au/com/mineauz/minigames/menu/MenuItemWhitelistBlock.java # Minigames/src/main/java/au/com/mineauz/minigames/minigame/Minigame.java # Minigames/src/main/java/au/com/mineauz/minigames/minigame/ScoreboardDisplay.java # Minigames/src/main/java/au/com/mineauz/minigames/minigame/modules/TeamsModule.java # Minigames/src/main/java/au/com/mineauz/minigames/presets/PresetLoader.java # Minigames/src/main/java/au/com/mineauz/minigames/signs/RewardSign.java # Minigames/src/main/java/au/com/mineauz/minigames/signs/ScoreSign.java # Minigames/src/main/java/au/com/mineauz/minigames/signs/TeamSign.java # Minigames/src/main/java/au/com/mineauz/minigames/stats/StatSettings.java # Minigames/src/main/java/au/com/mineauz/minigames/tool/MinigameTool.java # Minigames/src/main/resources/messages.properties # Regions/src/main/java/au/com/mineauz/minigamesregions/actions/SpawnEntityAction.java # Regions/src/main/java/au/com/mineauz/minigamesregions/conditions/MatchBlockCondition.java # Regions/src/main/java/au/com/mineauz/minigamesregions/conditions/MatchTeamCondition.java # Regions/src/main/java/au/com/mineauz/minigamesregions/conditions/PlayerHasItemCondition.java # Regions/src/main/java/au/com/mineauz/minigamesregions/menuitems/MenuItemNodeExecutor.java # Regions/src/main/java/au/com/mineauz/minigamesregions/menuitems/MenuItemRegionExecutor.java

Dropped support for pre 1.8 rewards

# Conflicts: # Minigames/src/main/java/au/com/mineauz/minigames/MinigameTimer.java # Minigames/src/main/java/au/com/mineauz/minigames/Minigames.java # Minigames/src/main/java/au/com/mineauz/minigames/backend/BackendManager.java # Minigames/src/main/java/au/com/mineauz/minigames/commands/DebugCommand.java # Minigames/src/main/java/au/com/mineauz/minigames/commands/GlobalLoadoutCommand.java # Minigames/src/main/java/au/com/mineauz/minigames/commands/ScoreboardCommand.java # Minigames/src/main/java/au/com/mineauz/minigames/config/ComponentFlag.java # Minigames/src/main/java/au/com/mineauz/minigames/managers/language/langkeys/MgMenuLangKey.java # Minigames/src/main/java/au/com/mineauz/minigames/managers/language/langkeys/MinigameLangKey.java # Minigames/src/main/java/au/com/mineauz/minigames/menu/MenuItemComponent.java # Minigames/src/main/java/au/com/mineauz/minigames/menu/MenuItemDisplayEffects.java # Minigames/src/main/java/au/com/mineauz/minigames/menu/MenuItemTeam.java # Minigames/src/main/java/au/com/mineauz/minigames/minigame/ScoreboardDisplay.java # Minigames/src/main/java/au/com/mineauz/minigames/minigame/modules/TeamsModule.java # Minigames/src/main/java/au/com/mineauz/minigames/minigame/reward/ItemReward.java # Minigames/src/main/java/au/com/mineauz/minigames/minigame/reward/Rewards.java # Minigames/src/main/java/au/com/mineauz/minigames/minigame/reward/scheme/TimeRewardScheme.java # Minigames/src/main/java/au/com/mineauz/minigames/signs/RewardSign.java # Minigames/src/main/java/au/com/mineauz/minigames/stats/BasicMinigameStat.java # Minigames/src/main/java/au/com/mineauz/minigames/stats/MinigameStatistics.java # Minigames/src/main/java/au/com/mineauz/minigames/stats/StatisticValueField.java # Minigames/src/main/java/au/com/mineauz/minigames/tool/LobbyLocationMode.java # Minigames/src/main/java/au/com/mineauz/minigames/tool/StartLocationMode.java # Minigames/src/main/resources/messages.properties # Regions/src/main/java/au/com/mineauz/minigamesregions/commands/SetNodeCommand.java # Regions/src/main/java/au/com/mineauz/minigamesregions/commands/SetRegionCommand.java # Regions/src/main/java/au/com/mineauz/minigamesregions/language/RegionLangKey.java # Regions/src/main/java/au/com/mineauz/minigamesregions/menuitems/MenuItemNodeExecutor.java

# Conflicts: # Minigames/src/main/java/au/com/mineauz/minigames/commands/set/SetStartCommand.java # Minigames/src/main/java/au/com/mineauz/minigames/managers/language/langkeys/MgMenuLangKey.java # Minigames/src/main/java/au/com/mineauz/minigames/menu/MenuItemRewardGroup.java # Minigames/src/main/java/au/com/mineauz/minigames/minigame/modules/InfectionModule.java

Minigames compiles! Merry Christmas Therefore this includes fixes for missed errors since testing is on the table

joshi1999 · 2024-02-22T14:12:18Z

Hello there o/
First of all, the fixes on "paperMerged2" are highly unstable and untested at this moment, we absolutely do not recommend to merge this branch into the main branch. "feuerFixes" is also unstable right now - We recommend to stick at the main branch if you're looking for reliable code. We also recommend to wait until we do a PR, so you do not risk to merge untested and/or unstable code. If you're looking for an advanced dev-branch: "dev" is probably the most stable branch of our current developing phase.

We are as excited as you to publish our fixes, but also really want to make it good ^^

Best regards
joshi

FireInstall · 2024-02-24T06:37:36Z

Just in the wild case you still want to merge our highly unstable paperMerged2 branch:
We merged the fixes branch into our dev branch and I just rebased the paperMerged2 branch onto it. You have now a stale version of it. While I fully agree with joshi - my recommendation would also to stick with our dev branch for unstable and our PRs for stable - for the off chance you want to merge it, please use the rebased version.

Best regards,
Feuer

addstar · 2024-02-25T10:02:11Z

Ohh no problem! I thought that might be the case but it looked like it had so many good fixed, and some we really wanted to merge into master 😁 I'll close this PR and maybe make another that just has a few cherry-picked commits which fix the problems we're seeing. Thanks again for all your efforts and support!

joshi1999 and others added 30 commits January 30, 2022 18:16

Fixing not visible tool-points

44f9d2e

Fixing Loadout for Offhand

848223e

Offhand can now be placed without errors

Adding new 1.16 materials

1663f14

Adding new 1.16 materials and prevent outdating through new materials.

Merge pull request #1 from GreenSurvivors/dev

c87ed8e

Fixing not visible tool-points

MatchTeamColor Condidtion showing matching item to color

9978137

Fixes PlayerHasItemCondition

c32475a

Fixing AsyncInventoryEvent Calls

da8b7ad

Adding GameTickTrigger

f7dbe71

Fixing Region Select NoSuchElementError

5630353

Adding keep inventory option

89f039b

Update to 1.19

3f1b9f7

- Change RegionDisplay to Barrier and imporved performance issues, when many and big regions were displayed

Update minigamesdistribution to 1.19

7b64d34

Update Mavenworkflow to Java 17

442a00e

Adding potionFriendlyFire configuration

fdb29ea

T::28 Correcting GUI information

8705cbf

Action "Take Item" had another name in the gui -> "Give Item"

T::32,39,42 Translation strings missing

49c4814

Several translation string were missed or were not correctly used.

Added every possible vanilla potion effekt.

a7f0952

Fixes T::45, T::46, T::49, T::53

891bdb6

- TakeFlagTrigger wasn't triggered - Only Oak-Signs worked as Flags - Broadcasts wasn't working - CTF-Broadcasts are now a seperate option - Flag Home-Returns were announced, even though broadcasts were disabled

Merge pull request #2 from GreenSurvivors/keepInv

a41fc9b

Severall Bugfixes for gui and game elements; Adding some new Game Elements like, potionFriendlyFire and gameTickTriggers.

Merge branch 'master' of github.com:GreenSurvivors/GreenMinigames int…

f3aa5ff

…o dev

T::44 Support for signs

f87dd28

T::9 Autocomplete Commands: set node/region

827968d

T::22 Wrong message when there's no lobby

92e3848

T::18 Flag falling in lava does not respawn

c6afe45

Replaced deprecated MinigameUtils.formStr call

19ae085

Fixed reset of Blocks in Minigames. (#3)

39f3d81

* Fixed reset of Blocks in Minigames.

Rebuilt FloorDegeneration to use the new Regeneration Regions (#7)

8592d4d

Code cleanup (#5)

420accd

Merging Memory and Region Actions from Turidus (#8)

af2c6c8

Co-authored-by: joshi1999 <[email protected]>

FireInstall added 21 commits February 1, 2024 13:17

lang 13 rework

71204be

lang 14 rework

804dfd9

lang 15 rework

492c41f

Menus start

lang 16 rework

82365d5

Code clean MenuItems rework Triggers

lang 17 rework

5847728

Fix merge artifacts

5797d1c

Update Descriptions the correct way

d4e4fde

Langrework 18

6618639

lang 19 rework

d5acd48

lang 20 rework

908abff

Fix merge artifacts once again

c51a7de

lang 21 rework

3b8261e

Dropped support for pre 1.8 rewards

lang 22 rework

a224ac5

Lang rework 23

b8c2b33

Lang rework 24

7c7b3bb

Minigames compiles! Merry Christmas Therefore this includes fixes for missed errors since testing is on the table

addstar added Needs Testing in progress labels Feb 22, 2024

addstar requested a review from Reed022 February 22, 2024 06:44

addstar self-assigned this Feb 22, 2024

addstar closed this Feb 25, 2024

addstar mentioned this pull request Mar 3, 2024

All dev changes from GreenSurvivors #383

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Merge many fixes from GreenSurvivors #381

Merge many fixes from GreenSurvivors #381

addstar commented Feb 22, 2024

joshi1999 commented Feb 22, 2024

FireInstall commented Feb 24, 2024

addstar commented Feb 25, 2024

Merge many fixes from GreenSurvivors #381

Merge many fixes from GreenSurvivors #381

Conversation

addstar commented Feb 22, 2024

Purpose

Reason

joshi1999 commented Feb 22, 2024

FireInstall commented Feb 24, 2024

addstar commented Feb 25, 2024