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

Re-enable and fix building for older MC versions

Browse Source
This commit is contained in:
Jonas Herzig
2019-03-02 18:11:01 +01:00
parent 528791c91f
commit 8705bbad9a
24 changed files with 142 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/main/java/com/replaymod/core/ReplayMod.java
View File

@@ -61,7 +61,6 @@ import net.minecraftforge.fml.ModList;
//$$ import net.minecraftforge.fml.common.Mod.Instance;
//$$ import net.minecraftforge.fml.common.ModContainer;
//$$ import net.minecraftforge.fml.common.event.FMLInitializationEvent;
//$$ import net.minecraftforge.fml.common.event.FMLPostInitializationEvent;
//$$ import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
//$$ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
//#endif
@@ -74,7 +73,6 @@ import net.minecraftforge.fml.common.gameevent.TickEvent;
//$$ import cpw.mods.fml.common.Mod.Instance;
//$$ import cpw.mods.fml.common.ModContainer;
//$$ import cpw.mods.fml.common.event.FMLInitializationEvent;
//$$ import cpw.mods.fml.common.event.FMLPostInitializationEvent;
//$$ import cpw.mods.fml.common.event.FMLPreInitializationEvent;
//$$ import cpw.mods.fml.common.eventhandler.SubscribeEvent;
//$$ import cpw.mods.fml.common.gameevent.TickEvent;
@@ -158,7 +156,11 @@ public class ReplayMod implements Module {
// Initialize the static OpenGL info field from the minecraft main thread
// Unfortunately lwjgl uses static methods so we have to make use of magic init calls as well
//#if MC>=11300
DeferredWorkQueue.runLater(OpenGLUtils::init);
//#else
//$$ OpenGLUtils.init();
//#endif
//#if MC>=11300
DeferredWorkQueue.runLater(() -> MCVer.getMinecraft().resourcePackRepository.addPackFinder(new LangResourcePack.Finder()));
@@ -177,14 +179,19 @@ public class ReplayMod implements Module {
//#if MC>=11300
settingsRegistry.register();
//#else
//$$ config = new Configuration(event.getSuggestedConfigurationFile());
//$$ config.load();
//$$ settingsRegistry.setConfiguration(config);
//$$ settingsRegistry.save(); // Save default values to disk
//#endif
}
//#if MC<=11300
//$$ @EventHandler
//$$ public void init(FMLPreInitializationEvent event) {
//$$ config = new Configuration(event.getSuggestedConfigurationFile());
//$$ config.load();
//$$ settingsRegistry.setConfiguration(config);
//$$ settingsRegistry.save(); // Save default values to disk
//$$ }
//#endif
public KeyBindingRegistry getKeyBindingRegistry() {
return keyBindingRegistry;
}
@@ -424,7 +431,6 @@ public class ReplayMod implements Module {
private void printToChat(boolean warning, String message, Object... args) {
if (getSettingsRegistry().get(Setting.NOTIFICATIONS)) {
/* FIXME: needs RuntimeInvisibleParameterAnnotations workaround
// Some nostalgia: "§8[§6Replay Mod§8]§r Your message goes here"
//#if MC>=10904
Style coloredDarkGray = new Style().setColor(TextFormatting.DARK_GRAY);
@@ -445,8 +451,7 @@ public class ReplayMod implements Module {
//#endif
// Send message to chat GUI
// The ingame GUI is initialized at startup, therefore this is possible before the client is connected
*/
mc.ingameGUI.getChatGUI().printChatMessage(new TextComponentTranslation(message, args));
mc.ingameGUI.getChatGUI().printChatMessage(text);
}
}
}

10
src/main/java/com/replaymod/core/versions/MCVer.java
View File

@@ -69,7 +69,7 @@ import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
//#if MC>=10800
import net.minecraft.client.renderer.GlStateManager;
// FIXME import net.minecraft.client.renderer.GlStateManager.BooleanState;
import net.minecraft.client.renderer.GlStateManager.BooleanState;
import net.minecraft.world.WorldType;
//#if MC>=11300
import net.minecraftforge.eventbus.api.IEventBus;
@@ -346,7 +346,7 @@ public class MCVer {
return world.playerEntities;
}
public static GlStateManager.BooleanState fog() {
public static BooleanState fog() {
//#if MC>=11300
return GlStateManager.FOG.fog;
//#else
@@ -362,7 +362,7 @@ public class MCVer {
//#endif
}
public static void fog(GlStateManager.BooleanState fog) {
public static void fog(BooleanState fog) {
//#if MC>=11300
GlStateManager.FOG.fog = fog;
//#else
@@ -378,7 +378,7 @@ public class MCVer {
//#endif
}
public static GlStateManager.BooleanState texture2DState(int index) {
public static BooleanState texture2DState(int index) {
//#if MC>=11300
return GlStateManager.TEXTURES[index].texture2DState;
//#else
@@ -390,7 +390,7 @@ public class MCVer {
//#endif
}
public static void texture2DState(int index, GlStateManager.BooleanState texture2DState) {
public static void texture2DState(int index, BooleanState texture2DState) {
//#if MC>=11300
GlStateManager.TEXTURES[index].texture2DState = texture2DState;
//#else

4
src/main/java/com/replaymod/online/ReplayModOnline.java
View File

@@ -18,16 +18,16 @@ import de.johni0702.minecraft.gui.container.GuiScreen;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
//#if MC>=10800
//#if MC>=11300
import net.minecraftforge.eventbus.api.SubscribeEvent;
//#else
//$$ import net.minecraftforge.common.config.Configuration;
//#if MC>=10800
//$$ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
//#endif
//#else
//$$ import cpw.mods.fml.common.eventhandler.SubscribeEvent;
//#endif
//#endif
import java.io.File;
import java.io.IOException;

4
src/main/java/com/replaymod/recording/ReplayModRecording.java
View File

@@ -36,7 +36,9 @@ import static com.replaymod.core.versions.MCVer.*;
public class ReplayModRecording implements Module {
private static final Logger LOGGER = LogManager.getLogger();
//#if MC>=11300
private static final AttributeKey<Void> ATTR_CHECKED = AttributeKey.newInstance("ReplayModRecording_checked");
//#endif
{ instance = this; }
public static ReplayModRecording instance;
@@ -84,8 +86,10 @@ public class ReplayModRecording implements Module {
public void initiateRecording(NetworkManager networkManager) {
Channel channel = networkManager.channel();
if (channel.pipeline().get("ReplayModReplay_replaySender") != null) return;
//#if MC>=11300
if (channel.hasAttr(ATTR_CHECKED)) return;
channel.attr(ATTR_CHECKED).set(null);
//#endif
connectionEventHandler.onConnectedToServerEvent(networkManager);
}
}

1
src/main/java/com/replaymod/recording/gui/GuiRecordingOverlay.java
View File

@@ -18,6 +18,7 @@ import net.minecraftforge.eventbus.api.SubscribeEvent;
import static net.minecraft.client.renderer.GlStateManager.*;
//#else
//$$ import cpw.mods.fml.common.eventhandler.SubscribeEvent;
//$$ import static com.replaymod.core.versions.MCVer.GlStateManager.*;
//#endif
import static com.replaymod.core.ReplayMod.TEXTURE;

9
src/main/java/com/replaymod/recording/packet/ResourcePackRecorder.java
View File

@@ -9,11 +9,16 @@ import net.minecraft.client.gui.GuiYesNo;
import net.minecraft.client.gui.GuiYesNoCallback;
import net.minecraft.client.multiplayer.ServerData;
import net.minecraft.client.resources.I18n;
// FIXME import net.minecraft.client.resources.ResourcePackRepository;
import net.minecraft.util.HttpUtil;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
//#if MC>=11300
// FIXME
//#else
//$$ import net.minecraft.client.resources.ResourcePackRepository;
//#endif
//#if MC>=10904
import net.minecraft.network.play.client.CPacketResourcePackStatus;
import net.minecraft.network.play.client.CPacketResourcePackStatus.Action;
@@ -303,6 +308,7 @@ public class ResourcePackRecorder {
//#endif
}
}
*/
//#else
//$$ public synchronized S3FPacketCustomPayload handleResourcePack(S3FPacketCustomPayload packet) {
//$$ final int requestId = nextRequestId++;
@@ -377,5 +383,4 @@ public class ResourcePackRecorder {
//$$ }
//#endif
*/
}

1
src/main/java/com/replaymod/render/capturer/OpenGlFrameCapturer.java
View File

@@ -121,7 +121,6 @@ public abstract class OpenGlFrameCapturer<F extends Frame, D extends CaptureData
}
//#else
//$$ if (width != mc.displayWidth || height != mc.displayHeight) {
//$$ setWindowSize(width, height);
//$$ mc.resize(width, height);
//$$ }
//#endif

5
src/main/java/com/replaymod/render/gui/GuiVideoRenderer.java
View File

@@ -18,10 +18,13 @@ import de.johni0702.minecraft.gui.utils.lwjgl.Dimension;
import de.johni0702.minecraft.gui.utils.lwjgl.ReadableDimension;
import de.johni0702.minecraft.gui.utils.lwjgl.ReadablePoint;
import net.minecraft.client.renderer.texture.DynamicTexture;
import net.minecraft.client.renderer.texture.NativeImage;
import net.minecraft.client.resources.I18n;
import net.minecraft.util.ResourceLocation;
//#if MC>=11300
import net.minecraft.client.renderer.texture.NativeImage;
//#endif
import java.nio.ByteBuffer;
public class GuiVideoRenderer extends GuiScreen implements Tickable {

7
src/main/java/com/replaymod/render/mixin/MixinEntityRenderer.java
View File

@@ -8,7 +8,6 @@ import com.replaymod.render.hooks.EntityRendererHandler;
import com.replaymod.replay.camera.CameraEntity;
import de.johni0702.minecraft.gui.utils.lwjgl.ReadableColor;
import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.Matrix4f;
import net.minecraft.entity.Entity;
import net.minecraft.entity.player.EntityPlayer;
import org.lwjgl.opengl.GL11;
@@ -20,13 +19,15 @@ import org.spongepowered.asm.mixin.injection.Redirect;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
//#if MC>=11300
import net.minecraft.client.renderer.GameRenderer;
import net.minecraft.client.renderer.WorldRenderer;
import net.minecraft.client.GameSettings;
import net.minecraft.client.renderer.GameRenderer;
import net.minecraft.client.renderer.Matrix4f;
import net.minecraft.client.renderer.WorldRenderer;
//#else
//$$ import net.minecraft.client.renderer.EntityRenderer;
//$$ import net.minecraft.client.renderer.RenderGlobal;
//$$ import net.minecraft.client.settings.GameSettings;
//$$ import org.lwjgl.util.glu.Project;
//#endif
//#if MC>=10904

1
src/main/java/com/replaymod/render/rendering/VideoRenderer.java
View File

@@ -30,6 +30,7 @@ import net.minecraft.util.Timer;
import org.lwjgl.glfw.GLFW;
//#else
//$$ import net.minecraft.client.gui.ScaledResolution;
//$$ import org.lwjgl.input.Mouse;
//$$ import org.lwjgl.opengl.Display;
//#endif

14
src/main/java/com/replaymod/replay/FullReplaySender.java
View File

@@ -506,16 +506,22 @@ public class FullReplaySender extends ChannelDuplexHandler implements ReplaySend
//$$ if (p instanceof S3FPacketCustomPayload) {
//$$ S3FPacketCustomPayload packet = (S3FPacketCustomPayload) p;
//#endif
/* FIXME
//#if MC>=10800
String channelName = packet.getChannelName();
//#if MC>=11300
ResourceLocation channelName = packet.getChannelName();
//#else
//$$ String channelName = packet.getChannelName();
//#endif
//#else
//$$ String channelName = packet.func_149169_c();
//#endif
if ("MC|BOpen".equals(channelName)) {
//#if MC>=11300
if (SPacketCustomPayload.BOOK_OPEN.equals(channelName)) {
//#else
//$$ if ("MC|BOpen".equals(channelName)) {
//#endif
return null;
}
*/
//#if MC>=10800
}

20
src/main/java/com/replaymod/replay/InputReplayTimer.java
View File

@@ -1,4 +1,3 @@
/* FIXME
package com.replaymod.replay;
import com.replaymod.core.utils.WrappedTimer;
@@ -7,20 +6,21 @@ import com.replaymod.replay.camera.CameraEntity;
import com.replaymod.replay.events.ReplayDispatchKeypressesEvent;
import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.GuiScreen;
import net.minecraft.client.settings.GameSettings;
import net.minecraft.client.settings.KeyBinding;
import net.minecraft.crash.CrashReport;
import net.minecraft.util.ReportedException;
import net.minecraft.util.Timer;
import net.minecraftforge.client.ForgeHooksClient;
import net.minecraftforge.common.MinecraftForge;
import org.lwjgl.input.Keyboard;
import org.lwjgl.input.Mouse;
//#if MC>=11300
//#else
//$$ import net.minecraft.client.settings.GameSettings;
//$$ import org.lwjgl.input.Keyboard;
//$$ import org.lwjgl.input.Mouse;
//#if MC>=10800
import net.minecraftforge.fml.common.FMLCommonHandler;
import java.io.IOException;
//$$ import net.minecraftforge.fml.common.FMLCommonHandler;
//$$
//$$ import java.io.IOException;
//#else
//$$ import cpw.mods.fml.common.FMLCommonHandler;
//$$ import cpw.mods.fml.common.eventhandler.Event;
@@ -28,6 +28,7 @@ import java.io.IOException;
//$$
//$$ import static com.replaymod.core.versions.MCVer.FML_BUS;
//#endif
//#endif
public class InputReplayTimer extends WrappedTimer {
private final ReplayModReplay mod;
@@ -39,6 +40,7 @@ public class InputReplayTimer extends WrappedTimer {
this.mc = mod.getCore().getMinecraft();
}
/* FIXME
@Override
public void updateTimer() {
super.updateTimer();
@@ -260,9 +262,9 @@ public class InputReplayTimer extends WrappedTimer {
FMLCommonHandler.instance().fireKeyInput();
}
*/
//#if MC<=10710
//$$ public static class RunScheduledTasks extends Event {}
//#endif
}
*/

2
src/main/java/com/replaymod/replay/ReplayModReplay.java
View File

@@ -61,7 +61,7 @@ public class ReplayModReplay implements Module {
@Override
public void registerKeyBindings(KeyBindingRegistry registry) {
registry.registerKeyBinding("replaymod.input.marker", MCVer.Keyboard.KEY_M, new Runnable() {
registry.registerKeyBinding("replaymod.input.marker", Keyboard.KEY_M, new Runnable() {
@Override
public void run() {
if (replayHandler != null ) {

2
src/main/java/com/replaymod/replay/handler/GuiHandler.java
View File

@@ -67,7 +67,7 @@ public class GuiHandler {
// Replace "Exit Server" button with "Exit Replay" button
case BUTTON_EXIT_SERVER:
removeButton(event, b);
addButton(event, new GuiButton(BUTTON_EXIT_REPLAY, b.x, b.y, b.width, b.height, I18n.format("replaymod.gui.exit")) {
addButton(event, new GuiButton(BUTTON_EXIT_REPLAY, x(b), y(b), b.width, b.height, I18n.format("replaymod.gui.exit")) {
//#if MC>=11300
@Override
public void onClick(double mouseX, double mouseY) {

2
src/main/java/com/replaymod/replay/mixin/MixinPlayerControllerMP.java
View File

@@ -47,7 +47,7 @@ public abstract class MixinPlayerControllerMP {
//$$ private NetHandlerPlayClient netClientHandler;
//#endif
//#if MC>=11200
//#if MC>=11300
@Inject(method = "createPlayer", at=@At("HEAD"), cancellable = true)
private void replayModReplay_createReplayCamera(World worldIn, StatisticsManager statisticsManager, RecipeBookClient recipeBookClient, CallbackInfoReturnable<EntityPlayerSP> ci) {
if (ReplayModReplay.instance.getReplayHandler() != null) {