config and copper
This commit is contained in:
parent
acbe4c8348
commit
67a0070395
20
build.gradle
20
build.gradle
@ -11,17 +11,24 @@ version = project.mod_version
|
|||||||
group = project.maven_group
|
group = project.maven_group
|
||||||
|
|
||||||
repositories {
|
repositories {
|
||||||
// Add repositories to retrieve artifacts from in here.
|
maven {
|
||||||
// You should only use this when depending on other mods because
|
url 'https://jitpack.io'
|
||||||
// Loom adds the essential maven repositories to download Minecraft and libraries from automatically.
|
}
|
||||||
// See https://docs.gradle.org/current/userguide/declaring_repositories.html
|
maven {
|
||||||
// for more information about repositories.
|
url "https://maven.terraformersmc.com/"
|
||||||
|
}
|
||||||
|
maven {
|
||||||
|
url "https://maven.shedaniel.me/"
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
repositories {
|
repositories {
|
||||||
maven {url = "https://maven.kyrptonaught.dev"}
|
maven {url = "https://maven.kyrptonaught.dev"}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
// To change the versions see the gradle.properties file
|
// To change the versions see the gradle.properties file
|
||||||
minecraft "com.mojang:minecraft:${project.minecraft_version}"
|
minecraft "com.mojang:minecraft:${project.minecraft_version}"
|
||||||
@ -33,6 +40,9 @@ dependencies {
|
|||||||
|
|
||||||
modImplementation 'net.kyrptonaught:customportalapi:0.0.1-beta47-1.18'
|
modImplementation 'net.kyrptonaught:customportalapi:0.0.1-beta47-1.18'
|
||||||
include 'net.kyrptonaught:customportalapi:0.0.1-beta47-1.18'
|
include 'net.kyrptonaught:customportalapi:0.0.1-beta47-1.18'
|
||||||
|
|
||||||
|
modImplementation("com.gitlab.Lortseam:completeconfig:1.3.3")
|
||||||
|
include 'com.gitlab.Lortseam:completeconfig:1.3.3'
|
||||||
}
|
}
|
||||||
|
|
||||||
processResources {
|
processResources {
|
||||||
|
7
src/main/java/net/serenas/shitmod/MyContainer.java
Normal file
7
src/main/java/net/serenas/shitmod/MyContainer.java
Normal file
@ -0,0 +1,7 @@
|
|||||||
|
package net.serenas.shitmod;
|
||||||
|
|
||||||
|
import me.lortseam.completeconfig.api.ConfigContainer;
|
||||||
|
|
||||||
|
public class MyContainer implements ConfigContainer {
|
||||||
|
|
||||||
|
}
|
@ -1,5 +1,6 @@
|
|||||||
package net.serenas.shitmod;
|
package net.serenas.shitmod;
|
||||||
|
|
||||||
|
import me.lortseam.completeconfig.data.Config;
|
||||||
import net.fabricmc.api.ModInitializer;
|
import net.fabricmc.api.ModInitializer;
|
||||||
import net.fabricmc.fabric.api.client.itemgroup.FabricItemGroupBuilder;
|
import net.fabricmc.fabric.api.client.itemgroup.FabricItemGroupBuilder;
|
||||||
import net.fabricmc.fabric.api.item.v1.FabricItemSettings;
|
import net.fabricmc.fabric.api.item.v1.FabricItemSettings;
|
||||||
@ -36,6 +37,8 @@ public class Shitmod implements ModInitializer {
|
|||||||
new Identifier("shitmod", "tools"),
|
new Identifier("shitmod", "tools"),
|
||||||
() -> new ItemStack(Shitmod.BLAZE_METAL_SHOVEL));
|
() -> new ItemStack(Shitmod.BLAZE_METAL_SHOVEL));
|
||||||
|
|
||||||
|
public static final Config config = new Config("shitmod", new MyContainer(), new configGroup());
|
||||||
|
|
||||||
public static final Item FABRIC_ITEM = new FabricItem(new Item.Settings().group(Shitmod.GENERAL_GROUP));
|
public static final Item FABRIC_ITEM = new FabricItem(new Item.Settings().group(Shitmod.GENERAL_GROUP));
|
||||||
|
|
||||||
public static final Block FABRIC_BLOCK = new FabricBlock();
|
public static final Block FABRIC_BLOCK = new FabricBlock();
|
||||||
@ -91,6 +94,8 @@ public class Shitmod implements ModInitializer {
|
|||||||
@Override
|
@Override
|
||||||
public void onInitialize() {
|
public void onInitialize() {
|
||||||
|
|
||||||
|
config.load();
|
||||||
|
|
||||||
Registry.register(Registry.ITEM, new Identifier("shitmod", "fabric_item"), FABRIC_ITEM);
|
Registry.register(Registry.ITEM, new Identifier("shitmod", "fabric_item"), FABRIC_ITEM);
|
||||||
|
|
||||||
Registry.register(Registry.BLOCK, new Identifier("shitmod", "fabric_block"), FABRIC_BLOCK);
|
Registry.register(Registry.BLOCK, new Identifier("shitmod", "fabric_block"), FABRIC_BLOCK);
|
||||||
|
@ -1,251 +0,0 @@
|
|||||||
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<String, String> 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();
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
@ -17,7 +17,6 @@ public class blazeMetalSword extends SwordItem {
|
|||||||
public blazeMetalSword(ToolMaterial toolMaterial, int attackDamage, float attackSpeed, Settings settings) {
|
public blazeMetalSword(ToolMaterial toolMaterial, int attackDamage, float attackSpeed, Settings settings) {
|
||||||
super(toolMaterial, attackDamage, attackSpeed, settings);
|
super(toolMaterial, attackDamage, attackSpeed, settings);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public TypedActionResult<ItemStack> use(World World, PlayerEntity PlayerEntity, Hand Hand) {
|
public TypedActionResult<ItemStack> use(World World, PlayerEntity PlayerEntity, Hand Hand) {
|
||||||
|
21
src/main/java/net/serenas/shitmod/configGroup.java
Normal file
21
src/main/java/net/serenas/shitmod/configGroup.java
Normal file
@ -0,0 +1,21 @@
|
|||||||
|
package net.serenas.shitmod;
|
||||||
|
|
||||||
|
import me.lortseam.completeconfig.api.ConfigEntry;
|
||||||
|
import me.lortseam.completeconfig.api.ConfigGroup;
|
||||||
|
|
||||||
|
public class configGroup implements ConfigGroup {
|
||||||
|
@ConfigEntry
|
||||||
|
private int swordFireballStrengthMultiplier = 1;
|
||||||
|
@ConfigEntry
|
||||||
|
private int axeFireballStrengthMultiplier = 1;
|
||||||
|
@ConfigEntry
|
||||||
|
private int explosionAspectStrengthMultiplier = 1;
|
||||||
|
@ConfigEntry
|
||||||
|
private int explosiveThornsStrengthMultiplier = 1;
|
||||||
|
|
||||||
|
public void setSetting(int explosionAspectStrengthMultiplier) {
|
||||||
|
this.explosionAspectStrengthMultiplier = explosionAspectStrengthMultiplier;
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
12
src/main/java/net/serenas/shitmod/copperAxe.java
Normal file
12
src/main/java/net/serenas/shitmod/copperAxe.java
Normal file
@ -0,0 +1,12 @@
|
|||||||
|
package net.serenas.shitmod;
|
||||||
|
|
||||||
|
import net.minecraft.item.AxeItem;
|
||||||
|
import net.minecraft.item.ToolMaterial;
|
||||||
|
|
||||||
|
public class copperAxe extends AxeItem {
|
||||||
|
|
||||||
|
protected copperAxe(ToolMaterial material, float attackDamage, float attackSpeed, Settings settings) {
|
||||||
|
super(material, attackDamage, attackSpeed, settings);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
12
src/main/java/net/serenas/shitmod/copperHoe.java
Normal file
12
src/main/java/net/serenas/shitmod/copperHoe.java
Normal file
@ -0,0 +1,12 @@
|
|||||||
|
package net.serenas.shitmod;
|
||||||
|
|
||||||
|
import net.minecraft.item.HoeItem;
|
||||||
|
import net.minecraft.item.ToolMaterial;
|
||||||
|
|
||||||
|
public class copperHoe extends HoeItem {
|
||||||
|
|
||||||
|
protected copperHoe(ToolMaterial material, int attackDamage, float attackSpeed, Settings settings) {
|
||||||
|
super(material, attackDamage, attackSpeed, settings);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
12
src/main/java/net/serenas/shitmod/copperPickaxe.java
Normal file
12
src/main/java/net/serenas/shitmod/copperPickaxe.java
Normal file
@ -0,0 +1,12 @@
|
|||||||
|
package net.serenas.shitmod;
|
||||||
|
|
||||||
|
import net.minecraft.item.PickaxeItem;
|
||||||
|
import net.minecraft.item.ToolMaterial;
|
||||||
|
|
||||||
|
public class copperPickaxe extends PickaxeItem {
|
||||||
|
|
||||||
|
protected copperPickaxe(ToolMaterial material, int attackDamage, float attackSpeed, Settings settings) {
|
||||||
|
super(material, attackDamage, attackSpeed, settings);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
12
src/main/java/net/serenas/shitmod/copperShovel.java
Normal file
12
src/main/java/net/serenas/shitmod/copperShovel.java
Normal file
@ -0,0 +1,12 @@
|
|||||||
|
package net.serenas.shitmod;
|
||||||
|
|
||||||
|
import net.minecraft.item.ShovelItem;
|
||||||
|
import net.minecraft.item.ToolMaterial;
|
||||||
|
|
||||||
|
public class copperShovel extends ShovelItem{
|
||||||
|
|
||||||
|
public copperShovel(ToolMaterial material, float attackDamage, float attackSpeed, Settings settings) {
|
||||||
|
super(material, attackDamage, attackSpeed, settings);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
12
src/main/java/net/serenas/shitmod/copperSword.java
Normal file
12
src/main/java/net/serenas/shitmod/copperSword.java
Normal file
@ -0,0 +1,12 @@
|
|||||||
|
package net.serenas.shitmod;
|
||||||
|
|
||||||
|
import net.minecraft.item.SwordItem;
|
||||||
|
import net.minecraft.item.ToolMaterial;
|
||||||
|
|
||||||
|
public class copperSword extends SwordItem {
|
||||||
|
|
||||||
|
public copperSword(ToolMaterial toolMaterial, int attackDamage, float attackSpeed, Settings settings) {
|
||||||
|
super(toolMaterial, attackDamage, attackSpeed, settings);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
@ -14,7 +14,7 @@ public class explosionAspectEnchantment extends Enchantment {
|
|||||||
super(Enchantment.Rarity.RARE, EnchantmentTarget.WEAPON, new EquipmentSlot[] {EquipmentSlot.MAINHAND});
|
super(Enchantment.Rarity.RARE, EnchantmentTarget.WEAPON, new EquipmentSlot[] {EquipmentSlot.MAINHAND});
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public int getMinPower(int level) {
|
public int getMinPower(int level) {
|
||||||
return 100;
|
return 100;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user