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

Block & item config split

Browse source
This commit is contained in:
paulevsGitch 2020-12-12 13:11:37 +03:00
parent decc2097a3
commit a82c9225a4
9 changed files with 105 additions and 113 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/main/java/ru/betterend/registry/EndBlocks.java
View file

@ -32,10 +32,10 @@ import ru.betterend.blocks.BlockEndLotusSeed;
import ru.betterend.blocks.BlockEndLotusStem;
import ru.betterend.blocks.BlockEndstoneDust;
import ru.betterend.blocks.BlockGlowingMoss;
import ru.betterend.blocks.BlockHelixTreeLeaves;
import ru.betterend.blocks.BlockGlowingPillarLuminophor;
import ru.betterend.blocks.BlockGlowingPillarRoots;
import ru.betterend.blocks.BlockGlowingPillarSeed;
import ru.betterend.blocks.BlockHelixTreeLeaves;
import ru.betterend.blocks.BlockHelixTreeSapling;
import ru.betterend.blocks.BlockHydralux;
import ru.betterend.blocks.BlockHydraluxPetal;
@ -86,12 +86,9 @@ import ru.betterend.blocks.basis.BlockWallPlant;
import ru.betterend.blocks.complex.ColoredMaterial;
import ru.betterend.blocks.complex.StoneMaterial;
import ru.betterend.blocks.complex.WoodenMaterial;
import ru.betterend.config.ItemConfig;
import ru.betterend.config.Configs;
public class EndBlocks {
private static final ItemConfig CONFIG = Configs.ITEM_CONFIG;
// Terrain //
public static final Block ENDSTONE_DUST = registerBlock("endstone_dust", new BlockEndstoneDust());
public static final Block END_MYCELIUM = registerBlock("end_mycelium", new BlockTerrain(MaterialColor.LIGHT_BLUE));
@ -267,7 +264,7 @@ public class EndBlocks {
public static void register() {}
public static Block registerBlock(Identifier id, Block block) {
if (!CONFIG.getBoolean(id, "blocks", true)) {
if (!Configs.BLOCK_CONFIG.getBoolean(id, "blocks", true)) {
return block;
}
Registry.register(Registry.BLOCK, id, block);

8
src/main/java/ru/betterend/registry/EndItems.java
View file

@ -32,9 +32,7 @@ import net.minecraft.util.Identifier;
import net.minecraft.util.math.BlockPointer;
import net.minecraft.util.math.Direction;
import net.minecraft.util.registry.Registry;
import ru.betterend.BetterEnd;
import ru.betterend.config.ItemConfig;
import ru.betterend.config.Configs;
import ru.betterend.item.EndArmorMaterial;
import ru.betterend.item.EndAxe;
@ -49,8 +47,6 @@ import ru.betterend.tab.CreativeTabs;
import ru.betterend.util.TagHelper;
public class EndItems {
private static final ItemConfig CONFIG = Configs.ITEM_CONFIG;
private static final List<Item> MOD_BLOCKS = Lists.newArrayList();
private static final List<Item> MOD_ITEMS = Lists.newArrayList();
@ -122,7 +118,7 @@ public class EndItems {
}
public static Item registerItem(Identifier id, Item item) {
if (!(item instanceof BlockItem) && !CONFIG.getBoolean(id, "items", true)) {
if (!Configs.ITEM_CONFIG.getBoolean(id, "items", true)) {
return item;
}
if (item != Items.AIR) {
@ -137,7 +133,7 @@ public class EndItems {
protected static ToolItem registerTool(String name, ToolItem item) {
Identifier id = BetterEnd.makeID(name);
if (!CONFIG.getBoolean(id, "items", true)) {
if (!Configs.ITEM_CONFIG.getBoolean(id, "items", true)) {
return item;
}
Registry.register(Registry.ITEM, id, item);