keith/ForgePatch
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Wiki Activity
4969 commits 1 branch 2 tags 103 MiB
Commit graph

4969 commits

This branch
This branch
All branches
Author SHA1 Message Date
Christian
d932a23751 Warn when the objectholder finds nothing in the registry. Helps debug mismatched names. 
Also, actually make the scoping thing work with objectholder

Also handle Blocks.air as a special case. It should never be a valid block in the block registry.

Nothing can ever replace the default block registry block. It is disabled for replacement.

Air is properly skipped
 2014-05-26 11:25:25 -04:00
LexManos
96ee4caf39 Merge pull request #1089 from RainWarrior/render-events 
Added world display list render events
 2014-05-25 17:16:08 -07:00
RainWarrior
3980bf79da Added world display list render events 2014-05-26 04:09:21 +04:00
LexManos
5eb99791b0 Merge pull request #1103 from ganymedes01/patch-1 
Fix getOreIDs not using the wildcard value correctly
 2014-05-25 15:35:15 -07:00
ganymedes01
6924fef324 Fix getOreIDs not using the wildcard value correctly 
You can see it's not working by requesting the ore IDs from lapis, and you'll see the name "dye" is missing (and that's the one registered using the wildcard).

Fixed it by inverting the order of the item stack parameters.
 2014-05-25 19:15:26 -03:00
Lex Manos
25ef7e3469 Prevent duplciates in registered Ores in the OreDictionary and clean up some of the code, add new function to return all ores the specified ItemStack satisfies. Closes #1102 2014-05-25 14:20:02 -07:00
LexManos
507f184144 Merge pull request #1101 from Open-Code-Developers/master 
Fix fluid blocks
 2014-05-25 13:41:13 -07:00
Vilim
bc1434ff04 Make finite fluid blocks drainable 2014-05-25 19:59:59 +02:00
Vilim
bab2de72bc Fix fluid blocks 
For https://github.com/BuildCraft/BuildCraft/issues/1843 .
 2014-05-25 18:42:17 +02:00
Lex Manos
fcc43e0aaa Updated FML: 
MinecraftForge/FML@3aba56440a lastIndexOf, Note Don't code while sick.
 2014-05-24 21:49:22 -07:00
Lex Manos
bcec606b12 lastIndexOf, Note Don't code while sick. 2014-05-24 21:48:55 -07:00
Lex Manos
fc70334343 Updated FML: 
MinecraftForge/FML@3a687f48b9 -.- Save File First. My Bad.
 2014-05-24 21:11:35 -07:00
Lex Manos
cad049caa1 -.- Save File First. My Bad. 2014-05-24 21:11:08 -07:00
Lex Manos
db52113a7e Updated FML: 
MinecraftForge/FML@c828bb63c5 Make AccessTransformer change INVOKESPECIAL to INVOKEVIRTUAL when making methods visible
MinecraftForge/FML@a9aa468457 Merge pull request #431 from diesieben07/at-invokevirtual
MinecraftForge/FML@31d726abad Fix the null networkHandler in the MessageContext
MinecraftForge/FML@725d988e36 Add in the objectholder, autopopulated by FML based on simple rules. Allows for reference driven substitution of mod blocks and items based on their server running state.
MinecraftForge/FML@f07bf5cb30 Fixed deobfusication of nested inner classes. And removed legacy ModLoader remaps.
 2014-05-24 20:46:04 -07:00
Lex Manos
e69fd72d42 Fixed deobfusication of nested inner classes. And removed legacy ModLoader remaps. 2014-05-24 20:44:25 -07:00
Christian
05cde0c92f Add in the objectholder, autopopulated by FML based on simple rules. Allows 
for reference driven substitution of mod blocks and items based on their
server running state.
 2014-05-24 22:32:24 -04:00
Christian
2c5fcc6129 Fix the null networkHandler in the MessageContext 2014-05-24 16:54:48 -04:00
Lex Manos
243aa60bf9 Add Glass, Colored glass, ore storage blocks, alines, and a few others to ore dicitonary. Closes #1011 2014-05-24 13:01:35 -07:00
Lex Manos
acf8e468f3 Made WorldGenShrub respect Block.canSustainPlant, Closes #1096 2014-05-24 10:55:57 -07:00
Lex Manos
dc10db1d90 Add new PlayerEvent.Clone called when an EntityPlayer is cloned via dimension travil or respawn. 2014-05-24 10:50:52 -07:00
rwtema
576a1294da Fixed setBlock not using the location-specific version of getLightOpacity() 2014-05-23 22:37:41 +01:00
LexManos
c3cf12f3b2 Merge pull request #431 from diesieben07/at-invokevirtual 
Make ATs replace INVOKESPECIAL when needed
 2014-05-22 10:13:09 -07:00
LexManos
8145de123e Merge pull request #1091 from Clashsoft/master 
Don't render ItemStack tooltip twice
 2014-05-22 09:57:36 -07:00
Clashsoft
e530089639 Update GuiScreen.java.patch 2014-05-22 16:12:52 +02:00
diesieben07
7ede64fbf2 Make AccessTransformer change INVOKESPECIAL to INVOKEVIRTUAL when making methods visible 2014-05-22 14:25:23 +02:00
LexManos
d63a9b1b10 Merge pull request #1086 from WaDelma/master 
Added amount that is being filled/drained to the FluidEvent
 2014-05-21 18:44:38 -07:00
WaDelma
a3e8f0cbe4 Fluid events now know how much fluid is moved 
Added amount that is being filled/drained to the FluidEvent

Added constructors without amount to ensure backwards compability

Added deprecation to amountless constructors
 2014-05-20 01:39:51 +03:00
Lex Manos
7b062dd390 Fixed Stems not droping a random number of seeds based on metadata, Closes #1087 2014-05-19 11:11:04 -07:00
LexManos
83e7130216 Merge pull request #1081 from XCompWiz/master 
Bug Fixes to Biome Decoration and Chunk
 2014-05-18 15:48:10 -07:00
XCompWiz
cdad2dc55a Bug Fixes to Biome Decoration and Chunk 
Fixes issue with biome decoration crashing on worlds with exposed void
Fixes same issue in JungleBiome decoration
Fixes forge bug in getting lighting from a block in chunk
 2014-05-19 01:37:59 +03:00
Christian
3885f9bf84 First draft 1.7.9 support. 
This is not modding minecraft. It's performing an update. Go away!
 2014-05-17 16:30:13 -04:00
Lex Manos
9d66c91c86 Added accessible instance to RenderBlocks and RenderItem for modders to use who don't wish to create there own instance. Warning: Other modders may influance the transient state of the instance, BE WEARY MODDERS. 2014-05-14 12:23:22 -07:00
Lex Manos
1c7341b982 Added Farmland to PLAINS type plants as that has changed in 1.7. Also made BlockTallGrass call it's super.canBlockStay to better support custom soils. Closes #1077 2014-05-14 12:21:24 -07:00
Lex Manos
5e6c346c7c In Flower Forest biome a Poppy should spawn instead of Blue Orchid Closes #1078 2014-05-14 12:20:04 -07:00
Christian
3d9b5b1472 MinecraftForge/FML@43e3ee1af1 Swap Listenerlist constructor around. Should fix parent resizing issue? 2014-05-14 14:24:16 -04:00
Christian
ca674c2ae5 Swap Listenerlist constructor around. Should fix parent resizing issue? 2014-05-14 14:22:51 -04:00
Christian
7578f0813b MinecraftForge/FML@70570a863f Fix up possible CME 2014-05-14 10:13:00 -04:00
Christian
e05d6340d7 Fix up possible CME 2014-05-13 15:11:50 -04:00
Christian
71b3ba2041 MinecraftForge/FML@503da3a257 Don't consider null NetworkDispatchers. This should fix a bunch of fakeplayer issues. 2014-05-13 08:16:22 -04:00
Christian
8a69b17bd6 Don't consider null NetworkDispatchers. This should fix a bunch of fakeplayer issues. 
Nothing to see here. No modding being done.
 2014-05-13 08:14:21 -04:00
Lex Manos
f95ca18707 Fixed No Blue Orchids spawn in swamp when using bone meal Closes #1072 2014-05-12 12:36:36 -07:00
Lex Manos
711e92a59f Fully clear DimensionManager's DimensionID bitset when world is loaded. Closes #1074 2014-05-12 11:46:03 -07:00
Christian
26c55d89ef Fix forge validating strict versions on remote connections. 2014-05-12 13:49:46 -04:00
Christian
51b55eaf25 MinecraftForge/FML@a8cbef2321 Finally hopefully fully kills the race condition causing a classcast on slow machines. 
MinecraftForge/FML@8dbd1ae0a1 Fix ObjectIntIdentityMap sporadically matching non-identical objects.
MinecraftForge/FML@42713c66e5 Merge pull request #426 from sfPlayer1/master
 2014-05-12 10:51:00 -04:00
cpw
3f86cd32a7 Merge pull request #426 from sfPlayer1/master 
Fix ObjectIntIdentityMap sporadically matching non-identical objects.
 2014-05-12 10:50:20 -04:00
Player
ee671c3eab Fix ObjectIntIdentityMap sporadically matching non-identical objects. 2014-05-12 16:29:37 +02:00
Christian
39340e46aa Finally hopefully fully kills the race condition causing a classcast 
on slow machines.

This is me bugfixing. NOT MODDING! No! Stop it! I'm not!
 2014-05-11 22:15:29 -04:00
Adubbz
4454d3f341 Greatly simplified the addition of new biomes to the default world 2014-05-11 15:06:14 +10:00
Christian
bb52a6b062 MinecraftForge/FML@d8b6adb259 Add a helper for casting some common collection types into generic form 
MinecraftForge/FML@5275cea844 Try and see if there is anything to the identityHashCode collision hypothesis. If you see this in your error messages, kindly let us know!
 2014-05-10 14:54:23 -04:00
Christian
a66e8462d8 Try and see if there is anything to the identityHashCode collision hypothesis. If you see this in your error messages, kindly let us know! 2014-05-10 14:53:08 -04:00