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

956 commits

Author SHA1 Message Date
Krapht
df09099ca6 Merge branch 'PipeConnectionRefactor' 
Conflicts:
	common/buildcraft/transport/TileGenericPipe.java
 2013-04-17 08:23:53 +02:00
CovertJaguar
97ce3ff98a Merge pull request #655 from kouteiheika/master 
Bulletproof the Box class against accidental world corruption and bugs.

-Don't really understand, but merged anyway.
 2013-04-16 23:10:13 -07:00
Krapht
5705eb7ed7 Fixed pipe Icons not being properly refreshed when switching texture packs. Closes #740 2013-04-16 07:57:39 +02:00
Krapht
b528468f99 Make sure to include up to, and including, meta 15 for facade generation (black wool) 2013-04-16 00:34:21 +02:00
Flow86
26a90d96e4 fix transport connects 
remove general check on transport class
 2013-04-15 10:15:09 +02:00
Flow86
44ca72ae3b add ForgeDirection to logic too 2013-04-15 09:46:52 +02:00
Flow86
aad0e4f394 fix Pipe connection generation 2013-04-15 09:36:49 +02:00
Krapht
cb231cd5e6 Removed the config option to always connect pipes. Refactored pipe connections 2013-04-14 18:24:02 +02:00
CovertJaguar
5ce65d4b47 Missed one 2013-04-14 02:22:44 -07:00
CovertJaguar
c87e2eaa87 Fixed bad texture binds 
See previous commit.
 2013-04-14 02:20:04 -07:00
CovertJaguar
77a3f3ceaf Fixed bad texture bind 
Binding textures by directly accessing the render engine seems to cause random effects. One instance I encountered when using that method was texture binds would fail for other TESRs that used bindTextureByName().
 2013-04-14 02:14:28 -07:00
Alex
fc39665aff Changed to support compatibility. 
This change was made to buildcraft would work better when a IInventory returned false when calling func_102007_a function. Now continues to check other slots. (Maybe you're using func_102007_a to return true if you want items to only go into a specific slot and not out.)
 2013-04-13 16:31:43 -03:00
SirSengir
4b82788976 Patch up potential NPE in ExtractionHandler. Closes #741 2013-04-13 18:37:12 +02:00
SirSengir
a21dfb7b5e Fixed liquid icon check to actually catch that edge case. (h/t Player) 2013-04-12 21:50:11 +02:00
SirSengir
7511a1f767 Added handling for LiquidStacks which do not have an icon set. Closes #739 2013-04-12 20:17:21 +02:00
Krapht
b624b5dd9f Fixed Icon API for Actions/Triggers 2013-04-11 19:28:34 +02:00
Flow86
08f0216be7 Merge pull request #737 from dmillerw/master 
Simple change to make BlockUtils consider isAirBlock when creating an ItemStack for a block.
 2013-04-10 23:35:59 -07:00
Flow86
5f9666a8b4 Merge pull request #729 from AlgorithmX2/master 
Facade shouldPassSneakingClickToBlock
 2013-04-10 23:34:43 -07:00
Christian
e3a2546beb Fix rendertank. Also add support for vanilla sided inventories. 2013-04-10 23:35:51 -04:00
Christian
e80d50e767 Fix for MCP names update 
Fix liquid render breaking texture binds
 2013-04-10 22:11:35 -04:00
Dylan Miller
4e74b295eb Forgot a closing parenthesis 2013-04-09 23:43:36 -07:00
Dylan Miller
24185aabce Made BlockUtils obay isAirBlock when creating an ItemStack 2013-04-09 23:40:34 -07:00
CovertJaguar
027a7006ff Emerald Pipes should remember their state better 2013-04-08 16:29:42 -07:00
AlgorithmX2
3230bcac51 Minor patch to allow other mo blocks to remove facades the same was as BC Pipes. 2013-04-07 15:05:01 -05:00
Flow86
b64de23421 fix Pipe Renderer 
closes #723
 2013-04-05 13:57:44 +02:00
CovertJaguar
a420e7bcfb Moved Texture Bind outside the loop 2013-04-04 19:26:48 -07:00
Flow86
da25a18c98 Update ItemGate.java 
fix broken language
 2013-04-04 19:26:18 +03:00
Krapht
57073f71a0 Throw exception if an action/trigger does not return an IIconProvider 2013-04-03 20:09:42 +02:00
Krapht
d79c4326cf Fixed serverside reference to Icon 2013-04-03 18:24:18 +02:00
Flow86
5aed4d1261 fix Engine translation/name not working 2013-04-03 09:08:07 +02:00
Flow86
ac3db7f7bd fix loosing information on chunk save/load 2013-04-03 08:56:01 +02:00
Flow86
09581d100b dont use Math.round 
merges and closes #696
 2013-04-02 12:51:44 +02:00
Flow86
1ad6209d42 Players engine corrections to target a specific amount of energy in the engine before throttling 2013-04-02 09:17:17 +02:00
Krapht
8f40131c37 Import cleanup, added warning supressions 2013-04-01 16:21:12 +02:00
SirSengir
fa6393b95b Added NPE check to prevent a crash when certain config options are unused. 2013-04-01 10:55:51 +02:00
Krapht
cb8602439f Fix breaking fx for submod pipes 2013-04-01 01:31:33 +02:00
Krapht
2095731772 Clarified javadocs Closes #609 2013-03-31 19:34:05 +02:00
Krapht
8cb7ff17a0 Remove debug output 2013-03-31 19:23:08 +02:00
Krapht
8401fc600c Make idle TileLasers more cpu friendly. Closes #617 
*Will only search for work every 5s (up from 0.5s)
*Will bleed 0.1MJ / tick while searching, so unless it gets
additional power it will eventually fully stop searching
 2013-03-31 19:18:44 +02:00
Krapht
e84f6cf790 Removed debug output 2013-03-30 22:06:11 +01:00
Christian
99bae591d5 Revert experimental pipe flow changes 2013-03-29 22:59:04 -04:00
Christian
738d5ede52 Fix oil, fuel, quarry and pump 2013-03-29 22:55:53 -04:00
Christian
4a5d5b219d Fix filler GUI and world rendering 2013-03-29 21:45:07 -04:00
Christian
05c235da6f Fix lasers 2013-03-29 21:24:49 -04:00
Christian
5441e821ad Fix trigger/action rendering 2013-03-29 20:47:12 -04:00
Christian
e6633ae6ff Fix up engineiron to use the new tank persistence methods 2013-03-29 18:17:49 -04:00
Christian
b341914b84 Fix up for liquidstack immutability 2013-03-29 15:40:27 -04:00
Christian
53a8db85e8 Fix up the rendering of gui engines. Closes #708 2013-03-29 12:43:29 -04:00
Krapht
d4a396e94a Fixed the hit effects and delete the old fuel png 2013-03-28 23:12:36 +01:00
Krapht
d9db8bb0f5 * Fixed the breaking texture, good work CJ =) 2013-03-28 22:22:18 +01:00
CovertJaguar
4545cf90e2 Fixed block particle effects 
They now use the correct texture (in theory).
 2013-03-28 14:06:55 -07:00
Krapht
dbc76521a2 Use the striped pipe as the breaked block texture, for now 2013-03-28 21:40:21 +01:00
Krapht
50030fd815 Merge branch 'patch-4' of git://github.com/TarzanBuzzyMan/BuildCraft into fixxy 2013-03-28 17:01:46 +01:00
Krapht
6d93b645e2 Fir merge error 2013-03-28 16:44:03 +01:00
Krapht
aecc8f0d3a Merge branch 'IPowerReceptorChange' into mc1.5 
Conflicts:
	common/buildcraft/transport/TileGenericPipe.java
 2013-03-28 16:41:17 +01:00
Christian
28f93b9dcc Printline die! 2013-03-28 07:47:06 -04:00
Christian
04be016691 Merge branch 'master' into mc1.5 
Conflicts:
	common/buildcraft/transport/EnergyPulser.java
 2013-03-28 07:46:50 -04:00
Christian
eb8d6cace2 Fix some minor logic derps in the energy pulser. Much better behaviour now. 2013-03-28 07:45:49 -04:00
Flow86
a4e7e74d5e Merge pull request #666 from Flow86/patch-powerRequest 
Fix bug in power distribution (Generic and Wooden Pipe)
 2013-03-28 04:29:18 -07:00
Flow86
4a8f1654c5 Merge remote-tracking branch 'remotes/origin/patch-powerRequest' into patch-renderPipe 
closes #666
 2013-03-28 12:27:57 +01:00
Flow86
cf4ecc45fb fix power pipes rendering 2013-03-28 12:16:34 +01:00
Flow86
673ccb6b42 fix render refinery 2013-03-28 12:08:53 +01:00
Flow86
bff16e6c96 fix rendering of liquids in pipes 2013-03-28 12:00:51 +01:00
Flow86
e01ea820a0 null pointer check in rendertank 2013-03-28 11:58:56 +01:00
TarzanBuzzyMan
254c671cec Update BlockOilStill.java 
Strip off unnecessary code after Krapht's Forge PR merge.
 2013-03-28 23:19:19 +13:00
TarzanBuzzyMan
6642d4fac1 Update BlockOilFlowing.java 
Strip off unnecessary code after Krapht's Forge PR merge.
 2013-03-28 23:15:37 +13:00
Flow86
4d92a9b918 fix RenderTank 2013-03-28 10:00:05 +01:00
Flow86
f9b6980993 fix commit by TarzanBuzzyMan 2013-03-28 09:56:12 +01:00
Flow86
25755d57bc Merge remote-tracking branch 'remotes/patch-oil/patch-3' into patch-renderTank 2013-03-28 09:53:48 +01:00
Krapht
22d15a4c91 Fixed bad parameter name in IPowerReceptor. Fixed call to powerRequest calling with getOpposite in PipeTransportPower 2013-03-28 09:30:26 +01:00
Krapht
35d8a2c6bf Merge branch 'mc1.5' into IPowerReceptorChange 2013-03-28 09:24:24 +01:00
Christian
263ca23171 Fix logic inversion derp 2013-03-27 23:31:24 -04:00
Christian
ca0c865f2a Merge branch 'master' into mc1.5 and fix bug 
Conflicts:
	common/buildcraft/BuildCraftTransport.java
	common/buildcraft/transport/Pipe.java
 2013-03-27 23:30:30 -04:00
Christian
276cacdef6 Add in a few tweaks to autarchic gates - stacks of items if 8 pulses are set, and a "single edge" trigger mode. 2013-03-27 23:15:12 -04:00
Krapht
4438947cab Made the IPowerReceptor direction aware 2013-03-27 21:49:30 +01:00
Krapht
5703c85549 Replace BCAction and BCTrigger arrays with IAction and ITrigger arrays. Good catch AartBluestoke 2013-03-27 17:17:18 +01:00
Krapht
bd91c3ad21 Mark Builder API as deprecated 2013-03-27 17:00:44 +01:00
TarzanBuzzyMan
15430f4277 Update BlockOilFlowing.java 
Missed an @SideOnly
 2013-03-28 00:01:15 +13:00
TarzanBuzzyMan
38072c8aa7 Update BlockOilStill.java 
Missed an @SideOnly
 2013-03-28 00:00:06 +13:00
TarzanBuzzyMan
6e07805fce Update BlockOilStill.java 
I forgot something
 2013-03-27 23:54:53 +13:00
TarzanBuzzyMan
9baae232e3 Update BlockOilStill.java 
Fix quick bug that Flow86 pointed out.
 2013-03-27 23:48:56 +13:00
Krapht
005d0bc4e1 Fix marker's rendering 2013-03-25 17:56:14 +01:00
Krapht
86d69f4078 Extracted method dropFacadeItem to avoid code duplication 2013-03-23 23:09:10 +01:00
Krapht
ada2bad7b0 Merge branch 'patch-676' of git://github.com/Flow86/BuildCraft into Flow86-patch-676 2013-03-23 22:35:26 +01:00
Krapht
e7d18f8d82 Merge branch 'mc1.5' of git://github.com/Techjar/BuildCraft into Techjar-mc1.5 2013-03-23 22:32:44 +01:00
CovertJaguar
05f8b556c4 More API fixes 2013-03-23 11:34:10 -07:00
CovertJaguar
a5d5d1a436 Fixed blueprint softblock error 2013-03-23 11:00:31 -07:00
Krapht
e35e0f2240 A custom BC built from source at an arbitrary time is versionless. Versions are decided on release. 2013-03-23 18:06:10 +01:00
CovertJaguar
e9c0d29032 More API Pruning 2013-03-23 02:31:14 -07:00
CovertJaguar
da3aa8374b Mass Cleaning & Updating 2013-03-23 02:21:06 -07:00
CovertJaguar
6cfabf56af Merged Trigger APIs 2013-03-23 02:16:17 -07:00
Krapht
7260d9445d Organizing imports 2013-03-23 09:40:22 +01:00
Krapht
b0fb4b3d8f Merge branch 'mc1.5' of github.com:BuildCraft/BuildCraft into mc1.5 2013-03-22 23:01:00 +01:00
Krapht
d888cb7b8d Fixed tank rendering in inventory 
partially fixed the BlockMarker
fixed the template item icons
fixed the oil bucket icon
Added texture for pipeWaterproofing and moved it to the BC tab
 2013-03-22 23:00:02 +01:00
Krapht
dd0122d622 Fixed the derp reverse of lit/dark gate textures 2013-03-22 22:04:00 +01:00
Krapht
eb6f7832b8 Update forge to 604 
Revert Sengir's build.xml
Fix Icon registration in Core to use the Item atlas
 2013-03-22 21:52:35 +01:00
Krapht
8192c8d792 Update names for forge build 604 2013-03-22 20:36:01 +01:00
Vilim Lendvaj
43227c6b3e Update to MC1.5.1 
It's a 100% compiling, 100% working and 95% textured build for 1.5.1,
MCForge build .600
 2013-03-22 19:46:33 +01:00
TarzanBuzzyMan
7280fa7165 Updated for obfuscations 
The field 94425 that I duplicated is a private field, and the names that someone has put as the deobfuscation name of the real one is a pile of crap so I will leave it as that till I or someone else can come up with a better one.
 2013-03-22 19:45:10 +13:00
CovertJaguar
2e9dbaa0f7 Break soft blocks before filling 
Closes #693
 2013-03-21 23:26:52 -07:00
aznhe21
2e7368150e Fix mining wells not put two or more stacks in pipe 2013-03-22 04:06:01 +09:00
Krapht
c352bc53ad Fix ledger Icons 2013-03-21 00:24:41 +01:00
Krapht
d23562f1e3 Uncaps method name (sorry Flow) 2013-03-21 00:22:07 +01:00
Krapht
3507cb1b0f Fix Engine model texture binding 2013-03-19 23:00:47 +01:00
Techjar
afc4a84cd3 Spaces are now tabs >_> 2013-03-18 23:05:15 -04:00
Techjar
d2598ef011 Trigger block update when placing/removing a facade 2013-03-18 18:48:04 -04:00
Flow86
fef297d6d4 Merge remote-tracking branch 'remotes/upstream/mc1.5' into patch-648 
Conflicts:
	common/buildcraft/transport/BlockGenericPipe.java
 2013-03-18 09:59:16 +01:00
Flow86
602f5b8b22 #676: adds a generic interface for pipe(tiles) to allow them to be solid on a side, a facade always overwrites it 2013-03-18 09:48:24 +01:00
TarzanBuzzyMan
6dea7dfaff Update BlockOilFlowing.java 
Updated to use 1.5 texture system for liquid.

Checked that it will compile but untested code. The 2 methods works for my own liquid in test environment.

Do not merge if you have already updated the oil so that it textures.

Still needs the actual texture/animation files
 2013-03-18 11:56:01 +13:00
TarzanBuzzyMan
e784f614d3 Update BuildCraftCore.java 
Put config.hasChanged() on config.save() to fall in line with lex's merge on Forge.
 2013-03-18 11:05:45 +13:00
Krapht
7672b7fc24 Underp 2013-03-16 18:48:48 +01:00
Krapht
0f672972fe Started fix on actions/triggers, untested 
Removed Action and Trigger from API
Moved IIconProvider to API
Renamed Action -> BCAction
Renamed Trigger -> BCTrigger
 2013-03-16 09:21:48 +01:00
Krapht
c5ebbbdf48 Fixed Pipes, Gates, Wires and several items 
Actions and Triggers remain
 2013-03-16 00:47:08 +01:00
Christian
145e5df557 Delete getTextureFile from everything. It's gone. 2013-03-15 15:08:55 -04:00
CovertJaguar
e2e47f0f81 Tweaked Hopper fill speed 2013-03-14 08:40:41 -07:00
Krapht
ac7ab97353 Facade items render the block part correctly, pipes still messed up 
Pipe render state defaults to dirty to trigger a sync when placing a pipe
 2013-03-13 23:27:36 +01:00
Christian
4ed51b5522 A bunch of fixups. The code *runs*, but there's a lot of gfx issues to fix up. 2013-03-12 15:43:39 -04:00
Flow86
3b082dfddb fixes #648 2013-03-12 09:53:10 +01:00
SirSengir
28754ac6da Fixed rename. 2013-03-10 17:38:16 +01:00
Krapht
52b7ce7d36 Fixed Action/Trigger textures 2013-03-09 19:43:33 +01:00
Krapht
04726b05c1 Renamed getCollisionBoxes to addCollisionBoxesToList after forge/fml update 2013-03-09 17:51:18 +01:00
Krapht
ffa806418d Renamed getCollisionBoxes to addCollisionBoxesToList after forge/fml update 2013-03-09 15:28:00 +01:00
Krapht
90f776be7a Fix derp 2013-03-09 15:05:08 +01:00
Krapht
9cdd23f03d Migrated gates 
Minor renaming
 2013-03-09 14:46:03 +01:00
Krapht
365a0c0a47 Renamed pipe related textures 
Ported Pipe textures (Pipe "api" changed for submods)
Ported Wire textures
Updated pipe sync to accomodate Icons
Updated all pipes to new "api"
Nerfed Herobrine
 2013-03-09 02:26:11 +01:00
Christian
df26c32121 Huge amount of fixes. Still a LOT to go. 2013-03-07 00:31:35 -05:00
Christian
7089244846 Merge branch 'master' into mc1.5 2013-03-06 18:23:28 -05:00
Christian
e06e30dc87 First draft. Still lots to do. 2013-03-06 18:22:17 -05:00
FloSoft
324242bfea TileGenericPipe.java: 
- fixes not calling powerRequest of IPowerReceptor-Pipe

PipePowerWood.java:
- fixes exploding pipes directly behind of a wooden pipe if no power-consumer exists, instead it will only extract the power amount which is requested by the consumers
 2013-03-05 18:02:49 +01:00
Krapht
69ac580b3f Made the ACT respect ISidedInventory 2013-03-04 20:57:25 +01:00
Christian
55660989e4 Fix dupe bug on TileAssemblyAdvancedWorkbench 
Closes #634
 2013-02-26 14:24:15 -05:00
kouteiheika
1ec990d0c8 Bulletproof the Box class against accidental world corruption and bugs. 
In some rare cases the Box's initialize() may be supplied with
coordinates equal to INT_MAX while theoretically being initialized.
Normally this would be harmless, as with every coordinate being
INT_MAX the resulting box's dimensions are zero, however anywhere
where one of the coordinates is actually used in a loop with a
"i <= coord" condition the loop counter will overflow and bad things
will happen, e.g. in FillerFlattener.iteratePattern, where
I encountered this bug, an array will overflow and take down the
whole game with it resulting in a corrupted world. (As broken INT_MAX
coordinates will get saved in NBT tags.)
 2013-02-23 17:07:44 +01:00
SirSengir
c15f011a02 Merge pull request #652 from AartBluestoke/patch-6 
Update common/buildcraft/transport/PipeTransportItems.java
 2013-02-22 00:19:47 -08:00
Player
86897df6ec (hopefully) fix quarry target search 2013-02-21 22:20:37 +01:00
Andrew Hill
8354db8e21 Update common/buildcraft/transport/PipeTransportItems.java 
LogisticsPipes would like to be able to handle reversed items ourselves. (in some cases we want to buffer, and try to eject once the associated machine/inventory has space)
 2013-02-21 20:57:13 +10:00
Player
d609f9662f .. for real 2013-02-21 03:55:13 +01:00
Player
d10cd4bc4a fix previous commit 2013-02-21 03:53:01 +01:00
Player
f1a7ebf484 Merge branch 'master' of github.com:BuildCraft/BuildCraft 2013-02-21 00:28:49 +01:00
Player
99c8402df1 use a better algorithm when grouping items in transport pipes 2013-02-21 00:26:59 +01:00
SirSengir
6431318a8d Merge pull request #649 from AartBluestoke/upstreamMaster 
another null check needed
 2013-02-20 08:11:05 -08:00
Player
7146463b21 Merge branch 'master' of github.com:BuildCraft/BuildCraft 2013-02-20 16:54:30 +01:00
Player
81db6ee4c5 fix transport pipe explosions not destroying the pipe 2013-02-20 16:53:37 +01:00
Andrew Hill
131f2459ed another null check needed 
the crafting helper is not used anywhere other than the 3 places that
have null checks. (this was the third location)
 2013-02-21 01:50:51 +10:00
Andrew Hill
a48e184ddb correction to the previous commit 
please --squash this or the previous ones.
(and i'll try not to write up commits using the web interface, even for
simple things in the future)
 2013-02-21 01:04:11 +10:00
SirSengir
041e4afcf6 Merge pull request #646 from AartBluestoke/upstreamMaster 
check for null recipe
 2013-02-19 23:22:29 -08:00
Andrew Hill
d16e44fb81 check for null recipe 2013-02-20 11:04:35 +10:00
SirSengir
c211af80ee Merge pull request #641 from AartBluestoke/upstreamMaster 
cache the IRecipe
 2013-02-19 04:53:45 -08:00
Andrew Hill
6d700c4adc move CraftingHelper. 2013-02-19 10:04:30 +10:00
Andrew Hill
7d23bda09f add a method to get the recipe. 2013-02-18 16:11:01 +10:00
Andrew Hill
1730feed03 cache the IRecipe 
act's should not re-search for their recipe, when the last recipe found
is still able to be used.

CraftingHelper.findMatchinRecipe() is identical to
vanilla.CraftingManager.findMatchingRecipe, except it returns the
IRecipe, rather than just the result.
 2013-02-18 14:41:00 +10:00