MinecraftMods/BCLib
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Added Screen to confirm Patches

Browse source
This commit is contained in:
Frank Bauer 2021-07-26 18:36:20 +02:00
parent c93c271bd4
commit a247b17e7f
8 changed files with 384 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/main/java/ru/bclib/complexmaterials/ComplexMaterial.java
View file

@ -36,8 +36,8 @@ public abstract class ComplexMaterial {
private final Map<String, Block> blocks = Maps.newHashMap();
private final Map<String, Item> items = Maps.newHashMap();
private final String baseName;
private final String modID;
protected final String baseName;
protected final String modID;
public ComplexMaterial(String modID, String baseName) {
this.baseName = baseName;

25
src/main/java/ru/bclib/complexmaterials/WoodenComplexMaterial.java
View file

@ -41,6 +41,7 @@ import ru.bclib.complexmaterials.entry.RecipeEntry;
import ru.bclib.config.PathConfig;
import ru.bclib.recipes.GridRecipe;
import java.util.Arrays;
import java.util.List;
public class WoodenComplexMaterial extends ComplexMaterial {
@ -96,8 +97,14 @@ public class WoodenComplexMaterial extends ComplexMaterial {
@Override
protected void initDefault(FabricBlockSettings blockSettings, FabricItemSettings itemSettings) {
initDefault(blockSettings, itemSettings, new String[0]);
}
final protected void initDefault(FabricBlockSettings blockSettings, FabricItemSettings itemSettings, String[] excludedSuffixes) {
Tag.Named<Block> tagBlockLog = getBlockTag(TAG_LOGS);
Tag.Named<Item> tagItemLog = getItemTag(TAG_LOGS);
List<String> excl = Arrays.asList(excludedSuffixes);
addBlockEntry(
new BlockEntry(BLOCK_STRIPPED_LOG, (complexMaterial, settings) -> {
@ -173,12 +180,18 @@ public class WoodenComplexMaterial extends ComplexMaterial {
addBlockEntry(new BlockEntry(BLOCK_BARREL, (complexMaterial, settings) -> {
return new BaseBarrelBlock(getBlock(BLOCK_PLANKS));
}));
addBlockEntry(new BlockEntry(BLOCK_BOOKSHELF, (complexMaterial, settings) -> {
return new BaseBookshelfBlock(getBlock(BLOCK_PLANKS));
}).setBlockTags(TagAPI.BLOCK_BOOKSHELVES));
addBlockEntry(new BlockEntry(BLOCK_COMPOSTER, (complexMaterial, settings) -> {
return new BaseComposterBlock(getBlock(BLOCK_PLANKS));
}));
if (!excl.contains(BLOCK_BOOKSHELF)) {
addBlockEntry(new BlockEntry(BLOCK_BOOKSHELF, (complexMaterial, settings) -> {
return new BaseBookshelfBlock(getBlock(BLOCK_PLANKS));
}).setBlockTags(TagAPI.BLOCK_BOOKSHELVES));
}
if (!excl.contains(BLOCK_COMPOSTER)) {
addBlockEntry(new BlockEntry(BLOCK_COMPOSTER, (complexMaterial, settings) -> {
return new BaseComposterBlock(getBlock(BLOCK_PLANKS));
}));
}
}
@Override