Skip to content

Commit

Permalink
Change EDAUtils
Browse files Browse the repository at this point in the history
Now Includes "No Indium?"
  • Loading branch information
FirstMegaGame4 committed Dec 31, 2023
1 parent 064d1d1 commit ca5ab50
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 5 deletions.
8 changes: 6 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ repositories {
// See https://docs.gradle.org/current/userguide/declaring_repositories.html
// for more information about repositories.
maven { url 'https://jitpack.io' }
maven { url 'https://maven.cafeteria.dev/releases' }
exclusiveContent {
forRepository {
maven { url 'https://api.modrinth.com/maven' }
Expand All @@ -36,14 +37,17 @@ dependencies {
// MixinExtras
include(implementation(annotationProcessor("io.github.llamalad7:mixinextras-fabric:0.3.2")))

// Fabric API. This is technically optional, but you probably want it anyway.
// Fabric API
modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"

// env.json
modImplementation "com.github.FirstMegaGame4:env.json:${project.env_json_version}"

// sodium-fabric, needed for compatibility
modImplementation "maven.modrinth:sodium:${project.sodium_version}"

// noindium, needed for weirdos that doesn't know what "compatibility" means
include "me.luligabi:NoIndium:${project.noindium_version}"
}

loom {
Expand Down Expand Up @@ -93,4 +97,4 @@ publishing {
// The repositories here will be used for publishing your artifact, not for
// retrieving dependencies.
}
}
}
3 changes: 2 additions & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,5 @@ fabric_version=0.91.3+1.20.4
env_json_version=0.2.0

# Compatibilities
sodium_version=mc1.20.3-0.5.5
sodium_version=mc1.20.3-0.5.5
noindium_version=1.1.0+1.20.4
Original file line number Diff line number Diff line change
Expand Up @@ -42,14 +42,14 @@ public static <K, V> Map<V, K> reverseMap(Map<K, V> original, Supplier<Map<V, K>

public static List<JsonUnbakedModel> retrieveJsonUnbakedModels(UnbakedModel unbakedModel, Function<Identifier, UnbakedModel> modelLoader) {
List<JsonUnbakedModel> jsonUnbakedModels = new ArrayList<>();
/* if (unbakedModel instanceof MultipartUnbakedModel multipart) {
if (unbakedModel instanceof MultipartUnbakedModel multipart) {
multipart.getModels().forEach(weighted -> weighted.getVariants().forEach(variant -> {
UnbakedModel model = modelLoader.apply(variant.getLocation());
if (model instanceof JsonUnbakedModel jsonUnbakedModel) {
jsonUnbakedModels.add(jsonUnbakedModel);
}
}));
} */
}
if (unbakedModel instanceof WeightedUnbakedModel weighted) {
weighted.getVariants().forEach(variant -> {
UnbakedModel model = modelLoader.apply(variant.getLocation());
Expand Down

0 comments on commit ca5ab50

Please sign in to comment.