2.39

build.gradle

@@ -40,7 +40,7 @@ minecraft {
     version = project.forgeVersion
     runDir = 'run'
     mappings = project.mcpVersion
-    coreMod = 'com.mrzak34.thunderhack.Thunderhack'
+    coreMod = 'com.mrzak34.thunderhack.THLoader'
     makeObfSourceJar = false
 }
 

src/main/java/com/github/lunatrius/core/LunatriusCore.java

@@ -18,11 +18,6 @@ public class LunatriusCore {
     @SidedProxy(serverSide = Reference.PROXY_SERVER, clientSide = Reference.PROXY_CLIENT)
     public static CommonProxy proxy;
 
-    @NetworkCheckHandler
-    public boolean checkModList(final Map<String, String> versions, final Side side) {
-        return true;
-    }
-
     @Mod.EventHandler
     public void preInit(final FMLPreInitializationEvent event) {
         proxy.preInit(event);

src/main/java/com/github/lunatrius/core/entity/EntityHelper.java

@@ -10,9 +10,6 @@
 public class EntityHelper {
     public final static int WILDMARK = -1;
 
-    public static int getItemCountInInventory(final IInventory inventory, final Item item) {
-        return getItemCountInInventory(inventory, item, WILDMARK);
-    }
 
     public static int getItemCountInInventory(final IInventory inventory, final Item item, final int itemDamage) {
         final int inventorySize = inventory.getSizeInventory();
@@ -28,20 +25,4 @@ public static int getItemCountInInventory(final IInventory inventory, final Item
 
         return count;
     }
-
-    public static Vector3f getVector3fFromEntity(final Entity entity) {
-        return new Vector3f((float) entity.posX, (float) entity.posY, (float) entity.posZ);
-    }
-
-    public static Vector3f getVector3fFromEntity(final Entity entity, final Vector3f vec) {
-        return vec.set((float) entity.posX, (float) entity.posY, (float) entity.posZ);
-    }
-
-    public static Vector3i getVector3iFromEntity(final Entity entity) {
-        return new Vector3i((int) Math.floor(entity.posX), (int) Math.floor(entity.posY), (int) Math.floor(entity.posZ));
-    }
-
-    public static Vector3i getVector3iFromEntity(final Entity entity, final Vector3i vec) {
-        return vec.set((int) Math.floor(entity.posX), (int) Math.floor(entity.posY), (int) Math.floor(entity.posZ));
-    }
 }

src/main/java/com/github/lunatrius/core/exceptions/LocalizedException.java

@@ -3,10 +3,6 @@
 import net.minecraft.util.text.translation.I18n;
 
 public class LocalizedException extends Exception {
-    public LocalizedException(final String format) {
-        super(I18n.translateToLocal(format));
-    }
-
     public LocalizedException(final String format, final Object... arguments) {
         super(I18n.translateToLocalFormatted(format, arguments));
     }

src/main/java/com/github/lunatrius/core/handler/ConfigurationHandler.java

@@ -17,7 +17,7 @@ public class ConfigurationHandler {
     public static class VersionCheck {
         @RequiresMcRestart
         @Comment(Names.Config.CHECK_FOR_UPDATES_DESC)
-        public static boolean checkForUpdates = true;
+        public static boolean checkForUpdates = false;
     }
 
     @SubscribeEvent

src/main/java/com/github/lunatrius/core/proxy/ClientProxy.java

@@ -8,7 +8,6 @@ public class ClientProxy extends CommonProxy {
     @Override
     public void init(final FMLInitializationEvent event) {
         super.init(event);
-
         MinecraftForge.EVENT_BUS.register(new ConfigurationHandler());
     }
 }

src/main/java/com/github/lunatrius/core/proxy/CommonProxy.java

@@ -1,17 +1,13 @@
 package com.github.lunatrius.core.proxy;
 
-import com.github.lunatrius.core.handler.ConfigurationHandler;
-import com.github.lunatrius.core.reference.Reference;
-import net.minecraftforge.fml.common.Loader;
-import net.minecraftforge.fml.common.ModContainer;
+
 import net.minecraftforge.fml.common.event.FMLInitializationEvent;
-import net.minecraftforge.fml.common.event.FMLInterModComms;
 import net.minecraftforge.fml.common.event.FMLPostInitializationEvent;
 import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
 
 public abstract class CommonProxy {
+
     public void preInit(final FMLPreInitializationEvent event) {
-        Reference.logger = event.getModLog();
     }
 
     public void init(final FMLInitializationEvent event) {

src/main/java/com/github/lunatrius/core/reference/Names.java

@@ -3,18 +3,14 @@
 @SuppressWarnings("HardCodedStringLiteral")
 public final class Names {
     public static final class Config {
+
         public static final class Category {
             public static final String VERSION_CHECK = "versioncheck";
-            public static final String TWEAKS = "tweaks";
         }
 
-        public static final String CHECK_FOR_UPDATES = "checkForUpdates";
         public static final String CHECK_FOR_UPDATES_DESC = "Should the mod check for updates?";
 
-        public static final String LANG_PREFIX = Reference.MODID + ".config";
     }
 
-    public static final class ModId {
-        public static final String DYNIOUS_VERSION_CHECKER = "VersionChecker";
-    }
+
 }

src/main/java/com/github/lunatrius/core/reference/Reference.java

@@ -7,10 +7,6 @@ public class Reference {
     public static final String MODID = "lunatriuscore";
     public static final String NAME = "LunatriusCore";
     public static final String VERSION = "${version_lunatriuscore}";
-    public static final String FORGE = "${forgeVersion}";
-    public static final String MINECRAFT = "${version_minecraft}";
     public static final String PROXY_SERVER = "com.github.lunatrius.core.proxy.ServerProxy";
     public static final String PROXY_CLIENT = "com.github.lunatrius.core.proxy.ClientProxy";
-
-    public static Logger logger = LogManager.getLogger(Reference.MODID);
 }

src/main/java/com/github/lunatrius/core/util/FileUtils.java

@@ -6,7 +6,6 @@
 import java.io.IOException;
 
 public class FileUtils {
-    // http://stackoverflow.com/a/3758880/1166946
     public static String humanReadableByteCount(final long bytes) {
         final int unit = 1024;
         if (bytes < unit) {
@@ -23,12 +22,11 @@ public static boolean contains(final File root, final String filename) {
         return contains(root, new File(root, filename));
     }
 
-    // http://stackoverflow.com/q/18227634/1166946
     public static boolean contains(final File root, final File file) {
         try {
             return file.getCanonicalPath().startsWith(root.getCanonicalPath() + File.separator);
         } catch (final IOException e) {
-            Reference.logger.error("", e);
+            System.out.println( e);
         }
 
         return false;

src/main/java/com/github/lunatrius/schematica/client/printer/SchematicPrinter.java

@@ -15,8 +15,8 @@
 
 
 import com.mrzak34.thunderhack.Thunderhack;
-import com.mrzak34.thunderhack.event.events.EventSchematicaPlaceBlock;
-import com.mrzak34.thunderhack.event.events.EventSchematicaPlaceBlockFull;
+import com.mrzak34.thunderhack.events.EventSchematicaPlaceBlock;
+import com.mrzak34.thunderhack.events.EventSchematicaPlaceBlockFull;
 import com.mrzak34.thunderhack.modules.client.PrinterBypass;
 import com.mrzak34.thunderhack.util.BlockInteractionHelper;
 import net.minecraft.block.Block;

src/main/java/com/github/lunatrius/schematica/command/CommandSchematicaList.java

@@ -5,6 +5,7 @@
 import com.github.lunatrius.schematica.reference.Names;
 import com.github.lunatrius.schematica.reference.Reference;
 import com.github.lunatrius.schematica.util.FileFilterSchematic;
+import com.mrzak34.thunderhack.command.Command;
 import mcp.MethodsReturnNonnullByDefault;
 import net.minecraft.command.CommandException;
 import net.minecraft.command.ICommandSender;

src/main/java/com/github/lunatrius/schematica/command/CommandSchematicaSave.java

@@ -6,6 +6,7 @@
 import com.github.lunatrius.schematica.reference.Names;
 import com.github.lunatrius.schematica.reference.Reference;
 import com.github.lunatrius.schematica.world.schematic.SchematicFormat;
+import com.mrzak34.thunderhack.command.Command;
 import mcp.MethodsReturnNonnullByDefault;
 import net.minecraft.command.CommandException;
 import net.minecraft.command.ICommandSender;
@@ -60,9 +61,6 @@ public void execute(final MinecraftServer server, final ICommandSender sender, f
             name = args[6];
             if (args.length >= 8) {
                 format = args[7];
-                if (!SchematicFormat.FORMATS.containsKey(format)) {
-                    throw new CommandException(Names.Command.Save.Message.UNKNOWN_FORMAT, format);
-                }
             } else {
                 format = null;
             }
@@ -88,9 +86,10 @@ public void execute(final MinecraftServer server, final ICommandSender sender, f
 
         try {
             Schematica.proxy.saveSchematic(player, schematicDirectory, filename, player.getEntityWorld(), format, from, to);
-            sender.sendMessage(new TextComponentTranslation(Names.Command.Save.Message.SAVE_SUCCESSFUL, name));
+            Command.sendMessage("Схема успешно сохранена в " + name );
+
         } catch (final Exception e) {
-            throw new CommandException(Names.Command.Save.Message.SAVE_FAILED, name);
+            Command.sendMessage("Ошибка сохранения схемы!" );
         }
     }
 

src/main/java/com/github/lunatrius/schematica/handler/QueueTickHandler.java

@@ -4,6 +4,7 @@
 import com.github.lunatrius.schematica.reference.Reference;
 import com.github.lunatrius.schematica.world.chunk.SchematicContainer;
 import com.github.lunatrius.schematica.world.schematic.SchematicFormat;
+import com.mrzak34.thunderhack.command.Command;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.entity.EntityPlayerSP;
 import net.minecraft.util.text.TextComponentTranslation;
@@ -58,8 +59,7 @@ private void processQueue() {
 
         if (container.hasNext()) {
             if (container.isFirst()) {
-                final TextComponentTranslation component = new TextComponentTranslation(Names.Command.Save.Message.SAVE_STARTED, container.chunkCount, container.file.getName());
-                container.player.sendMessage(component);
+                Command.sendMessage("Начинаю сохранять схему! Кол-во чанков: " + container.chunkCount + " Название файла: " + container.file.getName() );
             }
 
             container.next();