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.

Sign up for GitHub

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

Jump to bottom

Resource Packs Update #7069

Open

TheAbsolutionism wants to merge 23 commits into SkriptLang:dev/feature from TheAbsolutionism:dev/resource-packs

TheAbsolutionism commented Sep 12, 2024

Description

This PR aims to allow users to use additional options when sending a resource packs to players.
As well as remove all resource packs or by uuid that were sent from the server.

Target Minecraft Versions: any
Requirements: none
Related Issues: #6222

TheAbsolutionism added 7 commits

September 11, 2024 21:21


          Starter Commit

5741c83

Added, EffSecSendResourcePack
Added, EffRemoveResourcePack
Added, Utils.convertUUID
Removed, EffSendResourcePack

:)


          test

452409f


          Merge branch 'dev/feature' into dev/resource-packs

5d44eef


          test2

6d15294


          Merge branch 'dev/resource-packs' of https://github.com/TheAbsolution…

d83d9e5

…ism/SkriptTest into dev/resource-packs


          test3

b50dbe4

Fusezion suggested changes

View reviewed changes

Contributor

Fusezion left a comment

First round of requested changes, more to come

src/main/java/ch/njol/skript/effects/EffSendResourcePack.java Show resolved Hide resolved

src/main/java/ch/njol/skript/effects/EffResourcePackValues.java Outdated Show resolved Hide resolved

src/main/java/ch/njol/skript/effects/EffResourcePackValues.java Outdated Show resolved Hide resolved

src/main/java/ch/njol/skript/effects/EffResourcePackValues.java Outdated Show resolved Hide resolved

src/main/java/ch/njol/skript/effects/EffResourcePackValues.java Outdated Show resolved Hide resolved

src/main/java/ch/njol/skript/sections/EffSecSendResourcePack.java Outdated Show resolved Hide resolved

src/main/java/ch/njol/skript/sections/EffSecSendResourcePack.java Outdated Show resolved Hide resolved

src/main/java/ch/njol/skript/sections/EffSecSendResourcePack.java Outdated Show resolved Hide resolved

src/main/java/ch/njol/skript/sections/EffSecSendResourcePack.java Show resolved Hide resolved

src/main/java/ch/njol/skript/util/Utils.java Outdated Show resolved Hide resolved

Fusezion suggested changes

View reviewed changes

Contributor

Fusezion left a comment

A few more changes to be made, unsure if round 3 will commence awaiting lang member reviews for now

src/main/java/ch/njol/skript/effects/EffRemoveResourcePack.java Outdated Show resolved Hide resolved

src/main/java/ch/njol/skript/effects/EffRemoveResourcePack.java Outdated Show resolved Hide resolved

src/main/java/ch/njol/skript/effects/EffRemoveResourcePack.java Outdated Show resolved Hide resolved

src/main/java/ch/njol/skript/effects/EffRemoveResourcePack.java Outdated Show resolved Hide resolved

src/main/java/ch/njol/skript/effects/EffRemoveResourcePack.java Outdated Show resolved Hide resolved

src/main/java/ch/njol/skript/effects/EffRemoveResourcePack.java Outdated Show resolved Hide resolved

src/main/java/ch/njol/skript/effects/EffResourcePackValues.java Outdated Show resolved Hide resolved

src/main/java/ch/njol/skript/sections/EffSecSendResourcePack.java Outdated Show resolved Hide resolved

Efnilite requested changes

View reviewed changes

src/main/java/ch/njol/skript/effects/EffRemoveResourcePack.java Outdated Show resolved Hide resolved

src/main/java/ch/njol/skript/effects/EffRemoveResourcePack.java Show resolved Hide resolved

src/main/java/ch/njol/skript/effects/EffRemoveResourcePack.java Outdated Show resolved Hide resolved

src/main/java/ch/njol/skript/effects/EffRemoveResourcePack.java Outdated Show resolved Hide resolved

src/main/java/ch/njol/skript/effects/EffResourcePackValues.java Outdated Show resolved Hide resolved

src/main/java/ch/njol/skript/sections/EffSecSendResourcePack.java Outdated Show resolved Hide resolved

src/main/java/ch/njol/skript/sections/EffSecSendResourcePack.java Outdated Show resolved Hide resolved

src/main/java/ch/njol/skript/sections/EffSecSendResourcePack.java Outdated Show resolved Hide resolved

src/main/java/ch/njol/skript/sections/EffSecSendResourcePack.java Outdated Show resolved Hide resolved

src/main/java/ch/njol/skript/sections/EffSecSendResourcePack.java Outdated Show resolved Hide resolved

sovdeeth added the feature label

TheAbsolutionism added 2 commits

September 12, 2024 15:01


          Requested Changes

d2582ae

Alot of changes


          Old pattern

55e96fa

cheeezburga requested changes

View reviewed changes

Member

cheeezburga left a comment

No time for a proper review at the moment, but just some styling stuff I saw off the bat. There are other annotations in the PR that I didn't mark with a comment, but they should be fixed too

src/main/java/ch/njol/skript/sections/EffSecSendResourcePack.java Outdated Show resolved Hide resolved

src/main/java/ch/njol/skript/sections/EffSecSendResourcePack.java Outdated Show resolved Hide resolved

src/main/java/ch/njol/skript/sections/EffSecSendResourcePack.java Outdated Show resolved Hide resolved

src/main/java/ch/njol/skript/util/Utils.java Outdated Show resolved Hide resolved

sovdeeth requested changes

View reviewed changes

src/main/java/ch/njol/skript/effects/EffRemoveResourcePack.java Outdated Show resolved Hide resolved

src/main/java/ch/njol/skript/effects/EffRemoveResourcePack.java Outdated Show resolved Hide resolved

src/main/java/ch/njol/skript/effects/EffRemoveResourcePack.java Outdated Show resolved Hide resolved

src/main/java/ch/njol/skript/effects/EffRemoveResourcePack.java Outdated Show resolved Hide resolved

src/main/java/ch/njol/skript/effects/EffRemoveResourcePack.java Outdated Show resolved Hide resolved

src/main/java/ch/njol/skript/sections/EffSecSendResourcePack.java Outdated Show resolved Hide resolved

src/main/java/ch/njol/skript/sections/EffSecSendResourcePack.java Outdated Show resolved Hide resolved

src/main/java/ch/njol/skript/sections/EffSecSendResourcePack.java Outdated Show resolved Hide resolved

src/main/java/ch/njol/skript/sections/EffSecSendResourcePack.java Outdated Show resolved Hide resolved

src/main/java/ch/njol/skript/util/Utils.java Outdated Show resolved Hide resolved

TheAbsolutionism added 4 commits

September 12, 2024 16:37


          Requested Changes - Part 2

3e3b148

A lot more changes


          UUID Requirement

55ae375

Removed, my custom UUID converter.
Added, checks to  ensure uuid is valid
Added, if UUID is provided, but is invalid, will not send/remove resource, encouraging users to look at console.


          Cleanup

69aca23


          Merge branch 'dev/feature' into dev/resource-packs

ee300f8

TheAbsolutionism requested a review from sovdeeth

September 21, 2024 17:05

TheAbsolutionism added 2 commits

September 21, 2024 18:09


          Merge branch 'dev/feature' into dev/resource-packs

df9fecd


          Merge branch 'dev/feature' into dev/resource-packs

4a4afde

sovdeeth requested changes

View reviewed changes

src/main/java/ch/njol/skript/effects/EffRemoveResourcePack.java Outdated Show resolved Hide resolved

src/main/java/ch/njol/skript/effects/EffRemoveResourcePack.java Show resolved Hide resolved

src/main/java/ch/njol/skript/effects/EffRemoveResourcePack.java Outdated Show resolved Hide resolved

src/main/java/ch/njol/skript/effects/EffRemoveResourcePack.java Outdated Show resolved Hide resolved

src/main/java/ch/njol/skript/sections/EffSecSendResourcePack.java Outdated Show resolved Hide resolved

src/main/java/ch/njol/skript/sections/EffSecSendResourcePack.java Outdated Show resolved Hide resolved

TheAbsolutionism added 3 commits

September 22, 2024 15:48


          Partial Changes

f7915aa


          Merge branch 'dev/feature' into dev/resource-packs

4200ee2


          EffSec Restriction

44b8ece

sovdeeth requested changes

View reviewed changes

Member

sovdeeth left a comment

Waiting for registration API for a better solution to restricted loadCode.

TheAbsolutionism added 3 commits

October 1, 2024 15:16


          Merge branch 'dev/feature' into dev/resource-packs

2318e3a


          Merge branch 'dev/feature' into dev/resource-packs

744f2f2


          Merge branch 'dev/feature' into dev/resource-packs

5ff133d

TheAbsolutionism added 2 commits

October 27, 2024 15:43


          Merge branch 'dev/feature' into dev/resource-packs

30bde57


          Merge branch 'dev/feature' into dev/resource-packs

ad68b12

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

Asleeepp Asleeepp left review comments

Fusezion Fusezion requested changes

GStudiosX2 GStudiosX2 left review comments

cheeezburga cheeezburga requested changes

Efnilite Efnilite requested changes

sovdeeth sovdeeth requested changes

Requested changes must be addressed to merge this pull request.

Labels

feature