diff --git a/psd/aeternium.psd b/psd/aeternium.psd new file mode 100644 index 00000000..155c2ccd Binary files /dev/null and b/psd/aeternium.psd differ diff --git a/psd/ender_block.psd b/psd/ender_block.psd new file mode 100644 index 00000000..060545f3 Binary files /dev/null and b/psd/ender_block.psd differ diff --git a/psd/terminite_block.psd b/psd/terminite_block.psd new file mode 100644 index 00000000..ff3ce1f3 Binary files /dev/null and b/psd/terminite_block.psd differ diff --git a/psd/terminite_ingot.psd b/psd/terminite_ingot.psd new file mode 100644 index 00000000..94e24815 Binary files /dev/null and b/psd/terminite_ingot.psd differ diff --git a/src/main/java/ru/betterend/BetterEnd.java b/src/main/java/ru/betterend/BetterEnd.java index 76cdcc03..096aae98 100644 --- a/src/main/java/ru/betterend/BetterEnd.java +++ b/src/main/java/ru/betterend/BetterEnd.java @@ -1,6 +1,7 @@ package ru.betterend; import net.fabricmc.api.ModInitializer; +import ru.betterend.config.MainConfig; import ru.betterend.registry.BiomeRegistry; import ru.betterend.registry.BlockRegistry; import ru.betterend.registry.FeatureRegistry; @@ -11,6 +12,7 @@ import ru.betterend.world.generator.BetterEndBiomeSource; public class BetterEnd implements ModInitializer { public static final String MOD_ID = "betterend"; public static final Logger LOGGER = Logger.get(); + public static final MainConfig CONFIG = MainConfig.getInstance(); @Override public void onInitialize() { diff --git a/src/main/java/ru/betterend/config/Config.java b/src/main/java/ru/betterend/config/Config.java index 5ca06a4b..c30533c1 100644 --- a/src/main/java/ru/betterend/config/Config.java +++ b/src/main/java/ru/betterend/config/Config.java @@ -95,7 +95,7 @@ public abstract class Config { } public boolean getBoolean(String key) { - Boolean val = configKeeper.getValue(key); + Boolean val = configKeeper.getValue(key); return val != null ? val : false; } diff --git a/src/main/java/ru/betterend/config/ConfigWriter.java b/src/main/java/ru/betterend/config/ConfigWriter.java index f21a49ae..30f9f32c 100644 --- a/src/main/java/ru/betterend/config/ConfigWriter.java +++ b/src/main/java/ru/betterend/config/ConfigWriter.java @@ -63,6 +63,13 @@ public class ConfigWriter { public static void save(File configFile, JsonElement config) { JsonFactory.storeJson(configFile, config); } + + public static String scrubFileName(String input) { + input = input.replaceAll("[/\\ ]+", "_"); + input = input.replaceAll("[,:&\"\\|\\<\\>\\?\\*]", "_"); + + return input; + } static { if (!MOD_CONFIG_DIR.exists()) { diff --git a/src/main/java/ru/betterend/mixin/client/WorldRendererMixin.java b/src/main/java/ru/betterend/mixin/client/WorldRendererMixin.java index dbacf753..86bee902 100644 --- a/src/main/java/ru/betterend/mixin/client/WorldRendererMixin.java +++ b/src/main/java/ru/betterend/mixin/client/WorldRendererMixin.java @@ -9,7 +9,6 @@ import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; -import com.mojang.blaze3d.platform.GlStateManager; import com.mojang.blaze3d.systems.RenderSystem; import net.minecraft.client.MinecraftClient; @@ -28,6 +27,7 @@ import net.minecraft.client.util.math.Vector3f; import net.minecraft.client.world.ClientWorld; import net.minecraft.util.Identifier; import net.minecraft.util.math.Quaternion; + import ru.betterend.BetterEnd; import ru.betterend.util.MHelper; @@ -80,7 +80,7 @@ public class WorldRendererMixin { BackgroundRenderer.setFogBlack(); RenderSystem.enableAlphaTest(); - GlStateManager.alphaFunc(516, 0.0F); + RenderSystem.alphaFunc(516, 0.0F); RenderSystem.enableBlend(); RenderSystem.enableTexture(); diff --git a/src/main/java/ru/betterend/world/biome/BiomeConfig.java b/src/main/java/ru/betterend/world/biome/BiomeConfig.java index aa215079..e2eedef1 100644 --- a/src/main/java/ru/betterend/world/biome/BiomeConfig.java +++ b/src/main/java/ru/betterend/world/biome/BiomeConfig.java @@ -20,7 +20,8 @@ public class BiomeConfig extends Config { public BiomeConfig(EndBiome biome) { this.biome = biome; Identifier biomeId = biome.getID(); - this.configFile = new File(BIOME_CONFIG_DIR.toFile(), biomeId.getPath()); + String folder = ConfigWriter.scrubFileName(biomeId.toString()); + this.configFile = new File(BIOME_CONFIG_DIR.toFile(), folder + ".json"); this.configWriter = new ConfigWriter(); this.registerEntries(); JsonObject config = configWriter.loadConfig(configFile); diff --git a/src/main/resources/assets/betterend/textures/block/aeternium_block.png b/src/main/resources/assets/betterend/textures/block/aeternium_block.png new file mode 100644 index 00000000..021ef5a4 Binary files /dev/null and b/src/main/resources/assets/betterend/textures/block/aeternium_block.png differ diff --git a/src/main/resources/assets/betterend/textures/block/ender_block.png b/src/main/resources/assets/betterend/textures/block/ender_block.png new file mode 100644 index 00000000..94d92da0 Binary files /dev/null and b/src/main/resources/assets/betterend/textures/block/ender_block.png differ diff --git a/src/main/resources/assets/betterend/textures/block/terminite_block.png b/src/main/resources/assets/betterend/textures/block/terminite_block.png new file mode 100644 index 00000000..216c7b98 Binary files /dev/null and b/src/main/resources/assets/betterend/textures/block/terminite_block.png differ diff --git a/src/main/resources/assets/betterend/textures/item/aeternium_ingot.png b/src/main/resources/assets/betterend/textures/item/aeternium_ingot.png new file mode 100644 index 00000000..e2183f2c Binary files /dev/null and b/src/main/resources/assets/betterend/textures/item/aeternium_ingot.png differ diff --git a/src/main/resources/assets/betterend/textures/item/terminite_ingot.png b/src/main/resources/assets/betterend/textures/item/terminite_ingot.png new file mode 100644 index 00000000..36bfaca6 Binary files /dev/null and b/src/main/resources/assets/betterend/textures/item/terminite_ingot.png differ