R3944Realms/CarryOn
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed configs not synching properly, added spanish translation

Browse Source
This commit is contained in:
Tschipp 2021-02-16 10:48:24 +01:00
parent af1012d7a3
commit 07e5153c40
6 changed files with 28 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gradle.properties
View File

@ -1,7 +1,7 @@
# Sets default memory used for gradle commands. Can be overridden by user or command line properties.
# This is required to provide enough memory for the Minecraft decompilation process.
org.gradle.jvmargs=-Xmx3G
version=1.15.2
version=1.15.3
minecraft_version=1.16.5
mcp_mappings=20201028-1.16.3
forge_version=36.0.22

4
src/main/java/tschipp/carryon/CarryOn.java
View File

@ -17,7 +17,6 @@ import net.minecraftforge.fml.common.Mod.EventBusSubscriber;
import net.minecraftforge.fml.config.ModConfig;
import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent;
import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
import net.minecraftforge.fml.loading.FMLPaths;
import net.minecraftforge.fml.network.NetworkDirection;
import net.minecraftforge.fml.network.NetworkRegistry;
import net.minecraftforge.fml.network.simple.SimpleChannel;
@ -56,9 +55,6 @@ public class CarryOn
ModLoadingContext.get().registerConfig(ModConfig.Type.CLIENT, Configs.CLIENT_CONFIG);
ModLoadingContext.get().registerConfig(ModConfig.Type.SERVER, Configs.SERVER_CONFIG);
Configs.loadConfig(Configs.CLIENT_CONFIG, FMLPaths.CONFIGDIR.get().resolve("carryon-client.toml"));
// Configs.loadConfig(Configs.SERVER_CONFIG, FMLPaths.CONFIGDIR.get().resolve("carryon-server.toml"));
info = ModLoadingContext.get().getActiveContainer().getModInfo();
}

33
src/main/java/tschipp/carryon/common/config/Configs.java
View File

@ -1,11 +1,10 @@
package tschipp.carryon.common.config;
import java.nio.file.Path;
import java.util.Arrays;
import java.util.List;
import com.electronwill.nightconfig.core.CommentedConfig;
import com.electronwill.nightconfig.core.file.CommentedFileConfig;
import com.electronwill.nightconfig.core.io.WritingMode;
import net.minecraftforge.common.ForgeConfigSpec;
import net.minecraftforge.common.ForgeConfigSpec.BooleanValue;
@ -14,11 +13,12 @@ import net.minecraftforge.common.ForgeConfigSpec.DoubleValue;
import net.minecraftforge.common.ForgeConfigSpec.IntValue;
import net.minecraftforge.eventbus.api.SubscribeEvent;
import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.common.Mod.EventBusSubscriber.Bus;
import net.minecraftforge.fml.config.ModConfig;
import tschipp.carryon.CarryOn;
import tschipp.carryon.common.handler.ListHandler;
@Mod.EventBusSubscriber
@Mod.EventBusSubscriber(modid = CarryOn.MODID, bus = Bus.MOD)
public class Configs {
private static final ForgeConfigSpec.Builder SERVER_BUILDER = new ForgeConfigSpec.Builder();
@ -39,34 +39,23 @@ public class Configs {
CLIENT_CONFIG = CLIENT_BUILDER.build();
}
public static void loadConfig(ForgeConfigSpec spec, Path path)
{
final CommentedFileConfig configData = CommentedFileConfig.builder(path)
.sync()
.autosave()
.autoreload()
.writingMode(WritingMode.REPLACE)
.preserveInsertionOrder()
.build();
CarryOn.LOGGER.debug("Loading CarryOn Config");
configData.load();
spec.setConfig(configData);
}
@SubscribeEvent
public static void onLoad(final ModConfig.Loading event)
{
}
@SubscribeEvent
public static void onChange(final ModConfig.Reloading event)
public static void onConfigChanged(ModConfig.Reloading event)
{
if(event.getConfig().getModId().equals(CarryOn.MODID))
if (event.getConfig().getModId().equals(CarryOn.MODID))
{
ListHandler.initConfigLists();
CommentedConfig cfg = event.getConfig().getConfigData();
if(cfg instanceof CommentedFileConfig)
((CommentedFileConfig) cfg).load();
}
}

16
src/main/java/tschipp/carryon/common/event/ItemEvents.java
View File

@ -41,9 +41,7 @@ import net.minecraftforge.eventbus.api.Event.Result;
import net.minecraftforge.eventbus.api.EventPriority;
import net.minecraftforge.eventbus.api.SubscribeEvent;
import net.minecraftforge.fml.common.Mod.EventBusSubscriber;
import net.minecraftforge.fml.config.ModConfig;
import net.minecraftforge.fml.event.server.FMLServerStartingEvent;
import net.minecraftforge.fml.loading.FMLPaths;
import net.minecraftforge.fml.network.PacketDistributor;
import net.minecraftforge.fml.network.PacketDistributor.TargetPoint;
import net.minecraftforge.items.CapabilityItemHandler;
@ -51,12 +49,10 @@ import net.minecraftforge.items.IItemHandler;
import tschipp.carryon.CarryOn;
import tschipp.carryon.client.keybinds.CarryOnKeybinds;
import tschipp.carryon.common.command.CommandCarryOn;
import tschipp.carryon.common.config.Configs;
import tschipp.carryon.common.config.Configs.Settings;
import tschipp.carryon.common.handler.CustomPickupOverrideHandler;
import tschipp.carryon.common.handler.ListHandler;
import tschipp.carryon.common.handler.PickupHandler;
import tschipp.carryon.common.handler.PickupHandler.PickUpBlockEvent;
import tschipp.carryon.common.handler.RegistrationHandler;
import tschipp.carryon.common.item.ItemCarryonBlock;
import tschipp.carryon.common.item.ItemCarryonEntity;
@ -523,18 +519,6 @@ public class ItemEvents
}
}
@SubscribeEvent
public void onConfigChanged(ModConfig.Reloading event)
{
if (event.getConfig().getModId().equals(CarryOn.MODID))
{
ListHandler.initConfigLists();
Configs.loadConfig(Configs.CLIENT_CONFIG, FMLPaths.CONFIGDIR.get().resolve("carryon-client.toml"));
Configs.loadConfig(Configs.CLIENT_CONFIG, FMLPaths.CONFIGDIR.get().resolve("carryon-server.toml"));
}
}
public int getSlot(PlayerEntity player, Item item)
{
for (int i = 0; i < player.inventory.getSizeInventory(); i++)

25
src/main/java/tschipp/carryon/common/handler/CustomPickupOverrideHandler.java
View File

@ -2,10 +2,6 @@ package tschipp.carryon.common.handler;
import java.util.HashMap;
import java.util.List;
import java.util.Map.Entry;
import java.util.function.Function;
import javax.annotation.Nullable;
import com.mojang.brigadier.StringReader;
import com.mojang.brigadier.exceptions.CommandSyntaxException;
@ -13,7 +9,6 @@ import com.mojang.brigadier.exceptions.CommandSyntaxException;
import net.minecraft.block.BlockState;
import net.minecraft.command.arguments.BlockStateParser;
import net.minecraft.entity.Entity;
import net.minecraft.state.Property;
import net.minecraftforge.fml.ModList;
import net.minecraftforge.registries.ForgeRegistries;
import tschipp.carryon.common.config.Configs.CustomPickupConditions;
@ -83,26 +78,6 @@ public class CustomPickupOverrideHandler
}
}
private static final Function<Entry<Property<?>, Comparable<?>>, String> func = new Function<Entry<Property<?>, Comparable<?>>, String>() {
public String apply(@Nullable Entry<Property<?>, Comparable<?>> p_apply_1_)
{
if (p_apply_1_ == null)
{
return "<NULL>";
}
else
{
Property<?> property = p_apply_1_.getKey();
return property.getName() + "=" + this.func_235905_a_(property, p_apply_1_.getValue());
}
}
@SuppressWarnings("unchecked")
private <T extends Comparable<T>> String func_235905_a_(Property<T> p_235905_1_, Comparable<?> comp)
{
return p_235905_1_.getName((T) comp);
}
};
public static boolean hasSpecialPickupConditions(BlockState state)
{

16
src/main/resources/assets/carryon/lang/es_es.json Normal file
View File

@ -0,0 +1,16 @@
{
"carryon.category.settings": "Configuración",
"carryon.category.blacklist": "Lista negra",
"carryon.category.modeloverrides": "Reescribir modelo (Avanzado)",
"carryon.category.custompickupconditions": "Customizar condiciones de recoger (Avanzado)",
"carryon.category.whitelist": "Lista blanca",
"carryon.general.modeloverrides.modeloverrides": "Reescribir modelo",
"carryon.general.blacklist.forbiddenentities": "Entidades que el jugador no puede recoger",
"carryon.general.blacklist.forbiddentiles": "Bloques que el jugador no puede recoger",
"carryon.category.custompickupconditions.custompickupconditionsblocks": "Customizar condiciones para recoger bloques",
"carryon.category.custompickupconditions.custompickupconditionsentities": "Customizar condiciones para recoger entidades",
"key.carry.desc": "Agarrar",
"key.carry.category": "Carry On"
}