tilera/Mekanism-tilera-Edition
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
2986 commits 2 branches 0 tags 102 MiB
Commit graph

141 commits

Author SHA1 Message Date
TheJulianJES
ea42e52973 Fix > 3D Bow Bug 2014-10-01 17:30:32 +02:00
Ben Spiers
1cfaec3692 Fix imports, key handler. 2014-09-14 05:18:35 +01:00
Ben Spiers
1ad8f62627 Merge branch 'development' into 1.8 
Conflicts:
	build.properties
	src/main/java/mekanism/client/MekanismKeyHandler.java
	src/main/java/mekanism/common/FluidNetwork.java
	src/main/java/mekanism/common/Mekanism.java
	src/main/java/mekanism/common/item/ItemBlockEnergyCube.java
	src/main/java/mekanism/common/item/ItemBlockGasTank.java
	src/main/java/mekanism/common/item/ItemBlockMachine.java
	src/main/java/mekanism/common/multipart/PartLogisticalTransporter.java
	src/main/java/mekanism/common/multipart/PartSidedPipe.java
	src/main/java/mekanism/common/util/MekanismUtils.java
	src/main/java/mekanism/generators/common/MekanismGenerators.java
	src/main/java/mekanism/tools/common/MekanismTools.java
 2014-09-14 01:36:11 +01:00
Ben Spiers
83d9ecaf23 Mouse button binding fixed 
Also, make the extra info in tooltips use the sneak keybind.
 2014-09-11 04:05:45 +01:00
Ben Spiers
c7a429177b More work in the quest for greater recipe efficiency. 2014-09-05 04:20:12 +01:00
Ben Spiers
cb1a40a137 Try and fix the mouse binding issue. 2014-09-03 19:25:29 +01:00
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
Ben Spiers
8f6b0ce6de Fix Portable tank fluid setting bug 2014-09-02 18:44:31 +01:00
Ben Spiers
05c7e63c55 Make shift not required to see contents of Portable Tanks. 
For convenience of NEI searching.
 2014-08-30 02:36:10 +01:00
Ben Spiers
0d77240289 Add lang utility methods to localise FluidStacks, use them throughout the codebase. 2014-08-30 02:34:50 +01:00
Ben Spiers
514b6962d2 Merge branch 'development' into 1.8 
Conflicts:
	src/main/java/mekanism/common/tile/TileEntitySalinationController.java
	src/main/java/mekanism/common/util/MekanismUtils.java
	src/main/java/mekanism/generators/common/block/BlockGenerator.java
 2014-08-28 22:18:31 +01:00
Ben Spiers
e16a39912e Configurator Overhaul. Modes now more accurately descriptive. 
Now only configurates in mode 0, mode 1 unchanged, mode 2 only
rotates and mode 3 acts as a buildcraft wrench.
 2014-08-28 19:59:50 +01:00
Aidan C. Brady
d3b5676e43 Transmitter networks now keep track of all connected sides of acceptors. This should fix many future bugs, and it will also allow me to implement a better caching system for Logistical Transporters. 2014-08-15 16:21:58 -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
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 C. Brady
7634c29df9 Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development 2014-08-07 21:33:23 -04:00
Aidan C. Brady
1fd5e498e8 Major packet improvements - trying to get on the good side of server owners. More to come. 
Instead of sending to all players in a dimension or within a defined range, packets will now only be sent to players who have the chunk loaded that the packet is being sent from on the server.
 2014-08-07 21:33:17 -04:00
Aidan Brady
81d3d53d76 Merge branch 'development' into 1.8 
Conflicts:
	src/main/java/mekanism/client/ClientTickHandler.java
	src/main/java/mekanism/common/item/ItemConfigurator.java
	src/main/java/mekanism/common/tile/TileEntityElectricPump.java
	src/main/java/mekanism/generators/client/gui/GuiSolarGenerator.java
 2014-08-07 12:29:43 -04:00
Ben Spiers
799f49d9b6 Move to Forge block rotation implementation. 
Hopefully the configurator should rotate more stuff now and more wrenches should be able to rotate our blocks
 2014-08-07 17:17:22 +01:00
Ben Spiers
1c71614c4a Properly localise fluid names on machine blocks 2014-08-04 01:01:15 +01:00
Ben Spiers
14852b0b5d Move some more code into the Blocks and Items classes, and fix the ObjectHolder annotations. Don't think it's going to be possible to make the Tools items work with ObjectHolder (they'd need to be final fields I think) because the material enums need to be initialised first. 2014-08-03 20:27:20 +01:00
Ben Spiers
2048083e11 Fix energy cubes not coming from NEI charged 2014-08-03 20:27:20 +01:00
Aidan Brady
dde9b53447 Fixed the addition of the "creative control circuit" 2014-07-31 21:08:46 -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 Brady
6e975ee632 Made them really infinite 2014-07-31 19:29:49 -04:00
Aidan Brady
ed4aa7671c Merge branch 'development' into 1.8 
Conflicts:
	src/main/java/mekanism/common/EnergyNetwork.java
 2014-07-31 19:00:54 -04:00
Aidan Brady
7e378dd796 Fixed Atomic Disassembler issue 2014-07-31 18:57:18 -04:00
Ben Spiers
b62c5c8a3a Get basic functionality working for the Laser Amplifier. No mode changing yet, and using the laser model in lieu of the actual one. 2014-07-30 22:26:03 +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
ab34edc46a Finished off new system of sustained data 2014-07-26 18:44:24 -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
7ac7fbc5cc Sustained gas and fluid support for Chemical Washer, Chemical Crystallizer and Chemical Infuser 2014-07-26 17:59:43 -04:00
Aidan C. Brady
ba289ced25 Added sustained fluid and gas tanks to PRC and Electrolytic Separator, fixed Gas Generator losing energy when being picked up 2014-07-26 17:37:25 -04:00
Aidan C. Brady
aaffc3e364 Updated some imports and added textures 2014-07-26 16:45:48 -04:00
Aidan C. Brady
22b3097d15 Laser model! Also added some new Reactor Block assets. 2014-07-24 23:02:30 -04:00
Aidan C. Brady
52efdac614 Eliminated the deprecated "getSpeedMultiplier()" and "getEnergyMultiplier()" methods 2014-07-23 10:17:03 -04:00
Aidan C. Brady
6470f69569 A big load of work on the new upgrade GUI 2014-07-22 20:37:53 -04:00
Aidan C. Brady
99482d8fd0 Fixed a minor issue 2014-07-21 22:24:27 -04:00
Aidan C. Brady
076c5f7377 More work! 2014-07-21 21:21: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
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
2f4d545fb5 Major Flamethrower work - finished networking and implemented active state management. Active sound effects work, too. 2014-07-17 17:18:53 -04:00
Aidan C. Brady
ee789547c6 A bit of work on flamethrower sound effect handling 2014-07-15 22:59:14 -04:00
Aidan C. Brady
a98bf8bba3 Merge branch 'development' into 1.8 2014-07-14 17:15:26 -04:00
Aidan C. Brady
146d974479 Fixed Teleporter localization, fixed balloons placing on non-solid sides, added AE processing recipes, improve tele porter efficiency 2014-07-14 17:14:32 -04:00
Aidan C. Brady
6fbfd22583 Merge branch 'development' into 1.8 2014-07-13 00:16:05 -04:00
Ben Spiers
4bea4c62fd Remove stray @Method 
Should fix #1500
 2014-07-13 05:06:57 +01:00
Aidan C. Brady
9abc111ecd Baby Skeletons, started work on Flamethrower 2014-07-12 22:34:58 -04:00
Aidan C. Brady
369eb012af Fixed Portable Tank transfer issue, fixed inventories not being sustained, fixed Logistical Transporter crash 2014-07-12 16:02:21 -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
Aidan C. Brady
7198704363 Fixed a crash! 2014-07-10 18:13:56 -04:00
Aidan C. Brady
1f9782d1c7 Added logic to allow fluid-accepting machines to use IFluidContainerItem fluids 2014-07-10 16:24:55 -04:00
Aidan C. Brady
95b6ac8be1 Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development 2014-07-10 13:35:37 -04:00
Aidan C. Brady
fc138c57c2 Portable Tank now serves as a FluidContainerItem, now I just need to get fluid-accepting machines to recognize them 2014-07-10 13:30:58 -04:00
Ben Spiers
cd10bc88c8 Updates for changed IC2 API. Not sure if I'll be able to use @Optional with the new non-legacy BC MJ API as it uses Annotations instead of interfaces. 2014-07-10 16:53:01 +01:00
Aidan C. Brady
9dc1c1d1c6 Work on a more consistent tier system. Added Reinforced Alloy, renamed Atomic Core to Atomic Alloy, and changed the recipe of the Atomic Alloy to use multiple levels of Metallurgic Infuser processing. The Reinforced Alloy is in between. 2014-07-09 23:52:01 -04:00
Aidan C. Brady
23adf9ad24 Added Salt Blocks - generates similarly to clay. Added tooltips for config GUI. Added option to regenerate ores, as this is now a thing. Also...began implementing different tiers of control circuits. 2014-07-09 22:06:36 -04:00
Aidan C. Brady
63970a29ea Upgraded gas item recipe integration greatly, should make things much smoother. 2014-07-09 17:05:33 -04:00
Aidan C. Brady
ee87d8cef5 Transmitter code cleanup - killed the now-unused merge() method and separated data handlers from ITransmitterNetwork itself. Also added new pipe textures. 2014-07-09 15:31:57 -04:00
Ben Spiers
9c58ed549f Start of work on Doing It Right™. Appears to work for cofh's API, not yet for IC2 or BC. Not sure why. Might have to ask @cpw. 2014-06-26 01:10:53 +01:00
Aidan C. Brady
098a74600c Fixed PRC NEI issue, fixed bucket not sustaining inventory, fixed a few other things 2014-06-19 20:33:10 +02:00
Aidan C. Brady
fba83a3634 Fluidic Plenisher work - just about done! 2014-06-19 13:57:30 +02:00
Aidan C. Brady
90da466ca1 Started work on Fluidic Plenisher 2014-06-19 12:42:59 +02:00
Aidan C. Brady
7924531a4e Dispensers can now latch balloons onto nearby entities, also working Portable Tank GUI 2014-06-19 01:13:23 +02:00
Aidan C. Brady
a3784d1fe7 More portable tank work, mainly on GUIs 2014-06-18 21:05:32 +02:00
Aidan C. Brady
adc8a9bc23 Portable Buckets...a lot more work than I thought 2014-06-18 19:42:57 +02:00
Aidan C. Brady
fd74ee5c92 Started work on Portable Tank 2014-06-18 03:01:23 +02: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
4fdae8cbef Cherrypicked @dschub's vein fix - thanks! 2014-06-15 13:40:06 +02:00
Aidan C. Brady
1a0821c727 Found work-around for javac issue - need to remember to submit an issue to oracle tomorrow 2014-06-14 01:35:25 +02:00
Aidan C. Brady
c8fb800c1a Updated localization yet again, fixed a small bug 2014-06-13 00:16:02 +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
d7fdc3a243 Greatly improved localization 2014-06-10 11:35:54 +02:00
Aidan C. Brady
dd83381774 Bug fixes! 2014-06-09 16:19:36 +02:00
Aidan C. Brady
726d9ebb0a Atomic Disassembler now can cut down trees with vein mode 2014-06-09 15:57:38 +02:00
Aidan C. Brady
4334690f78 Improved localization 2014-06-09 15:29:00 +02:00
Aidan C. Brady
d1c3b3b8ef Manually merged riches' PR 2014-06-04 11:05:29 +02:00
Aidan C. Brady
815944c49a A major load of fixes - things should be about back to normal now. 2014-06-03 19:54:45 +02:00
Aidan C. Brady
4446e14ba3 Sound system work 2014-06-02 23:57:40 +02:00
Aidan C. Brady
1933723b52 Major packet work, I think it's done. 34 errors to go! 2014-06-02 17:33:19 +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
6025572f15 Merge branch '1.7' into development (We're back to two branches) 
Conflicts:
	build.properties
 2014-05-08 17:40:27 -04:00
Ben Spiers
3d8c5c8696 More fixes. Around 1000 errors now, going to have to leave it to you from here on in @aidancbrady. 2014-04-20 22:34:45 +01: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