Ben Spiers
fab95e8900
Re-organise imports.
...
I went for what seemed like a good level of organisation:
Java
__________
Mekanism
__________
Minecraft
Forge
FML
__________
Netty
LWJGL
__________
Other APIs
__________
Static Imports.
2014-09-03 19:00:03 +01:00
Aidan C. Brady
775e1fbd6d
Merge branch 'development' into 1.8
...
Conflicts:
src/main/java/mekanism/common/tile/TileEntityAdvancedBoundingBlock.java
src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java
2014-08-24 09:51:12 -04:00
Aidan C. Brady
c364496212
Fixed the evil Bounding Block crash, fixed Dynamic Tank crashing when flowing icon is null
2014-08-24 09:46:38 -04:00
Aidan C. Brady
80021dd4c7
Work on path caching
2014-08-20 15:54:05 -04:00
Aidan C. Brady
275c7840cc
Reorganized package structure to separate content from base code
2014-08-20 15:22:55 -04:00
Aidan Brady
1d6de974d3
A bit of package reorganization, added InventoryNetwork to transporters
2014-08-09 22:20:49 -04:00
Aidan C. Brady
3523d03274
Digital Miner now mines blocks one chunk at a time - this will make the chunkloading upgrade easy.
2014-08-08 14:45:09 -04:00
Aidan C. Brady
d5508667f3
Merge branch 'development' into 1.8
...
Conflicts:
src/main/java/mekanism/common/item/ItemBlockEnergyCube.java
src/main/java/mekanism/common/multipart/PartTransmitter.java
src/main/java/mekanism/common/tile/TileEntityBasicMachine.java
src/main/java/mekanism/common/tile/TileEntityBin.java
src/main/java/mekanism/common/tile/TileEntityChargepad.java
src/main/java/mekanism/common/tile/TileEntityChemicalCrystallizer.java
src/main/java/mekanism/common/tile/TileEntityChemicalDissolutionChamber.java
src/main/java/mekanism/common/tile/TileEntityChemicalInfuser.java
src/main/java/mekanism/common/tile/TileEntityChemicalOxidizer.java
src/main/java/mekanism/common/tile/TileEntityChemicalWasher.java
src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java
src/main/java/mekanism/common/tile/TileEntityFactory.java
src/main/java/mekanism/common/tile/TileEntityMetallurgicInfuser.java
src/main/java/mekanism/common/tile/TileEntityPortableTank.java
src/main/java/mekanism/common/tile/TileEntityRotaryCondensentrator.java
src/main/java/mekanism/common/tile/TileEntitySeismicVibrator.java
src/main/java/mekanism/common/tile/TileEntityTeleporter.java
src/main/java/mekanism/generators/common/tile/TileEntityGenerator.java
2014-08-07 23:02:11 -04:00
Aidan C. Brady
12ad58b1f9
Turns out I was sending a ton of packets to the entire player list on the server when it wasn't actually necessary at all, switched to new sendToReceivers() method
2014-08-07 22:48:35 -04:00
Aidan Brady
faad9762df
Merge branch 'development' into 1.8
...
Conflicts:
build.properties
src/main/java/mekanism/common/Mekanism.java
src/main/java/mekanism/common/tile/TileEntityBin.java
src/main/java/mekanism/common/tile/TileEntityFluidicPlenisher.java
src/main/java/mekanism/generators/common/MekanismGenerators.java
src/main/java/mekanism/generators/common/tile/TileEntityWindTurbine.java
src/main/java/mekanism/tools/common/MekanismTools.java
2014-08-06 12:56:37 -04:00
Aidan C. Brady
12215490f0
Fixed a Digital Miner oversight, fixed Bins losing NBT data and allow Bins to accept items with varying item damage
2014-08-05 20:58:22 -04:00
Ben Spiers
725b7463f0
Make the mod classes significantly less godlike.
...
Move Config variables into their own class, (in api because other stuff in API references config, may make sense to move it back to common later), and move Blocks and Items into final variables in their own classes. It looks a lot cleaner this way and my OCD can finally rest now.
2014-08-01 01:35:06 +01:00
Aidan C. Brady
ce5bddbdd1
Merge branch 'development' into 1.8
...
Conflicts:
src/main/java/mekanism/common/block/BlockMachine.java
src/main/java/mekanism/common/item/ItemBlockMachine.java
src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java
src/main/java/mekanism/common/tile/TileEntityPRC.java
2014-07-26 18:57:18 -04:00
Aidan C. Brady
94c3a6aa60
Started work on a new system of managing sustained data
2014-07-26 18:16:00 -04:00
Aidan C. Brady
52efdac614
Eliminated the deprecated "getSpeedMultiplier()" and "getEnergyMultiplier()" methods
2014-07-23 10:17:03 -04:00
Aidan C. Brady
2523d2fd6b
Did some work on actual upgrade system
2014-07-21 20:46:35 -04:00
Aidan C. Brady
0416e2e904
Finished Digital Miner visual render functionality, also fixed a few issues with gas tanks
2014-07-21 13:30:39 -04:00
Aidan C. Brady
69a411813e
Started work on a Digital Miner visual render thing. For some reason it's culling all oceans.
2014-07-21 01:10:53 -04:00
Aidan C. Brady
7e525e10c6
Fixed a few recipes, also started work on Digital Miner visual
2014-07-20 23:29:35 -04:00
Aidan C. Brady
c1b317dcde
Added in warning for missing stacks. Onto visual Digital Miner range rendering!
2014-07-20 21:20:45 -04:00
Aidan C. Brady
de86e0b2a2
Finished off the filtering system! Also added new "fuzzy mode" to ItemStack filters in order to ignore metadata checks.
2014-07-20 20:19:01 -04:00
Aidan C. Brady
4adb6de83d
Fix a few bugs
2014-07-20 16:16:09 -04:00
Aidan C. Brady
fe177d20c7
Filter-based replacing works! Now to get the require system to work and the warning system set up.
2014-07-20 16:06:47 -04:00
Aidan C. Brady
65a8633441
Gave Chemical Oxidizer and PRC upgrade systems, fixed Chemical Oxidizer and Electrolytic Separator NEI modules
2014-07-10 22:28:04 -04:00
Ben Spiers
3a027d0ef4
Aaaaaaand ComputerCraft.
2014-06-26 21:07:46 +01:00
Aidan C. Brady
ead4af2f78
Fixed transporter item rendering, fixed WAILA display bug. Dispensers now eject balloon entities!
2014-06-17 18:21:59 +02:00
Aidan C. Brady
e5f76907ce
Rewrite networking code for the 100th time to fix memory leak
2014-06-11 11:57:49 +02:00
Aidan C. Brady
659b963af6
Alright, almost done with network changes (63 errors!)
2014-06-02 16:52:13 +02:00
Aidan C. Brady
ec2040cccc
Work on networking update
2014-06-01 17:42:23 +02:00
Aidan C. Brady
8be5ecf140
Down to 215 errors, pretty much everything is packets now
2014-05-30 23:49:24 +02:00
Aidan C. Brady
fa0c2e6f12
More bits of work
2014-05-30 23:10:05 +02:00
Aidan C. Brady
d1c193d0dd
Loads more work. 275 errors.
2014-05-29 19:01:43 +01:00
Aidan C. Brady
6f69c6d7b4
Major 1.7 work, down to a little more than 500 errors
2014-05-29 17:55:47 +01:00
Aidan Brady
7496ac7648
Some 1.7 work. Just about 800 errors!
2014-05-07 16:37:58 -04:00
Ben Spiers
31938e8b68
Under 1300 errors left now, started on packet/network stuffs.
2014-04-20 21:15:44 +01:00
Ben Spiers
db7121454a
Re-add an updated ic2, alter CC and update DepLoader. Fix more of the things.
...
1792 errors. A good night's work, I think.
2014-04-20 04:34:19 +01:00
Ben Spiers
ab47724473
Move the directory structure around to a more conventional one and start out on the 1.7 update.
...
3797 errors. We have a long way to go.
2014-04-20 03:44:06 +01:00