From acbe4c8348a56bf450feea4dcc6e66e006711d6b Mon Sep 17 00:00:00 2001 From: Sunskimmer822 <92886026+Sunskimmer822@users.noreply.github.com> Date: Thu, 17 Mar 2022 15:30:29 -0700 Subject: [PATCH] thine mother --- .../java/net/serenas/shitmod/Shitmod.java | 24 +- .../net/serenas/shitmod/SimpleConfig.java | 251 ++++++++++++++++++ .../serenas/shitmod/careFreeMelodyEffect.java | 1 - .../shitmod/explosionAspectEnchantment.java | 4 +- 4 files changed, 265 insertions(+), 15 deletions(-) create mode 100644 src/main/java/net/serenas/shitmod/SimpleConfig.java diff --git a/src/main/java/net/serenas/shitmod/Shitmod.java b/src/main/java/net/serenas/shitmod/Shitmod.java index 71ac683..be1b5f4 100644 --- a/src/main/java/net/serenas/shitmod/Shitmod.java +++ b/src/main/java/net/serenas/shitmod/Shitmod.java @@ -24,6 +24,18 @@ import net.minecraft.util.registry.Registry; public class Shitmod implements ModInitializer { + public static final ItemGroup CHARMS_GROUP = FabricItemGroupBuilder.build( + new Identifier("shitmod", "charms"), + () -> new ItemStack(Shitmod.KINGSOUL_CHARM)); + + public static final ItemGroup GENERAL_GROUP = FabricItemGroupBuilder.build( + new Identifier("shitmod", "general"), + () -> new ItemStack(Shitmod.FABRIC_ITEM)); + + public static final ItemGroup TOOLS_GROUP = FabricItemGroupBuilder.build( + new Identifier("shitmod", "tools"), + () -> new ItemStack(Shitmod.BLAZE_METAL_SHOVEL)); + public static final Item FABRIC_ITEM = new FabricItem(new Item.Settings().group(Shitmod.GENERAL_GROUP)); public static final Block FABRIC_BLOCK = new FabricBlock(); @@ -37,18 +49,6 @@ public class Shitmod implements ModInitializer { public static final StatusEffect EXP = new ExpStatusEffect(); public static final Item ORANGE_JUICE = new OrangeJuice(new Item.Settings().group(ItemGroup.FOOD).rarity(Rarity.EPIC).food(new FoodComponent.Builder().hunger(200).saturationModifier(10f).snack().meat().alwaysEdible().statusEffect(new StatusEffectInstance(StatusEffects.REGENERATION, 20*120, 5), 1f).statusEffect(new StatusEffectInstance(StatusEffects.ABSORPTION, 20*120, 20), 1f).statusEffect(new StatusEffectInstance(StatusEffects.FIRE_RESISTANCE, 20*120), 1f).statusEffect(new StatusEffectInstance(StatusEffects.RESISTANCE, 20*120, 3), 1f).statusEffect(new StatusEffectInstance(StatusEffects.SPEED, 20*120, 2), 1f).build())); - - public static final ItemGroup CHARMS_GROUP = FabricItemGroupBuilder.build( - new Identifier("shitmod", "charms"), - () -> new ItemStack(Shitmod.KINGSOUL_CHARM)); - - public static final ItemGroup GENERAL_GROUP = FabricItemGroupBuilder.build( - new Identifier("shitmod", "general"), - () -> new ItemStack(Shitmod.FABRIC_ITEM)); - - public static final ItemGroup TOOLS_GROUP = FabricItemGroupBuilder.build( - new Identifier("shitmod", "tools"), - () -> new ItemStack(Shitmod.BLAZE_METAL_SHOVEL)); public static final Item KINGSOUL_CHARM = new kingsoul(new Item.Settings().group(Shitmod.CHARMS_GROUP).maxDamage(500).fireproof()); diff --git a/src/main/java/net/serenas/shitmod/SimpleConfig.java b/src/main/java/net/serenas/shitmod/SimpleConfig.java new file mode 100644 index 0000000..3ca97ad --- /dev/null +++ b/src/main/java/net/serenas/shitmod/SimpleConfig.java @@ -0,0 +1,251 @@ +package net.serenas.shitmod; + +/* + * Copyright (c) 2021 magistermaks + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ + +import net.fabricmc.loader.api.FabricLoader; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + +import java.io.File; +import java.io.IOException; +import java.io.PrintWriter; +import java.nio.file.Files; +import java.nio.file.Path; +import java.util.HashMap; +import java.util.Scanner; + +public class SimpleConfig { + + private static final Logger LOGGER = LogManager.getLogger("SimpleConfig"); + private final HashMap config = new HashMap<>(); + private final ConfigRequest request; + private boolean broken = false; + + public interface DefaultConfig { + String get( String namespace ); + + static String empty( String namespace ) { + return ""; + } + } + + public static class ConfigRequest { + + private final File file; + private final String filename; + private DefaultConfig provider; + + private ConfigRequest(File file, String filename ) { + this.file = file; + this.filename = filename; + this.provider = DefaultConfig::empty; + } + + /** + * Sets the default config provider, used to generate the + * config if it's missing. + * + * @param provider default config provider + * @return current config request object + * @see DefaultConfig + */ + public ConfigRequest provider( DefaultConfig provider ) { + this.provider = provider; + return this; + } + + /** + * Loads the config from the filesystem. + * + * @return config object + * @see SimpleConfig + */ + public SimpleConfig request() { + return new SimpleConfig( this ); + } + + private String getConfig() { + return provider.get( filename ) + "\n"; + } + + } + + /** + * Creates new config request object, ideally `namespace` + * should be the name of the mod id of the requesting mod + * + * @param filename - name of the config file + * @return new config request object + */ + public static ConfigRequest of( String filename ) { + Path path = FabricLoader.getInstance().getConfigDir(); + return new ConfigRequest( path.resolve( filename + ".properties" ).toFile(), filename ); + } + + private void createConfig() throws IOException { + + // try creating missing files + request.file.getParentFile().mkdirs(); + Files.createFile( request.file.toPath() ); + + // write default config data + PrintWriter writer = new PrintWriter(request.file, "UTF-8"); + writer.write( request.getConfig() ); + writer.close(); + + } + + private void loadConfig() throws IOException { + Scanner reader = new Scanner( request.file ); + for( int line = 1; reader.hasNextLine(); line ++ ) { + parseConfigEntry( reader.nextLine(), line ); + } + } + + private void parseConfigEntry( String entry, int line ) { + if( !entry.isEmpty() && !entry.startsWith( "#" ) ) { + String[] parts = entry.split("=", 2); + if( parts.length == 2 ) { + config.put( parts[0], parts[1] ); + }else{ + throw new RuntimeException("Syntax error in config file on line " + line + "!"); + } + } + } + + private SimpleConfig( ConfigRequest request ) { + this.request = request; + String identifier = "Config '" + request.filename + "'"; + + if( !request.file.exists() ) { + LOGGER.info( identifier + " is missing, generating default one..." ); + + try { + createConfig(); + } catch (IOException e) { + LOGGER.error( identifier + " failed to generate!" ); + LOGGER.trace( e ); + broken = true; + } + } + + if( !broken ) { + try { + loadConfig(); + } catch (Exception e) { + LOGGER.error( identifier + " failed to load!" ); + LOGGER.trace( e ); + broken = true; + } + } + + } + + /** + * Queries a value from config, returns `null` if the + * key does not exist. + * + * @return value corresponding to the given key + * @see SimpleConfig#getOrDefault + */ + @Deprecated + public String get( String key ) { + return config.get( key ); + } + + /** + * Returns string value from config corresponding to the given + * key, or the default string if the key is missing. + * + * @return value corresponding to the given key, or the default value + */ + public String getOrDefault( String key, String def ) { + String val = get(key); + return val == null ? def : val; + } + + /** + * Returns integer value from config corresponding to the given + * key, or the default integer if the key is missing or invalid. + * + * @return value corresponding to the given key, or the default value + */ + public int getOrDefault( String key, int def ) { + try { + return Integer.parseInt( get(key) ); + } catch (Exception e) { + return def; + } + } + + /** + * Returns boolean value from config corresponding to the given + * key, or the default boolean if the key is missing. + * + * @return value corresponding to the given key, or the default value + */ + public boolean getOrDefault( String key, boolean def ) { + String val = get(key); + if( val != null ) { + return val.equalsIgnoreCase("true"); + } + + return def; + } + + /** + * Returns double value from config corresponding to the given + * key, or the default string if the key is missing or invalid. + * + * @return value corresponding to the given key, or the default value + */ + public double getOrDefault( String key, double def ) { + try { + return Double.parseDouble( get(key) ); + } catch (Exception e) { + return def; + } + } + + /** + * If any error occurred during loading or reading from the config + * a 'broken' flag is set, indicating that the config's state + * is undefined and should be discarded using `delete()` + * + * @return the 'broken' flag of the configuration + */ + public boolean isBroken() { + return broken; + } + + /** + * deletes the config file from the filesystem + * + * @return true if the operation was successful + */ + public boolean delete() { + LOGGER.warn( "Config '" + request.filename + "' was removed from existence! Restart the game to regenerate it." ); + return request.file.delete(); + } + +} diff --git a/src/main/java/net/serenas/shitmod/careFreeMelodyEffect.java b/src/main/java/net/serenas/shitmod/careFreeMelodyEffect.java index 1f1a38b..d39020e 100644 --- a/src/main/java/net/serenas/shitmod/careFreeMelodyEffect.java +++ b/src/main/java/net/serenas/shitmod/careFreeMelodyEffect.java @@ -8,5 +8,4 @@ public class careFreeMelodyEffect extends StatusEffect { protected careFreeMelodyEffect(StatusEffectCategory category, int color) { super(category, color); } - } diff --git a/src/main/java/net/serenas/shitmod/explosionAspectEnchantment.java b/src/main/java/net/serenas/shitmod/explosionAspectEnchantment.java index 5925c94..a220ec0 100644 --- a/src/main/java/net/serenas/shitmod/explosionAspectEnchantment.java +++ b/src/main/java/net/serenas/shitmod/explosionAspectEnchantment.java @@ -22,7 +22,7 @@ public class explosionAspectEnchantment extends Enchantment { @Override public int getMaxLevel() { - return 1; + return 5; } @Override @@ -30,7 +30,7 @@ public class explosionAspectEnchantment extends Enchantment { World world = user.world; if (target instanceof LivingEntity) { Vec3d pos = target.getPos(); - world.createExplosion(user, pos.x, pos.y, pos.z, 4.0F, Explosion.DestructionType.BREAK); + world.createExplosion(user, pos.x, pos.y, pos.z, level * 4.0F, Explosion.DestructionType.BREAK); } super.onTargetDamaged(user, target, level); }