Skip to content

Commit

Permalink
Fix inconsistencies
Browse files Browse the repository at this point in the history
  • Loading branch information
AlexProgrammerDE committed Jul 3, 2024
1 parent 42657e8 commit a35dc9f
Showing 1 changed file with 3 additions and 4 deletions.
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package dev.u9g.minecraftdatagenerator.generators;

import com.google.common.base.Joiner;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import com.google.gson.JsonElement;
Expand Down Expand Up @@ -41,7 +40,7 @@ private static String makeMaterialNameForTag(TagKey<Block> tag) {
}

private static void createCompositeMaterialInfo(List<MaterialInfo> allMaterials, List<String> combinedMaterials) {
String compositeMaterialName = Joiner.on(';').join(combinedMaterials);
String compositeMaterialName = String.join(";", combinedMaterials);

List<MaterialInfo> mappedMaterials = combinedMaterials.stream()
.map(otherName -> allMaterials.stream()
Expand All @@ -53,11 +52,11 @@ private static void createCompositeMaterialInfo(List<MaterialInfo> allMaterials,
mappedMaterials.stream().allMatch(it -> it.getPredicate().test(blockState));

MaterialInfo materialInfo = new MaterialInfo(compositeMaterialName, compositePredicate).includes(mappedMaterials);
allMaterials.add(0, materialInfo);
allMaterials.addFirst(materialInfo);
}

private static void createCompositeMaterial(Map<String, Map<Item, Float>> allMaterials, List<String> combinedMaterials) {
String compositeMaterialName = Joiner.on(';').join(combinedMaterials);
String compositeMaterialName = String.join(";", combinedMaterials);

Map<Item, Float> resultingToolSpeeds = new HashMap<>();
combinedMaterials.stream()
Expand Down

0 comments on commit a35dc9f

Please sign in to comment.