remove todos and hopefully fix some compiling?
This commit is contained in:
+1
-1
@@ -29,7 +29,7 @@ import org.spongepowered.asm.mixin.Mixin;
|
|||||||
*
|
*
|
||||||
* @see MixinUtilBackgroundThread
|
* @see MixinUtilBackgroundThread
|
||||||
*/
|
*/
|
||||||
@Mixin(net.minecraft.Util.class) // TODO we should allow version specific mixins so we don't have to create dummy mixins that exist for all MC versions
|
@Mixin(net.minecraft.Util.class)
|
||||||
public class MixinTracingExecutor
|
public class MixinTracingExecutor
|
||||||
{
|
{
|
||||||
|
|
||||||
|
|||||||
+7
-2
@@ -10,11 +10,16 @@ import com.seibel.distanthorizons.api.interfaces.world.IDhApiLevelWrapper;
|
|||||||
import com.seibel.distanthorizons.api.objects.data.DhApiChunk;
|
import com.seibel.distanthorizons.api.objects.data.DhApiChunk;
|
||||||
import com.seibel.distanthorizons.api.objects.data.DhApiTerrainDataPoint;
|
import com.seibel.distanthorizons.api.objects.data.DhApiTerrainDataPoint;
|
||||||
import com.seibel.distanthorizons.common.wrappers.world.ServerLevelWrapper;
|
import com.seibel.distanthorizons.common.wrappers.world.ServerLevelWrapper;
|
||||||
import net.minecraft.core.BlockPos;
|
|
||||||
import net.minecraft.core.QuartPos;
|
|
||||||
import net.minecraft.server.level.ServerLevel;
|
import net.minecraft.server.level.ServerLevel;
|
||||||
import net.minecraft.world.level.chunk.ChunkAccess;
|
import net.minecraft.world.level.chunk.ChunkAccess;
|
||||||
|
|
||||||
|
#if MC_VER >= MC_1_18_2
|
||||||
|
import net.minecraft.core.BlockPos;
|
||||||
|
import net.minecraft.core.QuartPos;
|
||||||
|
#endif
|
||||||
|
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
|
|
||||||
public class TestChunkWorldGenerator extends AbstractDhApiChunkWorldGenerator
|
public class TestChunkWorldGenerator extends AbstractDhApiChunkWorldGenerator
|
||||||
|
|||||||
+1
-6
@@ -11,8 +11,6 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
|
|||||||
@Mixin(ClientPacketListener.class)
|
@Mixin(ClientPacketListener.class)
|
||||||
public class MixinClientPacketListener
|
public class MixinClientPacketListener
|
||||||
{
|
{
|
||||||
// TODO update fabric version as well
|
|
||||||
|
|
||||||
@Inject(method = "handleLogin", at = @At("RETURN"))
|
@Inject(method = "handleLogin", at = @At("RETURN"))
|
||||||
void onHandleLoginEnd(CallbackInfo ci) { ClientApi.INSTANCE.onClientOnlyConnected(); }
|
void onHandleLoginEnd(CallbackInfo ci) { ClientApi.INSTANCE.onClientOnlyConnected(); }
|
||||||
|
|
||||||
@@ -21,9 +19,6 @@ public class MixinClientPacketListener
|
|||||||
#else
|
#else
|
||||||
@Inject(method = "close", at = @At("HEAD"))
|
@Inject(method = "close", at = @At("HEAD"))
|
||||||
#endif
|
#endif
|
||||||
void onCleanupStart(CallbackInfo ci)
|
void onCleanupStart(CallbackInfo ci) { ClientApi.INSTANCE.onClientOnlyDisconnected(); }
|
||||||
{
|
|
||||||
ClientApi.INSTANCE.onClientOnlyDisconnected();
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
-2
@@ -41,8 +41,6 @@ import net.minecraft.world.level.material.FluidState;
|
|||||||
import net.minecraft.world.level.material.FogType;
|
import net.minecraft.world.level.material.FogType;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@Mixin(FogRenderer.class)
|
@Mixin(FogRenderer.class)
|
||||||
public class MixinFogRenderer
|
public class MixinFogRenderer
|
||||||
{
|
{
|
||||||
|
|||||||
-5
@@ -76,11 +76,6 @@ public class MixinLevelRenderer
|
|||||||
@Unique
|
@Unique
|
||||||
private static float previousPartialTicks = 0;
|
private static float previousPartialTicks = 0;
|
||||||
|
|
||||||
// TODO: Is there any reason why this is here? Can it be deleted?
|
|
||||||
public MixinLevelRenderer()
|
|
||||||
{
|
|
||||||
throw new NullPointerException("Null cannot be cast to non-null type.");
|
|
||||||
}
|
|
||||||
|
|
||||||
#if MC_VER < MC_1_17_1
|
#if MC_VER < MC_1_17_1
|
||||||
@Inject(at = @At("RETURN"), method = "renderSky(Lcom/mojang/blaze3d/vertex/PoseStack;F)V")
|
@Inject(at = @At("RETURN"), method = "renderSky(Lcom/mojang/blaze3d/vertex/PoseStack;F)V")
|
||||||
|
|||||||
+1
-1
@@ -28,7 +28,7 @@ import org.spongepowered.asm.mixin.Mixin;
|
|||||||
*
|
*
|
||||||
* @see MixinUtilBackgroundThread
|
* @see MixinUtilBackgroundThread
|
||||||
*/
|
*/
|
||||||
@Mixin(net.minecraft.Util.class) // TODO we should allow version specific mixins so we don't have to create dummy mixins that exist for all MC versions
|
@Mixin(net.minecraft.Util.class)
|
||||||
public class MixinTracingExecutor
|
public class MixinTracingExecutor
|
||||||
{
|
{
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user