mirror of
https://github.com/GTNewHorizons/Chisel.git
synced 2026-11-16 18:55:06 +00:00
Delete PlayerSpecials and annoying logging
This commit is contained in:
1 parent
68f5fcaccb
commit
411d4f7dbe
3 files changed
+5
-172
No files matched your search
@@ -3,14 +3,9 @@ package com.cricketcraft.chisel;
|
||||
import java.io.File;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.entity.player.EntityPlayerMP;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraft.util.ChatComponentText;
|
||||
import net.minecraftforge.common.MinecraftForge;
|
||||
import net.minecraftforge.common.config.Configuration;
|
||||
import net.minecraftforge.event.entity.EntityJoinWorldEvent;
|
||||
|
||||
import org.apache.logging.log4j.LogManager;
|
||||
import org.apache.logging.log4j.Logger;
|
||||
@@ -182,8 +177,6 @@ public class Chisel {
|
||||
public void postInit(FMLPostInitializationEvent event) {
|
||||
ChiselTabs.postInit();
|
||||
Compatibility.init(event);
|
||||
FMLLog.severe("Unable to lookup chisel:... is not an error, please do not treat it as such");
|
||||
FMLLog.bigWarning("In case you didn't see the red above I suggest you read it - Cricket");
|
||||
}
|
||||
|
||||
@EventHandler
|
||||
|
||||
@@ -1,157 +0,0 @@
|
||||
package com.cricketcraft.chisel.client.player;
|
||||
|
||||
import java.util.Collection;
|
||||
import java.util.UUID;
|
||||
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.renderer.ItemRenderer;
|
||||
import net.minecraft.client.renderer.OpenGlHelper;
|
||||
import net.minecraft.client.renderer.Tessellator;
|
||||
import net.minecraft.client.renderer.texture.TextureMap;
|
||||
import net.minecraft.entity.Entity;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.EnumChatFormatting;
|
||||
import net.minecraft.util.IIcon;
|
||||
import net.minecraftforge.client.event.RenderLivingEvent;
|
||||
import net.minecraftforge.client.event.RenderPlayerEvent;
|
||||
import net.minecraftforge.common.MinecraftForge;
|
||||
|
||||
import org.lwjgl.opengl.GL11;
|
||||
|
||||
import com.cricketcraft.chisel.init.ChiselItems;
|
||||
import com.google.common.collect.ArrayListMultimap;
|
||||
import com.google.common.collect.Lists;
|
||||
import com.google.common.collect.Multimap;
|
||||
|
||||
import cpw.mods.fml.common.eventhandler.EventPriority;
|
||||
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
|
||||
|
||||
public class PlayerSpecials {
|
||||
|
||||
private interface IDevRenderer {
|
||||
|
||||
void renderPlayer(EntityPlayer player, boolean post);
|
||||
|
||||
void renderExtras(EntityPlayer player, boolean post);
|
||||
}
|
||||
|
||||
private class RenderHolstered implements IDevRenderer {
|
||||
|
||||
private ItemStack toRender;
|
||||
|
||||
private RenderHolstered(ItemStack toRender) {
|
||||
this.toRender = toRender;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void renderExtras(EntityPlayer player, boolean post) {
|
||||
if (!post) {
|
||||
GL11.glPushMatrix();
|
||||
Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationItemsTexture);
|
||||
if (player.isSneaking()) {
|
||||
GL11.glRotatef(28.64789F, 1.0F, 0.0F, 0.0F);
|
||||
}
|
||||
boolean armor = player.getCurrentArmor(1) != null;
|
||||
GL11.glRotatef(180.0F, 1.0F, 0.0F, 0.0F);
|
||||
GL11.glRotatef(90.0F, 0.0F, 1.0F, 0.0F);
|
||||
GL11.glTranslatef(-0.25F, -0.85F, armor ? 0.2F : 0.28F);
|
||||
GL11.glScalef(0.5F, 0.5F, 0.5F);
|
||||
GL11.glColor3f(1.0F, 1.0F, 1.0F);
|
||||
int light = 0xF000F0;
|
||||
int lightmapX = light % 0x10000;
|
||||
int lightmapY = light / 0x10000;
|
||||
OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, lightmapX, lightmapY);
|
||||
|
||||
IIcon icon = toRender.getIconIndex();
|
||||
ItemRenderer.renderItemIn2D(Tessellator.instance, icon.getMaxU(), icon.getMinV(), icon.getMinU(), icon.getMaxV(), icon.getIconWidth(), icon.getIconHeight(), 1.0F / 16.0F);
|
||||
GL11.glPopMatrix();
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void renderPlayer(EntityPlayer player, boolean post) {
|
||||
}
|
||||
}
|
||||
|
||||
private class RenderTranslucent implements IDevRenderer {
|
||||
|
||||
@Override
|
||||
public void renderExtras(EntityPlayer player, boolean post) {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void renderPlayer(EntityPlayer player, boolean post) {
|
||||
if (!post) {
|
||||
GL11.glColor4f(1.0F, 1.0F, 1.0F, 0.75F);
|
||||
GL11.glEnable(GL11.GL_BLEND);
|
||||
GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
|
||||
} else {
|
||||
GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
|
||||
GL11.glDisable(GL11.GL_BLEND);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public static final PlayerSpecials INSTANCE = new PlayerSpecials();
|
||||
|
||||
private Multimap<UUID, IDevRenderer> renderMap = ArrayListMultimap.create();
|
||||
|
||||
private PlayerSpecials() {
|
||||
RenderHolstered backChisel = new RenderHolstered(new ItemStack(ChiselItems.obsidianChisel));
|
||||
RenderTranslucent translucent = new RenderTranslucent();
|
||||
|
||||
renderMap.putAll(UUID.fromString("a7529984-8cb2-4fb9-b799-97980f770101"), Lists.newArrayList(backChisel, translucent)); // Cricket
|
||||
renderMap.putAll(UUID.fromString("a1d2532b-ee11-4ca3-b4c5-76e168d4c98e"), Lists.newArrayList(backChisel, translucent)); // TheCricket26
|
||||
renderMap.putAll(UUID.fromString("5399b615-3440-4c66-939d-ab1375952ac3"), Lists.newArrayList(backChisel, translucent)); // Drullkus
|
||||
|
||||
renderMap.put(UUID.fromString("671516b1-4fb3-4c03-aa7c-9c88cfab3ae8"), new RenderHolstered(new ItemStack(ChiselItems.diamondChisel))); // tterrag
|
||||
renderMap.put(UUID.fromString("ad18f501-08fa-4e7e-b324-86750009106e"), new RenderHolstered(new ItemStack(ChiselItems.chisel)));//minecreatr
|
||||
|
||||
MinecraftForge.EVENT_BUS.register(this);
|
||||
}
|
||||
|
||||
public static void init() {
|
||||
}
|
||||
|
||||
@SubscribeEvent(priority = EventPriority.HIGHEST)
|
||||
public void onPlayerRenderPre(RenderLivingEvent.Pre event) {
|
||||
if(nameIsGood(event.entity)){
|
||||
GL11.glColor4f(1.0F, 1.0F, 1.0F, 0.75F);
|
||||
GL11.glEnable(GL11.GL_BLEND);
|
||||
GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
|
||||
}
|
||||
}
|
||||
|
||||
@SubscribeEvent
|
||||
public void onPlayerRenderPost(RenderLivingEvent.Post event) {
|
||||
if(nameIsGood(event.entity)){
|
||||
GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
|
||||
GL11.glDisable(GL11.GL_BLEND);
|
||||
}
|
||||
}
|
||||
|
||||
@SubscribeEvent
|
||||
public void onPlayerRenderSpecialPre(RenderPlayerEvent.Specials.Pre event) {
|
||||
Collection<IDevRenderer> renders = renderMap.get(event.entityPlayer.getUniqueID());
|
||||
for (IDevRenderer r : renders) {
|
||||
r.renderExtras(event.entityPlayer, false);
|
||||
}
|
||||
}
|
||||
|
||||
@SubscribeEvent
|
||||
public void onPlayerRenderSpecialPost(RenderPlayerEvent.Specials.Post event) {
|
||||
Collection<IDevRenderer> renders = renderMap.get(event.entityPlayer.getUniqueID());
|
||||
for (IDevRenderer r : renders) {
|
||||
r.renderExtras(event.entityPlayer, true);
|
||||
}
|
||||
}
|
||||
|
||||
private boolean nameIsGood(Entity entity){
|
||||
if(EnumChatFormatting.getTextWithoutFormattingCodes(entity.getCommandSenderName()).equals("Cricket")
|
||||
|| EnumChatFormatting.getTextWithoutFormattingCodes(entity.getCommandSenderName()).equals("Drullkus")
|
||||
|| EnumChatFormatting.getTextWithoutFormattingCodes(entity.getCommandSenderName()).equals("minecreatr"))
|
||||
return true;
|
||||
return false;
|
||||
}
|
||||
}
|
||||
@@ -11,7 +11,6 @@ import com.cricketcraft.chisel.block.BlockCarvableBeacon;
|
||||
import com.cricketcraft.chisel.block.tileentity.TileEntityAutoChisel;
|
||||
import com.cricketcraft.chisel.block.tileentity.TileEntityCarvableBeacon;
|
||||
import com.cricketcraft.chisel.block.tileentity.TileEntityPresent;
|
||||
import com.cricketcraft.chisel.client.player.PlayerSpecials;
|
||||
import com.cricketcraft.chisel.client.render.RenderChiselSnowman;
|
||||
import com.cricketcraft.chisel.client.render.RendererCTM;
|
||||
import com.cricketcraft.chisel.client.render.RendererCTMPane;
|
||||
@@ -39,7 +38,7 @@ import cpw.mods.fml.client.registry.RenderingRegistry;
|
||||
public class ClientProxy extends CommonProxy {
|
||||
|
||||
ItemChiselRenderer renderer = new ItemChiselRenderer();
|
||||
|
||||
|
||||
@Override
|
||||
public void preInit() {
|
||||
}
|
||||
@@ -54,19 +53,19 @@ public class ClientProxy extends CommonProxy {
|
||||
RenderingRegistry.registerBlockHandler(new RendererEldritch());
|
||||
RenderingRegistry.registerBlockHandler(new RendererLayeredGlow());
|
||||
RenderingRegistry.registerBlockHandler(new RendererSimpleLayered());
|
||||
|
||||
|
||||
RenderingRegistry.registerBlockHandler(new RendererMultiLayer());
|
||||
|
||||
RenderAutoChisel rac = new RenderAutoChisel();
|
||||
RenderingRegistry.registerBlockHandler(rac);
|
||||
MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(ChiselBlocks.autoChisel), rac);
|
||||
ClientRegistry.bindTileEntitySpecialRenderer(TileEntityAutoChisel.class, rac);
|
||||
|
||||
|
||||
RenderCarvableBeacon rcb = new RenderCarvableBeacon();
|
||||
ClientRegistry.bindTileEntitySpecialRenderer(TileEntityCarvableBeacon.class, rcb);
|
||||
RenderingRegistry.registerBlockHandler(rcb);
|
||||
BlockCarvableBeacon.renderId = rcb.getRenderId();
|
||||
|
||||
|
||||
RenderPresent rp = new RenderPresent();
|
||||
MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(ChiselBlocks.present), rp);
|
||||
ClientRegistry.bindTileEntitySpecialRenderer(TileEntityPresent.class, rp);
|
||||
@@ -74,12 +73,10 @@ public class ClientProxy extends CommonProxy {
|
||||
RenderingRegistry.registerEntityRenderingHandler(EntityCloudInABottle.class, new RenderSnowball(ChiselItems.cloudinabottle));
|
||||
RenderingRegistry.registerEntityRenderingHandler(EntityBallOMoss.class, new RenderSnowball(ChiselItems.ballomoss));
|
||||
RenderingRegistry.registerEntityRenderingHandler(EntitySmashingRock.class, new RenderSnowball(ChiselItems.smashingrock));
|
||||
RenderingRegistry.registerEntityRenderingHandler(EntityChiselSnowman.class, new RenderChiselSnowman());
|
||||
RenderingRegistry.registerEntityRenderingHandler(EntityChiselSnowman.class, new RenderChiselSnowman());
|
||||
|
||||
MinecraftForgeClient.registerItemRenderer(ChiselItems.chisel, renderer);
|
||||
MinecraftForgeClient.registerItemRenderer(ChiselItems.diamondChisel, renderer);
|
||||
|
||||
PlayerSpecials.init();
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
Reference in new issue
Block a user