Skip to content

Commit bb7a893

Browse files
Smartin-bSmartin-b
committed
- config adjustments
1 parent 3788338 commit bb7a893

File tree

3 files changed

+62
-30
lines changed

3 files changed

+62
-30
lines changed

‎common/src/main/java/smartin/miapi/client/atlas/MaterialAtlasManager.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,8 @@ public void afterReload(SpriteLoader.StitchResult invalidResult, Profiler profil
8686
}
8787
SpriteContents materialSprite = materialAtlasPalette.generateSpriteContents(materialIdentifier, fromTexturePack);
8888
if(materialSprite==null){
89-
Miapi.LOGGER.error("Material Image was not found for " + materialIdentifier);
90-
Miapi.LOGGER.error("replacing with Uncolored Material " + materialIdentifier);
89+
//Miapi.LOGGER.error("Material Image was not found for " + materialIdentifier);
90+
//Miapi.LOGGER.error("replacing with Uncolored Material " + materialIdentifier);
9191
}
9292
else if (materialSprite.getWidth() != 256) {
9393
Miapi.LOGGER.error("Material Image not correctly sized for material " + materialIdentifier);

‎common/src/main/java/smartin/miapi/config/MiapiConfig.java‎

Lines changed: 29 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,9 @@ public static MiapiConfig getInstance() {
2121
}
2222

2323
protected MiapiConfig() {
24-
super(List.of(clientConfig, serverConfig),
24+
super(List.of(
25+
clientConfig,
26+
serverConfig),
2527
new File(Platform.getConfigFolder().toString(), "miapi.json"),
2628
"miapi_server");
2729
if (Platform.isModLoaded("cloth_config")) {
@@ -38,7 +40,10 @@ public static class ClientConfig extends ConfigItemGroup {
3840
public static CompatGroup compatGroup = new CompatGroup();
3941

4042
protected ClientConfig() {
41-
super(of(compatGroup, colorConfig), "client");
43+
super(of(
44+
compatGroup,
45+
colorConfig),
46+
"client");
4247
}
4348
}
4449

@@ -65,7 +70,9 @@ public static class CompatGroup extends ConfigItemGroup {
6570

6671

6772
protected CompatGroup() {
68-
super(of(animatedMaterial), "compat_settings");
73+
super(of(
74+
animatedMaterial),
75+
"compat_settings");
6976
animatedMaterial.changeListener.add((renderModeConfigItem -> {
7077
ModularItemCache.discardCache();
7178
}));
@@ -111,9 +118,22 @@ public static class OtherConfigGroup extends ConfigItemGroup {
111118
"stone_materials",
112119
true,
113120
"Generate Stone related Materials");
121+
public static IntegerConfigItem maxGeneratedMaterial = new IntegerConfigItem(
122+
"max_generated_materials",
123+
200,
124+
"Maximum amount of Materials generated per Type");
114125

115126
protected OtherConfigGroup() {
116-
super(of(developmentMode, forgeAutoReloads, generateMaterial, generateOtherMaterials, blockRegexGeneratedMaterials, generateWoodMaterials, generateStoneMaterials), "other");
127+
super(of(
128+
developmentMode,
129+
forgeAutoReloads,
130+
generateMaterial,
131+
generateOtherMaterials,
132+
blockRegexGeneratedMaterials,
133+
generateWoodMaterials,
134+
generateStoneMaterials,
135+
maxGeneratedMaterial),
136+
"other");
117137
}
118138
}
119139

@@ -132,7 +152,11 @@ public static class EnchantmentGroup extends ConfigItemGroup {
132152
"Truly Modular is more lean with its allowed Enchantments on its Tools");
133153

134154
protected EnchantmentGroup() {
135-
super(of(betterInfinity, betterLoyalty, leanEnchantments), "enchants");
155+
super(of(
156+
betterInfinity,
157+
betterLoyalty,
158+
leanEnchantments),
159+
"enchants");
136160
}
137161
}
138162
}

‎common/src/main/java/smartin/miapi/modules/material/GeneratedMaterial.java‎

Lines changed: 31 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ public static void onReloadClient() {
154154
}
155155
});
156156
stoneItems.forEach(stoneItem -> {
157-
try{
157+
try {
158158
GeneratedMaterial generatedMaterial = new GeneratedMaterial(ToolMaterials.STONE, stoneItem.getDefaultStack(), false);
159159
materials.put(generatedMaterial.getKey(), generatedMaterial);
160160
generatedMaterial.copyStatsFrom(materials.get("stone"));
@@ -182,8 +182,11 @@ public static void onReloadServer() {
182182
.stream()
183183
.filter(toolMaterial -> toolMaterial.getRepairIngredient().getMatchingStacks().length > 0)
184184
.filter(toolMaterial -> !toolMaterial.getRepairIngredient().getMatchingStacks()[0].isIn(RegistryInventory.MIAPI_FORBIDDEN_TAG))
185-
.filter(toolMaterial -> toolMaterial.getRepairIngredient() != null && toolMaterial.getRepairIngredient().getMatchingStacks() != null)
186-
.filter(toolMaterial -> Arrays.stream(toolMaterial.getRepairIngredient().getMatchingStacks()).allMatch(itemStack -> MaterialProperty.getMaterialFromIngredient(itemStack) == null && !itemStack.getItem().equals(Items.BARRIER)))
185+
.filter(toolMaterial -> toolMaterial.getRepairIngredient() != null &&
186+
toolMaterial.getRepairIngredient().getMatchingStacks() != null)
187+
.filter(toolMaterial -> Arrays.stream(toolMaterial.getRepairIngredient().getMatchingStacks())
188+
.allMatch(itemStack -> MaterialProperty.getMaterialFromIngredient(itemStack) == null && !itemStack.getItem().equals(Items.BARRIER)))
189+
.limit(MiapiConfig.OtherConfigGroup.maxGeneratedMaterial.getValue())
187190
.collect(Collectors.toSet()).forEach(toolMaterial -> {
188191
if (isValidItem(toolMaterial.getRepairIngredient().getMatchingStacks()[0].getItem())) {
189192
GeneratedMaterial generatedMaterial = new GeneratedMaterial(toolMaterial, false);
@@ -199,28 +202,33 @@ public static void onReloadServer() {
199202
}
200203

201204
if (MiapiConfig.OtherConfigGroup.generateWoodMaterials.getValue()) {
202-
Registries.ITEM.stream().filter(item ->
203-
item.getDefaultStack().isIn(ItemTags.PLANKS) &&
204-
!item.getDefaultStack().isIn(RegistryInventory.MIAPI_FORBIDDEN_TAG)).forEach(item -> {
205-
if (isValidItem(item)) {
206-
woodItems.add(item);
207-
GeneratedMaterial generatedMaterial = new GeneratedMaterial(ToolMaterials.WOOD, item.getDefaultStack(), false);
208-
materials.put(generatedMaterial.getKey(), generatedMaterial);
209-
generatedMaterial.copyStatsFrom(materials.get("wood"));
210-
}
211-
});
205+
Registries.ITEM.stream()
206+
.filter(item -> item.getDefaultStack().isIn(ItemTags.PLANKS) &&
207+
!item.getDefaultStack().isIn(RegistryInventory.MIAPI_FORBIDDEN_TAG))
208+
.limit(MiapiConfig.OtherConfigGroup.maxGeneratedMaterial.getValue())
209+
.forEach(item -> {
210+
if (isValidItem(item)) {
211+
woodItems.add(item);
212+
GeneratedMaterial generatedMaterial = new GeneratedMaterial(ToolMaterials.WOOD, item.getDefaultStack(), false);
213+
materials.put(generatedMaterial.getKey(), generatedMaterial);
214+
generatedMaterial.copyStatsFrom(materials.get("wood"));
215+
}
216+
});
212217
}
213218

214219
if (MiapiConfig.OtherConfigGroup.generateStoneMaterials.getValue()) {
215-
Registries.ITEM.stream().filter(item -> item.getDefaultStack().isIn(ItemTags.STONE_TOOL_MATERIALS) &&
216-
!item.getDefaultStack().isIn(RegistryInventory.MIAPI_FORBIDDEN_TAG)).forEach(item -> {
217-
if (isValidItem(item)) {
218-
stoneItems.add(item);
219-
GeneratedMaterial generatedMaterial = new GeneratedMaterial(ToolMaterials.STONE, item.getDefaultStack(), false);
220-
materials.put(generatedMaterial.getKey(), generatedMaterial);
221-
generatedMaterial.copyStatsFrom(materials.get("stone"));
222-
}
223-
});
220+
Registries.ITEM.stream()
221+
.filter(item -> item.getDefaultStack().isIn(ItemTags.STONE_TOOL_MATERIALS) &&
222+
!item.getDefaultStack().isIn(RegistryInventory.MIAPI_FORBIDDEN_TAG))
223+
.limit(MiapiConfig.OtherConfigGroup.maxGeneratedMaterial.getValue())
224+
.forEach(item -> {
225+
if (isValidItem(item)) {
226+
stoneItems.add(item);
227+
GeneratedMaterial generatedMaterial = new GeneratedMaterial(ToolMaterials.STONE, item.getDefaultStack(), false);
228+
materials.put(generatedMaterial.getKey(), generatedMaterial);
229+
generatedMaterial.copyStatsFrom(materials.get("stone"));
230+
}
231+
});
224232
}
225233

226234
toolItems.stream()
@@ -368,7 +376,7 @@ public void addSmithingRecipe(Material sourceMaterial, ItemStack templateItem, S
368376
RecipeManager manager = findManager(isClient);
369377
Collection<Recipe<?>> recipes = manager.values();
370378
String id = "generated_material_recipe." + key + "." + Registries.ITEM.getId(templateItem.getItem()) + "." + sourceMaterial.getKey();
371-
id = id.replace(":",".");
379+
id = id.replace(":", ".");
372380
Identifier recipeId = new Identifier(Miapi.MOD_ID, id);
373381
if (manager.get(recipeId).isEmpty()) {
374382
recipes.add(new MaterialSmithingRecipe(

0 commit comments

Comments
 (0)