Skip to content

Commit eb5cf15

Browse files
committedNov 17, 2014
Removed factory module.
1 parent 185cbdd commit eb5cf15

17 files changed

+6
-710
lines changed
 

‎src/main/java/lordfokas/stargatetech2/StargateTech2.java

-3
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
import lordfokas.stargatetech2.core.util.StargateLogger;
1313
import lordfokas.stargatetech2.enemy.ModuleEnemy;
1414
import lordfokas.stargatetech2.energy.ModuleEnergy;
15-
import lordfokas.stargatetech2.factory.ModuleFactory;
1615
import lordfokas.stargatetech2.integration.ModuleIntegration;
1716
import lordfokas.stargatetech2.transport.ModuleTransport;
1817
import lordfokas.stargatetech2.world.ModuleWorld;
@@ -48,7 +47,6 @@ public class StargateTech2 {
4847
public static ModuleAutomation automation = new ModuleAutomation();
4948
public static ModuleEnergy energy = new ModuleEnergy();
5049
public static ModuleEnemy enemy = new ModuleEnemy();
51-
public static ModuleFactory factory = new ModuleFactory();
5250
public static ModuleTransport transport = new ModuleTransport();
5351
public static ModuleWorld world = new ModuleWorld();
5452
public static ModuleIntegration integration = new ModuleIntegration();
@@ -60,7 +58,6 @@ public void preInit(FMLPreInitializationEvent event){
6058
modules.add(automation);
6159
modules.add(enemy);
6260
modules.add(energy);
63-
modules.add(factory);
6461
modules.add(transport);
6562
modules.add(world);
6663
modules.add(integration);

‎src/main/java/lordfokas/stargatetech2/core/util/GUIHandler.java

+3-11
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,19 @@
11
package lordfokas.stargatetech2.core.util;
22

3-
import net.minecraft.entity.player.EntityPlayer;
4-
import net.minecraft.tileentity.TileEntity;
5-
import net.minecraft.world.World;
63
import lordfokas.stargatetech2.core.base.BaseContainer;
74
import lordfokas.stargatetech2.enemy.gui.ContainerParticleIonizer;
85
import lordfokas.stargatetech2.enemy.gui.ContainerShieldController;
96
import lordfokas.stargatetech2.enemy.tileentity.TileParticleIonizer;
107
import lordfokas.stargatetech2.enemy.tileentity.TileShieldController;
11-
import lordfokas.stargatetech2.factory.gui.ContainerPrioritizer;
12-
import lordfokas.stargatetech2.factory.tileentity.TilePrioritizer;
8+
import net.minecraft.entity.player.EntityPlayer;
9+
import net.minecraft.tileentity.TileEntity;
10+
import net.minecraft.world.World;
1311
import cpw.mods.fml.common.network.IGuiHandler;
1412

1513
public class GUIHandler implements IGuiHandler {
1614
public enum Screen{
1715
SHIELD_CONTROLLER,
1816
PARTICLE_IONIZER,
19-
PRIORITIZER,
20-
CROSSOVER
2117
}
2218

2319
@Override
@@ -33,10 +29,6 @@ public BaseContainer getServerGuiElement(int ID, EntityPlayer player, World worl
3329
if(te instanceof TileParticleIonizer)
3430
container = new ContainerParticleIonizer((TileParticleIonizer)te, player);
3531
break;
36-
case PRIORITIZER:
37-
if(te instanceof TilePrioritizer)
38-
container = new ContainerPrioritizer((TilePrioritizer)te, player);
39-
break;
4032
default: break;
4133
}
4234
return container;

‎src/main/java/lordfokas/stargatetech2/core/util/GUIHandlerClient.java

+3-15
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,15 @@
11
package lordfokas.stargatetech2.core.util;
22

3-
import net.minecraft.entity.player.EntityPlayer;
4-
import net.minecraft.tileentity.TileEntity;
5-
import net.minecraft.world.World;
63
import lordfokas.stargatetech2.core.base.BaseGUI;
74
import lordfokas.stargatetech2.enemy.gui.ContainerParticleIonizer;
85
import lordfokas.stargatetech2.enemy.gui.ContainerShieldController;
96
import lordfokas.stargatetech2.enemy.gui.GUIParticleIonizer;
107
import lordfokas.stargatetech2.enemy.gui.GUIShieldController;
118
import lordfokas.stargatetech2.enemy.tileentity.TileParticleIonizer;
129
import lordfokas.stargatetech2.enemy.tileentity.TileShieldController;
13-
import lordfokas.stargatetech2.factory.gui.ContainerCrossover;
14-
import lordfokas.stargatetech2.factory.gui.ContainerPrioritizer;
15-
import lordfokas.stargatetech2.factory.gui.GUICrossover;
16-
import lordfokas.stargatetech2.factory.gui.GUIPrioritizer;
17-
import lordfokas.stargatetech2.factory.tileentity.TileCrossover;
18-
import lordfokas.stargatetech2.factory.tileentity.TilePrioritizer;
10+
import net.minecraft.entity.player.EntityPlayer;
11+
import net.minecraft.tileentity.TileEntity;
12+
import net.minecraft.world.World;
1913

2014
public class GUIHandlerClient extends GUIHandler {
2115

@@ -32,12 +26,6 @@ public BaseGUI getClientGuiElement(int ID, EntityPlayer player, World world, int
3226
if(te instanceof TileParticleIonizer)
3327
gui = new GUIParticleIonizer(new ContainerParticleIonizer((TileParticleIonizer)te, player));
3428
break;
35-
case CROSSOVER:
36-
if(te instanceof TileCrossover)
37-
gui = new GUICrossover(new ContainerCrossover((TileCrossover)te, player));
38-
case PRIORITIZER:
39-
if(te instanceof TilePrioritizer)
40-
gui = new GUIPrioritizer(new ContainerPrioritizer((TilePrioritizer)te, player));
4129
default: break;
4230
}
4331
return gui;

‎src/main/java/lordfokas/stargatetech2/factory/ModuleFactory.java

-40
This file was deleted.

‎src/main/java/lordfokas/stargatetech2/factory/block/BlockCrossover.java

-19
This file was deleted.

‎src/main/java/lordfokas/stargatetech2/factory/block/BlockPrioritizer.java

-38
This file was deleted.

‎src/main/java/lordfokas/stargatetech2/factory/gui/ContainerCrossover.java

-12
This file was deleted.

‎src/main/java/lordfokas/stargatetech2/factory/gui/ContainerPrioritizer.java

-13
This file was deleted.

‎src/main/java/lordfokas/stargatetech2/factory/gui/GUICrossover.java

-13
This file was deleted.

‎src/main/java/lordfokas/stargatetech2/factory/gui/GUIPrioritizer.java

-14
This file was deleted.

‎src/main/java/lordfokas/stargatetech2/factory/item/ItemBlockPrioritizer.java

-40
This file was deleted.

‎src/main/java/lordfokas/stargatetech2/factory/tileentity/TileCrossover.java

-29
This file was deleted.

‎src/main/java/lordfokas/stargatetech2/factory/tileentity/TilePrioritizer.java

-285
This file was deleted.

‎src/main/java/lordfokas/stargatetech2/factory/util/Buffer.java

-21
This file was deleted.

‎src/main/java/lordfokas/stargatetech2/factory/util/BufferEnergy.java

-39
This file was deleted.

‎src/main/java/lordfokas/stargatetech2/factory/util/BufferFluid.java

-39
This file was deleted.

‎src/main/java/lordfokas/stargatetech2/factory/util/BufferItem.java

-79
This file was deleted.

0 commit comments

Comments
 (0)
Please sign in to comment.