Skip to content

Commit

Permalink
Fix conflict with crowdin translate
Browse files Browse the repository at this point in the history
  • Loading branch information
isXander committed Apr 24, 2024
1 parent 525a145 commit c3278b4
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 35 deletions.
2 changes: 1 addition & 1 deletion build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ val isForgeLike = isNeoforge || isForge
val mcVersion = stonecutter.current.version

group = "dev.isxander"
val versionWithoutMC = "3.4.0"
val versionWithoutMC = "3.4.1"
version = "$versionWithoutMC+${stonecutter.current.project}"

val snapshotVer = "${grgit.branch.current().name.replace('/', '.')}-SNAPSHOT"
Expand Down
34 changes: 2 additions & 32 deletions changelog.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# YetAnotherConfigLib 3.4.0
# YetAnotherConfigLib 3.4.1

This build supports the following versions:
- Fabric 1.20.1
Expand All @@ -7,37 +7,7 @@ This build supports the following versions:
- Forge 1.20.1
- NeoForge 1.20.4

## For developers...

This is the first build which uses a new build toolchain to support multiple minecraft versions in the same codebase.
With this change, the artifact of the mod has changed.

```groovy
modImplementation "dev.isxander:yet-another-config-lib:{modversion}+{mcversion}-{loader}"
// for example...
modImplementation "dev.isxander:yet-another-config-lib:3.4.0+1.20.1-fabric"
```

If you are using YACL in an architectury project (one with a common subproject), you will from now on depend on
the fabric version of YACL. There is no longer any common artifact. I don't believe there to be any issues with doing it
like this.

## Additions

- New colour picker widget by [Superkat32](https://github.com/isXander/YetAnotherConfigLib/pull/140)
- This works with existing colour options.

![Colour picker example](https://i.imgur.com/G6Yx6RU.png)

- Added a custom tab API so categories can provide their own GUI, instead of YACL options.
- Mod developers can make their category class implement `CustomTabProvider`. Javadoc is available.
- Add a new Kotlin DSL for creating your YACL UIs. This is a wrapper on top of the java builder interface providing extra functionality for Kotlin users.
- YACL does not provide any kotlin libraries, nor does it depend on them. If you would like to use this DSL, make sure your own mod depends on your loader's Kotlin mod.
- This is included in the main artifact. You don't need additional dependencies.
- An example usage can be found [in the testmod](https://github.com/isXander/YetAnotherConfigLib/blob/multiversion/dev/src/testmod/kotlin/dev/isxander/yacl3/test/DslTest.kt)
- Improved the backend of dropdown controllers by [Crendgrim](https://github.com/isXander/YetAnotherConfigLib/pull/162)

## Bug Fixes

- Fix GIFs not being preloaded in the resource reloader
- Fix conflict with Crowdin Translate

Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
import net.minecraft.server.packs.resources.Resource;
import net.minecraft.server.packs.resources.ResourceManager;
import net.minecraft.util.profiling.ProfilerFiller;
import org.jetbrains.annotations.NotNull;

import java.util.ArrayList;
import java.util.List;
Expand All @@ -25,7 +26,7 @@ public class YACLImageReloadListener
/*?}*/
{
@Override
public CompletableFuture<Void> reload(
public @NotNull CompletableFuture<Void> reload(
PreparationBarrier preparationBarrier,
ResourceManager resourceManager,
ProfilerFiller preparationsProfiler,
Expand All @@ -34,7 +35,7 @@ public CompletableFuture<Void> reload(
Executor gameExecutor
) {
Map<ResourceLocation, Resource> imageResources = resourceManager.listResources(
"",
"textures",
location -> ImageRendererManager.PRELOADED_IMAGE_FACTORIES
.stream()
.anyMatch(factory -> factory.predicate().test(location))
Expand Down

0 comments on commit c3278b4

Please sign in to comment.