-
-
Notifications
You must be signed in to change notification settings - Fork 10
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
19 changed files
with
394 additions
and
347 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file not shown.
60 changes: 60 additions & 0 deletions
60
mcppatches/patches/net/minecraft/client/renderer/block/model/ModelBakery.java.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,60 @@ | ||
| --- a/net/minecraft/client/renderer/block/model/ModelBakery.java | ||
| +++ b/net/minecraft/client/renderer/block/model/ModelBakery.java | ||
| @@ -288,7 +288,7 @@ | ||
| { | ||
| Reader reader = null; | ||
| IResource iresource = null; | ||
| - ModelBlock s2; | ||
| + ModelBlock out; | ||
|
|
||
| try | ||
| { | ||
| @@ -330,7 +330,7 @@ | ||
| } | ||
|
|
||
| ModelBlock modelblock = MODEL_ENTITY; | ||
| - s2 = modelblock; | ||
| + out = modelblock; | ||
| } | ||
| finally | ||
| { | ||
| @@ -338,7 +338,7 @@ | ||
| IOUtils.closeQuietly((Closeable)iresource); | ||
| } | ||
|
|
||
| - return s2; | ||
| + return out; | ||
| } | ||
|
|
||
| private ResourceLocation getModelLocation(ResourceLocation location) | ||
| @@ -457,7 +457,7 @@ | ||
|
|
||
| for (Entry<RegistryDelegate<Item>, Set<String>> entry : customVariantNames.entrySet()) | ||
| { | ||
| - this.variantNames.put(((RegistryDelegate)entry.getKey()).get(), Lists.newArrayList(((Set)entry.getValue()).iterator())); | ||
| + this.variantNames.put((Item) ((RegistryDelegate)entry.getKey()).get(), Lists.newArrayList(((Set)entry.getValue()).iterator())); | ||
| } | ||
| } | ||
|
|
||
| @@ -680,12 +680,6 @@ | ||
| return set; | ||
| } | ||
|
|
||
| - @Nullable | ||
| - public IBakedModel bakeModel(ModelBlock modelBlockIn, ModelRotation modelRotationIn, boolean uvLocked) | ||
| - { | ||
| - return this.bakeModel(modelBlockIn, modelRotationIn, uvLocked); | ||
| - } | ||
| - | ||
| protected IBakedModel bakeModel(ModelBlock p_bakeModel_1_, ITransformation p_bakeModel_2_, boolean p_bakeModel_3_) | ||
| { | ||
| TextureAtlasSprite textureatlassprite = (TextureAtlasSprite)this.sprites.get(new ResourceLocation(p_bakeModel_1_.resolveTextureName("particle"))); | ||
| @@ -732,7 +726,7 @@ | ||
|
|
||
| protected BakedQuad makeBakedQuad(BlockPart p_makeBakedQuad_1_, BlockPartFace p_makeBakedQuad_2_, TextureAtlasSprite p_makeBakedQuad_3_, EnumFacing p_makeBakedQuad_4_, ITransformation p_makeBakedQuad_5_, boolean p_makeBakedQuad_6_) | ||
| { | ||
| - return this.faceBakery.makeBakedQuad(p_makeBakedQuad_1_.positionFrom, p_makeBakedQuad_1_.positionTo, p_makeBakedQuad_2_, p_makeBakedQuad_3_, p_makeBakedQuad_4_, p_makeBakedQuad_5_, p_makeBakedQuad_1_.partRotation, p_makeBakedQuad_6_, p_makeBakedQuad_1_.shade); | ||
| + return this.faceBakery.makeBakedQuad(p_makeBakedQuad_1_.positionFrom, p_makeBakedQuad_1_.positionTo, p_makeBakedQuad_2_, p_makeBakedQuad_3_, p_makeBakedQuad_4_, (ModelRotation) p_makeBakedQuad_5_, p_makeBakedQuad_1_.partRotation, p_makeBakedQuad_6_, p_makeBakedQuad_1_.shade); | ||
| } | ||
|
|
||
| private void loadModelsCheck() |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
14 changes: 7 additions & 7 deletions
14
mcppatches/patches/net/minecraft/src/ConnectedParser.java.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
mcppatches/patches/shadersmod/client/ShaderPackParser.java.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,12 +1,12 @@ | ||
| mc_version = "1.10.2" | ||
| mc_file_md5 = "37f80d266872ec11560ab0895f7cf63b" | ||
| of_file_name = "1.10.2_HD_U_D8" | ||
| of_json_name = "1.10.2_HD_U_D8" | ||
| of_file_md5 = "d2a99a8d96d1067cb9e384bbdc560c70" | ||
| of_file_name = "1.10.2_HD_U_E3" | ||
| of_json_name = "1.10.2_HD_U_E3" | ||
| of_file_md5 = "7ea7d7c1e353da2a94961b443e59026f" | ||
| minecrift_version_num = "1.10.2" | ||
| minecrift_build = "jrbudda-10-finalr2" | ||
| minecrift_build = "jrbudda-11" | ||
| of_file_extension = ".jar" | ||
| mcp_version = "mcp931" | ||
| mcp_uses_generics = True | ||
| mcp_download_url = "http://www.modcoderpack.com/website/sites/default/files/releases/mcp931.zip" | ||
| forge_version = "12.18.3.2281" | ||
| forge_version = "12.18.3.2316" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.