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

4743 commits

This branch
This branch
All branches
Author SHA1 Message Date
RainWarrior
db3e039b31 TESRs registering in preinit don't break pistons anymore. Fixes #2298. 2015-12-30 11:37:32 +03:00
RainWarrior
09e9a181ee Fixed color disabling not working for forge pipeline. Closes #2286. 2015-12-30 11:22:22 +03:00
RainWarrior
56eba05237 1.8.9 update 2015-12-30 07:15:03 +03:00
LexManos
6644e8c9ed Merge remote-tracking branch 'origin/1.8.8' 2015-12-29 19:25:38 -08:00
Fry
ad40f24fb1 Merge pull request #2322 from bonii-xx/dynbucket 
Fix bucket replacement not loading the bucket model by itself if repl…
 2015-12-29 15:34:59 +03:00
Bernhard Bonigl
509cc79112 Fix bucket replacement not loading the bucket model by itself if replacing buckets. 
This happens when no other mod that uses the bucket model is present.
Also added a simple method for registering the bucket model, should give
modders an idea on how to use the general model.
 2015-12-29 13:31:35 +01:00
LexManos
cce0f7a2ed Merge pull request #2320 from bonii-xx/slime 
Add a hook for custom particle spawning for slimes
 2015-12-28 13:17:28 -08:00
Bernhard Bonigl
7f52bc6547 Add a hook for custom particle spawning for slimes 2015-12-28 21:01:30 +01:00
LexManos
7298b21cb5 Merge pull request #2318 from diesieben07/entity-egg 
Allow forge-type spawn-eggs to spawn child entities when clicking EntityAgeable
 2015-12-28 07:12:39 -08:00
Take Weiland
af1e769895 Allow forge-type spawn-eggs to spawn child entities when clicking EntityAgeable 2015-12-28 15:58:37 +01:00
LexManos
d2248c3774 Fix Button/Torch/Lever placement on stairs and slabs. Closes #2291 2015-12-27 14:39:29 -08:00
RainWarrior
1cd0bf9ee4 Fixed random block position offset not applying correctly. 2015-12-25 09:31:32 +03:00
RainWarrior
097c0c6130 Added an ability to register custom item variants, not ending with "#inventory". Should allow grouping multiple item models into 1 blockstate json. 2015-12-24 06:06:38 +03:00
cpw
a54b939ea3 Try and make sure active substitutions are immediately available in the block to item map. 2015-12-23 16:41:53 -05:00
cpw
95825e5de0 Actually use the delegate for the itemblock 2015-12-23 15:55:45 -05:00
cpw
54e9a36b67 Capture ItemBlock remaps. 2015-12-23 15:07:16 -05:00
cpw
53227982e3 Try and fix registry NPE when substitution is active. 2015-12-23 14:11:17 -05:00
cpw
bcecf59a87 Blocks are no longer erased from the registry if the mod isn't present. This means that modded blocks can potentially retain their IDs 
even if they are temporarily not present in the game. Currently TileEntity data associated with the block is erased.
 2015-12-23 11:18:54 -05:00
cpw
5562c14c45 Fix up persistent substitution. Should close #2259 2015-12-23 10:37:11 -05:00
cpw
d8ca68b280 Fix the channel handler naming. It now uses the standard netty namer for it, by careful use of cunning reflection. 2015-12-22 18:12:35 -05:00
LexManos
6a8a9b3097 Fixed vanilla bug related to spawning entities on top of fences. Closes #2303 2015-12-22 11:52:36 -08:00
LexManos
cb609dbab3 Fixed registry issues that prevented connecting to 1.8 Forge servers. 
More precisely: Servers with missing registries default back to frozen version.
Throw descriptive error if we do not have any information.
 2015-12-21 13:42:40 -08:00
Fry
c7790f7b35 Merge pull request #2282 from bonii-xx/dynbucket 
Add a dynamic bucket model that displays the animated liquid contained
 2015-12-22 00:26:25 +03:00
Bernhard Bonigl
4f6784b733 Add a dynamic bucket model that displays the animated liquid contained 
Has a config option (default off) that replaces the vanilla buckets with the forge bucket model

New original bucket textures from mr_hazard
 2015-12-21 22:22:40 +01:00
RainWarrior
56f35f4401 Fixed NPE caused by accessing undefined layer in MultiLayerModel. 2015-12-20 22:16:17 +03:00
LexManos
f8473adf6f Merge pull request #2293 from Lunatrius/fix/client-command-autocomplete 
Fix client side command auto-complete not working correctly.
 2015-12-19 11:31:43 -08:00
Lunatrius
b665026378 Fix client side commands adding parts of the color codes on autocomplete (prefix "7" and suffix "r"). 2015-12-19 12:55:26 +01:00
RainWarrior
1dcc9abab2 Fix dependency resolution for models with custom data/textures. 2015-12-17 04:41:54 +03:00
RainWarrior
80ba13be89 LightUtil.pack and .unpack now work correctly with unpacked arrays of size <4. 2015-12-15 23:31:09 +03:00
RainWarrior
d67c57827a Delayed quad list resolution in MultiModel, fixes NPE in MultiLayerModel. 2015-12-15 23:03:09 +03:00
RainWarrior
f0ae51bb34 Forge pipeline will now take original model lightmap into account, if present. 2015-12-15 22:27:01 +03:00
RainWarrior
7c4d643de2 Fixed java6 errors in previous commit. 2015-12-15 22:27:01 +03:00
RainWarrior
86c09722a0 IModel can now depend on a variant definition (ModelResourceLocation); added MultiLayerModel - simple model that'll render correctly in multiple layers + example of using it. 2015-12-15 21:49:19 +03:00
RainWarrior
d6ee373e87 Preparations for the Animation system. 
Changes to the Model API - IModelState now works with Optional. Handling of parts of the model is not optional, and coordinate space/result interpretation is up to the caller. IModel doesn't extend IModelPart by default anymore; MapModelState uses composition to achieve previous functionality, IModelPart implementations are disjoint now. Updated perspective handing to the new API, removed IPerspectiveState (MapModelState is now the same thing). Perspective transforms for the default fluid model.
 2015-12-14 23:27:27 +03:00
LexManos
9032f7e37e Fix enchanting applying the same enchantment multiple times. Closes #2273 2015-12-14 03:49:58 -08:00
cpw
82537e5763 Merge pull request #2272 from AlgorithmX2/addLandingEffects 
Added addLandingEffects allowing mods to override landing particles
 2015-12-13 17:09:13 -05:00
cpw
bf779e6803 Merge pull request #2270 from AlgorithmX2/getHighlightTip 
Add getHighlightTip allowing a item to override its displayed renderToolHightlight
 2015-12-13 17:00:02 -05:00
AlgorithmX2
a319adba53 Added addLandingEffects allowing mods to override landing particles, for blocks that require world information to determine textures. 2015-12-13 15:35:15 -06:00
cpw
94eadab9fd A test for issue #1848. Please try this with any mods you can @ 1.8.8, and see if you still get log spam of any kind (not just the 
log message from the issue either).
 2015-12-13 14:22:53 -05:00
AlgorithmX2
8db720151d Add getHighlightTip allowing a item to override its displayed renderToolHightlight. 2015-12-13 04:47:25 -06:00
LexManos
2ed4f39a13 Merge pull request #2268 from minzmann/master 
[1.8.8] Minor Fixes to PotionEffect.java.patch
 2015-12-12 19:48:23 -08:00
cpw
0632f2aadf Fix derpage when loading a 1.8 world, with persistent state being entirely ignored in that case. 2015-12-12 18:53:44 -05:00
minzmann
bf6c31c879 Update PotionEffect.java.patch 2015-12-12 17:05:14 +01:00
LexManos
c6d64cd94a Merge pull request #2239 from bonii-xx/potionhiding 
Add shouldRender() to Potions that allows to hide them completely in …
 2015-12-12 00:18:18 -08:00
cpw
cef50616d8 Merge pull request #2228 from Minecrell/patch-2 
Fix some issues with the console command completion
 2015-12-11 15:42:06 -05:00
cpw
3631955641 Use ItemStack.hasEffect. closes #2230 2015-12-11 15:30:43 -05:00
cpw
46840fb71a Merge pull request #2233 from liachmodded/mcl-typo 
Fix a typo in jar detection
 2015-12-11 15:16:24 -05:00
Fry
5fd04595f2 Merge pull request #2248 from AlgorithmX2/isOpaqueFace 
Added doesSideBlockRendering to provide finer grain face culling.
 2015-12-11 22:57:40 +03:00
AlgorithmX2
ea75a3be69 Added doesSideBlockRendering to provide finer grain face culling. 
Implemented for BlockStairs and BlockSlab.
 2015-12-11 13:42:04 -06:00
LexManos
c356105e6d Fix wrong EventType passed for Emerald ore-gen. 2015-12-10 12:41:48 -08:00