Skip to content

Commit

Permalink
Split more files into parts
Browse files Browse the repository at this point in the history
  • Loading branch information
@mDiyo
mDiyo committed Jun 7, 2014
1 parent e2f0558 commit 5a87c10
Show file tree
Hide file tree
Showing 61 changed files with 1,354 additions and 1,488 deletions.
29 changes: 5 additions & 24 deletions src/main/java/tconstruct/TConstruct.java
View file
@@ -1,5 +1,7 @@
package tconstruct;

import java.util.Random;

import mantle.lib.TabTools;
import mantle.module.ModuleController;
import net.minecraft.world.gen.structure.MapGenStructureIO;
Expand All @@ -8,7 +10,6 @@
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;

import tconstruct.achievements.TAchievements;
import tconstruct.client.TControls;
import tconstruct.client.event.EventCloakRender;
import tconstruct.common.TProxyCommon;
Expand All @@ -18,9 +19,6 @@
import tconstruct.mechworks.landmine.behavior.Behavior;
import tconstruct.mechworks.landmine.behavior.stackCombo.SpecialStackHandler;
import tconstruct.util.EnvironmentChecks;
import tconstruct.util.TCraftingHandler;
import tconstruct.util.TEventHandler;
import tconstruct.util.TEventHandlerAchievement;
import tconstruct.util.config.DimensionBlacklist;
import tconstruct.util.config.PHConstruct;
import tconstruct.util.network.packet.PacketPipeline;
Expand Down Expand Up @@ -83,6 +81,8 @@ public class TConstruct

// The packet pipeline
public static final PacketPipeline packetPipeline = new PacketPipeline();

public static Random random = new Random();

public TConstruct()
{
Expand All @@ -99,7 +99,6 @@ public TConstruct()
}

EnvironmentChecks.verifyEnvironmentSanity();
MinecraftForge.EVENT_BUS.register(events = new TEventHandler());
//PluginController.registerModules();
}

Expand All @@ -117,21 +116,10 @@ public void preInit (FMLPreInitializationEvent event)
basinCasting = new LiquidCasting();
chiselDetailing = new Detailing();

events = new TEventHandler();
MinecraftForge.EVENT_BUS.register(events);
MinecraftForge.EVENT_BUS.register(new TEventHandlerAchievement());

proxy.registerRenderer();
proxy.addNames();
proxy.readManuals();
proxy.registerKeys();
proxy.registerTickHandler();

GameRegistry.registerWorldGenerator(new TBaseWorldGenerator(), 0);
MinecraftForge.TERRAIN_GEN_BUS.register(new TerrainGenEventHandler());
//GameRegistry.registerFuelHandler(content);
FMLCommonHandler.instance().bus().register(new TCraftingHandler());
NetworkRegistry.INSTANCE.registerGuiHandler(instance, proxy);
//NetworkRegistry.INSTANCE.registerGuiHandler(instance, proxy);

if (PHConstruct.addToVillages)
{
Expand Down Expand Up @@ -177,18 +165,12 @@ public void init (FMLInitializationEvent event)
DimensionBlacklist.getBadBimensions();
GameRegistry.registerWorldGenerator(new SlimeIslandGen(TinkerWorld.slimePool, 2), 2);

if (PHConstruct.achievementsEnabled)
{
TAchievements.init();
}

moduleLoader.init();
}

@EventHandler
public void postInit (FMLPostInitializationEvent evt)
{
proxy.postInit();
packetPipeline.postInitialise();
Behavior.registerBuiltInBehaviors();
SpecialStackHandler.registerBuiltInStackHandlers();
Expand All @@ -211,7 +193,6 @@ public static Detailing getChiselDetailing ()
return chiselDetailing;
}

public static TEventHandler events;
public static TPlayerHandler playerTracker;
public static LiquidCasting tableCasting;
public static LiquidCasting basinCasting;
Expand Down
32 changes: 0 additions & 32 deletions src/main/java/tconstruct/achievements/TAchievements.java
View file

This file was deleted.

211 changes: 104 additions & 107 deletions ...java/tconstruct/client/TClientEvents.java → ...va/tconstruct/armor/ArmorProxyClient.java
View file
@@ -1,95 +1,137 @@
package tconstruct.client;
package tconstruct.armor;

import java.util.ArrayList;
import java.util.Random;

import com.google.common.collect.Lists;

import cpw.mods.fml.common.FMLCommonHandler;
import cpw.mods.fml.common.Loader;
import cpw.mods.fml.common.eventhandler.SubscribeEvent;

import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.ScaledResolution;
import net.minecraft.client.model.ModelBiped;
import net.minecraft.client.gui.inventory.GuiInventory;
import net.minecraft.client.renderer.Tessellator;
import net.minecraft.client.renderer.texture.TextureMap;
import net.minecraft.client.settings.GameSettings;
import net.minecraft.entity.EntityLiving;
import net.minecraft.client.settings.KeyBinding;
import net.minecraft.entity.SharedMonsterAttributes;
import net.minecraft.entity.ai.attributes.IAttributeInstance;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.potion.Potion;
import net.minecraft.potion.PotionEffect;
import net.minecraft.util.IIcon;
import net.minecraft.util.MathHelper;
import net.minecraft.util.ResourceLocation;
import net.minecraft.world.World;
import net.minecraftforge.client.GuiIngameForge;
import net.minecraftforge.client.event.RenderGameOverlayEvent;
import net.minecraftforge.client.event.RenderGameOverlayEvent.ElementType;
import net.minecraftforge.client.event.TextureStitchEvent;
import net.minecraftforge.client.event.sound.SoundLoadEvent;
import tconstruct.TConstruct;
import tconstruct.armor.model.WingModel;
import tconstruct.smeltery.TinkerSmeltery;
import tconstruct.util.player.TPlayerStats;
import cpw.mods.fml.common.Loader;
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;

@SideOnly(Side.CLIENT)
public class TClientEvents
import net.minecraftforge.common.MinecraftForge;
import tconstruct.client.TControls;
import tconstruct.client.TKeyHandler;
import tconstruct.client.TProxyClient;
import tconstruct.client.gui.AdaptiveSmelteryGui;
import tconstruct.client.gui.ArmorExtendedGui;
import tconstruct.client.gui.CraftingStationGui;
import tconstruct.client.gui.FrypanGui;
import tconstruct.client.gui.FurnaceGui;
import tconstruct.client.gui.GuiLandmine;
import tconstruct.client.gui.KnapsackGui;
import tconstruct.client.gui.PartCrafterGui;
import tconstruct.client.gui.PatternChestGui;
import tconstruct.client.gui.SmelteryGui;
import tconstruct.client.gui.StencilTableGui;
import tconstruct.client.gui.ToolForgeGui;
import tconstruct.client.gui.ToolStationGui;
import tconstruct.client.tabs.InventoryTabArmorExtended;
import tconstruct.client.tabs.InventoryTabKnapsack;
import tconstruct.client.tabs.InventoryTabVanilla;
import tconstruct.client.tabs.TabRegistry;
import tconstruct.mechworks.MechworksProxyCommon;
import tconstruct.mechworks.inventory.ContainerLandmine;
import tconstruct.mechworks.logic.TileEntityLandmine;
import tconstruct.smeltery.SmelteryProxyCommon;
import tconstruct.smeltery.logic.AdaptiveSmelteryLogic;
import tconstruct.smeltery.logic.SmelteryLogic;
import tconstruct.tools.ToolProxyCommon;
import tconstruct.tools.logic.CraftingStationLogic;
import tconstruct.tools.logic.FrypanLogic;
import tconstruct.tools.logic.FurnaceLogic;
import tconstruct.tools.logic.PartBuilderLogic;
import tconstruct.tools.logic.PatternChestLogic;
import tconstruct.tools.logic.StencilTableLogic;
import tconstruct.tools.logic.ToolForgeLogic;
import tconstruct.tools.logic.ToolStationLogic;
import tconstruct.util.config.PHConstruct;

public class ArmorProxyClient extends ArmorProxyCommon
{
Minecraft mc = Minecraft.getMinecraft();

/* Sounds */

boolean initSounds;

@SubscribeEvent
public void onSound (SoundLoadEvent event)
public ArmorProxyClient()
{
if (!initSounds)
MinecraftForge.EVENT_BUS.register(this);
}

@Override
public Object getClientGuiElement (int ID, EntityPlayer player, World world, int x, int y, int z)
{
if (ID == ArmorProxyCommon.inventoryGui)
{
initSounds = true;
try
{
/*
* SoundManager soundmanager = event.manager;
* soundmanager.addSound("tinker:frypan_hit.ogg");
* soundmanager.addSound("tinker:little_saw.ogg");
* soundmanager.addSound("tinker:launcher_clank.ogg");
* TConstruct.logger.info("Successfully loaded sounds.");
*/
}
catch (Exception e)
{
TConstruct.logger.error("Failed to register one or more sounds");
}
GuiInventory inventory = new GuiInventory(player);
TabRegistry.addTabsToInventory(inventory);
return inventory;
}
if (ID == ArmorProxyCommon.armorGuiID)
{
TProxyClient.armorExtended.init(Minecraft.getMinecraft().thePlayer);
return new ArmorExtendedGui(player.inventory, TProxyClient.armorExtended);
}
if (ID == ArmorProxyCommon.knapsackGuiID)
{
TProxyClient.knapsack.init(Minecraft.getMinecraft().thePlayer);
return new KnapsackGui(player.inventory, TProxyClient.knapsack);
}
return null;
}

/* Liquids */

IIcon[] stillIcons = new IIcon[2];
IIcon[] flowIcons = new IIcon[2];
@Override
public void registerTickHandler ()
{
FMLCommonHandler.instance().bus().register(new ArmorTickHandler());
new ArmorTickHandler();
}

/* Keybindings */
public static TControls controlInstance;

@SubscribeEvent
public void preStitch (TextureStitchEvent.Pre event)
@Override
public void registerKeys ()
{
TextureMap register = event.map;
if (register.getTextureType() == 0)
{
stillIcons[0] = register.registerIcon("tinker:liquid_pigiron");
flowIcons[0] = register.registerIcon("tinker:liquid_pigiron");
}
controlInstance = new TControls();
uploadKeyBindingsToGame(Minecraft.getMinecraft().gameSettings, controlInstance);

TabRegistry.registerTab(new InventoryTabVanilla());
TabRegistry.registerTab(new InventoryTabArmorExtended());
TabRegistry.registerTab(new InventoryTabKnapsack());
}

@SubscribeEvent
public void postStitch (TextureStitchEvent.Post event)
public void uploadKeyBindingsToGame (GameSettings settings, TKeyHandler keyhandler)
{
if (event.map.getTextureType() == 0)
ArrayList<KeyBinding> harvestedBindings = Lists.newArrayList();
for (KeyBinding kb : keyhandler.keyBindings)
{
for (int i = 0; i < TinkerSmeltery.fluidBlocks.length; i++)
{
TinkerSmeltery.fluids[i].setIcons(TinkerSmeltery.fluidBlocks[i].getIcon(0, 0), TinkerSmeltery.fluidBlocks[i].getIcon(2, 0));
}
TinkerSmeltery.pigIronFluid.setIcons(stillIcons[0], flowIcons[0]);
harvestedBindings.add(kb);
}

KeyBinding[] modKeyBindings = harvestedBindings.toArray(new KeyBinding[harvestedBindings.size()]);
KeyBinding[] allKeys = new KeyBinding[settings.keyBindings.length + modKeyBindings.length];
System.arraycopy(settings.keyBindings, 0, allKeys, 0, settings.keyBindings.length);
System.arraycopy(modKeyBindings, 0, allKeys, settings.keyBindings.length, modKeyBindings.length);
settings.keyBindings = allKeys;
settings.loadOptions();
}


Minecraft mc = Minecraft.getMinecraft();

private static final ResourceLocation hearts = new ResourceLocation("tinker", "textures/gui/newhearts.png");
private static final ResourceLocation icons = new ResourceLocation("textures/gui/icons.png");
Expand Down Expand Up @@ -248,49 +290,4 @@ public void drawTexturedModalRect (int par1, int par2, int par3, int par4, int p
}

double zLevel = 0;

/*
* @SubscribeEvent public void fovModifier(FOVUpdateEvent event) { float f =
* 1.0F;
*
* if (event.entity.capabilities.isFlying) { f *= 1.1F; }
*
* if (event.entity.isUsingItem() && event.entity.getItemInUse().getItem()
* == Items.bow) { int i = event.entity.getItemInUseDuration(); float f1 =
* (float) i / 20.0F;
*
* if (f1 > 1.0F) { f1 = 1.0F; } else { f1 *= f1; }
*
* f *= 1.0F - f1 * 0.15F; } event.newfov = f; }
*/

/* Armor */
ModelBiped model = new ModelBiped(5f);
WingModel wings = new WingModel();

/*
* static { model.bipedHead.showModel = false; }
*/

private float interpolateRotation (float par1, float par2, float par3)
{
float f3;

for (f3 = par2 - par1; f3 < -180.0F; f3 += 360.0F)
{
;
}

while (f3 >= 180.0F)
{
f3 -= 360.0F;
}

return par1 + par3 * f3;
}

protected float handleRotationFloat (EntityLiving par1EntityLiving, float par2)
{
return (float) par1EntityLiving.ticksExisted + par2;
}
}

0 comments on commit 5a87c10

Please sign in to comment.