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

Update to 1.16-rc1

Browse Source
This commit is contained in:
Jonas Herzig
2020-06-21 15:29:07 +02:00
parent 82200a7c34
commit dc9fcb11cd
4 changed files with 25 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
jGui

Submodule jGui updated: da3361a02d...7ec30f59b5

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

@@ -31,6 +31,11 @@ import de.johni0702.minecraft.gui.versions.callbacks.PreTickCallback;
//$$ import net.minecraftforge.event.TickEvent;
//#endif
//#if MC>=11600
//$$ import com.mojang.datafixers.util.Pair;
//$$ import java.util.Collections;
//#endif
//#if MC>=11400
//#else
//$$ import net.minecraft.network.play.server.SPacketUseBed;
@@ -270,34 +275,16 @@ public class RecordingEventHandler extends EventRegistrations {
//Inventory Handling
//#if MC>=10904
if (playerItems[0] != player.getStackInHand(Hand.MAIN_HAND)) {
playerItems[0] = player.getStackInHand(Hand.MAIN_HAND);
packetListener.save(new EntityEquipmentUpdateS2CPacket(player.getEntityId(), EquipmentSlot.MAINHAND, playerItems[0]));
}
if (playerItems[1] != player.getStackInHand(Hand.OFF_HAND)) {
playerItems[1] = player.getStackInHand(Hand.OFF_HAND);
packetListener.save(new EntityEquipmentUpdateS2CPacket(player.getEntityId(), EquipmentSlot.OFFHAND, playerItems[1]));
}
if (playerItems[2] != player.getEquippedStack(EquipmentSlot.FEET)) {
playerItems[2] = player.getEquippedStack(EquipmentSlot.FEET);
packetListener.save(new EntityEquipmentUpdateS2CPacket(player.getEntityId(), EquipmentSlot.FEET, playerItems[2]));
}
if (playerItems[3] != player.getEquippedStack(EquipmentSlot.LEGS)) {
playerItems[3] = player.getEquippedStack(EquipmentSlot.LEGS);
packetListener.save(new EntityEquipmentUpdateS2CPacket(player.getEntityId(), EquipmentSlot.LEGS, playerItems[3]));
}
if (playerItems[4] != player.getEquippedStack(EquipmentSlot.CHEST)) {
playerItems[4] = player.getEquippedStack(EquipmentSlot.CHEST);
packetListener.save(new EntityEquipmentUpdateS2CPacket(player.getEntityId(), EquipmentSlot.CHEST, playerItems[4]));
}
if (playerItems[5] != player.getEquippedStack(EquipmentSlot.HEAD)) {
playerItems[5] = player.getEquippedStack(EquipmentSlot.HEAD);
packetListener.save(new EntityEquipmentUpdateS2CPacket(player.getEntityId(), EquipmentSlot.HEAD, playerItems[5]));
for (EquipmentSlot slot : EquipmentSlot.values()) {
ItemStack stack = player.getEquippedStack(slot);
if (playerItems[slot.ordinal()] != stack) {
playerItems[slot.ordinal()] = stack;
//#if MC>=11600
//$$ packetListener.save(new EntityEquipmentUpdateS2CPacket(player.getEntityId(), Collections.singletonList(Pair.of(slot, stack))));
//#else
packetListener.save(new EntityEquipmentUpdateS2CPacket(player.getEntityId(), slot, stack));
//#endif
}
}
//#else
//$$ if(playerItems[0] != mc.thePlayer.getHeldItem()) {

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

@@ -765,10 +765,10 @@ public class FullReplaySender extends ChannelDuplexHandler implements ReplaySend
// 8 - Fade time
if (!Arrays.asList(
//#if MC>=11600
//$$ GameStateChangeS2CPacket.field_25646,
//$$ GameStateChangeS2CPacket.field_25647,
//$$ GameStateChangeS2CPacket.field_25652,
//$$ GameStateChangeS2CPacket.field_25653
//$$ GameStateChangeS2CPacket.RAIN_STARTED,
//$$ GameStateChangeS2CPacket.RAIN_STOPPED,
//$$ GameStateChangeS2CPacket.RAIN_GRADIENT_CHANGED,
//$$ GameStateChangeS2CPacket.THUNDER_GRADIENT_CHANGED
//#else
1,
2,

10
versions/common.gradle
View File

@@ -224,22 +224,22 @@ dependencies {
minecraft 'com.mojang:minecraft:' + [
11404: '1.14.4',
11502: '1.15.2',
11600: '1.16-pre6',
11600: '1.16-rc1',
][mcVersion]
mappings 'net.fabricmc:yarn:' + [
11404: '1.14.4+build.16',
11502: '1.15.2+build.14',
11600: '1.16-pre6+build.1:v2',
11600: '1.16-rc1+build.8:v2',
][mcVersion]
modCompile 'net.fabricmc:fabric-loader:' + [
11404: '0.7.8+build.189',
11502: '0.7.8+build.189',
11600: '0.8.7+build.201',
11600: '0.8.8+build.202',
][mcVersion]
modCompile 'net.fabricmc.fabric-api:fabric-api:' + [
11404: '0.4.3+build.247-1.14',
11502: '0.5.1+build.294-1.15',
11600: '0.12.2+build.362-1.16',
11600: '0.12.5+build.367-1.16',
][mcVersion]
}
@@ -278,7 +278,7 @@ dependencies {
shadow 'com.github.ReplayMod.JavaBlend:2.79.0:a0696f8'
shadow "com.github.ReplayMod:ReplayStudio:99a06c7", shadeExclusions
shadow "com.github.ReplayMod:ReplayStudio:7cc1d0d", shadeExclusions
compileOnly(jGui){
transitive = false // FG 1.2 puts all MC deps into the compile configuration and we don't want to shade those