From 862c8d9b36ac99eb9078491443d78fac488e3184 Mon Sep 17 00:00:00 2001 From: Jonas Herzig Date: Sun, 23 Jun 2019 13:29:03 +0200 Subject: [PATCH] Update preprocessor - Switch from ECJ to IDEA (with potential for kotlin) - Can pull SRG mappings from FG, reducing amount of manual mappings (basically just class mappings and fixing errors in SRG mappings) --- jGui | 2 +- .../com/replaymod/core/versions/MCVer.java | 3 --- .../recording/gui/GuiRecordingOverlay.java | 7 ++--- versions/1.11.2/mapping.txt | 8 ------ versions/1.11/mapping.txt | 1 - versions/1.12/mapping.txt | 8 ------ versions/1.13.2/mapping.txt | 26 +++++-------------- versions/1.8.9/mapping.txt | 18 ------------- versions/1.8/mapping.txt | 5 +--- versions/1.9.4/mapping.txt | 11 -------- versions/common.gradle | 13 +++++++--- 11 files changed, 20 insertions(+), 82 deletions(-) diff --git a/jGui b/jGui index 9e297620..cd7d3dc5 160000 --- a/jGui +++ b/jGui @@ -1 +1 @@ -Subproject commit 9e297620ef3eb1e7f00f5e3f33ac5deda63c4fe5 +Subproject commit cd7d3dc55a4d40b63020772d8046b0878f989aad diff --git a/src/main/java/com/replaymod/core/versions/MCVer.java b/src/main/java/com/replaymod/core/versions/MCVer.java index eefca372..824e984f 100644 --- a/src/main/java/com/replaymod/core/versions/MCVer.java +++ b/src/main/java/com/replaymod/core/versions/MCVer.java @@ -608,9 +608,6 @@ public class MCVer { //#endif //#if MC>=11300 - public static void color(float r, float g, float b, float a) { GlStateManager.color4f(r, g, b, a); } - public static void enableAlpha() { GlStateManager.enableAlphaTest(); } - @SuppressWarnings("unused") public static abstract class Keyboard { public static final int KEY_LCONTROL = GLFW.GLFW_KEY_LEFT_CONTROL; diff --git a/src/main/java/com/replaymod/recording/gui/GuiRecordingOverlay.java b/src/main/java/com/replaymod/recording/gui/GuiRecordingOverlay.java index bbc86ca4..ea09fac6 100644 --- a/src/main/java/com/replaymod/recording/gui/GuiRecordingOverlay.java +++ b/src/main/java/com/replaymod/recording/gui/GuiRecordingOverlay.java @@ -21,10 +21,7 @@ import de.johni0702.minecraft.gui.versions.callbacks.PostRenderHudCallback; import static com.replaymod.core.ReplayMod.TEXTURE; import static com.replaymod.core.ReplayMod.TEXTURE_SIZE; import static com.replaymod.core.versions.MCVer.*; - -//#if MC<11300 -//$$ import static net.minecraft.client.renderer.GlStateManager.*; -//#endif +import static com.mojang.blaze3d.platform.GlStateManager.*; /** * Renders overlay during recording. @@ -57,7 +54,7 @@ public class GuiRecordingOverlay extends EventRegistrations { String text = guiControls.isPaused() ? I18n.translate("replaymod.gui.paused") : I18n.translate("replaymod.gui.recording"); fontRenderer.draw(text.toUpperCase(), 30, 18 - (fontRenderer.fontHeight / 2), 0xffffffff); bindTexture(TEXTURE); - enableAlpha(); + enableAlphaTest(); GuiRenderer renderer = new MinecraftGuiRenderer(MCVer.newScaledResolution(mc)); renderer.drawTexturedRect(10, 10, 58, 20, 16, 16, 16, 16, TEXTURE_SIZE, TEXTURE_SIZE); } diff --git a/versions/1.11.2/mapping.txt b/versions/1.11.2/mapping.txt index 411d2996..e69de29b 100644 --- a/versions/1.11.2/mapping.txt +++ b/versions/1.11.2/mapping.txt @@ -1,8 +0,0 @@ -net.minecraft.network.PacketBuffer readVarInt() readVarIntFromBuffer() -net.minecraft.network.PacketBuffer writeVarInt() writeVarIntToBuffer() -net.minecraft.network.PacketBuffer readString() readStringFromBuffer() -net.minecraft.network.PacketBuffer writeString() writeStringToBuffer() -net.minecraft.util.math.MathHelper floor() floor_double() -net.minecraft.client.Minecraft player thePlayer -net.minecraft.client.Minecraft world theWorld -net.minecraft.entity.Entity world worldObj \ No newline at end of file diff --git a/versions/1.11/mapping.txt b/versions/1.11/mapping.txt index 1d3d4e24..e69de29b 100644 --- a/versions/1.11/mapping.txt +++ b/versions/1.11/mapping.txt @@ -1 +0,0 @@ -net.minecraft.client.renderer.chunk.RenderChunk setPosition() setOrigin() \ No newline at end of file diff --git a/versions/1.12/mapping.txt b/versions/1.12/mapping.txt index 3f036260..7f5599f4 100644 --- a/versions/1.12/mapping.txt +++ b/versions/1.12/mapping.txt @@ -1,9 +1 @@ -net.minecraft.world.WorldType DEBUG_ALL_BLOCK_STATES DEBUG_WORLD -net.minecraft.client.resources.ResourcePackRepository setServerResourcePack() setResourcePackInstance() -net.minecraft.client.Minecraft fontRenderer fontRendererObj net.minecraft.client.renderer.BufferBuilder net.minecraft.client.renderer.VertexBuffer -net.minecraft.client.gui.GuiButton x xPosition -net.minecraft.client.gui.GuiButton y yPosition -net.minecraft.util.math.Vec3d x xCoord -net.minecraft.util.math.Vec3d y yCoord -net.minecraft.util.math.Vec3d z zCoord \ No newline at end of file diff --git a/versions/1.13.2/mapping.txt b/versions/1.13.2/mapping.txt index ff827dac..f6e6d44c 100644 --- a/versions/1.13.2/mapping.txt +++ b/versions/1.13.2/mapping.txt @@ -1,12 +1,6 @@ +net.minecraft.resources.AbstractResourcePack net.minecraft.client.resources.AbstractResourcePack net.minecraft.resources.FolderPack net.minecraft.client.resources.FolderResourcePack -net.minecraft.resources.AbstractResourcePack getInputStream() getInputStreamByName() -net.minecraft.client.gui.GuiYesNoCallback confirmResult() confirmClicked() -net.minecraft.entity.EntityLivingBase LIVING_FLAGS HAND_STATES -net.minecraft.entity.EntityLivingBase livingTick() onLivingUpdate() net.minecraft.client.resources.DownloadingPackFinder net.minecraft.client.resources.ResourcePackRepository -net.minecraft.client.resources.DownloadingPackFinder func_195741_a() setServerResourcePack() -net.minecraft.client.renderer.color.ItemColors getColor() getColorFromItemstack() -net.minecraft.client.renderer.GlStateManager activeTexture activeTextureUnit net.minecraft.client.renderer.FirstPersonRenderer net.minecraft.client.renderer.ItemRenderer net.minecraft.client.renderer.chunk.ChunkRenderTask net.minecraft.client.renderer.chunk.ChunkCompileTaskGenerator net.minecraft.client.GameSettings net.minecraft.client.settings.GameSettings @@ -19,21 +13,15 @@ net.minecraft.client.renderer.entity.model.ModelRenderer net.minecraft.client.mo net.minecraft.crash.ReportedException net.minecraft.util.ReportedException net.minecraftforge.eventbus.api.IEventBus net.minecraftforge.fml.common.eventhandler.EventBus com.replaymod.core.versions.MCVer.Keyboard org.lwjgl.input.Keyboard -net.minecraft.client.Minecraft gameDir mcDataDir -net.minecraft.client.Minecraft getInstance() getMinecraft() -net.minecraft.client.Minecraft getPackFinder() getResourcePackRepository() net.minecraft.client.renderer.WorldRenderer net.minecraft.client.renderer.RenderGlobal net.minecraft.network.play.server.SPacketEntity.Move net.minecraft.network.play.server.SPacketEntity.S17PacketEntityLookMove -net.minecraft.entity.Entity setBoundingBox() setEntityBoundingBox() -net.minecraft.entity.Entity isPassenger() isRiding() -net.minecraft.entity.Entity tick() onUpdate() -net.minecraft.entity.Entity remove() setDead() -net.minecraft.entity.Entity removed isDead net.minecraftforge.fml.network.NetworkRegistry net.minecraftforge.fml.common.network.NetworkRegistry net.minecraft.client.renderer.ItemRenderer net.minecraft.client.renderer.RenderItem -net.minecraft.world.World getChunk() getChunkFromChunkCoords() -net.minecraft.util.text.ITextComponent getString() getUnformattedText() -net.minecraft.network.play.server.SPacketRespawn func_212643_b() getDimensionID() net.minecraft.client.renderer.GameRenderer net.minecraft.client.renderer.EntityRenderer net.minecraft.client.renderer.WorldRenderer net.minecraft.client.renderer.RenderGlobal -net.minecraft.client.gui.GuiScreen buttons buttonList \ No newline at end of file + +net.minecraft.resources.AbstractResourcePack getInputStream() getInputStreamByName() +net.minecraft.client.gui.GuiYesNoCallback confirmResult() confirmClicked() +net.minecraft.util.text.ITextComponent getString() getUnformattedText() +net.minecraft.network.play.server.SPacketRespawn func_212643_b() getDimensionID() +net.minecraft.client.Minecraft getPackFinder() getResourcePackRepository() diff --git a/versions/1.8.9/mapping.txt b/versions/1.8.9/mapping.txt index a5c0feb9..a4e34b71 100644 --- a/versions/1.8.9/mapping.txt +++ b/versions/1.8.9/mapping.txt @@ -1,20 +1,2 @@ net.minecraft.client.renderer.WorldRenderer begin() startDrawing() -net.minecraft.util.Timer counter field_74285_i -net.minecraft.client.resources.ResourcePackRepository downloadResourcePack() func_180601_a() -net.minecraft.client.resources.ResourcePackRepository setResourcePackInstance() func_177319_a() -net.minecraft.network.play.server.S0DPacketCollectItem getEntityID() func_149353_d() -net.minecraft.network.play.server.S08PacketPlayerPosLook getX() func_148932_c() -net.minecraft.network.play.server.S08PacketPlayerPosLook getY() func_148928_d() -net.minecraft.network.play.server.S08PacketPlayerPosLook getZ() func_148933_e() -net.minecraft.network.play.server.S21PacketChunkData getExtractedSize() func_149276_g() -net.minecraft.network.play.server.S21PacketChunkData getChunkX() func_149273_e() -net.minecraft.network.play.server.S21PacketChunkData getChunkZ() func_149271_f() net.minecraft.network.play.server.S38PacketPlayerListItem getAction() func_179768_b() -net.minecraft.network.play.server.S38PacketPlayerListItem.AddPlayerData getProfile() func_179962_a() -net.minecraft.network.play.server.S48PacketResourcePackSend getURL() func_179783_a() -net.minecraft.network.play.server.S48PacketResourcePackSend getHash() func_179784_b() -net.minecraft.network.play.server.S0CPacketSpawnPlayer watcher field_148960_i -net.minecraft.network.play.server.S0CPacketSpawnPlayer getPlayer() func_179819_c() -net.minecraft.network.play.server.S40PacketDisconnect getReason() func_149165_c() -net.minecraft.network.play.server.S2BPacketChangeGameState getGameState() func_149138_c() -net.minecraft.network.play.server.S0EPacketSpawnObject getType() func_148993_l() \ No newline at end of file diff --git a/versions/1.8/mapping.txt b/versions/1.8/mapping.txt index c1bd2df8..2129a269 100644 --- a/versions/1.8/mapping.txt +++ b/versions/1.8/mapping.txt @@ -20,7 +20,6 @@ net.minecraftforge.fml.client.FMLClientHandler cpw.mods.fml.client.FMLClientHand net.minecraftforge.fml.common.eventhandler.EventBus cpw.mods.fml.common.eventhandler.EventBus net.minecraft.client.renderer.GlStateManager com.replaymod.core.versions.MCVer.GlStateManager net.minecraft.client.renderer.GlStateManager.BooleanState com.replaymod.render.hooks.GLStateTracker.BooleanState -net.minecraft.client.settings.KeyBinding isKeyDown() getIsKeyPressed() net.minecraftforge.fml.common.network.FMLNetworkEvent cpw.mods.fml.common.network.FMLNetworkEvent net.minecraftforge.fml.common.network.handshake.FMLHandshakeCodec cpw.mods.fml.common.network.handshake.FMLHandshakeCodec net.minecraftforge.fml.common.network.handshake.NetworkDispatcher cpw.mods.fml.common.network.handshake.NetworkDispatcher @@ -31,6 +30,4 @@ net.minecraftforge.fml.common.network.handshake.FMLHandshakeMessage.RegistryData net.minecraftforge.fml.common.network.internal.FMLProxyPacket cpw.mods.fml.common.network.internal.FMLProxyPacket net.minecraftforge.fml.common.network.NetworkRegistry cpw.mods.fml.common.network.NetworkRegistry net.minecraftforge.fml.common.gameevent.InputEvent cpw.mods.fml.common.gameevent.InputEvent -net.minecraft.client.renderer.tileentity.TileEntityEndPortalRenderer net.minecraft.client.renderer.tileentity.RenderEndPortal -net.minecraft.network.play.server.S3FPacketCustomPayload getChannelName() func_149169_c() -net.minecraft.network.play.server.S01PacketJoinGame getEntityId() func_149197_c() \ No newline at end of file +net.minecraft.client.renderer.tileentity.TileEntityEndPortalRenderer net.minecraft.client.renderer.tileentity.RenderEndPortal \ No newline at end of file diff --git a/versions/1.9.4/mapping.txt b/versions/1.9.4/mapping.txt index 9d49999f..ce621b67 100644 --- a/versions/1.9.4/mapping.txt +++ b/versions/1.9.4/mapping.txt @@ -1,7 +1,5 @@ net.minecraft.stats.StatisticsManager net.minecraft.stats.StatFileWriter -net.minecraft.client.renderer.texture.TextureMap LOCATION_BLOCKS_TEXTURE locationBlocksTexture net.minecraft.init.MobEffects net.minecraft.potion.Potion -net.minecraft.init.MobEffects INVISIBILITY invisibility net.minecraft.util.text.TextComponentString net.minecraft.util.ChatComponentText net.minecraft.util.text.TextComponentTranslation net.minecraft.util.ChatComponentTranslation net.minecraft.util.text.Style net.minecraft.util.ChatStyle @@ -10,20 +8,14 @@ net.minecraft.util.text.ITextComponent net.minecraft.util.IChatComponent net.minecraft.network.datasync.EntityDataManager net.minecraft.entity.DataWatcher net.minecraft.network.datasync.EntityDataManager.DataEntry net.minecraft.entity.DataWatcher.WatchableObject net.minecraft.client.renderer.VertexBuffer net.minecraft.client.renderer.WorldRenderer -net.minecraft.client.renderer.Tessellator getBuffer() getWorldRenderer() net.minecraft.client.particle.Particle net.minecraft.client.particle.EntityFX net.minecraft.util.math.MathHelper net.minecraft.util.MathHelper net.minecraft.util.SoundCategory net.minecraft.client.audio.SoundCategory -net.minecraft.client.Minecraft getConnection() getNetHandler() -net.minecraft.client.multiplayer.ServerList saveSingleServer() func_147414_b() -net.minecraft.client.network.NetHandlerPlayClient sendPacket() addToSendQueue() net.minecraft.util.math.BlockPos net.minecraft.util.BlockPos net.minecraft.client.gui.GuiWorldSelection net.minecraft.client.gui.GuiSelectWorld -net.minecraft.network.play.server.SPacketSpawnPlayer getUniqueId() getPlayer() net.minecraft.util.math.AxisAlignedBB net.minecraft.util.AxisAlignedBB net.minecraft.util.math.RayTraceResult net.minecraft.util.MovingObjectPosition net.minecraft.client.renderer.RenderItem net.minecraft.client.renderer.entity.RenderItem -net.minecraft.network.play.server.SPacketJoinGame getPlayerId() getEntityId() net.minecraft.network.play.server.SPacketJoinGame net.minecraft.network.play.server.S01PacketJoinGame net.minecraft.network.play.server.SPacketChat net.minecraft.network.play.server.S02PacketChat @@ -33,11 +25,8 @@ net.minecraft.network.play.server.SPacketPlayerPosLook net.minecraft.network.pla net.minecraft.network.play.server.SPacketPlayerListItem net.minecraft.network.play.server.S38PacketPlayerListItem net.minecraft.network.play.server.SPacketRespawn net.minecraft.network.play.server.S07PacketRespawn net.minecraft.network.play.server.SPacketSpawnPlayer net.minecraft.network.play.server.S0CPacketSpawnPlayer -net.minecraft.network.play.server.SPacketSpawnPlayer getDataManagerEntries() func_148944_c() net.minecraft.network.play.server.SPacketSpawnObject net.minecraft.network.play.server.S0EPacketSpawnObject net.minecraft.network.play.server.SPacketSpawnMob net.minecraft.network.play.server.S0FPacketSpawnMob -net.minecraft.network.play.server.SPacketSpawnMob dataManager field_149043_l -net.minecraft.network.play.server.SPacketSpawnMob getDataManagerEntries() func_149027_c() net.minecraft.network.play.server.SPacketSpawnGlobalEntity net.minecraft.network.play.server.S2CPacketSpawnGlobalEntity net.minecraft.network.play.server.SPacketSpawnPainting net.minecraft.network.play.server.S10PacketSpawnPainting net.minecraft.network.play.server.SPacketSpawnExperienceOrb net.minecraft.network.play.server.S11PacketSpawnExperienceOrb diff --git a/versions/common.gradle b/versions/common.gradle index 01a8fc0f..b15d61d1 100644 --- a/versions/common.gradle +++ b/versions/common.gradle @@ -36,16 +36,21 @@ buildscript { if (mcVersion >= 11400) { classpath 'fabric-loom:fabric-loom.gradle.plugin:0.2.2-SNAPSHOT' } else if (mcVersion >= 11300) { - classpath 'net.minecraftforge.gradle:ForgeGradle:3.+' + classpath('net.minecraftforge.gradle:ForgeGradle:3.+'){ + exclude group: 'trove', module: 'trove' // preprocessor/idea requires more recent one + } } else { - classpath 'com.github.ReplayMod:ForgeGradle:' + ( + classpath('com.github.ReplayMod:ForgeGradle:' + ( mcVersion >= 11200 ? 'd5c13801' : // FG 2.3 mcVersion >= 10904 ? 'bf0ea7b8' : // FG 2.2 mcVersion >= 10800 ? 'ab81684e' : // FG 2.1 'e93f77b4' // FG 1.2 - ) + )){ + exclude group: 'net.sf.trove4j', module: 'trove4j' // preprocessor/idea requires more recent one + exclude group: 'trove', module: 'trove' // different name same thing + } } - classpath 'com.github.replaymod:preprocessor:eb4fac9' + classpath 'com.github.replaymod:preprocessor:8ec3e31' } }