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

318 commits

Author SHA1 Message Date
Lex Manos
01aac69514 Use Guava instead of Nio for J6 compatibility. 2015-06-18 11:48:14 -07:00
RainWarrior
07038f8342 Added fluid renderer. 2015-06-18 14:26:53 +03:00
LexManos
bf63879a92 Merge pull request #1941 from xxmicloxx/xxmicloxx-patch-b3dloader 
Bugfix for B3DLoader
 2015-06-17 16:52:08 -07:00
LexManos
1dc7a80d4f Merge pull request #1506 from mezz/GuiScreenInputEvents 
Add GuiScreenEvents for keyboard and mouse input
 2015-06-17 16:45:41 -07:00
LexManos
87b55860af Merge pull request #1781 from ShetiPhian/Block.getPickBlock 
Player sensitive version of Block.getPickBlock
 2015-06-17 16:37:03 -07:00
Lex Manos
6ec1ec2575 Fixed compile issues with irtimaled's PR. 2015-06-17 16:01:33 -07:00
LexManos
20ea3bc0ce Merge pull request #1749 from irtimaled/master 
Copy fortress.dat from the overworld to the Nether. Fixes #1747
 2015-06-17 14:23:58 -07:00
xxmicloxx
b45c90ceb8 Bugfix for B3DLoader 2015-06-17 19:48:51 +02:00
Lex Manos
e94288bbb1 Fixup model loading errors not being printed by making ICustomModelLoader.loadModel propogate IOExceptions as needed. 2015-06-16 16:03:10 -07:00
cpw
114ac38910 Merge branch '1.7.10' 
Conflicts:
	fml/src/main/java/net/minecraftforge/fml/common/MinecraftDummyContainer.java
	fml/src/main/java/net/minecraftforge/fml/common/registry/FMLControlledNamespacedRegistry.java
	fml/src/main/java/net/minecraftforge/fml/common/registry/LanguageRegistry.java
 2015-06-14 13:57:23 -04:00
superckl
c84f7a740f Fixing two IndexOutBoundsExceptions from the BiomeDictionary 2015-06-12 17:08:19 -07:00
Lex Manos
b94c2799ab Cleanup mod signature data table. Easily seperating those mods with signatures vs those with none. 2015-06-09 22:25:13 -07:00
Lex Manos
d4f6e9e419 Quiet CrashReport class pre-loading debug, no flag to re-enable. 2015-06-09 21:37:33 -07:00
Lex Manos
acbb330214 Bump version for new RB 2015-06-09 17:17:35 -07:00
Lex Manos
db7d82a889 Copy over parent's modelSet value in variants as well. 2015-06-09 17:17:23 -07:00
Lex Manos
9ef7b13442 Bump version for new RB. 2015-06-09 15:06:42 -07:00
cpw
db42d1f532 Merge branch '1.7.10' 2015-06-09 17:57:35 -04:00
LexManos
7406e3df9f Merge pull request #1795 from lumien231/ExperienceEvent 
Added LivingExperienceDropsEvent to change how much experience an entity drops
 2015-06-09 13:23:01 -07:00
Lex Manos
fef959d1e9 Redefine removal value in IRetextureableModel from null to empty string {""} due to ImmutibleMap not allowing null Values. Closes #1927 2015-06-09 12:36:36 -07:00
LexManos
f62ee5c4f5 Merge pull request #1881 from ganymedes01/master 
Added a brewing recipe registry system
 2015-06-09 12:05:40 -07:00
ganymedes01
0373920f99 Added a brewing registry system 2015-06-09 14:01:45 -03:00
RainWarrior
d6bc936ffa B3D Improvements 
- fixed keyframe transformation application
 - textures are now resolved the same way as in vanilla models
 - added the ability to use forge blockstate texture information
 - removed unused code from the B3D example
 2015-06-04 18:58:42 +03:00
RainWarrior
685a97fd93 Fixed missing variant logging; added the possibility to specify the item variant in the blockstate json. 2015-06-04 18:07:03 +03:00
RainWarrior
897d41fa77 Fixed partial variant detection in the forge blockstate loader. 2015-06-04 16:59:18 +03:00
cpw
63f2300794 Fix up the client/server fluid race condition that could cause the game to bail when an SSP game connects. 
There's still a teeny gap, but it's MUCH less prominent than it was before.
 2015-06-03 19:26:53 -04:00
LexManos
61f9c5a201 Merge pull request #1885 from LexManos/EnhanvedBlockStateJson 
Hook BlockState's Json loading to add support for simplified Forge format.
 2015-06-02 16:52:06 -07:00
Lex Manos
267e1ee62f Hook BlockState's Json loading to add support for simplified Forge format. 
See https://github.com/MinecraftForge/MinecraftForge/pull/1885 for more details.
 2015-06-02 16:49:56 -07:00
cpw
3c640fa32d Bump minor version # to 2 because of the fluid changes (mirroring what happening in 1.7.10) 2015-06-01 16:31:16 -04:00
cpw
d02636213a Merge branch '1.7.10' - imports all the fluid fixups and other stuff from 1.7 into 1.8 
Conflicts:
	fml/src/main/java/net/minecraftforge/fml/common/FMLCommonHandler.java
	fml/src/main/java/net/minecraftforge/fml/common/Loader.java
	patches/minecraft/net/minecraft/client/Minecraft.java.patch
	patches/minecraft/net/minecraft/client/renderer/texture/TextureMap.java.patch
	patches/minecraft/net/minecraft/item/ItemArmor.java.patch
	patches/minecraft/net/minecraft/nbt/CompressedStreamTools.java.patch
	patches/minecraft/net/minecraft/nbt/NBTTagCompound.java.patch
	patches/minecraft/net/minecraft/nbt/NBTTagList.java.patch
	patches/minecraft/net/minecraft/world/World.java.patch
	patches/minecraft/net/minecraft/world/WorldProvider.java.patch
	src/main/java/net/minecraftforge/common/ForgeVersion.java
	src/main/java/net/minecraftforge/common/network/ForgeMessage.java
	src/main/java/net/minecraftforge/fluids/BlockFluidBase.java
	src/main/java/net/minecraftforge/fluids/FluidContainerRegistry.java
	src/main/java/net/minecraftforge/fluids/FluidRegistry.java
	src/main/java/net/minecraftforge/oredict/OreDictionary.java
 2015-06-01 16:29:34 -04:00
Lex Manos
3331d2a496 Fixed damage reduction rate of vanilla armor incorrectly scaling with armor's current durability. 2015-05-26 23:34:32 -07:00
Lex Manos
df5e594e95 Loosen up ServerChatEvent to support IChatComponent Closes #1893 2015-05-25 13:34:34 -07:00
t1g3l
6a299a483a Changed forge command tab completion to use getListOfStringsMatchingLastWord() 2015-05-18 13:51:05 +02:00
t1g3l
fe327fbd76 Added tab completion 2015-05-17 11:00:42 +02:00
Tmtravlr
b2de64bc70 Initialized the Nether Fortress chest loot 
Forced the nether fortress chest loot to initialize in ChestGenHooks
like the other types.

Changed tabs to spaces. Silly Eclipse.
 2015-05-10 15:59:07 -07:00
cpw
96cbadb874 Expose the fluid that a block was constructed with, useful for 'non-default' 
configuration of fluidblocks. Shouldn't be used outside of this purpose.
 2015-04-20 10:29:04 -04:00
cpw
50608986fe Replace the OLD fluid in the fluidID map, not the new one.. 2015-04-20 10:01:36 -04:00
cpw
7bbe8df2b8 Fix static initializer derp. 2015-04-20 09:26:27 -04:00
cpw
0543828603 Make FluidStack hold a delegate for the fluid. This can then float based on what is "live" at present. 2015-04-20 09:06:23 -04:00
cpw
dcb2f2588c Actually use the override constraint in ticket requests. Closes #1802 2015-04-19 11:57:39 -04:00
cpw
54af750717 Verify that the fluid registry doesn't contain "junk" fluids thru reflection. 2015-04-18 21:37:45 -04:00
King Lemming
cd3bbfb02c Adds some new Ore querying functionality. 
Also attempts to size initial Hashmaps in a logical manner.

Signed-off-by: King Lemming <kinglemming@gmail.com>
 2015-04-16 17:18:37 -04:00
Lumien
81ab4cbc5f Added LivingExperienceDropsEvent to change the amount of experience an entity drops 2015-04-14 11:58:00 +02:00
LexManos
475d7fc02d Revert KL's change, requesting a ore WILL register it. 
Registering like this and returning a new empty list allows for modders to register their recipes and such without requiring to be executed after someone actually adds an item. If handled properly this allows for more flexible load orders, and more responsive code.
 2015-04-13 21:28:16 -07:00
King Lemming
3cd7f6bd87 Adjusts OreDictionary to prevent invalid registrations. 
Getting Ore Names for a non-existent ore will no longer automatically add that Name to the list nor generate an ID.

Tweaks a warning message in the FluidContainerRegistry. No functionality change.

Signed-off-by: King Lemming <kinglemming@gmail.com>
 2015-04-13 22:40:38 -04:00
cpw
5c88164211 And handle the null case in the constructor itself. Closes #1794 (again) 2015-04-11 17:38:15 -04:00
cpw
230d757a89 Fix NPE - Closes #1794 2015-04-11 17:27:14 -04:00
cpw
9671179453 Fluids are now tracked internally by mod. This allows for the server and the world to specify a "default" 
in the case of a possible alternative fluid implementation. If you always called registerFluid, things
should work pretty seamlessly, but if you didn't (gating with an isFluidRegistered check for example)
you should change to register anyway. This way, even if you're not default in the overall instance, you may
become default if you're the only mod present on a server, for example, or in a world save.

This should radically decrease the mixups caused by mod load ordering problems, and other issues around fluid
tracking.
 2015-04-11 17:18:53 -04:00
King Lemming
37d63b3fe9 Adds a warning to the FluidContainerRegistry when a mod does something stupid! Also denies the registration. 
Signed-off-by: King Lemming <kinglemming@gmail.com>
 2015-04-10 20:09:58 -04:00
King Lemming
186f92479d Fixes FluidContainerRegistry properly - no more corner case where client/server mods disagree. 
Also clarifies the 2x Fluid registration error message somewhat.

Signed-off-by: King Lemming <kinglemming@gmail.com>
 2015-04-10 16:38:45 -04:00
King Lemming
433b7ca589 Fixes #1782 
Signed-off-by: King Lemming <kinglemming@gmail.com>
 2015-04-09 17:28:20 -04:00