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

Add 1.7.10 version

Browse Source
This commit is contained in:
Jonas Herzig
2018-03-07 22:00:30 +01:00
parent fbbca76099
commit eb04eb47dc
106 changed files with 2083 additions and 251 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/java/com/replaymod/simplepathing/ReplayModSimplePathing.java
View File

@@ -11,11 +11,18 @@ import com.replaymod.simplepathing.SPTimeline.SPPath;
import com.replaymod.simplepathing.gui.GuiPathing;
import com.replaymod.simplepathing.preview.PathPreview;
import lombok.Getter;
import org.apache.logging.log4j.Logger;
import org.lwjgl.input.Keyboard;
//#if MC>=10800
import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
import org.apache.logging.log4j.Logger;
import org.lwjgl.input.Keyboard;
//#else
//$$ import cpw.mods.fml.common.Mod;
//$$ import cpw.mods.fml.common.event.FMLPreInitializationEvent;
//$$ import cpw.mods.fml.common.eventhandler.SubscribeEvent;
//#endif
import static com.replaymod.core.versions.MCVer.*;
@@ -23,7 +30,9 @@ import static com.replaymod.core.versions.MCVer.*;
version = "@MOD_VERSION@",
acceptedMinecraftVersions = "@MC_VERSION@",
acceptableRemoteVersions = "*",
//#if MC>=10800
clientSideOnly = true,
//#endif
useMetadata = true)
public class ReplayModSimplePathing {
public static final String MOD_ID = "replaymod-simplepathing";

10
src/main/java/com/replaymod/simplepathing/gui/GuiPathing.java
View File

@@ -46,7 +46,6 @@ import de.johni0702.minecraft.gui.popup.GuiInfoPopup;
import de.johni0702.minecraft.gui.popup.GuiYesNoPopup;
import de.johni0702.minecraft.gui.utils.Colors;
import net.minecraft.crash.CrashReport;
import net.minecraftforge.fml.common.Loader;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.lwjgl.input.Keyboard;
@@ -55,6 +54,12 @@ import org.lwjgl.util.ReadableDimension;
import org.lwjgl.util.ReadablePoint;
import org.lwjgl.util.WritablePoint;
//#if MC>=10800
import net.minecraftforge.fml.common.Loader;
//#else
//$$ import cpw.mods.fml.common.Loader;
//#endif
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import java.io.IOException;
@@ -62,6 +67,7 @@ import java.util.Collections;
import java.util.function.Consumer;
import static com.replaymod.core.utils.Utils.error;
import static com.replaymod.core.versions.MCVer.*;
import static com.replaymod.simplepathing.ReplayModSimplePathing.LOGGER;
@@ -618,7 +624,7 @@ public class GuiPathing {
CameraEntity camera = replayHandler.getCameraEntity();
int spectatedId = -1;
if (!replayHandler.isCameraView()) {
spectatedId = replayHandler.getOverlay().getMinecraft().getRenderViewEntity().getEntityId();
spectatedId = getRenderViewEntity(replayHandler.getOverlay().getMinecraft()).getEntityId();
}
timeline.addPositionKeyframe(time, camera.posX, camera.posY, camera.posZ,
camera.rotationYaw, camera.rotationPitch, camera.roll, spectatedId);

7
src/main/java/com/replaymod/simplepathing/preview/PathPreview.java
View File

@@ -8,9 +8,14 @@ import com.replaymod.replay.events.ReplayCloseEvent;
import com.replaymod.replay.events.ReplayOpenEvent;
import com.replaymod.simplepathing.ReplayModSimplePathing;
import com.replaymod.simplepathing.Setting;
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
import org.lwjgl.input.Keyboard;
//#if MC>=10800
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
//#else
//$$ import cpw.mods.fml.common.eventhandler.SubscribeEvent;
//#endif
import static com.replaymod.core.versions.MCVer.*;
public class PathPreview {

29
src/main/java/com/replaymod/simplepathing/preview/PathPreviewRenderer.java
View File

@@ -15,17 +15,23 @@ import com.replaymod.simplepathing.ReplayModSimplePathing;
import com.replaymod.simplepathing.SPTimeline;
import com.replaymod.simplepathing.gui.GuiPathing;
import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.GlStateManager;
import net.minecraft.client.renderer.Tessellator;
import net.minecraft.entity.Entity;
import net.minecraft.util.ResourceLocation;
import net.minecraftforge.client.event.RenderWorldLastEvent;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
import org.apache.commons.lang3.tuple.Pair;
import org.apache.commons.lang3.tuple.Triple;
import org.lwjgl.opengl.GL11;
//#if MC>=10800
import net.minecraft.client.renderer.GlStateManager;
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
//#else
//$$ import com.replaymod.core.versions.MCVer.GlStateManager;
//$$ import cpw.mods.fml.common.eventhandler.SubscribeEvent;
//#endif
import java.util.Comparator;
import java.util.Optional;
@@ -60,7 +66,7 @@ public class PathPreviewRenderer {
public void renderCameraPath(RenderWorldLastEvent event) {
if (!replayHandler.getReplaySender().isAsyncMode() || mc.gameSettings.hideGUI) return;
Entity view = mc.getRenderViewEntity();
Entity view = getRenderViewEntity(mc);
if (view == null) return;
GuiPathing guiPathing = mod.getGuiPathing();
@@ -78,8 +84,12 @@ public class PathPreviewRenderer {
int renderDistance = mc.gameSettings.renderDistanceChunks * 16;
int renderDistanceSquared = renderDistance * renderDistance;
//#if MC>=10800
// Eye height is subtracted to make path appear higher (at eye height) than it actually is (at foot height)
Triple<Double, Double, Double> viewPos = Triple.of(view.posX, view.posY - view.getEyeHeight(), view.posZ);
//#else
//$$ Triple<Double, Double, Double> viewPos = Triple.of(view.posX, view.posY, view.posZ);
//#endif
GL11.glPushAttrib(GL11.GL_ALL_ATTRIB_BITS);
try {
@@ -220,7 +230,7 @@ public class PathPreviewRenderer {
);
GL11.glLineWidth(3);
Tessellator.getInstance().draw();
Tessellator_getInstance().draw();
BufferBuilder_setTranslation(0, 0, 0);
}
@@ -263,10 +273,10 @@ public class PathPreviewRenderer {
pos.getRight() - view.getRight()
);
GL11.glNormal3f(0, 1, 0);
GL11.glRotatef(-mc.getRenderManager().playerViewY, 0, 1, 0);
GL11.glRotatef(mc.getRenderManager().playerViewX, 1, 0, 0);
GL11.glRotatef(-getRenderManager().playerViewY, 0, 1, 0);
GL11.glRotatef(getRenderManager().playerViewX, 1, 0, 0);
Tessellator.getInstance().draw();
Tessellator_getInstance().draw();
GL11.glPopMatrix();
}
@@ -274,7 +284,6 @@ public class PathPreviewRenderer {
private void drawCamera(Triple<Double, Double, Double> view,
Triple<Double, Double, Double> pos,
Triple<Float, Float, Float> rot) {
Tessellator tessellator = Tessellator.getInstance();
BufferBuilder_setTranslation(0, 0, 0);
mc.renderEngine.bindTexture(CAMERA_HEAD);
@@ -298,7 +307,7 @@ public class PathPreviewRenderer {
BufferBuilder_addPosCol(0, 0, 0, 0, 255, 0, 170);
BufferBuilder_addPosCol(0, 0, 2, 0, 255, 0, 170);
tessellator.draw();
Tessellator_getInstance().draw();
// draw camera cube
GL11.glEnable(GL11.GL_TEXTURE_2D);
@@ -345,7 +354,7 @@ public class PathPreviewRenderer {
BufferBuilder_addPosTexCol(r + cubeSize, r + cubeSize, r + cubeSize, 2*8/64f, 8/64f, 255, 255, 255, 200);
BufferBuilder_addPosTexCol(r + cubeSize, r + cubeSize, r, 2 * 8 / 64f, 0, 255, 255, 255, 200);
tessellator.draw();
Tessellator_getInstance().draw();
GL11.glPopMatrix();
}