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

Update to MC 1.14.3

Browse Source
This commit is contained in:
Jonas Herzig
2019-06-24 18:17:51 +02:00
parent 1f547f92ce
commit 214da6ba59
22 changed files with 93 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/replaymod/render/blend/exporters/ItemExporter.java
View File

@@ -70,7 +70,7 @@ public class ItemExporter implements Exporter {
if (object == null) {
object = new ItemBasedDObject(renderItem, model, stack);
//#if MC>=11300
object.id.name = stack.getDisplayName().getString();
object.id.name = stack.getName().getString();
//#else
//$$ object.id.name = stack.getDisplayName();
//#endif

6
src/main/java/com/replaymod/render/gui/GuiRenderQueue.java
View File

@@ -38,7 +38,7 @@ import java.util.List;
import static com.replaymod.render.ReplayModRender.LOGGER;
//#if MC>=11400
import net.minecraft.network.chat.TranslatableComponent;
import net.minecraft.text.TranslatableText;
//#endif
public class GuiRenderQueue extends AbstractGuiPopup<GuiRenderQueue> {
@@ -217,8 +217,8 @@ public class GuiRenderQueue extends AbstractGuiPopup<GuiRenderQueue> {
NoticeScreen errorScreen = new NoticeScreen(
//#if MC>=11400
container::display,
new TranslatableComponent("replaymod.gui.rendering.error.title"),
new TranslatableComponent("replaymod.gui.rendering.error.message")
new TranslatableText("replaymod.gui.rendering.error.title"),
new TranslatableText("replaymod.gui.rendering.error.message")
//#else
//$$ I18n.format("replaymod.gui.rendering.error.title"),
//$$ I18n.format("replaymod.gui.rendering.error.message")

6
src/main/java/com/replaymod/render/gui/GuiRenderSettings.java
View File

@@ -53,7 +53,7 @@ import static com.replaymod.core.utils.Utils.error;
import static com.replaymod.render.ReplayModRender.LOGGER;
//#if MC>=11400
import net.minecraft.network.chat.TranslatableComponent;
import net.minecraft.text.TranslatableText;
//#endif
public class GuiRenderSettings extends GuiScreen implements Closeable {
@@ -241,8 +241,8 @@ public class GuiRenderSettings extends GuiScreen implements Closeable {
NoticeScreen errorScreen = new NoticeScreen(
//#if MC>=11400
GuiRenderSettings.this::display,
new TranslatableComponent("replaymod.gui.rendering.error.title"),
new TranslatableComponent("replaymod.gui.rendering.error.message")
new TranslatableText("replaymod.gui.rendering.error.title"),
new TranslatableText("replaymod.gui.rendering.error.message")
//#else
//$$ I18n.format("replaymod.gui.rendering.error.title"),
//$$ I18n.format("replaymod.gui.rendering.error.message")

26
src/main/java/com/replaymod/render/hooks/ChunkLoadingRenderGlobal.java
View File

@@ -35,7 +35,7 @@ public class ChunkLoadingRenderGlobal {
//#else
//$$ private JailingQueue<ChunkCompileTaskGenerator> workerJailingQueue;
//#endif
private CustomChunkRenderWorker renderWorker;
private ChunkRenderWorkerAccessor renderWorker;
private int frame;
@SuppressWarnings("unchecked")
@@ -63,7 +63,7 @@ public class ChunkLoadingRenderGlobal {
private void setup(ChunkBatcher renderDispatcher) {
this.renderDispatcher = renderDispatcher;
this.renderWorker = new CustomChunkRenderWorker(renderDispatcher, new BlockLayeredBufferBuilder());
this.renderWorker = (ChunkRenderWorkerAccessor) new ChunkRenderWorker(renderDispatcher, new BlockLayeredBufferBuilder());
ChunkRenderDispatcherAccessor renderDispatcherAcc = (ChunkRenderDispatcherAccessor) renderDispatcher;
int workerThreads = renderDispatcherAcc.getListThreadedWorkers().size();
@@ -123,7 +123,7 @@ public class ChunkLoadingRenderGlobal {
queueChunkUpdates = ((ChunkRenderDispatcherAccessor) renderDispatcher).getQueueChunkUpdates();
while (!queueChunkUpdates.isEmpty()) {
try {
renderWorker.runTask(queueChunkUpdates.poll());
renderWorker.doRunTask(queueChunkUpdates.poll());
} catch (InterruptedException ignored) { }
}
@@ -160,25 +160,5 @@ public class ChunkLoadingRenderGlobal {
public int nextFrameId() {
return frame++;
}
/**
* Custom ChunkRenderWorker class providing access to the protected processTask method
*/
private static class CustomChunkRenderWorker extends ChunkRenderWorker {
public CustomChunkRenderWorker(ChunkBatcher p_i46202_1_, BlockLayeredBufferBuilder p_i46202_2_) {
super(p_i46202_1_, p_i46202_2_);
}
@Override
protected void runTask(
//#if MC>=11300
ChunkRenderTask p_178474_1_
//#else
//$$ ChunkCompileTaskGenerator p_178474_1_
//#endif
) throws InterruptedException {
super.runTask(p_178474_1_);
}
}
}
//#endif

19
src/main/java/com/replaymod/render/mixin/MixinChunkRenderWorker.java Normal file
View File

@@ -0,0 +1,19 @@
package com.replaymod.render.mixin;
//#if MC>=10800
import com.replaymod.core.versions.MCVer;
import net.minecraft.client.render.chunk.ChunkRenderTask;
import net.minecraft.client.render.chunk.ChunkRenderWorker;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Shadow;
@Mixin(ChunkRenderWorker.class)
public abstract class MixinChunkRenderWorker implements MCVer.ChunkRenderWorkerAccessor {
@Shadow abstract void runTask(ChunkRenderTask task) throws InterruptedException;
public void doRunTask(ChunkRenderTask task) throws InterruptedException {
runTask(task);
}
}
//#endif