From 424e7c8c19768f9f375440cf1b4b3420fb279a11 Mon Sep 17 00:00:00 2001 From: Xamora64 <49618907+Xamora64@users.noreply.github.com> Date: Sun, 15 Sep 2024 15:43:17 +0200 Subject: [PATCH] remove useless import, change folder name because strange crash building mod --- README.md | 2 +- .../BlockHelper.java | 3 +-- .../ChunkObfuscator.java | 2 +- .../{Orebfuscator => orebfuscator}/Fields.java | 2 +- java/{Orebfuscator => orebfuscator}/Log.java | 8 +------- .../MapChunkBulkObfuscator.java | 12 ++++-------- .../Options.java | 6 +----- .../Orebfuscator.java | 18 +++--------------- .../PlayerHandler.java | 11 +---------- .../PlayerInjector.java | 9 +-------- .../ProxyChannel.java | 3 +-- resources/mcmod.info | 4 ++-- 12 files changed, 18 insertions(+), 62 deletions(-) rename java/{Orebfuscator => orebfuscator}/BlockHelper.java (96%) rename java/{Orebfuscator => orebfuscator}/ChunkObfuscator.java (99%) rename java/{Orebfuscator => orebfuscator}/Fields.java (99%) rename java/{Orebfuscator => orebfuscator}/Log.java (80%) rename java/{Orebfuscator => orebfuscator}/MapChunkBulkObfuscator.java (85%) rename java/{Orebfuscator => orebfuscator}/Options.java (98%) rename java/{Orebfuscator => orebfuscator}/Orebfuscator.java (67%) rename java/{Orebfuscator => orebfuscator}/PlayerHandler.java (84%) rename java/{Orebfuscator => orebfuscator}/PlayerInjector.java (69%) rename java/{Orebfuscator => orebfuscator}/ProxyChannel.java (98%) diff --git a/README.md b/README.md index bdf8714..d9dbbd2 100644 --- a/README.md +++ b/README.md @@ -3,4 +3,4 @@ orebfuscator for mcpc+ 1.7.10
Fix issue and remove random crash in chunk load original fork: https://github.com/shsa/orebfuscator
-original idea: https://github.com/Shevchik/Orebfuscator +original idea: https://github.com/Shevchik/orebfuscator diff --git a/java/Orebfuscator/BlockHelper.java b/java/orebfuscator/BlockHelper.java similarity index 96% rename from java/Orebfuscator/BlockHelper.java rename to java/orebfuscator/BlockHelper.java index 980e594..a33ccd2 100644 --- a/java/Orebfuscator/BlockHelper.java +++ b/java/orebfuscator/BlockHelper.java @@ -1,6 +1,5 @@ -package Orebfuscator; +package orebfuscator; -import net.minecraft.block.Block; import net.minecraft.world.World; import net.minecraft.world.chunk.Chunk; import net.minecraft.world.chunk.storage.ExtendedBlockStorage; diff --git a/java/Orebfuscator/ChunkObfuscator.java b/java/orebfuscator/ChunkObfuscator.java similarity index 99% rename from java/Orebfuscator/ChunkObfuscator.java rename to java/orebfuscator/ChunkObfuscator.java index 6d29fbf..dec94d8 100644 --- a/java/Orebfuscator/ChunkObfuscator.java +++ b/java/orebfuscator/ChunkObfuscator.java @@ -1,4 +1,4 @@ -package Orebfuscator; +package orebfuscator; import net.minecraft.block.Block; import net.minecraft.world.World; diff --git a/java/Orebfuscator/Fields.java b/java/orebfuscator/Fields.java similarity index 99% rename from java/Orebfuscator/Fields.java rename to java/orebfuscator/Fields.java index d071c88..1ff91eb 100644 --- a/java/Orebfuscator/Fields.java +++ b/java/orebfuscator/Fields.java @@ -1,4 +1,4 @@ -package Orebfuscator; +package orebfuscator; import java.lang.reflect.Field; diff --git a/java/Orebfuscator/Log.java b/java/orebfuscator/Log.java similarity index 80% rename from java/Orebfuscator/Log.java rename to java/orebfuscator/Log.java index 9b69e43..6773a08 100644 --- a/java/Orebfuscator/Log.java +++ b/java/orebfuscator/Log.java @@ -1,14 +1,8 @@ -package Orebfuscator; - -import java.util.Locale; +package orebfuscator; import org.apache.logging.log4j.Level; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.apache.logging.log4j.ThreadContext; - -import cpw.mods.fml.common.TracingPrintStream; -import cpw.mods.fml.relauncher.FMLRelaunchLog; public class Log { diff --git a/java/Orebfuscator/MapChunkBulkObfuscator.java b/java/orebfuscator/MapChunkBulkObfuscator.java similarity index 85% rename from java/Orebfuscator/MapChunkBulkObfuscator.java rename to java/orebfuscator/MapChunkBulkObfuscator.java index 94e675d..41cc515 100644 --- a/java/Orebfuscator/MapChunkBulkObfuscator.java +++ b/java/orebfuscator/MapChunkBulkObfuscator.java @@ -1,13 +1,9 @@ -package Orebfuscator; +package orebfuscator; import java.lang.reflect.Field; -import java.util.ArrayList; -import net.minecraft.network.EnumConnectionState; import net.minecraft.network.play.server.S26PacketMapChunkBulk; -import net.minecraft.server.MinecraftServer; import net.minecraft.world.World; -import net.minecraft.world.chunk.Chunk; public class MapChunkBulkObfuscator { @@ -16,13 +12,13 @@ public class MapChunkBulkObfuscator public static Field fieldHasSky; - // 1110011 - íàáîð áëîêîâ (ExtendedBlockStorage.blockLSBArray) ïî âûñîòå (1 - åñòü áëîê, 0 - íåò áëîêà) + // 1110011 - ����� ������ (ExtendedBlockStorage.blockLSBArray) �� ������ (1 - ���� ����, 0 - ��� �����) public static Field fieldStatusLSB = null; - // 0001110 - íàáîð áëîêîâ (ExtendedBlockStorage.blockMSBArray) ïî âûñîòå (1 - åñòü áëîê, 0 - íåò áëîêà) + // 0001110 - ����� ������ (ExtendedBlockStorage.blockMSBArray) �� ������ (1 - ���� ����, 0 - ��� �����) public static Field fieldStatusMSB; - // -- ìàññèâ äàííûõ + // -- ������ ������ public static Field fieldData; public static Field field_149268_i; diff --git a/java/Orebfuscator/Options.java b/java/orebfuscator/Options.java similarity index 98% rename from java/Orebfuscator/Options.java rename to java/orebfuscator/Options.java index 241d265..2abb3bd 100644 --- a/java/Orebfuscator/Options.java +++ b/java/orebfuscator/Options.java @@ -1,16 +1,12 @@ -package Orebfuscator; +package orebfuscator; import java.io.File; -import java.net.URLClassLoader; import java.util.ArrayList; import java.util.HashMap; -import java.util.HashSet; import net.minecraft.block.Block; -import net.minecraft.block.material.Material; import net.minecraft.init.Blocks; import net.minecraft.world.World; -import net.minecraft.world.WorldProvider; import net.minecraft.world.WorldProviderEnd; import net.minecraft.world.WorldProviderHell; import net.minecraft.world.WorldProviderSurface; diff --git a/java/Orebfuscator/Orebfuscator.java b/java/orebfuscator/Orebfuscator.java similarity index 67% rename from java/Orebfuscator/Orebfuscator.java rename to java/orebfuscator/Orebfuscator.java index 3edd788..5e3bd07 100644 --- a/java/Orebfuscator/Orebfuscator.java +++ b/java/orebfuscator/Orebfuscator.java @@ -1,16 +1,7 @@ -package Orebfuscator; +package orebfuscator; -import java.io.File; -import java.lang.reflect.Method; -import java.util.HashSet; - -import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.network.EnumConnectionState; -import net.minecraft.network.NetHandlerPlayServer; -import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.common.config.Configuration; import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.Mod; import cpw.mods.fml.common.Mod.EventHandler; @@ -18,15 +9,12 @@ import cpw.mods.fml.common.event.FMLInitializationEvent; import cpw.mods.fml.common.event.FMLPreInitializationEvent; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.gameevent.PlayerEvent; -import cpw.mods.fml.common.network.FMLNetworkEvent; -import cpw.mods.fml.common.network.simpleimpl.SimpleNetworkWrapper; -import cpw.mods.fml.relauncher.ReflectionHelper; @Mod(modid = Orebfuscator.MODID, version = Orebfuscator.VERSION, acceptableRemoteVersions = "*") public class Orebfuscator { - public static final String MODID = "Orebfuscator"; - public static final String VERSION = "0.4"; + public static final String MODID = "orebfuscator"; + public static final String VERSION = "0.5"; @EventHandler public void init(FMLInitializationEvent event) diff --git a/java/Orebfuscator/PlayerHandler.java b/java/orebfuscator/PlayerHandler.java similarity index 84% rename from java/Orebfuscator/PlayerHandler.java rename to java/orebfuscator/PlayerHandler.java index e54c284..c967113 100644 --- a/java/Orebfuscator/PlayerHandler.java +++ b/java/orebfuscator/PlayerHandler.java @@ -1,19 +1,10 @@ -package Orebfuscator; +package orebfuscator; import java.util.HashMap; import java.util.Map; -import java.util.concurrent.Callable; -import Orebfuscator.Options.WorldOptions; -import net.minecraft.block.Block; -import net.minecraft.crash.CrashReport; -import net.minecraft.crash.CrashReportCategory; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Blocks; -import net.minecraft.util.ReportedException; import net.minecraft.world.World; -import net.minecraft.world.chunk.Chunk; -import net.minecraft.world.chunk.storage.ExtendedBlockStorage; import net.minecraftforge.event.entity.player.PlayerEvent; import net.minecraftforge.event.world.BlockEvent; import cpw.mods.fml.common.eventhandler.SubscribeEvent; diff --git a/java/Orebfuscator/PlayerInjector.java b/java/orebfuscator/PlayerInjector.java similarity index 69% rename from java/Orebfuscator/PlayerInjector.java rename to java/orebfuscator/PlayerInjector.java index 395c4e0..6a8dee2 100644 --- a/java/Orebfuscator/PlayerInjector.java +++ b/java/orebfuscator/PlayerInjector.java @@ -1,16 +1,9 @@ -package Orebfuscator; +package orebfuscator; import io.netty.channel.Channel; -import java.lang.reflect.Field; -import java.lang.reflect.Method; -import java.util.Queue; - -import cpw.mods.fml.relauncher.ReflectionHelper; import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.network.NetHandlerPlayServer; import net.minecraft.network.NetworkManager; -import net.minecraft.network.Packet; public class PlayerInjector { diff --git a/java/Orebfuscator/ProxyChannel.java b/java/orebfuscator/ProxyChannel.java similarity index 98% rename from java/Orebfuscator/ProxyChannel.java rename to java/orebfuscator/ProxyChannel.java index 06c4f6d..3ec46bb 100644 --- a/java/Orebfuscator/ProxyChannel.java +++ b/java/orebfuscator/ProxyChannel.java @@ -1,9 +1,8 @@ -package Orebfuscator; +package orebfuscator; import java.net.SocketAddress; import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.network.play.server.S23PacketBlockChange; import net.minecraft.network.play.server.S26PacketMapChunkBulk; import io.netty.buffer.ByteBufAllocator; import io.netty.channel.Channel; diff --git a/resources/mcmod.info b/resources/mcmod.info index 3856b5f..72165ab 100644 --- a/resources/mcmod.info +++ b/resources/mcmod.info @@ -1,7 +1,7 @@ [ { - "modid": "Orebfuscator", - "name": "Orebfuscator", + "modid": "orebfuscator", + "name": "", "description": "", "version": "${version}", "mcversion": "${mcversion}",