From 58a389eaf27eab329058ce58e4b57a177e756bd1 Mon Sep 17 00:00:00 2001 From: paulevsGitch Date: Fri, 11 Dec 2020 21:07:45 +0300 Subject: [PATCH] Small fixes, gunpowder recipe --- src/main/java/ru/betterend/BetterEnd.java | 4 +-- .../java/ru/betterend/config/Configs.java | 11 ++++++++ .../java/ru/betterend/config/MainConfig.java | 28 ------------------- .../ru/betterend/recipe/CraftingRecipes.java | 2 ++ .../java/ru/betterend/registry/EndBiomes.java | 2 ++ .../java/ru/betterend/registry/EndBlocks.java | 4 +-- .../java/ru/betterend/registry/EndItems.java | 4 +-- 7 files changed, 21 insertions(+), 34 deletions(-) create mode 100644 src/main/java/ru/betterend/config/Configs.java delete mode 100644 src/main/java/ru/betterend/config/MainConfig.java diff --git a/src/main/java/ru/betterend/BetterEnd.java b/src/main/java/ru/betterend/BetterEnd.java index 69868ef8..80bcee3f 100644 --- a/src/main/java/ru/betterend/BetterEnd.java +++ b/src/main/java/ru/betterend/BetterEnd.java @@ -4,7 +4,7 @@ import net.fabricmc.api.ModInitializer; import net.fabricmc.loader.api.FabricLoader; import net.minecraft.util.Identifier; import ru.betterend.api.BetterEndPlugin; -import ru.betterend.config.MainConfig; +import ru.betterend.config.Configs; import ru.betterend.effects.EndEnchantments; import ru.betterend.effects.EndPotions; import ru.betterend.item.GuideBook; @@ -55,7 +55,7 @@ public class BetterEnd implements ModInitializer { } FabricLoader.getInstance().getEntrypoints("betterend", BetterEndPlugin.class).forEach(BetterEndPlugin::register); - MainConfig.saveConfig(); + Configs.saveConfigs(); } public static boolean hasGuideBook() { diff --git a/src/main/java/ru/betterend/config/Configs.java b/src/main/java/ru/betterend/config/Configs.java new file mode 100644 index 00000000..e454be83 --- /dev/null +++ b/src/main/java/ru/betterend/config/Configs.java @@ -0,0 +1,11 @@ +package ru.betterend.config; + +public class Configs { + public static final ItemConfig ITEM_CONFIG = new ItemConfig(); + public static final BiomeConfig BIOME_CONFIG = new BiomeConfig(); + + public static void saveConfigs() { + ITEM_CONFIG.saveChanges(); + BIOME_CONFIG.saveChanges(); + } +} diff --git a/src/main/java/ru/betterend/config/MainConfig.java b/src/main/java/ru/betterend/config/MainConfig.java deleted file mode 100644 index 68df26fe..00000000 --- a/src/main/java/ru/betterend/config/MainConfig.java +++ /dev/null @@ -1,28 +0,0 @@ -package ru.betterend.config; - -public class MainConfig { - public static final ItemConfig ITEM_CONFIG = getItemConfig(); - public static final BiomeConfig BIOME_CONFIG = getBiomeConfig(); - - private static ItemConfig itemConfig; - private static BiomeConfig biomeConfig; - - public static ItemConfig getItemConfig() { - if (itemConfig == null) { - itemConfig = new ItemConfig(); - } - return itemConfig; - } - - public static BiomeConfig getBiomeConfig() { - if (biomeConfig == null) { - biomeConfig = new BiomeConfig(); - } - return biomeConfig; - } - - public static void saveConfig() { - itemConfig.saveChanges(); - biomeConfig.saveChanges(); - } -} diff --git a/src/main/java/ru/betterend/recipe/CraftingRecipes.java b/src/main/java/ru/betterend/recipe/CraftingRecipes.java index eb4c5ee4..ef66e031 100644 --- a/src/main/java/ru/betterend/recipe/CraftingRecipes.java +++ b/src/main/java/ru/betterend/recipe/CraftingRecipes.java @@ -147,6 +147,8 @@ public class CraftingRecipes { .addMaterial('C', EndItems.CRYSTAL_SHARDS) .build(); } + + GridRecipe.make("sulphur_gunpowder", Items.GUNPOWDER).setList("SC").addMaterial('S', EndItems.CRYSTALLINE_SULPHUR).addMaterial('C', Items.COAL, Items.CHARCOAL).build(); } private static void registerLantern(String name, Block lantern, Block slab) { diff --git a/src/main/java/ru/betterend/registry/EndBiomes.java b/src/main/java/ru/betterend/registry/EndBiomes.java index 35bdc6da..5a8a50c6 100644 --- a/src/main/java/ru/betterend/registry/EndBiomes.java +++ b/src/main/java/ru/betterend/registry/EndBiomes.java @@ -24,6 +24,7 @@ import net.minecraft.world.biome.Biome; import net.minecraft.world.biome.Biome.Category; import net.minecraft.world.biome.BiomeKeys; import ru.betterend.BetterEnd; +import ru.betterend.config.Configs; import ru.betterend.util.JsonFactory; import ru.betterend.world.biome.BiomeAmberLand; import ru.betterend.world.biome.BiomeBlossomingSpires; @@ -267,6 +268,7 @@ public class EndBiomes { private static void registerBiomeDirect(EndBiome biome) { fillSet(); int possibleID = incID++; + Configs.BIOME_CONFIG.getBoolean(biome, "enabled"); if (occupiedIDs.contains(possibleID)) { String message = "ID for biome " + biome.getID() + " is already occupied, changing biome ID from " + possibleID + " to "; while (occupiedIDs.contains(possibleID)) { diff --git a/src/main/java/ru/betterend/registry/EndBlocks.java b/src/main/java/ru/betterend/registry/EndBlocks.java index ed2b6445..9b0a8881 100644 --- a/src/main/java/ru/betterend/registry/EndBlocks.java +++ b/src/main/java/ru/betterend/registry/EndBlocks.java @@ -87,10 +87,10 @@ 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.MainConfig; +import ru.betterend.config.Configs; public class EndBlocks { - private static final ItemConfig CONFIG = MainConfig.ITEM_CONFIG; + private static final ItemConfig CONFIG = Configs.ITEM_CONFIG; // Terrain // public static final Block ENDSTONE_DUST = registerBlock("endstone_dust", new BlockEndstoneDust()); diff --git a/src/main/java/ru/betterend/registry/EndItems.java b/src/main/java/ru/betterend/registry/EndItems.java index f4778300..b8fdc8c3 100644 --- a/src/main/java/ru/betterend/registry/EndItems.java +++ b/src/main/java/ru/betterend/registry/EndItems.java @@ -35,7 +35,7 @@ import net.minecraft.util.registry.Registry; import ru.betterend.BetterEnd; import ru.betterend.config.ItemConfig; -import ru.betterend.config.MainConfig; +import ru.betterend.config.Configs; import ru.betterend.item.EndArmorMaterial; import ru.betterend.item.EndAxe; import ru.betterend.item.EndHammer; @@ -50,7 +50,7 @@ import ru.betterend.util.TagHelper; public class EndItems { - private static final ItemConfig CONFIG = MainConfig.ITEM_CONFIG; + private static final ItemConfig CONFIG = Configs.ITEM_CONFIG; private static final List MOD_BLOCKS = Lists.newArrayList(); private static final List MOD_ITEMS = Lists.newArrayList();