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

Get rid of all the ATs in favor of Mixins

Browse Source
This commit is contained in:
Jonas Herzig
2019-05-06 16:53:39 +02:00
parent 2094c518a0
commit bd91d0d3bd
41 changed files with 302 additions and 778 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/com/replaymod/replay/camera/CameraEntity.java
View File

@@ -701,8 +701,8 @@ public class CameraEntity
if (lastHandRendered != player) {
lastHandRendered = player;
//#if MC>=10904
FirstPersonRendererAccessor acc = (FirstPersonRendererAccessor) mc.entityRenderer.itemRenderer;
//#if MC>=10904
acc.setPrevEquippedProgressMainHand(1);
acc.setPrevEquippedProgressOffHand(1);
acc.setEquippedProgressMainHand(1);
@@ -710,10 +710,10 @@ public class CameraEntity
acc.setItemStackMainHand(player.getItemStackFromSlot(EntityEquipmentSlot.MAINHAND));
acc.setItemStackOffHand(player.getItemStackFromSlot(EntityEquipmentSlot.OFFHAND));
//#else
//$$ mc.entityRenderer.itemRenderer.prevEquippedProgress = 1;
//$$ mc.entityRenderer.itemRenderer.equippedProgress = 1;
//$$ mc.entityRenderer.itemRenderer.itemToRender = player.inventory.getCurrentItem();
//$$ mc.entityRenderer.itemRenderer.equippedItemSlot = player.inventory.currentItem;
//$$ acc.setPrevEquippedProgress(1);
//$$ acc.setEquippedProgress(1);
//$$ acc.setItemToRender(player.inventory.getCurrentItem());
//$$ acc.setEquippedItemSlot(player.inventory.currentItem);
//#endif

6
src/main/java/com/replaymod/replay/camera/SpectatorCameraController.java
View File

@@ -61,15 +61,15 @@ public class SpectatorCameraController implements CameraController {
//#else
camera.inventory = viewPlayer.inventory;
//#endif
//#if MC>=10904
EntityPlayerAccessor cameraA = (EntityPlayerAccessor) camera;
EntityPlayerAccessor viewPlayerA = (EntityPlayerAccessor) camera;
//#if MC>=10904
cameraA.setItemStackMainHand(viewPlayerA.getItemStackMainHand());
camera.swingingHand = viewPlayer.swingingHand;
cameraA.setActiveItemStackUseCount(viewPlayerA.getActiveItemStackUseCount());
//#else
//$$ camera.itemInUse = viewPlayer.itemInUse;
//$$ camera.itemInUseCount = viewPlayer.itemInUseCount;
//$$ cameraA.setItemInUse(viewPlayerA.getItemInUse());
//$$ cameraA.setItemInUseCount(viewPlayerA.getItemInUseCount());
//#endif
}
}