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

./gradlew :1.15.2:setCoreVersion

Browse Source 
Also `./gradlew :jGui:1.15.2:setCoreVersion`.
This commit is contained in:
Jonas Herzig
2020-04-06 12:35:56 +02:00
parent f3c4092c72
commit b119d2d127
70 changed files with 1217 additions and 1217 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/replaymod/recording/mixin/IntegratedServerAccessor.java
View File

@@ -8,9 +8,9 @@ import org.spongepowered.asm.mixin.gen.Accessor;
public interface IntegratedServerAccessor {
// TODO probably https://github.com/ReplayMod/remap/issues/10
//#if MC>=11500
//$$ @Accessor("paused")
@Accessor("paused")
//#else
@Accessor("field_5524")
//$$ @Accessor("field_5524")
//#endif
boolean isGamePaused();
}

8
src/main/java/com/replaymod/recording/mixin/SPacketSpawnMobAccessor.java
View File

@@ -8,9 +8,9 @@ import org.spongepowered.asm.mixin.gen.Accessor;
@Mixin(MobSpawnS2CPacket.class)
public interface SPacketSpawnMobAccessor {
//#if MC<11500
@Accessor("dataTracker")
DataTracker getDataManager();
@Accessor("dataTracker")
void setDataManager(DataTracker value);
//$$ @Accessor("dataTracker")
//$$ DataTracker getDataManager();
//$$ @Accessor("dataTracker")
//$$ void setDataManager(DataTracker value);
//#endif
}

8
src/main/java/com/replaymod/recording/mixin/SPacketSpawnPlayerAccessor.java
View File

@@ -8,9 +8,9 @@ import org.spongepowered.asm.mixin.gen.Accessor;
@Mixin(PlayerSpawnS2CPacket.class)
public interface SPacketSpawnPlayerAccessor {
//#if MC<11500
@Accessor("dataTracker")
DataTracker getDataManager();
@Accessor("dataTracker")
void setDataManager(DataTracker value);
//$$ @Accessor("dataTracker")
//$$ DataTracker getDataManager();
//$$ @Accessor("dataTracker")
//$$ void setDataManager(DataTracker value);
//#endif
}

58
src/main/java/com/replaymod/recording/packet/PacketListener.java
View File

@@ -326,49 +326,49 @@ public class PacketListener extends ChannelInboundHandlerAdapter {
@SuppressWarnings("unchecked")
private byte[] getPacketData(Packet packet) throws Exception {
//#if MC<11500
if (packet instanceof MobSpawnS2CPacket) {
MobSpawnS2CPacket p = (MobSpawnS2CPacket) packet;
SPacketSpawnMobAccessor pa = (SPacketSpawnMobAccessor) p;
if (pa.getDataManager() == null) {
pa.setDataManager(new DataTracker(null));
if (p.getTrackedValues() != null) {
Set<Integer> seen = new HashSet<>();
//$$ if (packet instanceof MobSpawnS2CPacket) {
//$$ MobSpawnS2CPacket p = (MobSpawnS2CPacket) packet;
//$$ SPacketSpawnMobAccessor pa = (SPacketSpawnMobAccessor) p;
//$$ if (pa.getDataManager() == null) {
//$$ pa.setDataManager(new DataTracker(null));
//$$ if (p.getTrackedValues() != null) {
//$$ Set<Integer> seen = new HashSet<>();
//#if MC>=10904
for (DataTracker.Entry<?> entry : Lists.reverse(p.getTrackedValues())) {
if (!seen.add(entry.getData().getId())) continue;
DataManager_set(pa.getDataManager(), entry);
}
//$$ for (DataTracker.Entry<?> entry : Lists.reverse(p.getTrackedValues())) {
//$$ if (!seen.add(entry.getData().getId())) continue;
//$$ DataManager_set(pa.getDataManager(), entry);
//$$ }
//#else
//$$ for(DataWatcher.WatchableObject wo : Lists.reverse((List<DataWatcher.WatchableObject>) p.func_149027_c())) {
//$$ if (!seen.add(wo.getDataValueId())) continue;
//$$ pa.getDataManager().addObject(wo.getDataValueId(), wo.getObject());
//$$ }
//#endif
}
}
}
if (packet instanceof PlayerSpawnS2CPacket) {
PlayerSpawnS2CPacket p = (PlayerSpawnS2CPacket) packet;
SPacketSpawnPlayerAccessor pa = (SPacketSpawnPlayerAccessor) p;
if (pa.getDataManager() == null) {
pa.setDataManager(new DataTracker(null));
if (p.getTrackedValues() != null) {
Set<Integer> seen = new HashSet<>();
//$$ }
//$$ }
//$$ }
//$$
//$$ if (packet instanceof PlayerSpawnS2CPacket) {
//$$ PlayerSpawnS2CPacket p = (PlayerSpawnS2CPacket) packet;
//$$ SPacketSpawnPlayerAccessor pa = (SPacketSpawnPlayerAccessor) p;
//$$ if (pa.getDataManager() == null) {
//$$ pa.setDataManager(new DataTracker(null));
//$$ if (p.getTrackedValues() != null) {
//$$ Set<Integer> seen = new HashSet<>();
//#if MC>=10904
for (DataTracker.Entry<?> entry : Lists.reverse(p.getTrackedValues())) {
if (!seen.add(entry.getData().getId())) continue;
DataManager_set(pa.getDataManager(), entry);
}
//$$ for (DataTracker.Entry<?> entry : Lists.reverse(p.getTrackedValues())) {
//$$ if (!seen.add(entry.getData().getId())) continue;
//$$ DataManager_set(pa.getDataManager(), entry);
//$$ }
//#else
//$$ for(DataWatcher.WatchableObject wo : Lists.reverse((List<DataWatcher.WatchableObject>) p.func_148944_c())) {
//$$ if (!seen.add(wo.getDataValueId())) continue;
//$$ pa.getDataManager().addObject(wo.getDataValueId(), wo.getObject());
//$$ }
//#endif
}
}
}
//$$ }
//$$ }
//$$ }
//#endif
//#if MC>=10800