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

Get core, recording and replay modules compiling on 1.13.2

Browse Source
This commit is contained in:
Jonas Herzig
2019-03-01 10:18:58 +01:00
parent b6a4206816
commit c1fefdeb3c
18 changed files with 280 additions and 162 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,5 +1,7 @@
package com.replaymod.recording;
import com.replaymod.core.KeyBindingRegistry;
import com.replaymod.core.Module;
import com.replaymod.core.ReplayMod;
import com.replaymod.core.utils.Restrictions;
import com.replaymod.recording.handler.ConnectionEventHandler;
@@ -20,22 +22,18 @@ import com.replaymod.core.versions.MCVer.Keyboard;
//#endif
//#if MC>=10800
import net.minecraftforge.fml.common.event.FMLInitializationEvent;
import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
//#if MC>=11300
import net.minecraftforge.fml.network.NetworkRegistry;
//#else
//$$ import net.minecraftforge.fml.common.network.NetworkRegistry;
//#endif
//#else
//$$ import cpw.mods.fml.common.event.FMLInitializationEvent;
//$$ import cpw.mods.fml.common.event.FMLPreInitializationEvent;
//$$ import cpw.mods.fml.common.network.NetworkRegistry;
//#endif
import static com.replaymod.core.versions.MCVer.*;
public class ReplayModRecording extends ReplayMod.Module {
public class ReplayModRecording implements Module {
private static final Logger LOGGER = LogManager.getLogger();
private static final AttributeKey<Void> ATTR_CHECKED = AttributeKey.newInstance("ReplayModRecording_checked");
@@ -49,13 +47,13 @@ public class ReplayModRecording extends ReplayMod.Module {
public ReplayModRecording(ReplayMod mod) {
core = mod;
core.getSettingsRegistry().register(Setting.class);
}
@Override
public void preInit(FMLPreInitializationEvent event) {
core.getSettingsRegistry().register(Setting.class);
core.getKeyBindingRegistry().registerKeyBinding("replaymod.input.marker", Keyboard.KEY_M, new Runnable() {
public void registerKeyBindings(KeyBindingRegistry registry) {
registry.registerKeyBinding("replaymod.input.marker", Keyboard.KEY_M, new Runnable() {
@Override
public void run() {
PacketListener packetListener = connectionEventHandler.getPacketListener();
@@ -68,7 +66,7 @@ public class ReplayModRecording extends ReplayMod.Module {
}
@Override
public void init(FMLInitializationEvent event) {
public void initClient() {
FML_BUS.register(connectionEventHandler = new ConnectionEventHandler(LOGGER, core));
new GuiHandler(core).register();

3
src/main/java/com/replaymod/recording/handler/ConnectionEventHandler.java
View File

@@ -16,6 +16,7 @@ import org.apache.logging.log4j.Logger;
//#if MC>=10800
//#if MC>=11300
import net.minecraft.world.dimension.DimensionType;
import net.minecraftforge.eventbus.api.SubscribeEvent;
//#else
//$$ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
@@ -62,7 +63,7 @@ public class ConnectionEventHandler {
if (local) {
//#if MC>=10800
//#if MC>=11300
if (mc.getIntegratedServer().getWorld(0).getWorldType() == WorldType_DEBUG_ALL_BLOCK_STATES) {
if (mc.getIntegratedServer().getWorld(DimensionType.OVERWORLD).getWorldType() == WorldType_DEBUG_ALL_BLOCK_STATES) {
//#else
//$$ if (mc.getIntegratedServer().getEntityWorld().getWorldType() == WorldType_DEBUG_ALL_BLOCK_STATES) {
//#endif

13
src/main/java/com/replaymod/recording/handler/RecordingEventHandler.java
View File

@@ -370,8 +370,17 @@ public class RecordingEventHandler {
try {
//#if MC>=11100
//#if MC>=11200
packetListener.save(new SPacketCollectItem(event.pickedUp.getEntityId(), event.player.getEntityId(),
event.pickedUp.getItem().getMaxStackSize()));
//#if MC>=11300
ItemStack stack = event.getStack();
packetListener.save(new SPacketCollectItem(
event.getOriginalEntity().getEntityId(),
event.getPlayer().getEntityId(),
event.getStack().getCount()
));
//#else
//$$ packetListener.save(new SPacketCollectItem(event.pickedUp.getEntityId(), event.player.getEntityId(),
//$$ event.pickedUp.getItem().getMaxStackSize()));
//#endif
//#else
//$$ packetListener.save(new SPacketCollectItem(event.pickedUp.getEntityId(), event.player.getEntityId(),
//$$ event.pickedUp.getEntityItem().getMaxStackSize()));

6
src/main/java/com/replaymod/recording/mixin/MixinRenderGlobal.java
View File

@@ -1,12 +1,16 @@
package com.replaymod.recording.mixin;
import com.replaymod.recording.handler.RecordingEventHandler;
import net.minecraft.client.renderer.RenderGlobal;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
//#if MC>=11300
//#else
//$$ import net.minecraft.client.renderer.RenderGlobal;
//#endif
//#if MC>=10904
import net.minecraft.util.math.BlockPos;
//#else

13
src/main/java/com/replaymod/recording/mixin/MixinWorldClient.java
View File

@@ -20,6 +20,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
//#if MC>=11300
import net.minecraft.world.dimension.Dimension;
import net.minecraft.world.storage.WorldSavedDataStorage;
//#else
//$$ import net.minecraft.world.WorldProvider;
//#endif
@@ -31,14 +32,22 @@ public abstract class MixinWorldClient extends World implements RecordingEventHa
@Shadow
private Minecraft mc;
protected MixinWorldClient(ISaveHandler saveHandlerIn, WorldInfo info,
protected MixinWorldClient(ISaveHandler saveHandlerIn,
//#if MC>=11300
WorldSavedDataStorage mapStorage,
//#endif
WorldInfo info,
//#if MC>=11300
Dimension providerIn,
//#else
//$$ WorldProvider providerIn,
//#endif
Profiler profilerIn, boolean client) {
super(saveHandlerIn, info, providerIn, profilerIn, client);
super(saveHandlerIn,
//#if MC>=11300
mapStorage,
//#endif
info, providerIn, profilerIn, client);
}
private RecordingEventHandler replayModRecording_getRecordingEventHandler() {