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

2
src/main/java/com/replaymod/core/ReplayMod.java
View File

@@ -445,7 +445,7 @@ public class ReplayMod implements
// Fail-fast in case we ever switch to async loading and forget to change this
// (except for fabric 1.15+ because it loads the mod before the client thread is set)
//#if FABRIC<1 || MC<11500
{ if (!MinecraftClient.getInstance().isOnThread()) throw new RuntimeException(); }
//$$ { if (!MinecraftClient.getInstance().isOnThread()) throw new RuntimeException(); }
//#endif
private ReplayModExecutor(String string_1) {

10
src/main/java/com/replaymod/core/events/PostRenderWorldCallback.java
View File

@@ -4,20 +4,20 @@ package com.replaymod.core.events;
import de.johni0702.minecraft.gui.utils.Event;
//#if MC>=11500
//$$ import net.minecraft.client.util.math.MatrixStack;
import net.minecraft.client.util.math.MatrixStack;
//#endif
public interface PostRenderWorldCallback {
Event<PostRenderWorldCallback> EVENT = Event.create((listeners) ->
//#if MC>=11500
//$$ (MatrixStack matrixStack) -> {
(MatrixStack matrixStack) -> {
//#else
() -> {
//$$ () -> {
//#endif
for (PostRenderWorldCallback listener : listeners) {
listener.postRenderWorld(
//#if MC>=11500
//$$ matrixStack
matrixStack
//#endif
);
}
@@ -26,7 +26,7 @@ public interface PostRenderWorldCallback {
void postRenderWorld(
//#if MC>=11500
//$$ MatrixStack matrixStack
MatrixStack matrixStack
//#endif
);
}

10
src/main/java/com/replaymod/core/mixin/MixinGameRenderer.java
View File

@@ -11,13 +11,13 @@ import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
//#if MC>=11500
//$$ import net.minecraft.client.util.math.MatrixStack;
import net.minecraft.client.util.math.MatrixStack;
//#endif
@Mixin(GameRenderer.class)
public class MixinGameRenderer {
@Inject(
method = "renderCenter",
method = "renderWorld",
at = @At(
value = "FIELD",
target = "Lnet/minecraft/client/render/GameRenderer;renderHand:Z"
@@ -27,12 +27,12 @@ public class MixinGameRenderer {
float partialTicks,
long nanoTime,
//#if MC>=11500
//$$ MatrixStack matrixStack,
MatrixStack matrixStack,
//#endif
CallbackInfo ci) {
PostRenderWorldCallback.EVENT.invoker().postRenderWorld(
//#if MC>=11500
//$$ matrixStack
matrixStack
//#endif
);
}
@@ -40,7 +40,7 @@ public class MixinGameRenderer {
@Inject(method = "renderHand", at = @At("HEAD"), cancellable = true)
private void preRenderHand(
//#if MC>=11500
//$$ MatrixStack matrixStack,
MatrixStack matrixStack,
//#endif
Camera camera,
float partialTicks,

2
src/main/java/com/replaymod/core/mixin/MixinModResourcePackUtil.java
View File

@@ -4,7 +4,7 @@ package com.replaymod.core.mixin;
import com.replaymod.core.ReplayMod;
import com.replaymod.core.versions.LangResourcePack;
import net.fabricmc.fabric.api.resource.ModResourcePack;
import net.fabricmc.fabric.impl.resources.ModResourcePackUtil;
import net.fabricmc.fabric.impl.resource.loader.ModResourcePackUtil;
import net.fabricmc.loader.api.FabricLoader;
import net.fabricmc.loader.api.ModContainer;
import net.minecraft.resource.ResourcePack;

2
src/main/java/com/replaymod/core/versions/LangResourcePack.java
View File

@@ -140,7 +140,7 @@ public class LangResourcePack extends AbstractFileResourcePack {
public Collection<Identifier> findResources(
ResourceType resourcePackType,
//#if MC>=11500
//$$ String namespace,
String namespace,
//#endif
String path,
int maxDepth,

58
src/main/java/com/replaymod/core/versions/MCVer.java
View File

@@ -24,10 +24,10 @@ import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
//#if MC>=11500
//$$ import net.minecraft.client.model.ModelPart.Cuboid;
//$$ import java.util.ArrayList;
import net.minecraft.client.model.ModelPart.Cuboid;
import java.util.ArrayList;
//#else
import net.minecraft.client.model.Box;
//$$ import net.minecraft.client.model.Box;
//#endif
//#if MC>=11400
@@ -88,7 +88,7 @@ import com.mojang.blaze3d.platform.GlStateManager;
import net.minecraft.client.render.VertexFormat;
import net.minecraft.client.render.VertexFormatElement;
//#if MC<11500
import net.minecraft.client.render.chunk.ChunkRenderTask;
//$$ import net.minecraft.client.render.chunk.ChunkRenderTask;
//#endif
//#else
//$$ import com.replaymod.core.mixin.ResourcePackRepositoryAccessor;
@@ -172,35 +172,35 @@ public class MCVer {
public static double Entity_getX(Entity entity) {
//#if MC>=11500
//$$ return entity.getX();
return entity.getX();
//#else
return entity.x;
//$$ return entity.x;
//#endif
}
public static double Entity_getY(Entity entity) {
//#if MC>=11500
//$$ return entity.getY();
return entity.getY();
//#else
return entity.y;
//$$ return entity.y;
//#endif
}
public static double Entity_getZ(Entity entity) {
//#if MC>=11500
//$$ return entity.getZ();
return entity.getZ();
//#else
return entity.z;
//$$ return entity.z;
//#endif
}
public static void Entity_setPos(Entity entity, double x, double y, double z) {
//#if MC>=11500
//$$ entity.setPos(x, y, z);
entity.setPos(x, y, z);
//#else
entity.x = x;
entity.y = y;
entity.z = z;
//$$ entity.x = x;
//$$ entity.y = y;
//$$ entity.z = z;
//#endif
}
@@ -368,13 +368,13 @@ public class MCVer {
@SuppressWarnings("unchecked")
//#if MC>=11500
//$$ public static List<Cuboid> cubeList(ModelPart modelRenderer) {
//$$ return new ArrayList<>(); // FIXME 1.15
//$$ }
//#else
public static List<Box> cubeList(ModelPart modelRenderer) {
return modelRenderer.boxes;
public static List<Cuboid> cubeList(ModelPart modelRenderer) {
return new ArrayList<>(); // FIXME 1.15
}
//#else
//$$ public static List<Box> cubeList(ModelPart modelRenderer) {
//$$ return modelRenderer.boxes;
//$$ }
//#endif
@SuppressWarnings("unchecked")
@@ -397,9 +397,9 @@ public class MCVer {
//#if MC>=11400
public static Window getWindow(MinecraftClient mc) {
//#if MC>=11500
//$$ return mc.getWindow();
return mc.getWindow();
//#else
return mc.window;
//$$ return mc.window;
//#endif
}
//#endif
@@ -609,9 +609,9 @@ public class MCVer {
}
//#if MC>=10800 && MC<11500
public interface ChunkRenderWorkerAccessor {
void doRunTask(ChunkRenderTask task) throws InterruptedException;
}
//$$ public interface ChunkRenderWorkerAccessor {
//$$ void doRunTask(ChunkRenderTask task) throws InterruptedException;
//$$ }
//#endif
public static long milliTime() {
@@ -624,10 +624,10 @@ public class MCVer {
public static void bindTexture(Identifier texture) {
//#if MC>=11500
//$$ getMinecraft().getTextureManager().bindTexture(texture);
getMinecraft().getTextureManager().bindTexture(texture);
//#else
//#if MC>=11400
getMinecraft().getTextureManager().bindTexture(texture);
//$$ getMinecraft().getTextureManager().bindTexture(texture);
//#else
//$$ getMinecraft().renderEngine.bindTexture(texture);
//#endif
@@ -822,10 +822,10 @@ public class MCVer {
public static boolean isKeyDown(int keyCode) {
//#if MC>=11500
//$$ return InputUtil.isKeyPressed(getMinecraft().getWindow().getHandle(), keyCode);
return InputUtil.isKeyPressed(getMinecraft().getWindow().getHandle(), keyCode);
//#else
//#if MC>=11400
return InputUtil.isKeyPressed(getMinecraft().window.getHandle(), keyCode);
//$$ return InputUtil.isKeyPressed(getMinecraft().window.getHandle(), keyCode);
//#else
//#if MC>=11400
//$$ return InputMappings.isKeyDown(keyCode);