DIvan2000/ReplayModCinematic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add logging to BetterSprinting compat class

Browse Source
This commit is contained in:
Jonas Herzig
2017-10-31 11:11:03 +01:00
parent 1c888aadc2
commit bfbaec44ba
2 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/com/replaymod/compat/ReplayModCompat.java
View File

@@ -7,7 +7,9 @@ import com.replaymod.compat.shaders.ShaderBeginRender;
import net.minecraftforge.fml.common.FMLCommonHandler; import net.minecraftforge.fml.common.FMLCommonHandler;
import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.common.event.FMLInitializationEvent; import net.minecraftforge.fml.common.event.FMLInitializationEvent;
import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
import net.minecraftforge.fml.common.eventhandler.EventBus; import net.minecraftforge.fml.common.eventhandler.EventBus;
import org.apache.logging.log4j.Logger;
@Mod(modid = ReplayModCompat.MOD_ID, @Mod(modid = ReplayModCompat.MOD_ID,
version = "@MOD_VERSION@", version = "@MOD_VERSION@",
@@ -17,6 +19,13 @@ import net.minecraftforge.fml.common.eventhandler.EventBus;
public class ReplayModCompat { public class ReplayModCompat {
public static final String MOD_ID = "replaymod-compat"; public static final String MOD_ID = "replaymod-compat";
public static Logger LOGGER;
@Mod.EventHandler
public void preInit(FMLPreInitializationEvent event) {
LOGGER = event.getModLog();
}
@Mod.EventHandler @Mod.EventHandler
public void init(FMLInitializationEvent event) { public void init(FMLInitializationEvent event) {
EventBus bus = FMLCommonHandler.instance().bus(); EventBus bus = FMLCommonHandler.instance().bus();

8
src/main/java/com/replaymod/compat/bettersprinting/DisableBetterSprinting.java
View File

@@ -20,6 +20,8 @@ import net.minecraftforge.fml.common.versioning.VersionRange;
import java.util.Collections; import java.util.Collections;
import static com.replaymod.compat.ReplayModCompat.LOGGER;
/** /**
* Old Better Sprinting versions replace the vanilla player with their own, overridden instance (replacing the camera entity). * Old Better Sprinting versions replace the vanilla player with their own, overridden instance (replacing the camera entity).
* *
@@ -39,7 +41,9 @@ public class DisableBetterSprinting {
.ifPresent($_ -> MinecraftForge.EVENT_BUS.register(new DisableBetterSprinting())); .ifPresent($_ -> MinecraftForge.EVENT_BUS.register(new DisableBetterSprinting()));
} }
private DisableBetterSprinting() {} private DisableBetterSprinting() {
LOGGER.info("BetterSprinting workaround enabled");
}
private final Minecraft mc = Minecraft.getMinecraft(); private final Minecraft mc = Minecraft.getMinecraft();
private PlayerControllerMP originalController; private PlayerControllerMP originalController;
@@ -66,6 +70,7 @@ public class DisableBetterSprinting {
// Suppress this message if it's the Better Sprinting warning message // Suppress this message if it's the Better Sprinting warning message
for (StackTraceElement elem : Thread.currentThread().getStackTrace()) { for (StackTraceElement elem : Thread.currentThread().getStackTrace()) {
if (LOGIC_CLASS_NAME.equals(elem.getClassName())) { if (LOGIC_CLASS_NAME.equals(elem.getClassName())) {
LOGGER.info("BetterSprinting warning message suppressed.");
event.setCanceled(true); event.setCanceled(true);
return; return;
} }
@@ -78,6 +83,7 @@ public class DisableBetterSprinting {
if (mc.playerController != null && mc.playerController.getClass().getName().equals(CONTROLLER_OVERRIDE_CLASS_NAME)) { if (mc.playerController != null && mc.playerController.getClass().getName().equals(CONTROLLER_OVERRIDE_CLASS_NAME)) {
// Someone has secretly swapped out the player controller and is about to substitute their own player entity. // Someone has secretly swapped out the player controller and is about to substitute their own player entity.
// This is the right time to destroy their plan. // This is the right time to destroy their plan.
LOGGER.info("Preventing player controller {} from being replaced by BetterSprinting with {}.", originalController, mc.playerController);
mc.playerController = originalController; mc.playerController = originalController;
} }
} }