Anvilcraft/buildcraft
3
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
604 commits 1 branch 0 tags 19 MiB
Commit graph

604 commits

This branch
This branch
All branches
Author SHA1 Message Date
SirSengir
7dbd03e34c Merge branch 'master' into FacadesRefactor 2012-07-13 22:23:36 +02:00
Krapht
db1619c416 Merge branch 'FacadesRefactor' of github.com:SirSengir/BuildCraft into FacadesRefactor 
Conflicts:
	buildcraft_client/net/minecraft/src/buildcraft/transport/PipeWorldRenderer.java
	buildcraft_client/net/minecraft/src/mod_BuildCraftCore.java
	buildcraft_client/net/minecraft/src/mod_BuildCraftTransport.java
	common/net/minecraft/src/BuildCraftTransport.java
	common/net/minecraft/src/buildcraft/transport/PipeRenderState.java
	common/net/minecraft/src/buildcraft/transport/TileGenericPipe.java
 2012-07-13 22:05:38 +02:00
Krapht
1df6245237 Implemented facades. 
Still to do:
Proper names
Hollow facades
Bounding boxes
Crafing recipe (assembly table?)
Look into multiple bounding boxes for pipes to be able to access stuff through the gaps
 2012-07-13 21:55:26 +02:00
Krapht
8365d1ca35 Rewrote pipe world renderer to render from a state object instead of containing logic to calculate what to render. This state object can then be synced to the client to completely overwrite the client's view of the world 2012-07-13 21:55:25 +02:00
Krapht
19c4de5a1c Refactoring of PipeWorldRenderer and initial commit of PipeRenderState 2012-07-13 21:55:25 +02:00
Krapht
eec4aa0323 Pulled the pipe world renderer out of core and put it in transport, also made the actual rendering a class of its own. Legacy world rendering not touched (quarry frames) 2012-07-13 21:55:25 +02:00
Krapht
9758782f19 Moved the rendering of Pipe items from mod_BuildcraftTransport to its own class 2012-07-13 21:55:24 +02:00
SirSengir
604fa62374 Merge branch 'master' of github.com:SirSengir/BuildCraft 2012-07-12 14:33:59 +02:00
SirSengir
7f3163636f Refactored API for combustion engine fuels and refinery. 2012-07-12 14:33:22 +02:00
SirSengir
c632f79150 Cleaned up liquids/LiquidStack.java 2012-07-12 13:11:59 +02:00
SirSengir
486cc38229 Merge pull request #91 from AartBluestoke/master 
fixes issue 66
 2012-07-12 03:19:28 -07:00
SirSengir
3022e1e5f3 Merge pull request #90 from psxlover/Localization 
Refactored Localization.java to support addon localizations.
 2012-07-12 03:03:10 -07:00
Krapht
984d5d67af Merge branch 'master' of github.com:SirSengir/BuildCraft into FacadesRefactor 2012-07-12 05:57:32 +02:00
Krapht
02b1e4ae35 Rewrote pipe world renderer to render from a state object instead of containing logic to calculate what to render. This state object can then be synced to the client to completely overwrite the client's view of the world 2012-07-12 05:56:07 +02:00
AartBluestoke
89c69427db fixes issue 66, by using a temporary PRNG until the next full packet update comes through 2012-07-12 10:26:51 +10:00
psxlover
2cdbf7494d Refactored Localization.java to support addon localizations. 2012-07-12 03:19:33 +03:00
SirSengir
740cb92802 Merge pull request #88 from psxlover/NPEfixes 
NPE fixes
 2012-07-11 14:57:18 -07:00
psxlover
c3dc022880 Fixed an NPE when a power pipe tries to give power to a ghost pipe. 
This has been bugging me a long time, but since the old svn is gone I don't know what change caused it (it's not happening in 3.1.5).
It may not be the best approach but it prevents mc from crashing.
 2012-07-12 00:22:19 +03:00
psxlover
610be32388 Discovered more NPEs related to LiquidManager so I took a new approach. 2012-07-12 00:16:52 +03:00
psxlover
edf5e8eb32 Null pointer exception when starting a server. 2012-07-12 00:04:05 +03:00
SirSengir
e24e663fbd Redirected old liquid api references. 2012-07-11 19:20:37 +02:00
SirSengir
d3d4473d82 Fixed last commit. 2012-07-11 19:15:45 +02:00
SirSengir
57760812bd Merge pull request #86 from CovertJaguar/master 
Added filling of generic liquid containers to the Tank
 2012-07-11 10:13:09 -07:00
SirSengir
1098c2ef72 Moved item inventory into Engine object. 2012-07-11 19:09:17 +02:00
CovertJaguar
785c51660f Added filling of generic containers to Tank 2012-07-11 03:37:24 -07:00
SirSengir
685310fd79 Merge pull request #84 from pwaller/mcp-mapping-fix 
mcp mapping update: Update func_46057_a => getIconFromDamageForRenderPass
 2012-07-10 10:58:52 -07:00
Peter Waller
8f2ca3362b mcp mapping update: Update func_46057_a => getIconFromDamageForRenderPass 2012-07-10 18:56:57 +01:00
SirSengir
062032da50 Merge branch 'master' of github.com:SirSengir/BuildCraft 2012-07-10 19:36:25 +02:00
SirSengir
792f2bff5f Started refactor of liquid handling. 2012-07-10 19:35:43 +02:00
Kyprus
163984bdc2 Updated the README 2012-07-10 14:13:12 -03:00
SirSengir
f1caf84953 Merge pull request #83 from CovertJaguar/master 
Added a new API function for filling liquid containers
 2012-07-10 10:04:04 -07:00
Krapht
6881db2406 Refactoring of PipeWorldRenderer and initial commit of PipeRenderState 2012-07-10 13:46:15 +02:00
Krapht
0d3cec7bf6 Pulled the pipe world renderer out of core and put it in transport, also made the actual rendering a class of its own. Legacy world rendering not touched (quarry frames) 2012-07-10 13:14:58 +02:00
CovertJaguar
ace10b05f4 Changed fill code to safer BuildcraftAPI.fillLiquidContainer() 2012-07-10 03:07:56 -07:00
Krapht
421b657ab8 Moved the rendering of Pipe items from mod_BuildcraftTransport to its own class 2012-07-10 12:06:10 +02:00
CovertJaguar
2f0f8d9081 Added Liquid fill function. 2012-07-10 03:05:30 -07:00
SirSengir
6956322fd8 Merge pull request #79 from mistaqur/master 
Compatibility fix to pipes with custom connection logic
 2012-07-09 06:56:41 -07:00
SirSengir
95b6579e6d Merge pull request #82 from Chicken-Bones/master 
BuildCraft Frame patches
 2012-07-09 06:53:47 -07:00
Chicken Bones
9755eadfb0 Patches so that pumps and pipes can be moved by frames properly, other buildcraft tiles not tested 2012-07-09 23:41:27 +10:00
mistaqur
692d0ff6d5 Compatibility fix to pipes with custom connection logic (e.g. pipes from Additional Buildcraft Objects) 2012-07-07 07:04:20 +04:00
SirSengir
7fbe8623ac Diamond pipes now handle metadata when updating. Removed IInventory from TileGenericPipe. 2012-07-06 14:53:15 +02:00
SirSengir
51303806e3 Merge pull request #78 from rhilenova/issue_68 
Issue 68: Stripping a gate will not clear the pipe of any active actions
 2012-07-06 02:47:11 -07:00
rhilenova
16e33933c0 Reset all gate parameters when gate is stripped from pipe. This includes triggers, trigger parameters, actions, redstone, and pipe wires. 2012-07-05 21:30:41 -04:00
Krapht
85316e16f3 Check that we have a quarry arm before trying to tell it what to do 2012-07-05 18:27:46 +02:00
Krapht
cadd088f0b Fix NPE when worldObj is null while reading NBT 2012-07-05 17:36:41 +02:00
SirSengir
5458dde84f Merge pull request #77 from Maeyanie/master 
Config option: Fillers destroy blocks
 2012-07-05 03:58:24 -07:00
SirSengir
ed65b94585 Merge pull request #74 from Flow86/master 
Don't redownload files everytime
 2012-07-05 03:54:52 -07:00
Maeyanie
7f642772ed Add config option to support Fillers destroying blocks instead of breaking them. 
Prevents Fillers from being (ab)used as cheap Quarries.
 2012-07-04 21:47:52 -04:00
SirSengir
a24e3c25ef Fixed MCP mapping server side. 2012-07-01 19:12:50 +02:00
FloSoft
0bdd55fff4 moved download dir outside of builddir, 
only download files if changed
 2012-07-01 19:10:24 +02:00