PonyMirrors/MineLittlePony
1
0
Fork 0
mirror of https://github.com/MineLittlePony/MineLittlePony.git synced 2025-02-17 01:54:22 +01:00
Code Issues Projects Releases Packages Wiki Activity

Cleaned up MixinRenderManager and made KillJoy happy

Browse source 
This will be the last commit on master until I can get this PR merged
This commit is contained in:
Sollace 2018-05-01 12:40:18 +02:00
parent df5d18d350
commit 1f68025252
4 changed files with 15 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/main/java/com/minelittlepony/PonyRenderManager.java
View file

@ -3,7 +3,7 @@ package com.minelittlepony;
import java.util.Map; import java.util.Map;
import com.google.common.collect.Maps; import com.google.common.collect.Maps;
import com.minelittlepony.ducks.IRenderManager; import com.minelittlepony.mixin.MixinRenderManager;
import com.minelittlepony.hdskins.gui.EntityPonyModel; import com.minelittlepony.hdskins.gui.EntityPonyModel;
import com.minelittlepony.hdskins.gui.RenderPonyModel; import com.minelittlepony.hdskins.gui.RenderPonyModel;
import com.minelittlepony.model.player.PlayerModels; import com.minelittlepony.model.player.PlayerModels;
@ -56,13 +56,15 @@ public class PonyRenderManager {
registerPlayerSkin(manager, PlayerModels.ALICORN); registerPlayerSkin(manager, PlayerModels.ALICORN);
} }
protected void registerPlayerSkin(RenderManager manager, PlayerModels playerModel) { private void registerPlayerSkin(RenderManager manager, PlayerModels playerModel) {
addPlayerSkin(manager, new RenderPonyPlayer(manager, false, playerModel)); addPlayerSkin(manager, false, playerModel);
addPlayerSkin(manager, new RenderPonyPlayer(manager, true, playerModel)); addPlayerSkin(manager, true, playerModel);
} }
public void addPlayerSkin(RenderManager manager, RenderPonyPlayer renderer) { private void addPlayerSkin(RenderManager manager, boolean slimArms, PlayerModels playerModel) {
((IRenderManager)manager).addPlayerSkin(renderer.skinId, renderer); RenderPonyPlayer renderer = new RenderPonyPlayer(manager, slimArms, playerModel.getModel(slimArms));
((MixinRenderManager)manager).getSkinMap().put(playerModel.getId(slimArms), renderer);
} }
/** /**

12
src/main/java/com/minelittlepony/ducks/IRenderManager.java
View file

@ -1,12 +0,0 @@
package com.minelittlepony.ducks;
import net.minecraft.client.renderer.entity.RenderPlayer;
public interface IRenderManager {
/**
* Registers a new player model to the underlying skinMap object.
* @param key The key to identify it by.
* @param render The renderer to add.
*/
void addPlayerSkin(String key, RenderPlayer render);
}

16
src/main/java/com/minelittlepony/mixin/MixinRenderManager.java
View file

@ -2,22 +2,14 @@ package com.minelittlepony.mixin;
import java.util.Map; import java.util.Map;
import org.spongepowered.asm.mixin.Final;
import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.gen.Accessor;
import com.minelittlepony.ducks.IRenderManager;
import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.client.renderer.entity.RenderManager;
import net.minecraft.client.renderer.entity.RenderPlayer; import net.minecraft.client.renderer.entity.RenderPlayer;
@Mixin(RenderManager.class) @Mixin(RenderManager.class)
public abstract class MixinRenderManager implements IRenderManager { public interface MixinRenderManager {
@Shadow @Final @Accessor
private Map<String, RenderPlayer> skinMap; Map<String, RenderPlayer> getSkinMap();
@Override
public void addPlayerSkin(String key, RenderPlayer render) {
skinMap.put(key, render);
}
} }

12
src/main/java/com/minelittlepony/render/player/RenderPonyPlayer.java
View file

@ -2,7 +2,7 @@ package com.minelittlepony.render.player;
import com.minelittlepony.MineLittlePony; import com.minelittlepony.MineLittlePony;
import com.minelittlepony.ducks.IPonyAnimationHolder; import com.minelittlepony.ducks.IPonyAnimationHolder;
import com.minelittlepony.model.player.PlayerModels; import com.minelittlepony.model.ModelWrapper;
import net.minecraft.client.entity.AbstractClientPlayer; import net.minecraft.client.entity.AbstractClientPlayer;
import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.GlStateManager;
@ -10,14 +10,8 @@ import net.minecraft.client.renderer.entity.RenderManager;
public class RenderPonyPlayer extends RenderPonyBase { public class RenderPonyPlayer extends RenderPonyBase {
/** public RenderPonyPlayer(RenderManager renderManager, boolean useSmallArms, ModelWrapper model) {
* The id used to find this renderer in the player skin map. super(renderManager, useSmallArms, model);
*/
public final String skinId;
public RenderPonyPlayer(RenderManager renderManager, boolean useSmallArms, PlayerModels model) {
super(renderManager, useSmallArms, model.getModel(useSmallArms));
skinId = model.getId(useSmallArms);
} }
@Override @Override