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

5562 commits

This branch
This branch
All branches
Author SHA1 Message Date
Lex Manos
f0d96b7c50 Fixed being kicked from the server while swimming. 2015-02-06 21:35:27 -08:00
Lex Manos
7ed7da159e Fixed debugging Dedicated server in Forge Dev workspace. 2015-02-06 21:35:11 -08:00
Lex Manos
9704f25aa8 Fixed potential NPEs in Structure code caused by componenets not being able to load. 2015-02-05 17:03:43 -08:00
Lex Manos
c80e75de9b Fixed potential NPEs in Structure code caused by componenets not being able to load. Closes #1686 2015-02-05 17:02:30 -08:00
Lex Manos
e903f0ff69 Added ability for language files to opt-in to loading using normal Java properties format. 
This allows for escape characters, as well as keeping %d and %f replacements in tact.
To opt-in, the lang file must have this comment line:
# PARSE_ESCAPES
As this is opt-in, any errors resulting from misused format strings is on the modder/end user.
 2015-02-04 17:23:41 -08:00
Lex Manos
b036b37a35 Fixed BlockBush and BlockCrops not respecting custom soils. Closes #1683 2015-02-04 12:20:24 -08:00
Lex Manos
48c24246a5 Fixed InitMapGenEvent's fire order so values are used. And added OCEAN_MONUMENT type. Closes #1681 2015-02-04 12:20:24 -08:00
RainWarrior
9cb7cc557a Restore binary backwards compatibility 2015-02-04 10:05:07 +03:00
RainWarrior
b8add23d9b ModelBakeEvent now has ModelLoader as an argument instead of ModelBakery; Added various static hooks to ModelLoader to allow registering model-related information before it's needed (prevents file-not-found errors on first baking pass); ModelLoader waits until ModelBakeEvent is done before showing any missing model exceptions; It's now possible to define models completely in-code (as illustrated by ModelBakeEventDebug). 2015-02-04 09:45:23 +03:00
Lex Manos
501665fc1e Bump version to 11.14.1 for next development cycle. 2015-02-03 19:44:29 -08:00
Lex Manos
9c50745bdb Updated FML: 
MinecraftForge/FML@1de3bf733a Fix FML's package for net.miencraftforge on maven. Fixes uploading of new builds. Note: 1.7.10 builds are bug fixes only while FML/Forge for 1.8 stabelizes.
MinecraftForge/FML@05ecefb538 Update to ASM5 for Java 8 support
MinecraftForge/FML@1112c455b9 Merge pull request #595 from Grinch/master
 2015-02-03 00:26:17 -08:00
RainWarrior
3a0de2edca Fixed tracking of UV locking state. Closes #1679 2015-02-03 10:40:30 +03:00
Lex Manos
c814be0359 Updated FML: MinecraftForge/FML@22c9656196 Reset S->C CustomPayload data after Write, allowing the same packet to be written multiple times. 2015-02-02 13:08:02 -08:00
Lex Manos
79356d7023 Fixed ItemFrames not having a model. Closes #1678 2015-02-02 13:06:57 -08:00
Lex Manos
1b80328d3f Reset S->C CustomPayload data after Write, allowing the same packet to be written multiple times. Closes #588 2015-02-02 12:09:26 -08:00
Lex Manos
76825d19b8 Fixed Buttons not dropping anything when broken. Closes #1676 2015-02-01 10:49:17 -08:00
Lex Manos
80c0ff4066 Fixed domain support in ArmorMaterial texture name. Closes #1675 2015-02-01 10:48:48 -08:00
Lex Manos
072aca4350 Updated FML: 
MinecraftForge/FML@d00feb58c7 Remove debug code that was causing console spam in Forge.
MinecraftForge/FML@1de3bf733a Fix FML's package for net.miencraftforge on maven. Fixes uploading of new builds. Note: 1.7.10 builds are bug fixes only while FML/Forge for 1.8 stabelizes.
MinecraftForge/FML@05ecefb538 Update to ASM5 for Java 8 support
MinecraftForge/FML@1112c455b9 Merge pull request #595 from Grinch/master
MinecraftForge/FML@9c3013e02a Merge remote-tracking branch 'origin/1.8'
 2015-01-31 19:00:38 -08:00
Lex Manos
c374ba5463 Merge remote-tracking branch 'origin/1.8' 2015-01-31 18:56:00 -08:00
Lex Manos
79b5c28d38 Merge remote-tracking branch 'origin/1.8' 2015-01-31 18:33:32 -08:00
LexManos
c7c29979c9 Merge pull request #595 from Grinch/master 
Update to ASM5 for Java 8 support, IF ANYONE MAKES A MOD THAT REQUIRES JAVA8 BEFORE MINECRAFT FORCES IT ALL USERS REQUESTING SUPPORT WILL BE BANNED FROM ALL FORGE RELATED SERVICES.
 2015-01-31 03:37:15 -06:00
RainWarrior
ab39b7e4e0 Removed leftover debug messages 2015-01-30 03:14:12 +03:00
LexManos
a420927007 Merge pull request #1666 from TechStack/1.8 
Fixes issue #1552 Where the flowIntoBlock method was not setting the Block to the fluid and causing crashes
 2015-01-29 16:29:30 -06:00
LexManos
7581ead65f Merge pull request #1664 from Lunatrius/fix-debug 
Fixed debug text rendering one line to low.
 2015-01-29 16:19:20 -06:00
TechStack
146b08a8cd Closes #1552 
Set the destination block the to the fluid.
In the previous code the destination block was still Air and would would
cause a crash because air doesn't have a property for LEVEL
 2015-01-29 17:11:22 -05:00
RainWarrior
67121d9ebc Merge pull request #1521 from RainWarrior/model-system 
Model loader registry
 2015-01-29 13:25:47 +03:00
RainWarrior
6eba0ebb93 Added model loader registry 
Entry point: ModelLoaderRegistry
loader interface: ICustomModelLoader
custom model: IModel

ModelLoader is responsible for splicing into vanilla model system.
(you probably don't need to use it directly)

Interop with vanilla models isn't great yet
(vanilla models can't refer to custom ones as parents), will improve in
the future.

Includes loader for B3D models, with animation support
(net.minecraftforge.client.model.b3d).
Blender export plugin with compatible coordinate system:
https://github.com/RainWarrior/B3DExport

OBJ loader is being written, will be included at some point in the
future. For now you can convert OBJ to B3D via blender, or wait.
 2015-01-29 11:33:52 +03:00
Steven Downer
79d224f76e Update to ASM5 for Java 8 support 
SpecialSource updated ASM5 and ForgeGradle supports ASM5 as well but
neither FML or Forge were actually updated to support ASM5 opcodes. This
commit resolves this.

Signed-off-by: Steven Downer <grinch@outlook.com>
 2015-01-28 20:17:21 -06:00
Lunatrius
39eb036b0e Don't skip the first line when rendering (debug) text. 2015-01-28 21:41:39 +01:00
LexManos
c9670d3c1d Merge pull request #1646 from Ivorforce/patch-1 
Fix fluid tanks incorrectly reading NBT when empty
 2015-01-22 21:09:59 -08:00
Lex Manos
8b6ef01ecc Updated FML: 
MinecraftForge/FML@a55e412453 Save the mod list of players in their NetworkDispatcher (Make it accessable for mods)
MinecraftForge/FML@69d479d46a Fixed getEffectiveSide() for Netty Server threads
MinecraftForge/FML@0f9a33cf14 Exclude only log4j2 queue from class loader
 2015-01-19 11:38:05 -08:00
LexManos
9a2c4998ae Merge pull request #591 from Minecrell/patch-1 
Exclude only log4j2 queue from class loader
 2015-01-18 14:46:18 -08:00
Ivorius
e629774753 Fix fluid tanks incorrectly reading NBT when empty 
If the Empty flag was set, the tank would not correctly read the data, keeping the outdated FluidStack instead. This is especially relevant with updatable TileFluidHandler TEs.
 2015-01-17 00:36:42 +01:00
LexManos
c4b0fea9ee Merge pull request #1647 from Parker8283/fluid-icons 
Re-enabled Icon setting for Fluids
 2015-01-16 15:22:09 -08:00
LexManos
698b1558cd Merge pull request #1645 from Lunatrius/chat-npe-fix 
Fixed NPE when canceling ClientChatRecievedEvent. Fixes #1644
 2015-01-16 15:18:02 -08:00
LexManos
c7da6c703f Merge pull request #575 from lumien231/1.8 
Save the mod list of players in their NetworkDispatcher
 2015-01-16 14:40:06 -08:00
Parker Young
bfcce919b9 Re-enabled Icon setting for Fluids 2015-01-16 17:30:00 -05:00
Minecrell
8cfca4376f Exclude only log4j2 queue from class loader 
Right now the complete com.mojang package is excluded from the LaunchClassLoader on the server. This means mods can't transform authlib for example which doesn't need to be excluded for the UI to work. By excluding only the specific log4j2 QueueLogAppender, mods can also transform the classes in the com.mojang.authlib package.
 2015-01-16 23:15:17 +01:00
Lunatrius
4380ca026e Fixed NPE when canceling ClientChatRecievedEvent. Fixes #1644 2015-01-16 23:09:45 +01:00
Lex Manos
f6a378e136 Silently eat exceptions when getting a TE's rendering bounding box, this 'fixes' Bukkit servers screwing up world data and causing clients to crash. 2015-01-14 19:02:50 -08:00
LexManos
204c6119e7 Merge pull request #1635 from asiekierka/master 
Fix shouldRefresh being too broad in tile entity update
 2015-01-11 13:03:00 -08:00
asiekierka
0a707236e1 fix shouldRefresh being too broad in tile entity update 2015-01-11 11:12:54 +01:00
RainWarrior
dcabad2bd1 Merge pull request #1602 from Chicken-Bones/1.8 
Allow blocks to render in multiple layers
 2015-01-10 13:35:29 +03:00
LexManos
465e330566 Merge pull request #1615 from lumien231/master 
Fix versionCheck config option
 2015-01-09 04:37:26 -08:00
LexManos
7d82925017 Merge pull request #1627 from CovertJaguar/tile-refresh 
Bulk Chunk Data packets should also check TileEntity.shouldRefresh().
 2015-01-09 03:42:46 -08:00
Lex Manos
64bf7bb3be Fix value passed for Item.getModel useRemaining argument. Closes #1623 2015-01-08 23:37:06 -08:00
Lex Manos
fb88b021c5 Made Chunk.fillBlock respect TileEntity.shouldRefresh. 2015-01-08 23:22:45 -08:00
Lex Manos
d899f8fb84 Call World.init from DimensionManager.initDimension Closes #1551 2015-01-08 23:02:25 -08:00
Lex Manos
5328701219 Fix potential NPE when loading a single player world where you were saved in a unloaded dimension. Closes #1575 2015-01-08 21:42:13 -08:00
CovertJaguar
30196b8696 Bulk Chunk Data packets should also check TileEntity.shouldRefresh(). 2015-01-07 15:37:54 -08:00