Cleaning up for MC 1.3.*
This commit is contained in:
pahimar
parent
2f68680f04
commit
fea27f4298
|
|
@ -1,137 +0,0 @@
|
|||
package ee3.client;
|
||||
|
||||
import java.io.File;
|
||||
import java.lang.reflect.Field;
|
||||
|
||||
import cpw.mods.fml.common.ReflectionHelper;
|
||||
|
||||
import ee3.mod_EE3;
|
||||
import ee3.client.core.KeyBindingHandler;
|
||||
import ee3.client.core.SoundHandler;
|
||||
import ee3.client.core.TextureRedWaterFX;
|
||||
import ee3.client.core.TextureRedWaterFlowFX;
|
||||
import ee3.client.gui.GuiPortableCrafting;
|
||||
import ee3.core.interfaces.IProxy;
|
||||
import ee3.lib.GuiIds;
|
||||
import ee3.lib.Reference;
|
||||
import static ee3.lib.CustomItemRarity.*;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.src.EntityPlayer;
|
||||
import net.minecraft.src.EnumRarity;
|
||||
import net.minecraft.src.KeyBinding;
|
||||
import net.minecraft.src.ModLoader;
|
||||
import net.minecraft.src.NetworkManager;
|
||||
import net.minecraft.src.World;
|
||||
import net.minecraft.src.forge.EnumHelperClient;
|
||||
import net.minecraft.src.forge.MinecraftForgeClient;
|
||||
|
||||
/**
|
||||
* TODO Class Description
|
||||
* @author pahimar, cpw
|
||||
* @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
|
||||
*
|
||||
*/
|
||||
public class EEProxy implements IProxy {
|
||||
|
||||
public EEProxy() { }
|
||||
|
||||
@Override
|
||||
public void registerRenderInformation() {
|
||||
// TODO Auto-generated method stub
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public void registerTileEntities() {
|
||||
// TODO Auto-generated method stub
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public File getMinecraftDir() {
|
||||
return Minecraft.getMinecraftDir();
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isRemote() {
|
||||
return ModLoader.getMinecraftInstance().theWorld.isRemote;
|
||||
}
|
||||
|
||||
@Override
|
||||
public World getCurrentWorld() {
|
||||
return ModLoader.getMinecraftInstance().theWorld;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getMinecraftVersion() {
|
||||
return ModLoader.getMinecraftInstance().getVersion();
|
||||
}
|
||||
|
||||
public void handleControl(NetworkManager network, int key) { }
|
||||
public void handlePedestalPacket(int x, int y, int z, int itemId, boolean activated) { }
|
||||
public void handleTEPacket(int x, int y, int z, byte direction, String player) { }
|
||||
|
||||
@Override
|
||||
public void registerSoundHandler() {
|
||||
MinecraftForgeClient.registerSoundHandler(new SoundHandler());
|
||||
}
|
||||
|
||||
@Override
|
||||
public Object handleGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) {
|
||||
if (ID == GuiIds.PORTABLE_CRAFTING) {
|
||||
return new GuiPortableCrafting(player.inventory);
|
||||
}
|
||||
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void playSound(String soundName, float x, float y, float z, float volume, float pitch) {
|
||||
ModLoader.getMinecraftInstance().sndManager.playSound(soundName, x, y, z, volume, pitch);
|
||||
}
|
||||
|
||||
public void addCustomEnumRarityTypes() {
|
||||
EnumHelperClient.addRarity(JUNK, COLOR_JUNK, DISPLAY_NAME_JUNK);
|
||||
EnumHelperClient.addRarity(NORMAL, COLOR_NORMAL, DISPLAY_NAME_NORMAL);
|
||||
EnumHelperClient.addRarity(MAGICAL, COLOR_MAGICAL, DISPLAY_NAME_MAGICAL);
|
||||
EnumHelperClient.addRarity(RARE, COLOR_RARE, DISPLAY_NAME_RARE);
|
||||
EnumHelperClient.addRarity(LEGENDARY, COLOR_LEGENDARY, DISPLAY_NAME_LEGENDARY);
|
||||
}
|
||||
|
||||
@Override
|
||||
public EnumRarity getCustomEnumRarityType(String custom) {
|
||||
for (EnumRarity eRare : EnumRarity.class.getEnumConstants()) {
|
||||
if (eRare.name().equals(custom))
|
||||
return eRare;
|
||||
}
|
||||
return EnumRarity.common;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void registerKeyBindings() {
|
||||
KeyBindingHandler.init();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void keyBindingEvent(Object event) {
|
||||
KeyBindingHandler.keyboardEvent((KeyBinding)event);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isPortableCraftingGUIOpen() {
|
||||
return (ModLoader.getMinecraftInstance().currentScreen instanceof GuiPortableCrafting);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void preloadTextures() {
|
||||
MinecraftForgeClient.preloadTexture(Reference.SPRITE_SHEET_LOCATION + Reference.BLOCK_SPRITE_SHEET);
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public void initTextureFX() {
|
||||
ModLoader.getMinecraftInstance().renderEngine.registerTextureFX(new TextureRedWaterFX());
|
||||
ModLoader.getMinecraftInstance().renderEngine.registerTextureFX(new TextureRedWaterFlowFX());
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -1,68 +0,0 @@
|
|||
package ee3.client.core;
|
||||
|
||||
import org.lwjgl.input.Keyboard;
|
||||
|
||||
import ee3.mod_EE3;
|
||||
import ee3.item.ModItems;
|
||||
import ee3.lib.GuiIds;
|
||||
|
||||
import net.minecraft.src.EntityPlayerSP;
|
||||
import net.minecraft.src.Item;
|
||||
import net.minecraft.src.KeyBinding;
|
||||
import net.minecraft.src.ModLoader;
|
||||
import net.minecraft.src.World;
|
||||
|
||||
/**
|
||||
* TODO Class Description
|
||||
* @author pahimar
|
||||
* @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
|
||||
*
|
||||
*/
|
||||
public class KeyBindingHandler {
|
||||
|
||||
public static KeyBinding Extra;
|
||||
public static KeyBinding Charge;
|
||||
public static KeyBinding Toggle;
|
||||
public static KeyBinding Release;
|
||||
|
||||
public static void init() {
|
||||
Extra = new KeyBinding("ee3.mod.key.extra", Keyboard.KEY_C);
|
||||
Charge = new KeyBinding("ee3.mod.key.charge", Keyboard.KEY_V);
|
||||
Toggle = new KeyBinding("ee3.mod.key.toggle", Keyboard.KEY_G);
|
||||
Release = new KeyBinding("ee3.mod.key.release", Keyboard.KEY_R);
|
||||
|
||||
ModLoader.registerKey(mod_EE3.instance(), Extra, false);
|
||||
ModLoader.registerKey(mod_EE3.instance(), Charge, false);
|
||||
ModLoader.registerKey(mod_EE3.instance(), Toggle, false);
|
||||
ModLoader.registerKey(mod_EE3.instance(), Release, false);
|
||||
}
|
||||
|
||||
public static void keyboardEvent(KeyBinding event) {
|
||||
// We only care about keybinding events that happen when the game is "in play"
|
||||
if (!ModLoader.getMinecraftInstance().isGamePaused) {
|
||||
|
||||
EntityPlayerSP thePlayer = ModLoader.getMinecraftInstance().thePlayer;
|
||||
World theWorld = ModLoader.getMinecraftInstance().theWorld;
|
||||
|
||||
if (event.equals(Extra)) {
|
||||
if (thePlayer.inventory.getCurrentItem() != null) {
|
||||
Item currentItem = thePlayer.inventory.getCurrentItem().getItem();
|
||||
if ((currentItem.shiftedIndex == ModItems.miniumStone.shiftedIndex) || (currentItem.shiftedIndex == ModItems.philStone.shiftedIndex)) {
|
||||
thePlayer.openGui(mod_EE3.instance(), GuiIds.PORTABLE_CRAFTING, theWorld, (int)thePlayer.posX, (int)thePlayer.posY, (int)thePlayer.posZ);
|
||||
}
|
||||
}
|
||||
}
|
||||
else if (event.equals(Charge)) {
|
||||
// Check to see if the player is sneaking
|
||||
System.out.println("Charge Key Pressed");
|
||||
}
|
||||
else if (event.equals(Toggle)) {
|
||||
System.out.println("Toggle Key Pressed");
|
||||
}
|
||||
else if (event.equals(Release)) {
|
||||
System.out.println("Release Key Pressed");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -1,24 +0,0 @@
|
|||
package ee3.client.core;
|
||||
|
||||
import static ee3.lib.Sounds.soundFiles;
|
||||
|
||||
import net.minecraft.src.Entity;
|
||||
import net.minecraft.src.SoundManager;
|
||||
import net.minecraft.src.SoundPoolEntry;
|
||||
import net.minecraft.src.forge.adaptors.SoundHandlerAdaptor;
|
||||
|
||||
/**
|
||||
* TODO Class Description
|
||||
* @author pahimar
|
||||
* @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
|
||||
*
|
||||
*/
|
||||
public class SoundHandler extends SoundHandlerAdaptor {
|
||||
|
||||
@Override
|
||||
// Initializes our entries into the Sound Pool
|
||||
public void onLoadSoundSettings(SoundManager soundManager) {
|
||||
for (int i = 0; i < soundFiles.length; i++)
|
||||
soundManager.getSoundsPool().addSound(soundFiles[i], this.getClass().getResource("/" + soundFiles[i]));
|
||||
}
|
||||
}
|
||||
|
|
@ -1,118 +0,0 @@
|
|||
package ee3.client.core;
|
||||
|
||||
import net.minecraft.src.RenderEngine;
|
||||
import net.minecraft.src.forge.MinecraftForgeClient;
|
||||
import cpw.mods.fml.client.FMLTextureFX;
|
||||
import ee3.block.ModBlocks;
|
||||
import ee3.lib.Reference;
|
||||
|
||||
/**
|
||||
* TODO Class Description
|
||||
* @author pahimar
|
||||
* @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
|
||||
*
|
||||
* Based heavily off of TextureWaterFX (like, 99%)
|
||||
*/
|
||||
public class TextureRedWaterFX extends FMLTextureFX {
|
||||
|
||||
protected float[] red = new float[256];
|
||||
protected float[] green = new float[256];
|
||||
protected float[] blue = new float[256];
|
||||
protected float[] alpha = new float[256];
|
||||
private int tickCounter = 0;
|
||||
|
||||
public TextureRedWaterFX() {
|
||||
super(ModBlocks.redWaterStill.blockIndexInTexture);
|
||||
setup();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setup() {
|
||||
super.setup();
|
||||
red = new float[tileSizeSquare];
|
||||
green = new float[tileSizeSquare];
|
||||
blue = new float[tileSizeSquare];
|
||||
alpha = new float[tileSizeSquare];
|
||||
tickCounter = 0;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void bindImage(RenderEngine renderengine) {
|
||||
MinecraftForgeClient.bindTexture(Reference.SPRITE_SHEET_LOCATION + Reference.BLOCK_SPRITE_SHEET);
|
||||
}
|
||||
|
||||
public void onTick() {
|
||||
++this.tickCounter;
|
||||
int var1;
|
||||
int var2;
|
||||
float var3;
|
||||
int var5;
|
||||
int var6;
|
||||
|
||||
for (var1 = 0; var1 < tileSizeBase; ++var1) {
|
||||
for (var2 = 0; var2 < tileSizeBase; ++var2) {
|
||||
var3 = 0.0F;
|
||||
|
||||
for (int var4 = var1 - 1; var4 <= var1 + 1; ++var4) {
|
||||
var5 = var4 & tileSizeMask;
|
||||
var6 = var2 & tileSizeMask;
|
||||
var3 += this.red[var5 + var6 * tileSizeBase];
|
||||
}
|
||||
|
||||
this.green[var1 + var2 * tileSizeBase] = var3 / 3.3F + this.blue[var1 + var2 * tileSizeBase] * 0.8F;
|
||||
}
|
||||
}
|
||||
|
||||
for (var1 = 0; var1 < tileSizeBase; ++var1) {
|
||||
for (var2 = 0; var2 < tileSizeBase; ++var2) {
|
||||
this.blue[var1 + var2 * tileSizeBase] += this.alpha[var1 + var2 * tileSizeBase] * 0.05F;
|
||||
|
||||
if (this.blue[var1 + var2 * tileSizeBase] < 0.0F) {
|
||||
this.blue[var1 + var2 * tileSizeBase] = 0.0F;
|
||||
}
|
||||
|
||||
this.alpha[var1 + var2 * tileSizeBase] -= 0.1F;
|
||||
|
||||
if (Math.random() < 0.05D) {
|
||||
this.alpha[var1 + var2 * tileSizeBase] = 0.5F;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
float[] var12 = this.green;
|
||||
this.green = this.red;
|
||||
this.red = var12;
|
||||
|
||||
for (var2 = 0; var2 < tileSizeSquare; ++var2) {
|
||||
var3 = this.red[var2];
|
||||
|
||||
if (var3 > 1.0F) {
|
||||
var3 = 1.0F;
|
||||
}
|
||||
|
||||
if (var3 < 0.0F) {
|
||||
var3 = 0.0F;
|
||||
}
|
||||
|
||||
float var13 = var3 * var3;
|
||||
var5 = (int)(32.0F + var13 * 32.0F);
|
||||
var6 = (int)(50.0F + var13 * 64.0F);
|
||||
int var7 = 255;
|
||||
int var8 = (int)(146.0F + var13 * 50.0F);
|
||||
|
||||
if (this.anaglyphEnabled) {
|
||||
int var9 = (var5 * 30 + var6 * 59 + var7 * 11) / 100;
|
||||
int var10 = (var5 * 30 + var6 * 70) / 100;
|
||||
int var11 = (var5 * 30 + var7 * 70) / 100;
|
||||
var5 = var9;
|
||||
var6 = var10;
|
||||
var7 = var11;
|
||||
}
|
||||
|
||||
this.imageData[var2 * 4 + 0] = (byte)var5;
|
||||
this.imageData[var2 * 4 + 1] = (byte)0;
|
||||
this.imageData[var2 * 4 + 2] = (byte)0;
|
||||
this.imageData[var2 * 4 + 3] = (byte)192;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1,113 +0,0 @@
|
|||
package ee3.client.core;
|
||||
|
||||
import net.minecraft.src.RenderEngine;
|
||||
import net.minecraft.src.forge.MinecraftForgeClient;
|
||||
import cpw.mods.fml.client.FMLTextureFX;
|
||||
import ee3.block.ModBlocks;
|
||||
import ee3.lib.Reference;
|
||||
|
||||
public class TextureRedWaterFlowFX extends FMLTextureFX {
|
||||
|
||||
protected float[] red = new float[256];
|
||||
protected float[] green = new float[256];
|
||||
protected float[] blue = new float[256];
|
||||
protected float[] alpha = new float[256];
|
||||
private int tickCounter = 0;
|
||||
|
||||
public TextureRedWaterFlowFX() {
|
||||
super(ModBlocks.redWaterStill.blockIndexInTexture + 1);
|
||||
tileSize = 2;
|
||||
setup();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setup() {
|
||||
super.setup();
|
||||
red = new float[tileSizeSquare];
|
||||
green = new float[tileSizeSquare];
|
||||
blue = new float[tileSizeSquare];
|
||||
alpha = new float[tileSizeSquare];
|
||||
tickCounter = 0;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void bindImage(RenderEngine renderengine) {
|
||||
MinecraftForgeClient.bindTexture(Reference.SPRITE_SHEET_LOCATION + Reference.BLOCK_SPRITE_SHEET);
|
||||
}
|
||||
|
||||
public void onTick() {
|
||||
++this.tickCounter;
|
||||
int var1;
|
||||
int var2;
|
||||
float var3;
|
||||
int var5;
|
||||
int var6;
|
||||
|
||||
for (var1 = 0; var1 < tileSizeBase; ++var1) {
|
||||
for (var2 = 0; var2 < tileSizeBase; ++var2) {
|
||||
var3 = 0.0F;
|
||||
|
||||
for (int var4 = var2 - 2; var4 <= var2; ++var4) {
|
||||
var5 = var1 & tileSizeMask;
|
||||
var6 = var4 & tileSizeMask;
|
||||
var3 += this.red[var5 + var6 * tileSizeBase];
|
||||
}
|
||||
|
||||
this.green[var1 + var2 * tileSizeBase] = var3 / 3.2F + this.blue[var1 + var2 * tileSizeBase] * 0.8F;
|
||||
}
|
||||
}
|
||||
|
||||
for (var1 = 0; var1 < tileSizeBase; ++var1) {
|
||||
for (var2 = 0; var2 < tileSizeBase; ++var2) {
|
||||
this.blue[var1 + var2 * tileSizeBase] += this.alpha[var1 + var2 * tileSizeBase] * 0.05F;
|
||||
|
||||
if (this.blue[var1 + var2 * tileSizeBase] < 0.0F) {
|
||||
this.blue[var1 + var2 * tileSizeBase] = 0.0F;
|
||||
}
|
||||
|
||||
this.alpha[var1 + var2 * tileSizeBase] -= 0.3F;
|
||||
|
||||
if (Math.random() < 0.2D) {
|
||||
this.alpha[var1 + var2 * tileSizeBase] = 0.5F;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
float[] var12 = this.green;
|
||||
this.green = this.red;
|
||||
this.red = var12;
|
||||
|
||||
for (var2 = 0; var2 < tileSizeSquare; ++var2) {
|
||||
var3 = this.red[var2 - this.tickCounter * tileSizeBase & tileSizeSquareMask];
|
||||
|
||||
if (var3 > 1.0F) {
|
||||
var3 = 1.0F;
|
||||
}
|
||||
|
||||
if (var3 < 0.0F) {
|
||||
var3 = 0.0F;
|
||||
}
|
||||
|
||||
float var13 = var3 * var3;
|
||||
var5 = (int)(32.0F + var13 * 32.0F);
|
||||
var6 = (int)(50.0F + var13 * 64.0F);
|
||||
int var7 = 255;
|
||||
int var8 = (int)(146.0F + var13 * 50.0F);
|
||||
|
||||
if (this.anaglyphEnabled) {
|
||||
int var9 = (var5 * 30 + var6 * 59 + var7 * 11) / 100;
|
||||
int var10 = (var5 * 30 + var6 * 70) / 100;
|
||||
int var11 = (var5 * 30 + var7 * 70) / 100;
|
||||
var5 = var9;
|
||||
var6 = var10;
|
||||
var7 = var11;
|
||||
}
|
||||
|
||||
this.imageData[var2 * 4 + 0] = (byte)var5;
|
||||
this.imageData[var2 * 4 + 1] = (byte)0;
|
||||
this.imageData[var2 * 4 + 2] = (byte)0;
|
||||
this.imageData[var2 * 4 + 3] = (byte)192;
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -1,40 +0,0 @@
|
|||
package ee3.client.gui;
|
||||
|
||||
import org.lwjgl.opengl.GL11;
|
||||
|
||||
import ee3.container.ContainerPortableCrafting;
|
||||
|
||||
import net.minecraft.src.GuiContainer;
|
||||
import net.minecraft.src.InventoryPlayer;
|
||||
|
||||
/**
|
||||
* TODO Class Description
|
||||
* @author pahimar
|
||||
* @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
|
||||
*
|
||||
*/
|
||||
public class GuiPortableCrafting extends GuiContainer {
|
||||
|
||||
public GuiPortableCrafting(InventoryPlayer inventoryPlayer) {
|
||||
super(new ContainerPortableCrafting(inventoryPlayer, inventoryPlayer.player.worldObj, (int)inventoryPlayer.player.posX, (int)inventoryPlayer.player.posY, (int)inventoryPlayer.player.posZ));
|
||||
}
|
||||
|
||||
public void onGuiClosed() {
|
||||
super.onGuiClosed();
|
||||
}
|
||||
|
||||
protected void drawGuiContainerForegroundLayer() {
|
||||
fontRenderer.drawString("Crafting", 28, 6, 0x404040);
|
||||
fontRenderer.drawString("Inventory", 8, (ySize - 96) + 2, 0x404040);
|
||||
}
|
||||
|
||||
protected void drawGuiContainerBackgroundLayer(float f, int l, int m) {
|
||||
int i = mc.renderEngine.getTexture("/gui/crafting.png");
|
||||
GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
|
||||
mc.renderEngine.bindTexture(i);
|
||||
int j = (width - xSize) / 2;
|
||||
int k = (height - ySize) / 2;
|
||||
drawTexturedModalRect(j, k, 0, 0, xSize, ySize);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -1,19 +0,0 @@
|
|||
package ee3.client.render;
|
||||
|
||||
import net.minecraft.src.TileEntity;
|
||||
import net.minecraft.src.TileEntitySpecialRenderer;
|
||||
|
||||
public class RenderCalcinator extends TileEntitySpecialRenderer {
|
||||
|
||||
public RenderCalcinator() {
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public void renderTileEntityAt(TileEntity var1, double var2, double var4,
|
||||
double var6, float var8) {
|
||||
// TODO Auto-generated method stub
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
Loading…
Reference in a new issue