PonyMirrors/Unicopia
1
0
Fork 0
mirror of https://github.com/Sollace/Unicopia.git synced 2024-11-27 23:27:59 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch '1.20.1' into 1.20.2

Browse source
This commit is contained in:
Sollace 2024-02-02 21:17:53 +00:00
commit 466ba09072
No known key found for this signature in database
GPG key ID: E52FACE7B5C773DB
2 changed files with 1 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/main/java/com/minelittlepony/unicopia/client/render/spell/PortalSpellRenderer.java
View file

@ -6,9 +6,7 @@ import com.minelittlepony.unicopia.ability.magic.spell.effect.PortalSpell;
import com.minelittlepony.unicopia.client.render.RenderLayers; import com.minelittlepony.unicopia.client.render.RenderLayers;
import com.minelittlepony.unicopia.client.render.model.SphereModel; import com.minelittlepony.unicopia.client.render.model.SphereModel;
import com.minelittlepony.unicopia.entity.EntityReference; import com.minelittlepony.unicopia.entity.EntityReference;
import it.unimi.dsi.fastutil.objects.ObjectArrayList;
import net.minecraft.client.MinecraftClient; import net.minecraft.client.MinecraftClient;
import net.minecraft.client.render.Frustum;
import net.minecraft.client.render.VertexConsumer; import net.minecraft.client.render.VertexConsumer;
import net.minecraft.client.render.VertexConsumerProvider; import net.minecraft.client.render.VertexConsumerProvider;
import net.minecraft.client.util.math.MatrixStack; import net.minecraft.client.util.math.MatrixStack;
@ -80,10 +78,4 @@ public class PortalSpellRenderer extends SpellRenderer<PortalSpell> {
matrices.pop(); matrices.pop();
} }
public interface WorldRendererDuck {
ObjectArrayList<?> unicopia_getChunkInfos();
Frustum unicopia_getFrustum();
}
} }

9
src/main/java/com/minelittlepony/unicopia/mixin/client/MixinWorldRenderer.java
View file

@ -15,10 +15,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
import com.minelittlepony.unicopia.client.ClientBlockDestructionManager; import com.minelittlepony.unicopia.client.ClientBlockDestructionManager;
import com.minelittlepony.unicopia.client.UnicopiaClient; import com.minelittlepony.unicopia.client.UnicopiaClient;
import com.minelittlepony.unicopia.client.render.spell.PortalSpellRenderer;
import it.unimi.dsi.fastutil.longs.Long2ObjectMap; import it.unimi.dsi.fastutil.longs.Long2ObjectMap;
import it.unimi.dsi.fastutil.objects.ObjectArrayList;
import net.minecraft.client.render.BlockBreakingInfo; import net.minecraft.client.render.BlockBreakingInfo;
import net.minecraft.client.render.Camera; import net.minecraft.client.render.Camera;
import net.minecraft.client.render.WorldRenderer; import net.minecraft.client.render.WorldRenderer;
@ -28,7 +25,7 @@ import net.minecraft.resource.SynchronousResourceReloader;
import net.minecraft.util.math.RotationAxis; import net.minecraft.util.math.RotationAxis;
@Mixin(value = WorldRenderer.class, priority = 1001) @Mixin(value = WorldRenderer.class, priority = 1001)
abstract class MixinWorldRenderer implements SynchronousResourceReloader, AutoCloseable, ClientBlockDestructionManager.Source, PortalSpellRenderer.WorldRendererDuck { abstract class MixinWorldRenderer implements SynchronousResourceReloader, AutoCloseable, ClientBlockDestructionManager.Source {
private final ClientBlockDestructionManager destructions = new ClientBlockDestructionManager(); private final ClientBlockDestructionManager destructions = new ClientBlockDestructionManager();
@ -44,10 +41,6 @@ abstract class MixinWorldRenderer implements SynchronousResourceReloader, AutoCl
return destructions; return destructions;
} }
@Override
@Accessor("chunkInfos")
public abstract ObjectArrayList<?> unicopia_getChunkInfos();
@Override @Override
@Accessor("ticks") @Accessor("ticks")
public abstract int getTicks(); public abstract int getTicks();