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

[Changes] Adopted BCLib changes to BaseRegistry

Browse source
This commit is contained in:
Frank 2023-05-20 22:52:07 +02:00
parent 1cea03c1ca
commit f39fd67d62
4 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/org/betterx/betterend/BetterEnd.java
View file

@ -10,6 +10,7 @@ import org.betterx.betterend.effects.EndPotions;
import org.betterx.betterend.integration.Integrations; import org.betterx.betterend.integration.Integrations;
import org.betterx.betterend.recipe.builders.InfusionRecipe; import org.betterx.betterend.recipe.builders.InfusionRecipe;
import org.betterx.betterend.registry.*; import org.betterx.betterend.registry.*;
import org.betterx.betterend.tab.CreativeTabs;
import org.betterx.betterend.util.BonemealPlants; import org.betterx.betterend.util.BonemealPlants;
import org.betterx.betterend.util.LootTableUtil; import org.betterx.betterend.util.LootTableUtil;
import org.betterx.betterend.world.generator.EndLandBiomeDecider; import org.betterx.betterend.world.generator.EndLandBiomeDecider;
@ -60,6 +61,7 @@ public class BetterEnd implements ModInitializer {
.forEach(BetterEndPlugin::register); .forEach(BetterEndPlugin::register);
Integrations.init(); Integrations.init();
Configs.saveConfigs(); Configs.saveConfigs();
CreativeTabs.ensureStaticallyLoaded();
if (GeneratorOptions.useNewGenerator()) { if (GeneratorOptions.useNewGenerator()) {
BiomeDecider.registerHighPriorityDecider(makeID("end_land"), new EndLandBiomeDecider()); BiomeDecider.registerHighPriorityDecider(makeID("end_land"), new EndLandBiomeDecider());

3
src/main/java/org/betterx/betterend/registry/EndBlocks.java
View file

@ -10,7 +10,6 @@ import org.betterx.betterend.complexmaterials.*;
import org.betterx.betterend.config.Configs; import org.betterx.betterend.config.Configs;
import org.betterx.betterend.item.material.EndArmorMaterial; import org.betterx.betterend.item.material.EndArmorMaterial;
import org.betterx.betterend.item.material.EndToolMaterial; import org.betterx.betterend.item.material.EndToolMaterial;
import org.betterx.betterend.tab.CreativeTabs;
import org.betterx.worlds.together.tag.v3.CommonBlockTags; import org.betterx.worlds.together.tag.v3.CommonBlockTags;
import org.betterx.worlds.together.tag.v3.TagManager; import org.betterx.worlds.together.tag.v3.TagManager;
@ -27,7 +26,7 @@ import org.jetbrains.annotations.ApiStatus;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
public class EndBlocks { public class EndBlocks {
private static final BlockRegistry REGISTRY = new BlockRegistry(CreativeTabs.TAB_BLOCKS, Configs.BLOCK_CONFIG); private static final BlockRegistry REGISTRY = new BlockRegistry(Configs.BLOCK_CONFIG);
// Terrain // // Terrain //
public static final Block ENDSTONE_DUST = registerBlock("endstone_dust", new EndstoneDustBlock()); public static final Block ENDSTONE_DUST = registerBlock("endstone_dust", new EndstoneDustBlock());

3
src/main/java/org/betterx/betterend/registry/EndItems.java
View file

@ -15,7 +15,6 @@ import org.betterx.betterend.item.material.EndArmorMaterial;
import org.betterx.betterend.item.material.EndToolMaterial; import org.betterx.betterend.item.material.EndToolMaterial;
import org.betterx.betterend.item.tool.EndHammerItem; import org.betterx.betterend.item.tool.EndHammerItem;
import org.betterx.betterend.item.tool.EndPickaxe; import org.betterx.betterend.item.tool.EndPickaxe;
import org.betterx.betterend.tab.CreativeTabs;
import net.minecraft.core.Holder; import net.minecraft.core.Holder;
import net.minecraft.sounds.SoundEvent; import net.minecraft.sounds.SoundEvent;
@ -32,7 +31,7 @@ import org.jetbrains.annotations.ApiStatus;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
public class EndItems { public class EndItems {
private static final ItemRegistry REGISTRY = new ItemRegistry(CreativeTabs.TAB_ITEMS, Configs.ITEM_CONFIG); private static final ItemRegistry REGISTRY = new ItemRegistry(Configs.ITEM_CONFIG);
// Materials // // Materials //
public final static Item ENDER_DUST = registerEndItem("ender_dust"); public final static Item ENDER_DUST = registerEndItem("ender_dust");

4
src/main/java/org/betterx/betterend/tab/CreativeTabs.java
View file

@ -15,6 +15,10 @@ public class CreativeTabs {
public static final CreativeModeTab TAB_BLOCKS; public static final CreativeModeTab TAB_BLOCKS;
public static final CreativeModeTab TAB_ITEMS; public static final CreativeModeTab TAB_ITEMS;
public static void ensureStaticallyLoaded() {
// NO-OP
}
static { static {
TAB_BLOCKS = FabricItemGroup TAB_BLOCKS = FabricItemGroup
.builder(BetterEnd.makeID("end_blocks")) .builder(BetterEnd.makeID("end_blocks"))