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

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
*/
}