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

435 commits

Author SHA1 Message Date
luacs1998
05f6ede2ea Fix a possible crash in EventBus 2015-09-27 12:47:37 +08:00
RainWarrior
d70ca1a357 Workaround for MinecraftForge/ForgeGradle#256 2015-09-02 22:01:30 +03:00
cpw
5074f26ccd FMLNetworkHandler.openGui should not try and open a GUI on a FakePlayer. 
Fixes #2082 and probably dozens of mod errors. Also, side benefit of the
merged codebase! FML code can ref Forge code!
 2015-09-02 13:50:00 -04:00
cpw
b7e8dcff7b Format a bit better 2015-09-02 13:29:43 -04:00
cpw
5a9129f802 Merge branch 'patch-1' of https://github.com/laci200270/MinecraftForge into laci200270-patch-1 2015-09-02 13:27:42 -04:00
RainWarrior
b175d265b9 Much requested temporary hack for items and TESRs. Context: #1582, #1597, #1713, #2058 and others. 2015-09-02 07:35:24 +03:00
LexManos
e5ee9377fd Merge pull request #2086 from Vorquel/master 
Fix faulty channel name checking
 2015-09-01 16:32:26 -07:00
simon816
b312584ca4 Add Guava and Apache to LaunchClassLoader exclusion list on server 
Move exclusions to common place. Less likely to get out of sync
 2015-08-31 03:15:30 +01:00
Lex Manos
90a88efd8a Fixed issue where config folder would not be created before SplashProgress tried to read from it. 
Default macs to disable the new loading screen due to to many macs having issues.
Users can enable it again by editing their config.
Catch and gracefully handle more errors when starting up the Splash Screen.
 2015-08-22 18:55:32 -07:00
James
589465bb81 Fix faulty Channel name 2015-08-21 16:06:07 -07:00
cpw
b211aca5ce Merge branch 'fg2' 2015-08-20 12:27:20 -07:00
laci200270
ba8ae53867 Update FMLSecurityManager.java 2015-08-19 20:27:42 +02:00
LexManos
b45fd787f3 Merge pull request #1969 from diesieben07/blockhighlight 
Re-introduce RenderBlockOverlayEvent
 2015-08-05 11:48:53 -07:00
cpw
c2523c685a FML's metabolic processes are now history. FML's off the twig. FML's kicked the bucket, FML's shuffled off this mortal coil, 
run down the curtain and joined the bleedin' choir invisible!! THIS IS AN EX-PROJECT!
 2015-08-02 00:20:19 -04:00
cpw
614bbcb0da FML is no more. FML has ceased to be. FML's expired and gone to meet its maker. FML's a stiff! Bereft of life, FML rests in peace. 2015-08-01 23:51:40 -04:00
cpw
9a859f8d5c Merge branch 'master' of https://github.com/AbrarSyed/MinecraftForge into fg2 2015-08-01 20:55:58 -04:00
cpw
5045d8df68 Merge branch '1.7.10' 2015-08-01 20:30:22 -04:00
LexManos
5623634f56 Merge pull request #2048 from shadekiller666/UnlistedPropertyValue 
Fix for ExtendedBlockStates containing at least one IProperty and one IUnlistedProperty preventing block placement.
 2015-07-25 15:12:57 -07:00
shadekiller666
87bbbfafcc Fixed a bug with ExtendedBlockStates containing at least one IProperty and one IUnlistedProperty not allowing blocks to be placed. 2015-07-25 14:55:42 -07:00
LexManos
2a85ab0eab Merge pull request #2017 from liach/add-enum 
Add hook for adding EnumPlantType and fixed npe in BiomeType
 2015-07-24 17:08:16 -07:00
LexManos
d72caa5005 Merge pull request #2047 from Zaggy1024/forgeblockstatesv1fixes 
Fixed two bugs with the Forge blockstates v1 loader.
 2015-07-24 11:28:23 -07:00
Zaggy1024
e580d3b6b6 Fixed a Forge blockstates json removing models causing an NPE in the loader. 
Fixed the deep clone of a V1 Variant not cloning the submodels properly.
 2015-07-24 13:20:10 -05:00
LexManos
5eea9cebae Merge pull request #1983 from clienthax/patch-1 
Make layer methods public
 2015-07-23 12:13:00 -07:00
Ruben Taelman
0cf1f0d51c Fix source block check for BlockFluidClassic 2015-07-21 10:51:53 +02:00
liach
e2ee54a27d Add an EnumHelper hook and fixed an issue 2015-07-14 08:55:51 +08:00
cpw
8636eb1883 Wake up the FluidRegistry before any mods start loading. Should stop mods claiming to own water or lava (depending on who accessed 
FluidRegistry first)
 2015-07-09 16:53:31 -04:00
cpw
50677ad87a Actually rebuild the fluidNames each rebuild, don't just try and force changes in. Should fix #1973 2015-07-09 16:40:51 -04:00
Clienthax
97f8c246b8 Signed-off-by: Clienthax <clienthax@gmail.com> 2015-06-30 22:29:34 +01:00
RainWarrior
c4f370a7e6 Custom transformations in forge blockstate json. 2015-06-30 21:37:11 +03:00
AbrarSyed
bbfae84ee8 removed broken and duplicate AT lines 2015-06-29 21:56:30 -05:00
LexManos
7a733d635e Merge pull request #1974 from Lunatrius/white-screen-fix 
Fixed error GUIs showing a white screen
 2015-06-26 16:16:01 -07:00
Lunatrius
44077774be Fixed error GUIs showing a white screen and replaced a rogue direct GL call. 2015-06-27 01:12:24 +02:00
Fry
37b4936e9d Fix particle texture of the generated item models. 2015-06-27 01:26:59 +03:00
diesieben07
ebef4553f3 Re-introduce RenderBlockOverlayEvent, seems to have been missed during 1.8 update 2015-06-25 19:09:32 +02:00
RainWarrior
74501f509f There's no Map.getOrDefault in java6. 2015-06-23 17:03:19 +03:00
RainWarrior
8f65678b99 Vanilla models can now use custom textures. Fixes #1962 2015-06-23 16:52:42 +03:00
RainWarrior
510b5523d5 Fixed perspective transformations for item models. 2015-06-23 15:56:18 +03:00
Lex Manos
d7c4a06ce8 Fix AT for Block constructor. 2015-06-23 01:26:33 -07:00
RainWarrior
1582e401ed Added ItemLayerModel - less awkward, simpler and faster version of ItemModelGenerator. 2015-06-23 04:43:48 +03:00
LexManos
8bb34107f1 Merge pull request #1858 from FlansMods/master 
Hook for Camera Angles, Including Roll
 2015-06-21 11:19:26 -07:00
larman
2cb971c38f fix logic for guessing mesa tag in biome dict 2015-06-19 07:04:19 -07:00
LexManos
94dc49e522 Merge pull request #1952 from ganymedes01/master 
Change permission levels on ore recipes parameters
 2015-06-18 11:55:46 -07:00
LexManos
40bc035d74 Merge pull request #1953 from ganymedes01/patch-1 
Fixed NPE when calling canBrew
 2015-06-18 11:51:48 -07:00
Lex Manos
01aac69514 Use Guava instead of Nio for J6 compatibility. 2015-06-18 11:48:14 -07:00
ganymedes01
953ddae475 Fixed NPE when calling canBrew 
Oversight on my part,

If the ingredient doesn't return true in Item.isPotionIngredient, Items.potionitem.getEffects(stack) returns null, causing an NPE to be thrown later on.

This invalidates #1947.
 2015-06-18 13:32:21 -03:00
ganymedes01
ab548afbfb Change permission levels on ore recipes parameters 2015-06-18 13:21:00 -03: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
Lex Manos
e7724c13cc Fixed Wavefront Object Importer reading files with integer values. Closes #1651, #1654 2015-06-17 15:48:22 -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
581363fddd fixed AT missing for getModelBlockDefinition 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
Lex Manos
5064d33519 Mitigate potential issue with users requesting lots of server status information by caching ServerStatus json. 2015-06-03 23:16:25 -07: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
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
Flan
306af4feee Added CameraSetup sub-event for camera angles 
Allows players to alter yaw and pitch of renderViewEntity, but more importantly, adds the ability to roll the view.

Added camera roll hook
 2015-05-19 16:14:44 +01: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