Fix all remaining errors in mantle's code, rename a few classes to match the new naming scheme. Sorry KnightMiner <3

This commit is contained in:
alexbegt committed 2019-06-25 13:32:57 -04:00
1 parent 5a1b21ea1c
commit 5ef2555b69
117 files changed
+2236 -2616

No files matched your search

@@ -3,6 +3,7 @@ package slimeknights.mantle.config;
import net.minecraft.client.Minecraft;
import net.minecraft.client.entity.player.ClientPlayerEntity;
import net.minecraft.entity.player.ServerPlayerEntity;
import net.minecraft.network.PacketBuffer;
import net.minecraft.util.text.StringTextComponent;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.api.distmarker.OnlyIn;
@@ -13,22 +14,19 @@ import net.minecraftforge.fml.common.gameevent.TickEvent;
import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent;
import net.minecraftforge.fml.loading.FMLEnvironment;
import net.minecraftforge.fml.loading.FMLPaths;
import slimeknights.mantle.network.NetworkWrapper;
import java.io.File;
import slimeknights.mantle.network.NetworkWrapper;
class ExampleSync
{
class ExampleSync {
static NetworkWrapper networkWrapper;
static ExampleSync INSTANCE;
static void setup()
{
static void setup() {
networkWrapper = new NetworkWrapper("mantle:example");
networkWrapper.registerPacket(ExampleSyncPacketImpl.class, ExampleSyncPacketImpl::encode, ExampleSyncPacketImpl::decode, ExampleSyncPacketImpl.Handler::handle);
networkWrapper.registerPacket(ExampleSyncPacketImpl.class, ExampleSyncPacketImpl::encode, ExampleSyncPacketImpl::new, ExampleSyncPacketImpl::handle);
INSTANCE = new ExampleSync();
}
@@ -37,10 +35,8 @@ class ExampleSync
@SubscribeEvent
@OnlyIn(Dist.DEDICATED_SERVER)
public void playerLoggedIn(PlayerEvent.PlayerLoggedInEvent event)
{
if (event.getPlayer() instanceof ServerPlayerEntity && FMLEnvironment.dist.isDedicatedServer())
{
public void playerLoggedIn(PlayerEvent.PlayerLoggedInEvent event) {
if (event.getPlayer() instanceof ServerPlayerEntity && FMLEnvironment.dist.isDedicatedServer()) {
ExampleSyncPacketImpl packet = new ExampleSyncPacketImpl();
networkWrapper.sendTo(packet, (ServerPlayerEntity) event.getPlayer());
}
@@ -48,73 +44,69 @@ class ExampleSync
@SubscribeEvent
@OnlyIn(Dist.CLIENT)
public void playerJoinedWorld(TickEvent.ClientTickEvent event)
{
public void playerJoinedWorld(TickEvent.ClientTickEvent event) {
ClientPlayerEntity player = Minecraft.getInstance().player;
if (needsRestart)
{
if (needsRestart) {
player.sendMessage(new StringTextComponent("Configs synced with server. Configs require a restart"));
}
else
{
else {
player.sendMessage(new StringTextComponent("Configs synced with server."));
}
MinecraftForge.EVENT_BUS.unregister(this);
}
static class ExampleConfig extends AbstractConfig
{
static class ExampleConfig extends AbstractConfig {
static ExampleConfig INSTANCE = new ExampleConfig();
ExampleConfigFile exampleConfigFile;
// call from preinit or something
public void onPreInit(final FMLCommonSetupEvent event)
{
exampleConfigFile = this.load(new ExampleConfigFile(FMLPaths.CONFIGDIR.get().toFile()), ExampleConfigFile.class);
public void onPreInit(final FMLCommonSetupEvent event) {
this.exampleConfigFile = this.load(new ExampleConfigFile(FMLPaths.CONFIGDIR.get().toFile()), ExampleConfigFile.class);
// register this serverside to sync
if (FMLEnvironment.dist.isDedicatedServer())
{
if (FMLEnvironment.dist.isDedicatedServer()) {
MinecraftForge.EVENT_BUS.register(INSTANCE);
}
}
}
static class ExampleConfigFile extends AbstractConfigFile
{
static class ExampleConfigFile extends AbstractConfigFile {
public ExampleConfigFile(File configFolder)
{
public ExampleConfigFile(File configFolder) {
super(configFolder, "exampleconfigfile");
}
@Override
public void insertDefaults()
{
public void insertDefaults() {
// no default values that need to initialized dynamically
}
@Override
protected int getConfigVersion()
{
protected int getConfigVersion() {
return 1;
}
}
static class ExampleSyncPacketImpl extends AbstractConfigSyncPacket
{
static class ExampleSyncPacketImpl extends AbstractConfigSyncPacket {
protected static AbstractConfig getConfig()
{
public ExampleSyncPacketImpl(PacketBuffer buffer) {
super(buffer);
}
public ExampleSyncPacketImpl() {
super();
}
@Override
protected AbstractConfig getConfig() {
return ExampleConfig.INSTANCE;
}
@Override
protected boolean sync()
{
if (super.sync())
{
protected boolean sync() {
if (super.sync()) {
// clientside register only
MinecraftForge.EVENT_BUS.register(INSTANCE);
return true;