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
c608e7c04e
Fixes MC-75630 - Exploit with signs and command blocks
2015-05-25 15:28:14 -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
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
Sergey Shatunov
a42cf1ae37
Fix FluidRegsitry.registerFluid
...
FluidRegistry:
```java
static BiMap<String, Fluid> fluids = HashBiMap.create();
static BiMap<Fluid, Integer> fluidIDs = HashBiMap.create();
...
public static boolean registerFluid(Fluid fluid)
{
if (fluidIDs.containsKey(fluid.getName()))
^^^^^^^
```
There is definitely should be fluids instead fluidIDs. This mistake broke many mods.
2015-04-08 17:26:40 +06:00
Lex Manos
02ebc9ca21
Restore binary compatibility issues in FluidRegistry caused by recent changes.
2015-04-07 20:06:55 -07:00
cpw
4f0e2fb9c4
You shouldn't be creating FluidStacks from unregistered Fluids. Warn clearly on failed registrations, and make a useful log message for failed fluidstack
...
creations. Should help a lot with tracking down broken mods that are doing this wrongly.
2015-04-05 22:48:09 -04:00
King Lemming
f7395f517b
Allow for duplicate Fluid Blocks. It's annoying to be sure but just as with the OreDictionary, we'll have to handle it.
...
Signed-off-by: King Lemming <kinglemming@gmail.com>
2015-04-05 22:30:39 -04:00
cpw
defaddecec
Fix formatting
2015-04-05 22:30:39 -04:00
cpw
7506a5b7ad
Add in a fluidid transformer
2015-04-05 22:30:39 -04:00
King Lemming
3fc40b955a
Removed fluidID from ItemStack.
...
This fixes a rather huge issue where FluidStacks on the client could be desynced if a modder was unaware of it.
This is a breaking change but can be mitigated with a transformer to the getter getFluidID().
Signed-off-by: King Lemming <kinglemming@gmail.com>
2015-04-05 22:30:39 -04:00
iChun
b2f1b036de
Readded but deprecated the old RenderPlayerEvent that were deleted. Sorry, Lex.
2015-04-04 22:30:23 +01:00
iChun
8c35bc1dc7
Reimplement RenderPlayerEvent that was removed in the port to 1.8 from 1.7.10.
...
RenderPlayerEvent.Specials was removed because the special effects are done in the LayerRenderer now.
2015-04-03 21:11:43 +01:00
cpw
38b9febfe5
Forge really should have always supported the concept of an "exact spawn". Individual world providers can still
...
change this behaviour of course, but for default maps it makes sense to support it as a config option.
2015-04-03 10:31:25 -04:00
RainWarrior
46b1b82f13
Fixed mipmapping not being enabled by expanding 1x1 texture
2015-04-01 16:06:03 +03:00
Lex Manos
0f162ddc6a
Updated FML:
...
MinecraftForge/FML@2a268cd566 Improve mod list GUI, add sort and search
MinecraftForge/FML@951fc2d9fd First attempt at making FMLControlledRegistry something a bit more generic than just blocks/items.
MinecraftForge/FML@410582222d Merge pull request #614 from tterrag1098/betterModList
MinecraftForge/FML@ba0b176430 Fix ModDiscoverer ignoring inner classes.
MinecraftForge/FML@9cc313eab9 Merge pull request #617 from diesieben07/innerclass-disc
MinecraftForge/FML@01aaa7dc97 Fix mods defined via --mods or --modListFile launch args not being searched for coremods. #560
MinecraftForge/FML@8cecc47b85 Merge pull request #620 from killjoy1221/extra-coremod-fix
MinecraftForge/FML@38d9a5f444 Enhance output of common FML errors in crash reports and server
Force load anonymous minecraft classes used in crash reports. This prevents some crashes being hiddedn behind class definiton exceptions.GUI.
2015-03-27 03:03:31 -07:00
Lex Manos
9e7e9e5cbf
MinecraftForge/FML@24cb4a42c4 Enhance output of common FML errors in crash reports and server GUI.
...
Force load anonymous minecraft classes used in crash reports. This prevents some crashes being hiddedn behind class definiton exceptions.
2015-03-27 02:54:55 -07:00
JamiesWhiteShirt
3b567a92d8
Added newVolume and newPitch to PlaySoundAtEntityEvent. Deprecated ForgeEventFactory.onPlaySoundAt, added replacement ForgeEventFactory.onPlaySoundAtEntity.
2015-03-19 12:37:21 +01:00
LexManos
888bab92c3
Merge pull request #1723 from Geforce132/master
...
Add an EntityMountEvent.
2015-03-16 10:01:53 -07:00
Geforce132
d2f36d56f1
-Added EntityMountEvent.
2015-03-13 19:12:16 -05:00
diesieben07
642003e065
Fix jukebox message being too low with forge
2015-03-11 23:25:41 +01:00
robin4002
af0316ab9b
remove translation and add a note for contributors
2015-03-04 20:21:16 +01:00
LexManos
7355bdf600
Merge pull request #1721 from me4502/update-event
...
Added NeighborNotifyEvent fired on server side only, allows for monitoring and disabling world 'physics' updates.
2015-02-28 22:54:48 -08:00
Me4502
c21e38cd3b
Add NeighborNotiftyEvent.
2015-03-01 16:53:32 +10:00
Tmtravlr
f152741bba
Added Nether Fortress chest to the ChestGenHooks
...
I tried to follow the directions on
https://github.com/MinecraftForge/MinecraftForge/wiki/If-you-want-to-contribute-to-Forge
as best as I could. =)
If anything is wrong, let me know and I'll change it!
2015-02-26 14:25:41 -07:00
RainWarrior
638af63f4d
Hopefully fix NPE during baking of empty vanilla item models
2015-02-23 16:02:10 +03:00
RainWarrior
0e34510032
Removed event bus call from the ModelLoader
2015-02-17 21:20:19 +03:00
Lex Manos
5b28eb53e8
Add safty to URL detection in chat. Closes #1712
2015-02-16 22:46:55 -08:00
RainWarrior
b14cfa45e5
RenderItem can now use baked quad color
2015-02-17 05:02:16 +03:00