Remove PRE and POST preprocessor MC versions

This commit is contained in:
James Seibel
2023-12-11 07:45:54 -06:00
parent fee1c98a34
commit 2bb2f5a233
75 changed files with 368 additions and 381 deletions
@@ -36,7 +36,7 @@ import com.seibel.distanthorizons.coreapi.ModInfo;
import net.minecraft.world.level.LevelAccessor;
import net.minecraft.client.multiplayer.ClientLevel;
#if PRE_MC_1_19_2
#if MC_1_16 || MC_1_17 || MC_1_18
import net.minecraftforge.event.world.ChunkEvent;
import net.minecraftforge.event.world.WorldEvent;
#else
@@ -44,7 +44,7 @@ import net.minecraftforge.event.level.ChunkEvent;
import net.minecraftforge.event.level.LevelEvent;
#endif
#if POST_MC_1_18_2
#if MC_1_19 || MC_1_20
import net.minecraftforge.client.event.RenderLevelStageEvent;
#endif
import net.minecraftforge.event.entity.player.PlayerInteractEvent;
@@ -79,7 +79,7 @@ public class ForgeClientProxy
// private static SimpleChannel multiversePluginChannel;
#if PRE_MC_1_19_2
#if MC_1_16 || MC_1_17 || MC_1_18
private static LevelAccessor GetEventLevel(WorldEvent e) { return e.getWorld(); }
#else
private static LevelAccessor GetEventLevel(LevelEvent e) { return e.getLevel(); }
@@ -107,7 +107,7 @@ public class ForgeClientProxy
//==============//
@SubscribeEvent
#if PRE_MC_1_19_2
#if MC_1_16 || MC_1_17 || MC_1_18
public void clientLevelLoadEvent(WorldEvent.Load event)
#else
public void clientLevelLoadEvent(LevelEvent.Load event)
@@ -115,7 +115,7 @@ public class ForgeClientProxy
{
LOGGER.info("level load");
#if PRE_MC_1_19_2
#if MC_1_16 || MC_1_17 || MC_1_18
LevelAccessor level = event.getWorld();
#else
LevelAccessor level = event.getLevel();
@@ -131,7 +131,7 @@ public class ForgeClientProxy
ClientApi.INSTANCE.clientLevelLoadEvent(clientLevelWrapper);
}
@SubscribeEvent
#if PRE_MC_1_19_2
#if MC_1_16 || MC_1_17 || MC_1_18
public void clientLevelUnloadEvent(WorldEvent.Unload event)
#else
public void clientLevelUnloadEvent(LevelEvent.Load event)
@@ -139,7 +139,7 @@ public class ForgeClientProxy
{
LOGGER.info("level unload");
#if PRE_MC_1_19_2
#if MC_1_16 || MC_1_17 || MC_1_18
LevelAccessor level = event.getWorld();
#else
LevelAccessor level = event.getLevel();
@@ -165,7 +165,7 @@ public class ForgeClientProxy
{
LOGGER.trace("interact or block place event at blockPos: " + event.getPos());
#if PRE_MC_1_19_2
#if MC_1_16 || MC_1_17 || MC_1_18
LevelAccessor level = event.getWorld();
#else
LevelAccessor level = event.getLevel();
@@ -179,7 +179,7 @@ public class ForgeClientProxy
{
LOGGER.trace("break or block attack at blockPos: " + event.getPos());
#if PRE_MC_1_19_2
#if MC_1_16 || MC_1_17 || MC_1_18
LevelAccessor level = event.getWorld();
#else
LevelAccessor level = event.getLevel();
@@ -217,7 +217,7 @@ public class ForgeClientProxy
//==============//
@SubscribeEvent
public void registerKeyBindings(#if PRE_MC_1_19_2 InputEvent.KeyInputEvent #else InputEvent.Key #endif event)
public void registerKeyBindings(#if MC_1_16 || MC_1_17 || MC_1_18 InputEvent.KeyInputEvent #else InputEvent.Key #endif event)
{
if (Minecraft.getInstance().player == null)
{
@@ -298,15 +298,15 @@ public class ForgeClientProxy
//===========//
@SubscribeEvent
#if POST_MC_1_18_2
#if MC_1_19 || MC_1_20
public void afterLevelRenderEvent(RenderLevelStageEvent event)
#else
public void afterLevelRenderEvent(TickEvent.RenderTickEvent event)
#endif
{
#if POST_MC_1_20_1
#if MC_1_20_2 || MC_1_20_4
if (event.getStage() == RenderLevelStageEvent.Stage.AFTER_LEVEL)
#elif POST_MC_1_18_2
#elif MC_1_19 || MC_1_20
if (event.getStage() == RenderLevelStageEvent.Stage.AFTER_SOLID_BLOCKS)
#else
// FIXME: Is this the correct location for 1.16 & 1.17???
@@ -39,7 +39,7 @@ import com.seibel.distanthorizons.forge.wrappers.modAccessor.OptifineAccessor;
import net.minecraft.client.renderer.block.model.BakedQuad;
import net.minecraft.core.Direction;
#if POST_MC_1_19_2
#if MC_1_19 || MC_1_20
import net.minecraft.util.RandomSource;
#endif
import net.minecraft.world.level.ColorResolver;
@@ -51,11 +51,11 @@ import net.minecraftforge.fml.ModLoadingContext;
import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.event.lifecycle.*;
import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
#if PRE_MC_1_17_1
#if MC_1_16
import net.minecraftforge.fml.ExtensionPoint;
#elif MC_1_17_1
#elif MC_1_17
import net.minecraftforge.fmlclient.ConfigGuiHandler;
#elif POST_MC_1_18_2 && PRE_MC_1_19_2
#elif MC_1_18
import net.minecraftforge.client.ConfigGuiHandler;
#else
import net.minecraftforge.client.ConfigScreenHandler;
@@ -64,7 +64,7 @@ import net.minecraftforge.client.ConfigScreenHandler;
import org.apache.logging.log4j.Logger;
// these imports change due to forge refactoring classes in 1.19
#if PRE_MC_1_19_2
#if MC_1_16 || MC_1_17 || MC_1_18
import net.minecraftforge.client.model.data.ModelDataMap;
import java.util.Random;
@@ -128,10 +128,10 @@ public class ForgeMain implements LodForgeMethodCaller
ModAccessorInjector.INSTANCE.bind(IOptifineAccessor.class, new OptifineAccessor());
}
#if PRE_MC_1_17_1
#if MC_1_16
ModLoadingContext.get().registerExtensionPoint(ExtensionPoint.CONFIGGUIFACTORY,
() -> (client, parent) -> GetConfigScreen.getScreen(parent));
#elif MC_1_17_1 || MC_1_18_2 || PRE_MC_1_19_2
#elif MC_1_16 || MC_1_17 || MC_1_18
ModLoadingContext.get().registerExtensionPoint(ConfigGuiHandler.ConfigGuiFactory.class,
() -> new ConfigGuiHandler.ConfigGuiFactory((client, parent) -> GetConfigScreen.getScreen(parent)));
#else
@@ -169,14 +169,14 @@ public class ForgeMain implements LodForgeMethodCaller
LOGGER.info("Mod Post-Initialized");
}
#if PRE_MC_1_19_2
#if MC_1_16 || MC_1_17 || MC_1_18
private final ModelDataMap modelData = new ModelDataMap.Builder().build();
#else
private final ModelData modelData = ModelData.EMPTY;
#endif
@Override
#if PRE_MC_1_19_2
#if MC_1_16 || MC_1_17 || MC_1_18
public List<BakedQuad> getQuads(MinecraftClientWrapper mc, Block block, BlockState blockState, Direction direction, Random random)
{
return mc.getModelManager().getBlockModelShaper().getBlockModel(block.defaultBlockState()).getQuads(blockState, direction, random, modelData);
@@ -184,14 +184,14 @@ public class ForgeMain implements LodForgeMethodCaller
#else
public List<BakedQuad> getQuads(MinecraftClientWrapper mc, Block block, BlockState blockState, Direction direction, RandomSource random)
{
return mc.getModelManager().getBlockModelShaper().getBlockModel(block.defaultBlockState()).getQuads(blockState, direction, random, modelData #if POST_MC_1_19_2 , RenderType.solid() #endif );
return mc.getModelManager().getBlockModelShaper().getBlockModel(block.defaultBlockState()).getQuads(blockState, direction, random, modelData #if MC_1_19 || MC_1_20 , RenderType.solid() #endif );
}
#endif
@Override //TODO: Check this if its still needed
public int colorResolverGetColor(ColorResolver resolver, Biome biome, double x, double z)
{
#if MC_1_17_1______Still_needed
#if MC_1_17______Still_needed
return resolver.m_130045_(biome, x, z);
#else
return resolver.getColor(biome, x, z);
@@ -14,7 +14,7 @@ import net.minecraft.server.level.ServerLevel;
import net.minecraft.world.level.Level;
import net.minecraft.world.level.LevelAccessor;
import net.minecraftforge.event.TickEvent;
#if PRE_MC_1_19_2
#if MC_1_16 || MC_1_17 || MC_1_18
import net.minecraftforge.event.world.ChunkEvent;
import net.minecraftforge.event.world.WorldEvent;
#else
@@ -26,7 +26,7 @@ import net.minecraftforge.eventbus.api.SubscribeEvent;
#if MC_1_16_5
import net.minecraftforge.fml.event.server.FMLServerAboutToStartEvent;
import net.minecraftforge.fml.event.server.FMLServerStoppingEvent;
#elif MC_1_17_1
#elif MC_1_17
import net.minecraftforge.fmlserverevents.FMLServerAboutToStartEvent;
import net.minecraftforge.fmlserverevents.FMLServerStoppingEvent;
#else
@@ -41,7 +41,7 @@ import java.util.function.Supplier;
public class ForgeServerProxy
{
#if PRE_MC_1_19_2
#if MC_1_16 || MC_1_17 || MC_1_18
private static LevelAccessor GetEventLevel(WorldEvent e) { return e.getWorld(); }
#else
private static LevelAccessor GetEventLevel(LevelEvent e) { return e.getLevel(); }
@@ -81,21 +81,21 @@ public class ForgeServerProxy
// ServerWorldLoadEvent
@SubscribeEvent
public void dedicatedWorldLoadEvent(#if MC_1_16_5 || MC_1_17_1 FMLServerAboutToStartEvent #else ServerAboutToStartEvent #endif event)
public void dedicatedWorldLoadEvent(#if MC_1_16_5 || MC_1_17 FMLServerAboutToStartEvent #else ServerAboutToStartEvent #endif event)
{
this.serverApi.serverLoadEvent(this.isDedicated);
}
// ServerWorldUnloadEvent
@SubscribeEvent
public void serverWorldUnloadEvent(#if MC_1_16_5 || MC_1_17_1 FMLServerStoppingEvent #else ServerStoppingEvent #endif event)
public void serverWorldUnloadEvent(#if MC_1_16_5 || MC_1_17 FMLServerStoppingEvent #else ServerStoppingEvent #endif event)
{
this.serverApi.serverUnloadEvent();
}
// ServerLevelLoadEvent
@SubscribeEvent
#if PRE_MC_1_19_2
#if MC_1_16 || MC_1_17 || MC_1_18
public void serverLevelLoadEvent(WorldEvent.Load event)
#else
public void serverLevelLoadEvent(LevelEvent.Load event)
@@ -109,7 +109,7 @@ public class ForgeServerProxy
// ServerLevelUnloadEvent
@SubscribeEvent
#if PRE_MC_1_19_2
#if MC_1_16 || MC_1_17 || MC_1_18
public void serverLevelUnloadEvent(WorldEvent.Unload event)
#else
public void serverLevelUnloadEvent(LevelEvent.Unload event)
@@ -16,7 +16,7 @@ public class MixinClientPacketListener
@Inject(method = "handleLogin", at = @At("RETURN"))
void onHandleLoginEnd(CallbackInfo ci) { ClientApi.INSTANCE.onClientOnlyConnected(); }
#if PRE_MC_1_19_4
#if MC_1_16 || MC_1_17 || MC_1_18 || MC_1_19_2
@Inject(method = "cleanup", at = @At("HEAD"))
#else
@Inject(method = "close", at = @At("HEAD"))
@@ -35,7 +35,7 @@ import net.minecraft.client.renderer.FogRenderer.FogMode;
import net.minecraft.world.effect.MobEffects;
import net.minecraft.world.entity.Entity;
import net.minecraft.world.entity.LivingEntity;
#if PRE_MC_1_17_1
#if MC_1_16
import net.minecraft.world.level.material.FluidState;
#else
import net.minecraft.world.level.material.FogType;
@@ -53,10 +53,10 @@ public class MixinFogRenderer
@Inject(at = @At("RETURN"),
method = "setupFog(Lnet/minecraft/client/Camera;Lnet/minecraft/client/renderer/FogRenderer$FogMode;FZF)V",
remap = #if MC_1_17_1 || MC_1_18_2 false #else true #endif ) // Remap messiness due to this being weird in forge
remap = #if MC_1_17 || MC_1_18 false #else true #endif ) // Remap messiness due to this being weird in forge
private static void disableSetupFog(Camera camera, FogMode fogMode, float f, boolean bl, float partTick, CallbackInfo callback)
{
#if PRE_MC_1_17_1
#if MC_1_16
FluidState fluidState = camera.getFluidInCamera();
boolean cameraNotInFluid = fluidState.isEmpty();
#else
@@ -71,7 +71,7 @@ public class MixinFogRenderer
&& !SingletonInjector.INSTANCE.get(IMinecraftRenderWrapper.class).isFogStateSpecial()
&& Config.Client.Advanced.Graphics.Fog.disableVanillaFog.get())
{
#if PRE_MC_1_17_1
#if MC_1_16
RenderSystem.fogStart(A_REALLY_REALLY_BIG_VALUE);
RenderSystem.fogEnd(A_EVEN_LARGER_VALUE);
#else
@@ -16,7 +16,7 @@ public class MixinGameRenderer
{
private static final Logger LOGGER = LogManager.getLogger(MixinGameRenderer.class.getSimpleName());
#if POST_MC_1_17_1
#if MC_1_18 || MC_1_19 || MC_1_20
// FIXME: This I think will dup multiple renderStartupEvent calls...
@Inject(method = {"reloadShaders", "preloadUiShader"}, at = @At("TAIL"))
public void onStartupShaders(CallbackInfo ci)
@@ -20,7 +20,7 @@
package com.seibel.distanthorizons.forge.mixins.client;
import com.mojang.blaze3d.vertex.PoseStack;
#if PRE_MC_1_19_4
#if MC_1_16 || MC_1_17 || MC_1_18 || MC_1_19_2
import com.mojang.math.Matrix4f;
#else
import net.minecraft.client.Camera;
@@ -52,7 +52,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
import java.nio.FloatBuffer;
#if PRE_MC_1_17_1
#if MC_1_16
import org.lwjgl.opengl.GL15;
#endif
@@ -84,7 +84,7 @@ public class MixinLevelRenderer
throw new NullPointerException("Null cannot be cast to non-null type.");
}
#if PRE_MC_1_17_1
#if MC_1_16
@Inject(at = @At("RETURN"), method = "renderSky(Lcom/mojang/blaze3d/vertex/PoseStack;F)V")
private void renderSky(PoseStack matrixStackIn, float partialTicks, CallbackInfo callback)
#else
@@ -99,17 +99,17 @@ public class MixinLevelRenderer
// TODO: Can we move this to forge's client proxy similarly to how fabric does it
#if PRE_MC_1_17_1
#if MC_1_16
@Inject(at = @At("HEAD"),
method = "renderChunkLayer(Lnet/minecraft/client/renderer/RenderType;Lcom/mojang/blaze3d/vertex/PoseStack;DDD)V",
cancellable = true)
private void renderChunkLayer(RenderType renderType, PoseStack matrixStackIn, double xIn, double yIn, double zIn, CallbackInfo callback)
#elif PRE_MC_1_19_4
#elif MC_1_16 || MC_1_17 || MC_1_18 || MC_1_19_2
@Inject(at = @At("HEAD"),
method = "renderChunkLayer(Lnet/minecraft/client/renderer/RenderType;Lcom/mojang/blaze3d/vertex/PoseStack;DDDLcom/mojang/math/Matrix4f;)V",
cancellable = true)
private void renderChunkLayer(RenderType renderType, PoseStack modelViewMatrixStack, double cameraXBlockPos, double cameraYBlockPos, double cameraZBlockPos, Matrix4f projectionMatrix, CallbackInfo callback)
#elif PRE_MC_1_20_2
#elif MC_1_16 || MC_1_17 || MC_1_18 || MC_1_19 || MC_1_20_1
@Inject(at = @At("HEAD"),
method = "renderChunkLayer(Lnet/minecraft/client/renderer/RenderType;Lcom/mojang/blaze3d/vertex/PoseStack;DDDLorg/joml/Matrix4f;)V",
cancellable = true)
@@ -151,7 +151,7 @@ public class MixinLevelRenderer
#if MC_1_16_5
SeamlessOverdraw.applyLegacyProjectionMatrix(matrixFloatArray);
#elif PRE_MC_1_19_4
#elif MC_1_16 || MC_1_17 || MC_1_18 || MC_1_19_2
projectionMatrix.load(FloatBuffer.wrap(matrixFloatArray));
#else
projectionMatrix.set(matrixFloatArray);
@@ -165,10 +165,10 @@ public class MixinLevelRenderer
}
}
#if PRE_MC_1_19_4
#if MC_1_16 || MC_1_17 || MC_1_18 || MC_1_19_2
@Inject(at = @At(value = "TAIL", target = "Lnet/minecraft/world/level/lighting/LevelLightEngine;runUpdates(IZZ)I"), method = "renderLevel")
public void callAfterRunUpdates(PoseStack poseStack, float partialTick, long finishNanoTime, boolean renderBlockOutline, Camera camera, GameRenderer gameRenderer, LightTexture lightTexture, Matrix4f projectionMatrix, CallbackInfo ci)
#elif PRE_MC_1_20_1
#elif MC_1_16 || MC_1_17 || MC_1_18 || MC_1_19
@Inject(at = @At(value = "TAIL", target = "Lnet/minecraft/world/level/lighting/LevelLightEngine;runUpdates(IZZ)I"), method = "renderLevel")
public void callAfterRunUpdates(PoseStack poseStack, float partialTick, long finishNanoTime, boolean renderBlockOutline, Camera camera, GameRenderer gameRenderer, LightTexture lightTexture, Matrix4f projectionMatrix, CallbackInfo ci)
#else
@@ -25,7 +25,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
@Mixin(Minecraft.class)
public class MixinMinecraft
{
#if PRE_MC_1_20_2
#if MC_1_16 || MC_1_17 || MC_1_18 || MC_1_19 || MC_1_20_1
#if MC_1_20_1
@Redirect(
method = "Lnet/minecraft/client/Minecraft;setInitialScreen(Lcom/mojang/realmsclient/client/RealmsClient;Lnet/minecraft/server/packs/resources/ReloadInstance;Lnet/minecraft/client/main/GameConfig$QuickPlayData;)V",
@@ -61,7 +61,7 @@ public class MixinMinecraft
}
#endif
#if POST_MC_1_20_2
#if MC_1_20_4
@Redirect(
method = "Lnet/minecraft/client/Minecraft;onGameLoadFinished(Lnet/minecraft/client/Minecraft$GameLoadCookie;)V",
at = @At(value = "INVOKE", target = "Ljava/lang/Runnable;run()V")
@@ -26,7 +26,7 @@ import com.seibel.distanthorizons.core.config.Config;
import net.minecraft.client.gui.screens.OptionsScreen;
import net.minecraft.client.gui.screens.Screen;
import net.minecraft.network.chat.Component;
#if PRE_MC_1_19_2
#if MC_1_16 || MC_1_17 || MC_1_18
import net.minecraft.network.chat.TranslatableComponent;
#endif
import net.minecraft.resources.ResourceLocation;
@@ -57,7 +57,7 @@ public class MixinOptionsScreen extends Screen
private void lodconfig$init(CallbackInfo ci)
{
if (Config.Client.optionsButton.get())
this. #if PRE_MC_1_17_1 addButton #else addRenderableWidget #endif
this. #if MC_1_16 addButton #else addRenderableWidget #endif
(new TexturedButtonWidget(
// Where the button is on the screen
this.width / 2 - 180, this.height / 6 - 12,
@@ -71,7 +71,7 @@ public class MixinOptionsScreen extends Screen
// For now it goes to the client option by default
(buttonWidget) -> Objects.requireNonNull(minecraft).setScreen(GetConfigScreen.getScreen(this)),
// Add a title to the button
#if PRE_MC_1_19_2
#if MC_1_16 || MC_1_17 || MC_1_18
new TranslatableComponent(ModInfo.ID + ".title")));
#else
Component.translatable(ModInfo.ID + ".title")));
@@ -22,7 +22,7 @@ package com.seibel.distanthorizons.forge.mixins.server;
import org.spongepowered.asm.mixin.Mixin;
import net.minecraft.world.level.chunk.ChunkGenerator;
#if PRE_MC_1_18_2
#if MC_1_16 || MC_1_17
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Redirect;
@@ -9,7 +9,7 @@ class MixinTFChunkGenerator
{
// not currently implemented, attempting to run with the mod enabled in the IDE causes the game to lock up
}
#elif PRE_MC_1_17_1
#elif MC_1_16
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Redirect;
@@ -50,7 +50,7 @@ public class MixinUtilBackgroundThread
}
}
#if POST_MC_1_17_1
#if MC_1_18 || MC_1_19 || MC_1_20
@Inject(method = "wrapThreadWithTaskName(Ljava/lang/String;Ljava/lang/Runnable;)Ljava/lang/Runnable;",
at = @At("HEAD"), cancellable = true)
private static void overrideUtil$wrapThreadWithTaskName(String string, Runnable r, CallbackInfoReturnable<Runnable> ci)
@@ -62,7 +62,7 @@ public class MixinUtilBackgroundThread
}
}
#endif
#if POST_MC_1_18_2
#if MC_1_19 || MC_1_20
@Inject(method = "wrapThreadWithTaskName(Ljava/lang/String;Ljava/util/function/Supplier;)Ljava/util/function/Supplier;",
at = @At("HEAD"), cancellable = true)
private static void overrideUtil$wrapThreadWithTaskNameForSupplier(String string, Supplier<?> r, CallbackInfoReturnable<Supplier<?>> ci)
@@ -20,7 +20,7 @@
package com.seibel.distanthorizons.forge.mixins.server.unsafe;
import org.spongepowered.asm.mixin.Mixin;
#if POST_MC_1_18_2
#if MC_1_19 || MC_1_20
import net.minecraft.util.ThreadingDetector;
import org.spongepowered.asm.mixin.Mutable;