BlockEntities bclib fix
This commit is contained in:
parent
ce3809cd93
commit
ea30863666
6 changed files with 42 additions and 9 deletions
|
@ -17,5 +17,5 @@ archives_base_name = better-end
|
||||||
patchouli_version = 50-FABRIC
|
patchouli_version = 50-FABRIC
|
||||||
fabric_version = 0.32.9+1.16
|
fabric_version = 0.32.9+1.16
|
||||||
canvas_version = 1.0.+
|
canvas_version = 1.0.+
|
||||||
bclib_version = 0.1.13
|
bclib_version = 0.1.15
|
||||||
rei_version = 5.8.10
|
rei_version = 5.8.10
|
|
@ -1,6 +1,5 @@
|
||||||
pluginManagement {
|
pluginManagement {
|
||||||
repositories {
|
repositories {
|
||||||
jcenter()
|
|
||||||
maven {
|
maven {
|
||||||
name = 'Fabric'
|
name = 'Fabric'
|
||||||
url = 'https://maven.fabricmc.net/'
|
url = 'https://maven.fabricmc.net/'
|
||||||
|
|
|
@ -8,6 +8,14 @@ import net.minecraft.core.Registry;
|
||||||
import net.minecraft.network.chat.Style;
|
import net.minecraft.network.chat.Style;
|
||||||
import net.minecraft.network.chat.TextComponent;
|
import net.minecraft.network.chat.TextComponent;
|
||||||
import net.minecraft.network.chat.TranslatableComponent;
|
import net.minecraft.network.chat.TranslatableComponent;
|
||||||
|
import net.minecraft.world.item.BlockItem;
|
||||||
|
import net.minecraft.world.item.Item;
|
||||||
|
import net.minecraft.world.level.block.Block;
|
||||||
|
import ru.bclib.blocks.BaseChestBlock;
|
||||||
|
import ru.bclib.blocks.BaseSignBlock;
|
||||||
|
import ru.bclib.client.render.BaseChestBlockEntityRenderer;
|
||||||
|
import ru.bclib.client.render.BaseSignBlockEntityRenderer;
|
||||||
|
import ru.bclib.registry.BaseRegistry;
|
||||||
import ru.bclib.util.TranslationHelper;
|
import ru.bclib.util.TranslationHelper;
|
||||||
import ru.betterend.BetterEnd;
|
import ru.betterend.BetterEnd;
|
||||||
import ru.betterend.client.render.ERenderLayer;
|
import ru.betterend.client.render.ERenderLayer;
|
||||||
|
@ -21,6 +29,8 @@ import ru.betterend.registry.EndModelProviders;
|
||||||
import ru.betterend.registry.EndParticles;
|
import ru.betterend.registry.EndParticles;
|
||||||
import ru.betterend.registry.EndScreens;
|
import ru.betterend.registry.EndScreens;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
public class BetterEndClient implements ClientModInitializer {
|
public class BetterEndClient implements ClientModInitializer {
|
||||||
@Override
|
@Override
|
||||||
public void onInitializeClient() {
|
public void onInitializeClient() {
|
||||||
|
@ -32,6 +42,7 @@ public class BetterEndClient implements ClientModInitializer {
|
||||||
EndModelProviders.register();
|
EndModelProviders.register();
|
||||||
MultiModelItem.register();
|
MultiModelItem.register();
|
||||||
ClientOptions.init();
|
ClientOptions.init();
|
||||||
|
registerRenderers();
|
||||||
registerTooltips();
|
registerTooltips();
|
||||||
|
|
||||||
if (BetterEnd.isDevEnvironment()) {
|
if (BetterEnd.isDevEnvironment()) {
|
||||||
|
@ -67,4 +78,12 @@ public class BetterEndClient implements ClientModInitializer {
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private static void registerRenderers() {
|
||||||
|
List<Item> modBlocks = BaseRegistry.getModBlocks(BetterEnd.MOD_ID);
|
||||||
|
modBlocks.stream().filter(item -> item instanceof BlockItem && ((BlockItem) item).getBlock() instanceof BaseChestBlock)
|
||||||
|
.map(item -> ((BlockItem) item).getBlock()).forEach(BaseChestBlockEntityRenderer::registerRenderLayer);
|
||||||
|
modBlocks.stream().filter(item -> item instanceof BlockItem && ((BlockItem) item).getBlock() instanceof BaseSignBlock)
|
||||||
|
.map(item -> ((BlockItem) item).getBlock()).forEach(BaseSignBlockEntityRenderer::registerRenderLayer);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -7,11 +7,17 @@ import net.minecraft.world.level.block.Block;
|
||||||
import net.minecraft.world.level.block.Blocks;
|
import net.minecraft.world.level.block.Blocks;
|
||||||
import net.minecraft.world.level.material.MaterialColor;
|
import net.minecraft.world.level.material.MaterialColor;
|
||||||
import org.jetbrains.annotations.NotNull;
|
import org.jetbrains.annotations.NotNull;
|
||||||
import ru.bclib.blocks.BasePathBlock;
|
import ru.bclib.blocks.*;
|
||||||
|
import ru.bclib.registry.BaseBlockEntities;
|
||||||
import ru.bclib.registry.BlocksRegistry;
|
import ru.bclib.registry.BlocksRegistry;
|
||||||
import ru.betterend.BetterEnd;
|
import ru.betterend.BetterEnd;
|
||||||
import ru.betterend.blocks.*;
|
import ru.betterend.blocks.*;
|
||||||
import ru.betterend.blocks.basis.*;
|
import ru.betterend.blocks.basis.*;
|
||||||
|
import ru.betterend.blocks.basis.SimpleLeavesBlock;
|
||||||
|
import ru.betterend.blocks.basis.StalactiteBlock;
|
||||||
|
import ru.betterend.blocks.basis.TripleTerrainBlock;
|
||||||
|
import ru.betterend.blocks.basis.VineBlock;
|
||||||
|
import ru.betterend.blocks.basis.WallMushroomBlock;
|
||||||
import ru.betterend.blocks.complex.ColoredMaterial;
|
import ru.betterend.blocks.complex.ColoredMaterial;
|
||||||
import ru.betterend.blocks.complex.CrystalSubblocksMaterial;
|
import ru.betterend.blocks.complex.CrystalSubblocksMaterial;
|
||||||
import ru.betterend.blocks.complex.MetalMaterial;
|
import ru.betterend.blocks.complex.MetalMaterial;
|
||||||
|
@ -313,15 +319,24 @@ public class EndBlocks extends BlocksRegistry {
|
||||||
if (!Configs.BLOCK_CONFIG.getBooleanRoot(id.getPath(), true)) {
|
if (!Configs.BLOCK_CONFIG.getBooleanRoot(id.getPath(), true)) {
|
||||||
return block;
|
return block;
|
||||||
}
|
}
|
||||||
|
if (block instanceof BaseChestBlock) {
|
||||||
|
BaseBlockEntities.CHEST.registerBlock(block);
|
||||||
|
}
|
||||||
|
if (block instanceof BaseSignBlock) {
|
||||||
|
BaseBlockEntities.SIGN.registerBlock(block);
|
||||||
|
}
|
||||||
|
if (block instanceof BaseBarrelBlock) {
|
||||||
|
BaseBlockEntities.BARREL.registerBlock(block);
|
||||||
|
}
|
||||||
|
if (block instanceof BaseFurnaceBlock) {
|
||||||
|
BaseBlockEntities.FURNACE.registerBlock(block);
|
||||||
|
}
|
||||||
getBlockRegistry().register(id, block);
|
getBlockRegistry().register(id, block);
|
||||||
return block;
|
return block;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static Block registerBlock(String name, Block block) {
|
public static Block registerBlock(String name, Block block) {
|
||||||
if (!Configs.BLOCK_CONFIG.getBooleanRoot(name, true)) {
|
return registerBlock(BetterEnd.makeID(name), block);
|
||||||
return block;
|
|
||||||
}
|
|
||||||
return getBlockRegistry().register(name, block);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public static Block registerEndBlockOnly(String name, Block block) {
|
public static Block registerEndBlockOnly(String name, Block block) {
|
||||||
|
|
|
@ -46,7 +46,7 @@
|
||||||
"fabricloader": ">=0.11.0",
|
"fabricloader": ">=0.11.0",
|
||||||
"fabric": ">=0.32.0",
|
"fabric": ">=0.32.0",
|
||||||
"minecraft": ">=1.16.4",
|
"minecraft": ">=1.16.4",
|
||||||
"bclib": ">=0.1.12"
|
"bclib": ">=0.1.15"
|
||||||
},
|
},
|
||||||
"suggests": {
|
"suggests": {
|
||||||
"byg": ">=1.1.3",
|
"byg": ">=1.1.3",
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue