mirror of
https://github.com/MinecraftForge/MinecraftForge.git
synced 2026-11-17 19:15:32 +00:00
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
23410ad4d4 | ||
|
|
19577254b2 | ||
|
|
ddbbeae4f1 | ||
|
|
c87aa67a8a | ||
|
|
ff1213fa7d | ||
|
|
7d60ce788b | ||
|
|
4d02491374 | ||
|
|
f1ee747082 | ||
|
|
949c8c20d4 | ||
|
|
146e1ecd94 | ||
|
|
068578e5ba | ||
|
|
d5963874b6 | ||
|
|
4b0dbdb19b | ||
|
|
4641bfc701 | ||
|
|
0e5519533f | ||
|
|
8029851b4e | ||
|
|
1c7077d4a1 | ||
|
|
8e453de369 | ||
|
|
35e1737cb3 | ||
|
|
b930704955 | ||
|
|
619f83931f | ||
|
|
5c8a222cb8 | ||
|
|
615f4966ce | ||
|
|
878193152a | ||
|
|
e747a17ec3 | ||
|
|
96aceffb6f | ||
|
|
b43300c388 | ||
|
|
faf6c22b71 | ||
|
|
286777b824 | ||
|
|
e67bde9e9e | ||
|
|
c544f06880 | ||
|
|
d867bd299f | ||
|
|
ca298ef6aa | ||
|
|
df52accf76 | ||
|
|
8ddbf3b0a8 | ||
|
|
3b22b6cb67 | ||
|
|
e2f60c1aaf | ||
|
|
369008fe1d | ||
|
|
e6dcfde214 | ||
|
|
4ea73399de | ||
|
|
9c148b56f8 | ||
|
|
4da5832290 | ||
|
|
e1ddc4315c | ||
|
|
2814df89b3 | ||
|
|
c6f181dcb2 | ||
|
|
7976ac4a2b | ||
|
|
5198b4d690 | ||
|
|
03e922fa05 | ||
|
|
81d61218b6 | ||
|
|
1c0b53f3bf | ||
|
|
14d8151b02 | ||
|
|
acdfe97bd6 | ||
|
|
d77033b0d0 | ||
|
|
61d00dd05f | ||
|
|
2df36137c2 | ||
|
|
34463690c5 | ||
|
|
6ffd94a08e | ||
|
|
0b41a0a822 | ||
|
|
27a5b60c89 | ||
|
|
003d0c601d | ||
|
|
56ed8fec1e | ||
|
|
b2e3f353df | ||
|
|
e4d04afd95 | ||
|
|
91cc592a3a | ||
|
|
cbf6cb9744 | ||
|
|
93a4e13837 | ||
|
|
460a2189d6 | ||
|
|
af2ca8e250 | ||
|
|
c0eea379a4 | ||
|
|
cec90d7f48 | ||
|
|
69b72201ac | ||
|
|
d84ee35245 | ||
|
|
3eb7b59cf4 | ||
|
|
582f33fc85 | ||
|
|
f92425cf71 | ||
|
|
5f4cd69167 | ||
|
|
dbc6baf2f7 | ||
|
|
646a8977d6 | ||
|
|
2c7c538c73 | ||
|
|
2234039b96 | ||
|
|
15aee5b18a | ||
|
|
901df8345c | ||
|
|
f22874d3be | ||
|
|
72dd06ca85 | ||
|
|
5ffbbd3b9f | ||
|
|
fd0dabd60c | ||
|
|
f7f46be8ff | ||
|
|
be2d814155 | ||
|
|
b99aa9bca4 | ||
|
|
671d462645 | ||
|
|
52409e15cf | ||
|
|
9619be4a17 | ||
|
|
f0eb941abc | ||
|
|
f2425b7486 | ||
|
|
ae96fd08db | ||
|
|
d850ca890f | ||
|
|
4d23ce1314 | ||
|
|
b6194b0cca | ||
|
|
25497d310b | ||
|
|
72937c90be | ||
|
|
006b8cc8bd | ||
|
|
c1a38c541a | ||
|
|
4fbc847736 | ||
|
|
43375ded29 | ||
|
|
67247fba29 | ||
|
|
ef94421dc6 | ||
|
|
55587fca08 | ||
|
|
45e0738f43 | ||
|
|
724ffe1d70 | ||
|
|
c49ff259b5 | ||
|
|
f4ce57cd21 | ||
|
|
2003dee17f | ||
|
|
a6284e6053 | ||
|
|
a15dee61d6 | ||
|
|
384567c4a5 | ||
|
|
d3e4fde2b2 | ||
|
|
da5b2201fa | ||
|
|
9d71b667b6 | ||
|
|
64cb9cdafd | ||
|
|
bd4fe54753 | ||
|
|
64c9aae0c4 | ||
|
|
bf154730bd | ||
|
|
5cce054548 | ||
|
|
a4a6d5fa6c | ||
|
|
7cdbe5d518 | ||
|
|
1df8d5f8e5 | ||
|
|
3c3fcc0ffd | ||
|
|
ab4c4db0d5 | ||
|
|
e5eb2e795b | ||
|
|
219e1d418b | ||
|
|
d3c6130f88 | ||
|
|
403eda184a | ||
|
|
7c9b67b574 | ||
|
|
6ae39ac027 | ||
|
|
7550f4b05e | ||
|
|
7aa1e00f31 | ||
|
|
a605c64c49 | ||
|
|
1d6cd35a09 | ||
|
|
b2e3233dc1 | ||
|
|
5f6bf3b063 | ||
|
|
caa85b33bf | ||
|
|
59a3b3cc79 | ||
|
|
6a15ab6ead | ||
|
|
8fbf4cf115 | ||
|
|
6745022d46 | ||
|
|
4a6b3ef6e3 | ||
|
|
450c3a80c1 | ||
|
|
0e9d741163 | ||
|
|
3379ee7df2 | ||
|
|
3e568b864e | ||
|
|
dcc76ccb58 | ||
|
|
ba875418fd | ||
|
|
7598d18a50 | ||
|
|
9888214524 | ||
|
|
bbc107de96 | ||
|
|
1e7eb6fb09 | ||
|
|
7da6c2d0e1 | ||
|
|
50bf03b82b | ||
|
|
926472b359 | ||
|
|
71efbf8132 | ||
|
|
d53397111b | ||
|
|
a41288644d | ||
|
|
df0f1c4e75 | ||
|
|
9835e3705c | ||
|
|
bc381b92ea | ||
|
|
aed00b5dce | ||
|
|
04885b3150 | ||
|
|
a718077a2e | ||
|
|
d72888b6ab | ||
|
|
d672584b8d | ||
|
|
3d12ef56b5 | ||
|
|
a824214333 | ||
|
|
941c3eff02 | ||
|
|
c545b8ecd4 | ||
|
|
43efa3cfc4 | ||
|
|
60211e6cd6 | ||
|
|
b020ea06ae | ||
|
|
4b627a3672 | ||
|
|
c4dea9fc66 | ||
|
|
43f3b3ec65 | ||
|
|
da3af92343 | ||
|
|
cea922432a | ||
|
|
d2872ec7a2 | ||
|
|
9ce6f8e03b | ||
|
|
042c8ec739 | ||
|
|
966c6263c3 | ||
|
|
a561f4c41c | ||
|
|
5165dc52bf | ||
|
|
1f4007e5d8 | ||
|
|
08a4f5f314 | ||
|
|
9010f1d7e7 | ||
|
|
e9143859c0 | ||
|
|
e32cc2a607 | ||
|
|
95e523f943 | ||
|
|
b9ebc44790 | ||
|
|
bdcfefeb42 | ||
|
|
4908f58b00 | ||
|
|
7c72e5168f | ||
|
|
6a125ae0d4 | ||
|
|
4530967009 | ||
|
|
20e026e601 | ||
|
|
a997222aca | ||
|
|
8dc4b5f9b5 | ||
|
|
22db1965c7 | ||
|
|
b203468cde | ||
|
|
1e6ae7d1f7 | ||
|
|
7fe8c48983 | ||
|
|
babe0c2d53 | ||
|
|
8eea766288 | ||
|
|
160427b12c | ||
|
|
aee9d8c9b4 | ||
|
|
daf21e4dcf | ||
|
|
b270839e91 | ||
|
|
c6bc4ec5a9 | ||
|
|
c82d3af550 | ||
|
|
3ef3b46ebb | ||
|
|
621d67d36a | ||
|
|
4b7219c07f | ||
|
|
f9c74cfc77 | ||
|
|
c1e832bff0 | ||
|
|
61fc4a70a3 | ||
|
|
6921ee54f5 | ||
|
|
a913a8a0f9 | ||
|
|
2009b3ec5e | ||
|
|
e09e6c0f24 | ||
|
|
1f26b3c3f2 | ||
|
|
2337b0a6ae | ||
|
|
14f3120eed | ||
|
|
0b9988bf45 | ||
|
|
249c468a75 | ||
|
|
ef1efaffec | ||
|
|
96f88538d5 | ||
|
|
dac8e49f50 | ||
|
|
5da0ac73b9 | ||
|
|
8d20258f3c | ||
|
|
c17b40790b | ||
|
|
b048c1a4b5 | ||
|
|
12733656eb | ||
|
|
4b51536592 | ||
|
|
86a772ee8c | ||
|
|
daee86d14d | ||
|
|
059605e352 | ||
|
|
45aa74454b | ||
|
|
c22382d12e | ||
|
|
969a75154f | ||
|
|
95ecd2a8f4 | ||
|
|
2bd8b95a3b | ||
|
|
2823447b6e | ||
|
|
e03d5915e5 | ||
|
|
8719fa0263 | ||
|
|
8f03658f1f | ||
|
|
b039e2172b | ||
|
|
b4881195b3 | ||
|
|
f12a4b5c1e | ||
|
|
668bf47337 | ||
|
|
9cf74914e7 | ||
|
|
1fa0c0c548 | ||
|
|
97ea0c4713 | ||
|
|
5ac6d374ed | ||
|
|
658769ea45 | ||
|
|
96ef9b564b | ||
|
|
85a2a2e661 | ||
|
|
f028ba88f5 | ||
|
|
150566d9a3 | ||
|
|
bf090cb4c2 | ||
|
|
df32442a64 | ||
|
|
5fd5f78bb9 | ||
|
|
6dcd276de1 | ||
|
|
eb6b3ea228 | ||
|
|
6f1a44a405 | ||
|
|
bf8fa5d286 | ||
|
|
42a7036393 | ||
|
|
3ea027c3bd | ||
|
|
6741967608 | ||
|
|
f0d9bf7886 | ||
|
|
def75dc092 | ||
|
|
b067435fa3 | ||
|
|
e498dc7532 | ||
|
|
cc48280a8b | ||
|
|
843d3022f8 | ||
|
|
f8cba13b5b | ||
|
|
41916ae39a | ||
|
|
648067efc2 | ||
|
|
c459b87ec9 | ||
|
|
4e6a774075 | ||
|
|
c177219ff3 | ||
|
|
9ab96fbda6 | ||
|
|
7a4aa5a1c4 | ||
|
|
998a78c3c1 | ||
|
|
42e0fbbb02 | ||
|
|
27ebd0e9b9 | ||
|
|
9a9c02fa25 | ||
|
|
5802a3b0b6 | ||
|
|
dc871ea273 | ||
|
|
5c78361b27 | ||
|
|
56e347d05a | ||
|
|
5f9034d95b | ||
|
|
858056c089 | ||
|
|
bd62cf81fd | ||
|
|
a1bbcf8a0b | ||
|
|
1eee6cd382 | ||
|
|
129f58c02f | ||
|
|
159ca09c54 | ||
|
|
9ecb005e98 | ||
|
|
b0558c63de | ||
|
|
80f0e0bb93 | ||
|
|
bea5d44273 | ||
|
|
7bbd3954f5 | ||
|
|
cfa63792bc | ||
|
|
490573a71f | ||
|
|
9c7d20b3a1 | ||
|
|
d7b241c224 | ||
|
|
d7dda9e960 | ||
|
|
5f06c95cfa | ||
|
|
6e8c05343c | ||
|
|
d3da111c08 | ||
|
|
7a63e67e9d | ||
|
|
d159f5f4e2 | ||
|
|
92eb71ae9c | ||
|
|
bc303074f6 | ||
|
|
c0db34796b | ||
|
|
ad1324d478 | ||
|
|
3a3c436e3f | ||
|
|
4feb1dff50 | ||
|
|
d3ad8aed76 | ||
|
|
7a84376044 | ||
|
|
1107088acb | ||
|
|
c58a66a816 | ||
|
|
2aaa4f424d | ||
|
|
89eb8f067d | ||
|
|
f08f3c1105 | ||
|
|
3b5ada083e | ||
|
|
8dca9f2694 | ||
|
|
4e3b6b0f15 | ||
|
|
cac55abec2 | ||
|
|
bf6437c12a | ||
|
|
853667c084 | ||
|
|
b879cc9b73 | ||
|
|
45097fed0c | ||
|
|
5964bf8cb2 | ||
|
|
24cccab718 | ||
|
|
ca1f704e2f | ||
|
|
f9c7caaf0c | ||
|
|
a05d4234f0 | ||
|
|
c3fe6ecf7c | ||
|
|
0c8f51bc95 | ||
|
|
12769dbaae | ||
|
|
ec2977afc9 | ||
|
|
a01bfc260a | ||
|
|
d6d9a45100 | ||
|
|
3222a9a771 | ||
|
|
8dbfe1baad | ||
|
|
7f40d90b75 | ||
|
|
b25a9256d3 | ||
|
|
f3d0d99404 | ||
|
|
dd41990db4 | ||
|
|
0e286f880e | ||
|
|
bfddcfb4fc | ||
|
|
b5db198f8b | ||
|
|
d17c025557 | ||
|
|
03c8852961 | ||
|
|
3a48a9cd73 | ||
|
|
20c662c1d0 | ||
|
|
8195c36434 | ||
|
|
180692ae5d | ||
|
|
7643be8cdc | ||
|
|
4cd0f88a69 | ||
|
|
1c8f22ed43 | ||
|
|
f20d728ed7 | ||
|
|
704b683e27 | ||
|
|
1c11a3622e | ||
|
|
fe2243df9f | ||
|
|
fdea60f89a | ||
|
|
62ec59103a | ||
|
|
69af6a9b8c | ||
|
|
ef28edb526 | ||
|
|
bc6b008364 | ||
|
|
7c4ffde39c | ||
|
|
f4e8804c8a | ||
|
|
f088e3df6b | ||
|
|
0f6b16cada | ||
|
|
4694152124 | ||
|
|
0cba2ed4eb | ||
|
|
4dcee246d5 | ||
|
|
53b43a6e1f | ||
|
|
1473334f61 | ||
|
|
7e15ab7da1 | ||
|
|
40f335ba66 | ||
|
|
de80d4c4af | ||
|
|
2aa7260bbb | ||
|
|
2eb3b72618 | ||
|
|
36d7148c5f | ||
|
|
579f028294 | ||
|
|
a3d8664028 | ||
|
|
b380ba717f | ||
|
|
9f9554f7e2 | ||
|
|
46cfaae3db | ||
|
|
5d9169db0f | ||
|
|
bc82f2ae5a | ||
|
|
b0fd97557e | ||
|
|
543156a008 | ||
|
|
056ff67a81 | ||
|
|
ab64d1a166 | ||
|
|
0cf2cdfdb3 | ||
|
|
f8ec3602f2 | ||
|
|
5a3047fbc2 | ||
|
|
fe96792506 | ||
|
|
cfba330459 | ||
|
|
31b3825069 | ||
|
|
cace1f00b2 | ||
|
|
f96a31c945 | ||
|
|
bc27f0e204 | ||
|
|
fc43ebbd7e | ||
|
|
5ebf77bfd9 | ||
|
|
b95d443f22 | ||
|
|
d7245c5ffe | ||
|
|
45b299ce06 | ||
|
|
7ed5fc7e00 | ||
|
|
94a41e1fcc | ||
|
|
a963c9854d | ||
|
|
cc0e6a1825 | ||
|
|
b7739ffc71 | ||
|
|
8f74d05d02 | ||
|
|
93a7ac3d89 | ||
|
|
db2f5ab416 | ||
|
|
ae0c02159f | ||
|
|
17858ef497 | ||
|
|
591ecdd7c9 | ||
|
|
7b5a5fbcbe | ||
|
|
32459b01b6 |
No files matched your search
+30
@@ -0,0 +1,30 @@
|
|||||||
|
sudo: required
|
||||||
|
dist: trusty
|
||||||
|
|
||||||
|
language: java
|
||||||
|
jdk: oraclejdk8
|
||||||
|
|
||||||
|
env:
|
||||||
|
- BUILD_NUMBER=9999
|
||||||
|
|
||||||
|
before_cache:
|
||||||
|
- rm -f $HOME/.gradle/caches/modules-2/modules-2.lock
|
||||||
|
- rm -fr $HOME/.gradle/caches/*/plugin-resolution/
|
||||||
|
- rm -f $HOME/.gradle/caches/minecraft/deobfedDeps/providedDummy.jar
|
||||||
|
- rm -f $HOME/.gradle/caches/minecraft/deobfedDeps/compileDummy.jar
|
||||||
|
cache:
|
||||||
|
directories:
|
||||||
|
- $HOME/.gradle/caches/
|
||||||
|
- $HOME/.gradle/wrapper/
|
||||||
|
- $TRAVIS_BUILD_DIR/build/localCache/Forge/
|
||||||
|
|
||||||
|
before_install: chmod +x gradlew
|
||||||
|
install:
|
||||||
|
- ./gradlew --refresh-dependencies
|
||||||
|
- ./gradlew ciWriteBuildNumber
|
||||||
|
script:
|
||||||
|
- travis_wait ./gradlew build -x createExe -S
|
||||||
|
- ./gradlew -p projects/Forge test -S
|
||||||
|
|
||||||
|
notifications:
|
||||||
|
email: false
|
||||||
@@ -0,0 +1,9 @@
|
|||||||
|
# On the Contribution of an RF-lite Energy System: "Energy"
|
||||||
|
Forge has acquired an Energy system, after many years of debate on the topic. The prevalence of the RF API has warranted the inclusion of a similar (but simpler) implementation to forge for 1.10.2 and onwards.
|
||||||
|
Those who wish to use an RF like API, feel free to use it. If you don't want to think about Energy, but know you need it, you can use it *if you wish*. If you want to interoperate with other energy systems, feel free to use this to broker with them.
|
||||||
|
|
||||||
|
# On Diversity in Energy Systems
|
||||||
|
Forge has always supported diversity in energy-like systems. If you have a burning desire to simulate electricity flow in all it's glory, we fully support you and look forward to playing your mod. If you wish to have pneumatic power, we have no objections, and would love to see your wonderful creations. If you have a power system of your own devising that is simply beyond our imagination, please, blow us away.
|
||||||
|
|
||||||
|
# On Modder Obligations
|
||||||
|
As a modder, you are under *no* obligation to use or support the forge Energy system. If anyone, user, mod-pack maker or even us, tells you otherwise, refer them to this statement. The Forge energy system is not intended to supplant diversity in energy systems. It is not intended to be one-size-fits-all. The choice to support it, is the choice of the modder.
|
||||||
@@ -35,8 +35,11 @@ Here is a short video from @cpw showing how to install and setup the MDK
|
|||||||
If you wish to actually inspect Forge, submit PRs or otherwise work
|
If you wish to actually inspect Forge, submit PRs or otherwise work
|
||||||
with Forge itself, you're in the right place! Clone this (either
|
with Forge itself, you're in the right place! Clone this (either
|
||||||
directly, or make a Fork first if you want to make a PR) and run
|
directly, or make a Fork first if you want to make a PR) and run
|
||||||
```gradlew.bat setup``` or ```gradlew setup```. This will download and
|
```gradlew.bat setupForge``` or ```gradlew setupForge```. This will download and
|
||||||
setup all the bits you need to have a functional Forge workspace.
|
setup all the bits you need to have a functional Forge workspace.
|
||||||
|
|
||||||
|
After that, open a workspace in your favorite IDE and import existing projects
|
||||||
|
the projects folder.
|
||||||
|
|
||||||
Here is a short video from @cpw showing how to install and setup Forge
|
Here is a short video from @cpw showing how to install and setup Forge
|
||||||
in Intellij.
|
in Intellij.
|
||||||
|
|||||||
-36
@@ -1,36 +0,0 @@
|
|||||||
*** HOW TO INSTALL ***
|
|
||||||
For Mod Users:
|
|
||||||
|
|
||||||
Download the latest installer from http://files.minecraftforge.net and follow instructions given by the installer.
|
|
||||||
|
|
||||||
|
|
||||||
For Mod Devs:
|
|
||||||
|
|
||||||
Download the latest Forge source distribution from http://files.minecraftforge.net and unzip it to a folder.
|
|
||||||
Open a command prompt, navigate to the directory where you unzipped the Forge sources, and run:
|
|
||||||
If you have Gradle: gradle setupDevWorkspace
|
|
||||||
If you DO NOT have Gradle installed:
|
|
||||||
Windows: ./gradlew.bat setupDevWorkspace
|
|
||||||
MacOS/Linux: ./gradlew setupDevWorkspace
|
|
||||||
|
|
||||||
If you wish to use the Eclipse IDE, run gradle eclipse instead of gradle setupDevWorkspace, or install the Gradle plugin for Eclipse and import the Forge source folder as a Gradle project.
|
|
||||||
|
|
||||||
To get the decompiled classes:
|
|
||||||
If you have Gradle: gradle setupDecompWorkspace
|
|
||||||
If you DO NOT have Gradle installed:
|
|
||||||
Windows: ./gradlew.bat setupDecompWorkspace
|
|
||||||
MacOS/Linux: ./gradlew setupDecompWorkspace
|
|
||||||
|
|
||||||
For Contributors: (Note: This assumes you have Gradle installed. If you don't, use ./gradlew(.bat) instead of gradle.
|
|
||||||
|
|
||||||
Clone this repository to a folder.
|
|
||||||
Open a command prompt and navigate to the folder where you cloned this repo.
|
|
||||||
Run gradle setupForge to setup your development environment.
|
|
||||||
|
|
||||||
To use Eclipse, point your Eclipse workspace at the eclipse folder inside the repo.
|
|
||||||
|
|
||||||
|
|
||||||
Requirements (for both mod devs and contributors):
|
|
||||||
You must have a JDK installed and accessible.
|
|
||||||
If you do not wish to use the gradle wrapper, you can install Gradle from http://www.gradle.org/ .
|
|
||||||
|
|
||||||
+17
-9
@@ -26,15 +26,15 @@ apply plugin: "maven"
|
|||||||
apply plugin: "net.minecraftforge.gradle.patcher"
|
apply plugin: "net.minecraftforge.gradle.patcher"
|
||||||
apply plugin: "net.minecraftforge.gradle.launch4j"
|
apply plugin: "net.minecraftforge.gradle.launch4j"
|
||||||
|
|
||||||
minecraft.version = "1.10.2"
|
minecraft.version = "1.11.2"
|
||||||
|
|
||||||
minecraft {
|
minecraft {
|
||||||
mappings = 'snapshot_nodoc_20160518'
|
mappings = 'snapshot_nodoc_20161220'
|
||||||
workspaceDir = "projects"
|
workspaceDir = "projects"
|
||||||
versionJson = "jsons/${minecraft.version}-dev.json"
|
versionJson = "jsons/${minecraft.version}-dev.json"
|
||||||
buildUserdev = true
|
buildUserdev = true
|
||||||
buildInstaller = true
|
buildInstaller = true
|
||||||
installerVersion = "1.4"
|
installerVersion = "1.5"
|
||||||
|
|
||||||
def common = {
|
def common = {
|
||||||
patchPrefixOriginal "../src-base/minecraft"
|
patchPrefixOriginal "../src-base/minecraft"
|
||||||
@@ -84,8 +84,6 @@ task changelog(type: JenkinsChangelog) {
|
|||||||
// skip if there is no forge jenkins pass
|
// skip if there is no forge jenkins pass
|
||||||
onlyIf {
|
onlyIf {
|
||||||
project.hasProperty('forgeJenkinsPass')
|
project.hasProperty('forgeJenkinsPass')
|
||||||
// Not sure what abrar was trying to do here...
|
|
||||||
//project.file("build/distributions/${project.name}-${project.version}-changelog.txt").text = ""
|
|
||||||
}
|
}
|
||||||
|
|
||||||
outputs.upToDateWhen { false } // never up to date
|
outputs.upToDateWhen { false } // never up to date
|
||||||
@@ -108,13 +106,14 @@ task crowdin(type: CrowdinDownload) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
def extraTxts = [
|
def extraTxts = [
|
||||||
changelog, // yeah we can do thi, because gradle and groovy are awesome
|
|
||||||
"CREDITS-fml.txt",
|
"CREDITS-fml.txt",
|
||||||
"LICENSE-new.txt",
|
"LICENSE-new.txt",
|
||||||
"MinecraftForge-Credits.txt",
|
"MinecraftForge-Credits.txt",
|
||||||
"Paulscode SoundSystem CodecIBXM License.txt",
|
"Paulscode SoundSystem CodecIBXM License.txt",
|
||||||
"Paulscode IBXM Library License.txt"
|
"Paulscode IBXM Library License.txt"
|
||||||
]
|
]
|
||||||
|
if (project.hasProperty('forgeJenkinsPass'))
|
||||||
|
extraTxts += changelog
|
||||||
|
|
||||||
outputJar {
|
outputJar {
|
||||||
classifier = 'universal'
|
classifier = 'universal'
|
||||||
@@ -135,6 +134,7 @@ installer {
|
|||||||
classifier = 'installer'
|
classifier = 'installer'
|
||||||
from extraTxts
|
from extraTxts
|
||||||
from "src/main/resources/forge_logo.png"
|
from "src/main/resources/forge_logo.png"
|
||||||
|
from "src/main/resources/url.png"
|
||||||
rename "forge_logo\\.png", "big_logo.png"
|
rename "forge_logo\\.png", "big_logo.png"
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -177,7 +177,8 @@ task makeMdk(type: Zip) {
|
|||||||
into ('eclipse') {
|
into ('eclipse') {
|
||||||
from 'mdk/eclipse'
|
from 'mdk/eclipse'
|
||||||
}
|
}
|
||||||
from changelog.output
|
if (project.hasProperty('forgeJenkinsPass'))
|
||||||
|
from changelog.output
|
||||||
from ('mdk') {
|
from ('mdk') {
|
||||||
filter(ReplaceTokens, tokens: [
|
filter(ReplaceTokens, tokens: [
|
||||||
VERSION: project.version,
|
VERSION: project.version,
|
||||||
@@ -211,7 +212,8 @@ tasks.build.dependsOn 'launch4j'
|
|||||||
// MAVEN
|
// MAVEN
|
||||||
|
|
||||||
artifacts {
|
artifacts {
|
||||||
archives changelog.output
|
if (project.hasProperty('forgeJenkinsPass'))
|
||||||
|
archives changelog.output
|
||||||
archives file("build/distributions/${project.name}-${project.version}-installer-win.exe")
|
archives file("build/distributions/${project.name}-${project.version}-installer-win.exe")
|
||||||
archives makeMdk
|
archives makeMdk
|
||||||
}
|
}
|
||||||
@@ -365,13 +367,19 @@ String getVersionFromJava(File file)
|
|||||||
|
|
||||||
if (branch && branch != 'master' && branch != 'HEAD' && branch != minecraft.version && branch != minecraft.version + '.0')
|
if (branch && branch != 'master' && branch != 'HEAD' && branch != minecraft.version && branch != minecraft.version + '.0')
|
||||||
{
|
{
|
||||||
if (!(branch.endsWith('.x') && minecraft.version.startsWith(branch.substring(0, branch.length() -1))))
|
if (!(branch.endsWith('.x') && minecraft.version.startsWith(branch.substring(0, branch.length() -2))))
|
||||||
out += "-$branch"
|
out += "-$branch"
|
||||||
}
|
}
|
||||||
|
|
||||||
return out;
|
return out;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
reobfuscate {
|
||||||
|
extraSrg = [
|
||||||
|
'MD: net/minecraftforge/fml/common/registry/FMLControlledNamespacedRegistry/getKeys ()Ljava/util/Set; net/minecraftforge/fml/common/registry/FMLControlledNamespacedRegistry/getKeys ()Ljava/util/Set;'
|
||||||
|
]
|
||||||
|
}
|
||||||
|
|
||||||
task resetBuildNumber << {
|
task resetBuildNumber << {
|
||||||
project.ext.properties.buildNumber = 0;
|
project.ext.properties.buildNumber = 0;
|
||||||
ciWriteBuildNumber.execute()
|
ciWriteBuildNumber.execute()
|
||||||
|
|||||||
+1
-1
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
|
|||||||
distributionPath=wrapper/dists
|
distributionPath=wrapper/dists
|
||||||
zipStoreBase=GRADLE_USER_HOME
|
zipStoreBase=GRADLE_USER_HOME
|
||||||
zipStorePath=wrapper/dists
|
zipStorePath=wrapper/dists
|
||||||
distributionUrl=https\://services.gradle.org/distributions/gradle-2.7-bin.zip
|
distributionUrl=https\://services.gradle.org/distributions/gradle-2.14-bin.zip
|
||||||
Binary file not shown.
|
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 7.2 KiB |
+10
-10
@@ -1,10 +1,10 @@
|
|||||||
{
|
{
|
||||||
"assetIndex": {
|
"assetIndex": {
|
||||||
"id": "1.10",
|
"id": "1.10",
|
||||||
"sha1": "d3bfc4ffba1ea334c725dd91eaf4ecd402d641f7",
|
"sha1": "72241db3c0bdc39e39b202182ff0000da5271a1d",
|
||||||
"size": 145627,
|
"size": 145874,
|
||||||
"url": "https://launchermeta.mojang.com/mc/assets/1.10/d3bfc4ffba1ea334c725dd91eaf4ecd402d641f7/1.10.json",
|
"url": "https://launchermeta.mojang.com/mc/assets/1.10/72241db3c0bdc39e39b202182ff0000da5271a1d/1.10.json",
|
||||||
"totalSize": 121931230
|
"totalSize": 122198775
|
||||||
},
|
},
|
||||||
"assets": "1.10",
|
"assets": "1.10",
|
||||||
"downloads": {
|
"downloads": {
|
||||||
@@ -242,13 +242,13 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "com.mojang:realms:1.9.3",
|
"name": "com.mojang:realms:1.9.8",
|
||||||
"downloads": {
|
"downloads": {
|
||||||
"artifact": {
|
"artifact": {
|
||||||
"size": 1575798,
|
"size": 1577897,
|
||||||
"sha1": "b291425bf7ef763452eaa894575018706339f72b",
|
"sha1": "c9609760e050cd7c369292252552c0cc81c54331",
|
||||||
"path": "com/mojang/realms/1.9.3/realms-1.9.3.jar",
|
"path": "com/mojang/realms/1.9.8/realms-1.9.8.jar",
|
||||||
"url": "https://libraries.minecraft.net/com/mojang/realms/1.9.3/realms-1.9.3.jar"
|
"url": "https://libraries.minecraft.net/com/mojang/realms/1.9.8/realms-1.9.8.jar"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
@@ -558,6 +558,6 @@
|
|||||||
"minecraftArguments": "--username ${auth_player_name} --version ${version_name} --gameDir ${game_directory} --assetsDir ${assets_root} --assetIndex ${assets_index_name} --uuid ${auth_uuid} --accessToken ${auth_access_token} --userType ${user_type} --versionType ${version_type}",
|
"minecraftArguments": "--username ${auth_player_name} --version ${version_name} --gameDir ${game_directory} --assetsDir ${assets_root} --assetIndex ${assets_index_name} --uuid ${auth_uuid} --accessToken ${auth_access_token} --userType ${user_type} --versionType ${version_type}",
|
||||||
"minimumLauncherVersion": 18,
|
"minimumLauncherVersion": 18,
|
||||||
"releaseTime": "2016-06-23T09:17:32+00:00",
|
"releaseTime": "2016-06-23T09:17:32+00:00",
|
||||||
"time": "2016-06-23T09:45:47+00:00",
|
"time": "2016-10-22T20:28:03+00:00",
|
||||||
"type": "release"
|
"type": "release"
|
||||||
}
|
}
|
||||||
@@ -0,0 +1,92 @@
|
|||||||
|
{
|
||||||
|
"id": "@minecraft_version@-@project@@version@",
|
||||||
|
"time": "@timestamp@",
|
||||||
|
"releaseTime": "1960-01-01T00:00:00-0700",
|
||||||
|
"type": "release",
|
||||||
|
"inheritsFrom": "1.11",
|
||||||
|
"minecraftArguments": "--version FML_DEV --tweakClass net.minecraftforge.fml.common.launcher.FMLTweaker",
|
||||||
|
"libraries": [
|
||||||
|
{
|
||||||
|
"name": "net.minecraft:launchwrapper:1.12"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "jline:jline:2.13",
|
||||||
|
"children": ["sources"],
|
||||||
|
"url" : "http://repo.maven.apache.org/maven2"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "com.google.code.findbugs:jsr305:1.3.9",
|
||||||
|
"children": ["sources"],
|
||||||
|
"url" : "http://repo.maven.apache.org/maven2"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "org.ow2.asm:asm-debug-all:5.0.3",
|
||||||
|
"children" : ["sources"],
|
||||||
|
"url" : "http://repo.maven.apache.org/maven2"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "com.typesafe.akka:akka-actor_2.11:2.3.3",
|
||||||
|
"children" : ["sources"],
|
||||||
|
"url" : "http://repo.maven.apache.org/maven2"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "com.typesafe:config:1.2.1",
|
||||||
|
"children" : ["sources"],
|
||||||
|
"url" : "http://repo.maven.apache.org/maven2"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "org.scala-lang:scala-actors-migration_2.11:1.1.0",
|
||||||
|
"children" : ["sources"],
|
||||||
|
"url" : "http://repo.maven.apache.org/maven2"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "org.scala-lang:scala-compiler:2.11.1",
|
||||||
|
"children" : ["sources"],
|
||||||
|
"url" : "http://repo.maven.apache.org/maven2"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "org.scala-lang.plugins:scala-continuations-library_2.11:1.0.2",
|
||||||
|
"children" : ["sources"],
|
||||||
|
"url" : "http://repo.maven.apache.org/maven2"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "org.scala-lang.plugins:scala-continuations-plugin_2.11.1:1.0.2",
|
||||||
|
"children" : ["sources"],
|
||||||
|
"url" : "http://repo.maven.apache.org/maven2"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "org.scala-lang:scala-library:2.11.1",
|
||||||
|
"children" : ["sources"],
|
||||||
|
"url" : "http://repo.maven.apache.org/maven2"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "org.scala-lang.modules:scala-parser-combinators_2.11:1.0.1",
|
||||||
|
"children" : ["sources"],
|
||||||
|
"url" : "http://repo.maven.apache.org/maven2"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "org.scala-lang:scala-reflect:2.11.1",
|
||||||
|
"children" : ["sources"],
|
||||||
|
"url" : "http://repo.maven.apache.org/maven2"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "org.scala-lang.modules:scala-swing_2.11:1.0.1",
|
||||||
|
"children" : ["sources"],
|
||||||
|
"url" : "http://repo.maven.apache.org/maven2"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "org.scala-lang.modules:scala-xml_2.11:1.0.2",
|
||||||
|
"children" : ["sources"],
|
||||||
|
"url" : "http://repo.maven.apache.org/maven2"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "lzma:lzma:0.0.1"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "java3d:vecmath:1.5.2"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "net.sf.trove4j:trove4j:3.0.3"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
@@ -0,0 +1,92 @@
|
|||||||
|
{
|
||||||
|
"id": "@minecraft_version@-@project@@version@",
|
||||||
|
"time": "@timestamp@",
|
||||||
|
"releaseTime": "1960-01-01T00:00:00-0700",
|
||||||
|
"type": "release",
|
||||||
|
"inheritsFrom": "1.11-pre1",
|
||||||
|
"minecraftArguments": "--version FML_DEV --tweakClass net.minecraftforge.fml.common.launcher.FMLTweaker",
|
||||||
|
"libraries": [
|
||||||
|
{
|
||||||
|
"name": "net.minecraft:launchwrapper:1.12"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "jline:jline:2.13",
|
||||||
|
"children": ["sources"],
|
||||||
|
"url" : "http://repo.maven.apache.org/maven2"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "com.google.code.findbugs:jsr305:1.3.9",
|
||||||
|
"children": ["sources"],
|
||||||
|
"url" : "http://repo.maven.apache.org/maven2"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "org.ow2.asm:asm-debug-all:5.0.3",
|
||||||
|
"children" : ["sources"],
|
||||||
|
"url" : "http://repo.maven.apache.org/maven2"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "com.typesafe.akka:akka-actor_2.11:2.3.3",
|
||||||
|
"children" : ["sources"],
|
||||||
|
"url" : "http://repo.maven.apache.org/maven2"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "com.typesafe:config:1.2.1",
|
||||||
|
"children" : ["sources"],
|
||||||
|
"url" : "http://repo.maven.apache.org/maven2"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "org.scala-lang:scala-actors-migration_2.11:1.1.0",
|
||||||
|
"children" : ["sources"],
|
||||||
|
"url" : "http://repo.maven.apache.org/maven2"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "org.scala-lang:scala-compiler:2.11.1",
|
||||||
|
"children" : ["sources"],
|
||||||
|
"url" : "http://repo.maven.apache.org/maven2"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "org.scala-lang.plugins:scala-continuations-library_2.11:1.0.2",
|
||||||
|
"children" : ["sources"],
|
||||||
|
"url" : "http://repo.maven.apache.org/maven2"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "org.scala-lang.plugins:scala-continuations-plugin_2.11.1:1.0.2",
|
||||||
|
"children" : ["sources"],
|
||||||
|
"url" : "http://repo.maven.apache.org/maven2"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "org.scala-lang:scala-library:2.11.1",
|
||||||
|
"children" : ["sources"],
|
||||||
|
"url" : "http://repo.maven.apache.org/maven2"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "org.scala-lang.modules:scala-parser-combinators_2.11:1.0.1",
|
||||||
|
"children" : ["sources"],
|
||||||
|
"url" : "http://repo.maven.apache.org/maven2"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "org.scala-lang:scala-reflect:2.11.1",
|
||||||
|
"children" : ["sources"],
|
||||||
|
"url" : "http://repo.maven.apache.org/maven2"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "org.scala-lang.modules:scala-swing_2.11:1.0.1",
|
||||||
|
"children" : ["sources"],
|
||||||
|
"url" : "http://repo.maven.apache.org/maven2"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "org.scala-lang.modules:scala-xml_2.11:1.0.2",
|
||||||
|
"children" : ["sources"],
|
||||||
|
"url" : "http://repo.maven.apache.org/maven2"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "lzma:lzma:0.0.1"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "java3d:vecmath:1.5.2"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "net.sf.trove4j:trove4j:3.0.3"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
@@ -0,0 +1,139 @@
|
|||||||
|
{
|
||||||
|
"install": {
|
||||||
|
"profileName": "@project@",
|
||||||
|
"target":"@minecraft_version@-@project@@version@",
|
||||||
|
"path":"@artifact@",
|
||||||
|
"version":"@project@ @version@",
|
||||||
|
"filePath":"@universal_jar@",
|
||||||
|
"welcome":"Welcome to the simple @project@ installer.",
|
||||||
|
"minecraft":"@minecraft_version@",
|
||||||
|
"mirrorList" : "http://files.minecraftforge.net/mirror-brand.list",
|
||||||
|
"logo":"/big_logo.png"
|
||||||
|
},
|
||||||
|
"versionInfo": {
|
||||||
|
"id": "@minecraft_version@-@project@@version@",
|
||||||
|
"time": "@timestamp@",
|
||||||
|
"releaseTime": "1960-01-01T00:00:00-0700",
|
||||||
|
"type": "release",
|
||||||
|
"minecraftArguments": "--username ${auth_player_name} --version ${version_name} --gameDir ${game_directory} --assetsDir ${assets_root} --assetIndex ${assets_index_name} --uuid ${auth_uuid} --accessToken ${auth_access_token} --userType ${user_type} --tweakClass net.minecraftforge.fml.common.launcher.FMLTweaker --versionType Forge",
|
||||||
|
"mainClass": "net.minecraft.launchwrapper.Launch",
|
||||||
|
"inheritsFrom": "1.11-pre1",
|
||||||
|
"jar": "1.11-pre1",
|
||||||
|
"libraries": [
|
||||||
|
{
|
||||||
|
"name": "@artifact@",
|
||||||
|
"url": "http://files.minecraftforge.net/maven/"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "net.minecraft:launchwrapper:1.12",
|
||||||
|
"serverreq":true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "org.ow2.asm:asm-all:5.0.3",
|
||||||
|
"serverreq":true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "jline:jline:2.13",
|
||||||
|
"url" : "http://files.minecraftforge.net/maven/",
|
||||||
|
"checksums" : [ "2d9530d0a25daffaffda7c35037b046b627bb171" ],
|
||||||
|
"serverreq":true,
|
||||||
|
"clientreq":false
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "com.typesafe.akka:akka-actor_2.11:2.3.3",
|
||||||
|
"url" : "http://files.minecraftforge.net/maven/",
|
||||||
|
"checksums" : [ "ed62e9fc709ca0f2ff1a3220daa8b70a2870078e", "25a86ccfdb6f6dfe08971f4825d0a01be83a6f2e" ],
|
||||||
|
"serverreq":true,
|
||||||
|
"clientreq":true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "com.typesafe:config:1.2.1",
|
||||||
|
"url" : "http://files.minecraftforge.net/maven/",
|
||||||
|
"checksums" : [ "f771f71fdae3df231bcd54d5ca2d57f0bf93f467", "7d7bc36df0989d72f2d5d057309675777acc528b" ],
|
||||||
|
"serverreq":true,
|
||||||
|
"clientreq":true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "org.scala-lang:scala-actors-migration_2.11:1.1.0",
|
||||||
|
"url" : "http://files.minecraftforge.net/maven/",
|
||||||
|
"checksums" : [ "dfa8bc42b181d5b9f1a5dd147f8ae308b893eb6f", "8c9aaeeb68487ca519411a14068e1b4d69739207" ],
|
||||||
|
"serverreq":true,
|
||||||
|
"clientreq":true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "org.scala-lang:scala-compiler:2.11.1",
|
||||||
|
"url" : "http://files.minecraftforge.net/maven/",
|
||||||
|
"checksums" : [ "56ea2e6c025e0821f28d73ca271218b8dd04926a", "1444992390544ba3780867a13ff696a89d7d1639" ],
|
||||||
|
"serverreq":true,
|
||||||
|
"clientreq":true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "org.scala-lang.plugins:scala-continuations-library_2.11:1.0.2",
|
||||||
|
"url" : "http://files.minecraftforge.net/maven/",
|
||||||
|
"checksums" : [ "87213338cd5a153a7712cb574c0ddd2edfee0386", "0b4c1bf8d48993f138d6e10c0c144e50acfff581" ],
|
||||||
|
"serverreq":true,
|
||||||
|
"clientreq":true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "org.scala-lang.plugins:scala-continuations-plugin_2.11.1:1.0.2",
|
||||||
|
"url" : "http://files.minecraftforge.net/maven/",
|
||||||
|
"checksums" : [ "1f7371605d4ba42aa26d3443440c0083c587b4e9", "1ea655dda4504ae0a367327e2340cd3beaee6c73" ],
|
||||||
|
"serverreq":true,
|
||||||
|
"clientreq":true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "org.scala-lang:scala-library:2.11.1",
|
||||||
|
"url" : "http://files.minecraftforge.net/maven/",
|
||||||
|
"checksums" : [ "0e11da23da3eabab9f4777b9220e60d44c1aab6a", "1e4df76e835201c6eabd43adca89ab11f225f134" ],
|
||||||
|
"serverreq":true,
|
||||||
|
"clientreq":true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "org.scala-lang:scala-parser-combinators_2.11:1.0.1",
|
||||||
|
"url" : "http://files.minecraftforge.net/maven/",
|
||||||
|
"checksums" : [ "f05d7345bf5a58924f2837c6c1f4d73a938e1ff0", "a1cbbcbde1dcc614f4253ed1aa0b320bc78d8f1d" ],
|
||||||
|
"serverreq":true,
|
||||||
|
"clientreq":true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "org.scala-lang:scala-reflect:2.11.1",
|
||||||
|
"url" : "http://files.minecraftforge.net/maven/",
|
||||||
|
"checksums" : [ "6580347e61cc7f8e802941e7fde40fa83b8badeb", "91ce0f0be20f4a536321724b4b3bbc6530ddcd88" ],
|
||||||
|
"serverreq":true,
|
||||||
|
"clientreq":true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "org.scala-lang:scala-swing_2.11:1.0.1",
|
||||||
|
"url" : "http://files.minecraftforge.net/maven/",
|
||||||
|
"checksums" : [ "b1cdd92bd47b1e1837139c1c53020e86bb9112ae", "d77152691dcf5bbdb00529af37aa7d3d887b3e63" ],
|
||||||
|
"serverreq":true,
|
||||||
|
"clientreq":true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "org.scala-lang:scala-xml_2.11:1.0.2",
|
||||||
|
"url" : "http://files.minecraftforge.net/maven/",
|
||||||
|
"checksums" : [ "7a80ec00aec122fba7cd4e0d4cdd87ff7e4cb6d0", "62736b01689d56b6d09a0164b7ef9da2b0b9633d" ],
|
||||||
|
"serverreq":true,
|
||||||
|
"clientreq":true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "lzma:lzma:0.0.1",
|
||||||
|
"serverreq":true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "net.sf.jopt-simple:jopt-simple:4.6",
|
||||||
|
"serverreq":true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "java3d:vecmath:1.5.2",
|
||||||
|
"clientreq":true,
|
||||||
|
"serverreq":true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "net.sf.trove4j:trove4j:3.0.3",
|
||||||
|
"clientreq":true,
|
||||||
|
"serverreq":true
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,563 @@
|
|||||||
|
{
|
||||||
|
"assetIndex": {
|
||||||
|
"id": "1.11",
|
||||||
|
"sha1": "a3d659674093b94bb39b9ddc7d63ed75c7a340e0",
|
||||||
|
"size": 157388,
|
||||||
|
"url": "https://launchermeta.mojang.com/mc/assets/1.11/a3d659674093b94bb39b9ddc7d63ed75c7a340e0/1.11.json",
|
||||||
|
"totalSize": 123827946
|
||||||
|
},
|
||||||
|
"assets": "1.11",
|
||||||
|
"downloads": {
|
||||||
|
"client": {
|
||||||
|
"sha1": "fdc07c099ad33f77c426464754841747a09ee8d7",
|
||||||
|
"size": 9183464,
|
||||||
|
"url": "https://launcher.mojang.com/mc/game/1.11-pre1/client/fdc07c099ad33f77c426464754841747a09ee8d7/client.jar"
|
||||||
|
},
|
||||||
|
"server": {
|
||||||
|
"sha1": "7e2884f11e3fb52ed1ad82376e3cada3aa95152e",
|
||||||
|
"size": 9713399,
|
||||||
|
"url": "https://launcher.mojang.com/mc/game/1.11-pre1/server/7e2884f11e3fb52ed1ad82376e3cada3aa95152e/server.jar"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"id": "1.11-pre1",
|
||||||
|
"libraries": [
|
||||||
|
{
|
||||||
|
"name": "com.mojang:netty:1.6",
|
||||||
|
"downloads": {
|
||||||
|
"artifact": {
|
||||||
|
"size": 7877,
|
||||||
|
"sha1": "4b75825a06139752bd800d9e29c5fd55b8b1b1e4",
|
||||||
|
"path": "com/mojang/netty/1.6/netty-1.6.jar",
|
||||||
|
"url": "https://libraries.minecraft.net/com/mojang/netty/1.6/netty-1.6.jar"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "oshi-project:oshi-core:1.1",
|
||||||
|
"downloads": {
|
||||||
|
"artifact": {
|
||||||
|
"size": 30973,
|
||||||
|
"sha1": "9ddf7b048a8d701be231c0f4f95fd986198fd2d8",
|
||||||
|
"path": "oshi-project/oshi-core/1.1/oshi-core-1.1.jar",
|
||||||
|
"url": "https://libraries.minecraft.net/oshi-project/oshi-core/1.1/oshi-core-1.1.jar"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "net.java.dev.jna:jna:3.4.0",
|
||||||
|
"downloads": {
|
||||||
|
"artifact": {
|
||||||
|
"size": 1008730,
|
||||||
|
"sha1": "803ff252fedbd395baffd43b37341dc4a150a554",
|
||||||
|
"path": "net/java/dev/jna/jna/3.4.0/jna-3.4.0.jar",
|
||||||
|
"url": "https://libraries.minecraft.net/net/java/dev/jna/jna/3.4.0/jna-3.4.0.jar"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "net.java.dev.jna:platform:3.4.0",
|
||||||
|
"downloads": {
|
||||||
|
"artifact": {
|
||||||
|
"size": 913436,
|
||||||
|
"sha1": "e3f70017be8100d3d6923f50b3d2ee17714e9c13",
|
||||||
|
"path": "net/java/dev/jna/platform/3.4.0/platform-3.4.0.jar",
|
||||||
|
"url": "https://libraries.minecraft.net/net/java/dev/jna/platform/3.4.0/platform-3.4.0.jar"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "com.ibm.icu:icu4j-core-mojang:51.2",
|
||||||
|
"downloads": {
|
||||||
|
"artifact": {
|
||||||
|
"size": 1634692,
|
||||||
|
"sha1": "63d216a9311cca6be337c1e458e587f99d382b84",
|
||||||
|
"path": "com/ibm/icu/icu4j-core-mojang/51.2/icu4j-core-mojang-51.2.jar",
|
||||||
|
"url": "https://libraries.minecraft.net/com/ibm/icu/icu4j-core-mojang/51.2/icu4j-core-mojang-51.2.jar"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "net.sf.jopt-simple:jopt-simple:4.6",
|
||||||
|
"downloads": {
|
||||||
|
"artifact": {
|
||||||
|
"size": 62477,
|
||||||
|
"sha1": "306816fb57cf94f108a43c95731b08934dcae15c",
|
||||||
|
"path": "net/sf/jopt-simple/jopt-simple/4.6/jopt-simple-4.6.jar",
|
||||||
|
"url": "https://libraries.minecraft.net/net/sf/jopt-simple/jopt-simple/4.6/jopt-simple-4.6.jar"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "com.paulscode:codecjorbis:20101023",
|
||||||
|
"downloads": {
|
||||||
|
"artifact": {
|
||||||
|
"size": 103871,
|
||||||
|
"sha1": "c73b5636faf089d9f00e8732a829577de25237ee",
|
||||||
|
"path": "com/paulscode/codecjorbis/20101023/codecjorbis-20101023.jar",
|
||||||
|
"url": "https://libraries.minecraft.net/com/paulscode/codecjorbis/20101023/codecjorbis-20101023.jar"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "com.paulscode:codecwav:20101023",
|
||||||
|
"downloads": {
|
||||||
|
"artifact": {
|
||||||
|
"size": 5618,
|
||||||
|
"sha1": "12f031cfe88fef5c1dd36c563c0a3a69bd7261da",
|
||||||
|
"path": "com/paulscode/codecwav/20101023/codecwav-20101023.jar",
|
||||||
|
"url": "https://libraries.minecraft.net/com/paulscode/codecwav/20101023/codecwav-20101023.jar"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "com.paulscode:libraryjavasound:20101123",
|
||||||
|
"downloads": {
|
||||||
|
"artifact": {
|
||||||
|
"size": 21679,
|
||||||
|
"sha1": "5c5e304366f75f9eaa2e8cca546a1fb6109348b3",
|
||||||
|
"path": "com/paulscode/libraryjavasound/20101123/libraryjavasound-20101123.jar",
|
||||||
|
"url": "https://libraries.minecraft.net/com/paulscode/libraryjavasound/20101123/libraryjavasound-20101123.jar"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "com.paulscode:librarylwjglopenal:20100824",
|
||||||
|
"downloads": {
|
||||||
|
"artifact": {
|
||||||
|
"size": 18981,
|
||||||
|
"sha1": "73e80d0794c39665aec3f62eee88ca91676674ef",
|
||||||
|
"path": "com/paulscode/librarylwjglopenal/20100824/librarylwjglopenal-20100824.jar",
|
||||||
|
"url": "https://libraries.minecraft.net/com/paulscode/librarylwjglopenal/20100824/librarylwjglopenal-20100824.jar"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "com.paulscode:soundsystem:20120107",
|
||||||
|
"downloads": {
|
||||||
|
"artifact": {
|
||||||
|
"size": 65020,
|
||||||
|
"sha1": "419c05fe9be71f792b2d76cfc9b67f1ed0fec7f6",
|
||||||
|
"path": "com/paulscode/soundsystem/20120107/soundsystem-20120107.jar",
|
||||||
|
"url": "https://libraries.minecraft.net/com/paulscode/soundsystem/20120107/soundsystem-20120107.jar"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "io.netty:netty-all:4.0.23.Final",
|
||||||
|
"downloads": {
|
||||||
|
"artifact": {
|
||||||
|
"size": 1779991,
|
||||||
|
"sha1": "0294104aaf1781d6a56a07d561e792c5d0c95f45",
|
||||||
|
"path": "io/netty/netty-all/4.0.23.Final/netty-all-4.0.23.Final.jar",
|
||||||
|
"url": "https://libraries.minecraft.net/io/netty/netty-all/4.0.23.Final/netty-all-4.0.23.Final.jar"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "com.google.guava:guava:17.0",
|
||||||
|
"downloads": {
|
||||||
|
"artifact": {
|
||||||
|
"size": 2243036,
|
||||||
|
"sha1": "9c6ef172e8de35fd8d4d8783e4821e57cdef7445",
|
||||||
|
"path": "com/google/guava/guava/17.0/guava-17.0.jar",
|
||||||
|
"url": "https://libraries.minecraft.net/com/google/guava/guava/17.0/guava-17.0.jar"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "org.apache.commons:commons-lang3:3.3.2",
|
||||||
|
"downloads": {
|
||||||
|
"artifact": {
|
||||||
|
"size": 412739,
|
||||||
|
"sha1": "90a3822c38ec8c996e84c16a3477ef632cbc87a3",
|
||||||
|
"path": "org/apache/commons/commons-lang3/3.3.2/commons-lang3-3.3.2.jar",
|
||||||
|
"url": "https://libraries.minecraft.net/org/apache/commons/commons-lang3/3.3.2/commons-lang3-3.3.2.jar"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "commons-io:commons-io:2.4",
|
||||||
|
"downloads": {
|
||||||
|
"artifact": {
|
||||||
|
"size": 185140,
|
||||||
|
"sha1": "b1b6ea3b7e4aa4f492509a4952029cd8e48019ad",
|
||||||
|
"path": "commons-io/commons-io/2.4/commons-io-2.4.jar",
|
||||||
|
"url": "https://libraries.minecraft.net/commons-io/commons-io/2.4/commons-io-2.4.jar"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "commons-codec:commons-codec:1.9",
|
||||||
|
"downloads": {
|
||||||
|
"artifact": {
|
||||||
|
"size": 263965,
|
||||||
|
"sha1": "9ce04e34240f674bc72680f8b843b1457383161a",
|
||||||
|
"path": "commons-codec/commons-codec/1.9/commons-codec-1.9.jar",
|
||||||
|
"url": "https://libraries.minecraft.net/commons-codec/commons-codec/1.9/commons-codec-1.9.jar"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "net.java.jinput:jinput:2.0.5",
|
||||||
|
"downloads": {
|
||||||
|
"artifact": {
|
||||||
|
"size": 208338,
|
||||||
|
"sha1": "39c7796b469a600f72380316f6b1f11db6c2c7c4",
|
||||||
|
"path": "net/java/jinput/jinput/2.0.5/jinput-2.0.5.jar",
|
||||||
|
"url": "https://libraries.minecraft.net/net/java/jinput/jinput/2.0.5/jinput-2.0.5.jar"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "net.java.jutils:jutils:1.0.0",
|
||||||
|
"downloads": {
|
||||||
|
"artifact": {
|
||||||
|
"size": 7508,
|
||||||
|
"sha1": "e12fe1fda814bd348c1579329c86943d2cd3c6a6",
|
||||||
|
"path": "net/java/jutils/jutils/1.0.0/jutils-1.0.0.jar",
|
||||||
|
"url": "https://libraries.minecraft.net/net/java/jutils/jutils/1.0.0/jutils-1.0.0.jar"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "com.google.code.gson:gson:2.2.4",
|
||||||
|
"downloads": {
|
||||||
|
"artifact": {
|
||||||
|
"size": 190432,
|
||||||
|
"sha1": "a60a5e993c98c864010053cb901b7eab25306568",
|
||||||
|
"path": "com/google/code/gson/gson/2.2.4/gson-2.2.4.jar",
|
||||||
|
"url": "https://libraries.minecraft.net/com/google/code/gson/gson/2.2.4/gson-2.2.4.jar"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "com.mojang:authlib:1.5.24",
|
||||||
|
"downloads": {
|
||||||
|
"artifact": {
|
||||||
|
"size": 64353,
|
||||||
|
"sha1": "0889ff5477b844800cff734babbf42c1bbda4b10",
|
||||||
|
"path": "com/mojang/authlib/1.5.24/authlib-1.5.24.jar",
|
||||||
|
"url": "https://libraries.minecraft.net/com/mojang/authlib/1.5.24/authlib-1.5.24.jar"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "com.mojang:realms:1.10.0",
|
||||||
|
"downloads": {
|
||||||
|
"artifact": {
|
||||||
|
"size": 1493992,
|
||||||
|
"sha1": "e73c98944e2170f895357a703c3322bcd68d1699",
|
||||||
|
"path": "com/mojang/realms/1.10.0/realms-1.10.0.jar",
|
||||||
|
"url": "https://libraries.minecraft.net/com/mojang/realms/1.10.0/realms-1.10.0.jar"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "org.apache.commons:commons-compress:1.8.1",
|
||||||
|
"downloads": {
|
||||||
|
"artifact": {
|
||||||
|
"size": 365552,
|
||||||
|
"sha1": "a698750c16740fd5b3871425f4cb3bbaa87f529d",
|
||||||
|
"path": "org/apache/commons/commons-compress/1.8.1/commons-compress-1.8.1.jar",
|
||||||
|
"url": "https://libraries.minecraft.net/org/apache/commons/commons-compress/1.8.1/commons-compress-1.8.1.jar"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "org.apache.httpcomponents:httpclient:4.3.3",
|
||||||
|
"downloads": {
|
||||||
|
"artifact": {
|
||||||
|
"size": 589512,
|
||||||
|
"sha1": "18f4247ff4572a074444572cee34647c43e7c9c7",
|
||||||
|
"path": "org/apache/httpcomponents/httpclient/4.3.3/httpclient-4.3.3.jar",
|
||||||
|
"url": "https://libraries.minecraft.net/org/apache/httpcomponents/httpclient/4.3.3/httpclient-4.3.3.jar"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "commons-logging:commons-logging:1.1.3",
|
||||||
|
"downloads": {
|
||||||
|
"artifact": {
|
||||||
|
"size": 62050,
|
||||||
|
"sha1": "f6f66e966c70a83ffbdb6f17a0919eaf7c8aca7f",
|
||||||
|
"path": "commons-logging/commons-logging/1.1.3/commons-logging-1.1.3.jar",
|
||||||
|
"url": "https://libraries.minecraft.net/commons-logging/commons-logging/1.1.3/commons-logging-1.1.3.jar"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "org.apache.httpcomponents:httpcore:4.3.2",
|
||||||
|
"downloads": {
|
||||||
|
"artifact": {
|
||||||
|
"size": 282269,
|
||||||
|
"sha1": "31fbbff1ddbf98f3aa7377c94d33b0447c646b6e",
|
||||||
|
"path": "org/apache/httpcomponents/httpcore/4.3.2/httpcore-4.3.2.jar",
|
||||||
|
"url": "https://libraries.minecraft.net/org/apache/httpcomponents/httpcore/4.3.2/httpcore-4.3.2.jar"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "it.unimi.dsi:fastutil:7.0.12_mojang",
|
||||||
|
"downloads": {
|
||||||
|
"artifact": {
|
||||||
|
"size": 522306,
|
||||||
|
"sha1": "ba787e741efdc425fc5d2ea654b57c15fba27efa",
|
||||||
|
"path": "it/unimi/dsi/fastutil/7.0.12_mojang/fastutil-7.0.12_mojang.jar",
|
||||||
|
"url": "https://libraries.minecraft.net/it/unimi/dsi/fastutil/7.0.12_mojang/fastutil-7.0.12_mojang.jar"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "org.apache.logging.log4j:log4j-api:2.0-beta9",
|
||||||
|
"downloads": {
|
||||||
|
"artifact": {
|
||||||
|
"size": 108161,
|
||||||
|
"sha1": "1dd66e68cccd907880229f9e2de1314bd13ff785",
|
||||||
|
"path": "org/apache/logging/log4j/log4j-api/2.0-beta9/log4j-api-2.0-beta9.jar",
|
||||||
|
"url": "https://libraries.minecraft.net/org/apache/logging/log4j/log4j-api/2.0-beta9/log4j-api-2.0-beta9.jar"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "org.apache.logging.log4j:log4j-core:2.0-beta9",
|
||||||
|
"downloads": {
|
||||||
|
"artifact": {
|
||||||
|
"size": 681134,
|
||||||
|
"sha1": "678861ba1b2e1fccb594bb0ca03114bb05da9695",
|
||||||
|
"path": "org/apache/logging/log4j/log4j-core/2.0-beta9/log4j-core-2.0-beta9.jar",
|
||||||
|
"url": "https://libraries.minecraft.net/org/apache/logging/log4j/log4j-core/2.0-beta9/log4j-core-2.0-beta9.jar"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "org.lwjgl.lwjgl:lwjgl:2.9.4-nightly-20150209",
|
||||||
|
"rules": [
|
||||||
|
{
|
||||||
|
"action": "allow"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"action": "disallow",
|
||||||
|
"os": {
|
||||||
|
"name": "osx"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"downloads": {
|
||||||
|
"artifact": {
|
||||||
|
"size": 1047168,
|
||||||
|
"sha1": "697517568c68e78ae0b4544145af031c81082dfe",
|
||||||
|
"path": "org/lwjgl/lwjgl/lwjgl/2.9.4-nightly-20150209/lwjgl-2.9.4-nightly-20150209.jar",
|
||||||
|
"url": "https://libraries.minecraft.net/org/lwjgl/lwjgl/lwjgl/2.9.4-nightly-20150209/lwjgl-2.9.4-nightly-20150209.jar"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "org.lwjgl.lwjgl:lwjgl_util:2.9.4-nightly-20150209",
|
||||||
|
"rules": [
|
||||||
|
{
|
||||||
|
"action": "allow"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"action": "disallow",
|
||||||
|
"os": {
|
||||||
|
"name": "osx"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"downloads": {
|
||||||
|
"artifact": {
|
||||||
|
"size": 173887,
|
||||||
|
"sha1": "d51a7c040a721d13efdfbd34f8b257b2df882ad0",
|
||||||
|
"path": "org/lwjgl/lwjgl/lwjgl_util/2.9.4-nightly-20150209/lwjgl_util-2.9.4-nightly-20150209.jar",
|
||||||
|
"url": "https://libraries.minecraft.net/org/lwjgl/lwjgl/lwjgl_util/2.9.4-nightly-20150209/lwjgl_util-2.9.4-nightly-20150209.jar"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"extract": {
|
||||||
|
"exclude": [
|
||||||
|
"META-INF/"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"name": "org.lwjgl.lwjgl:lwjgl-platform:2.9.4-nightly-20150209",
|
||||||
|
"natives": {
|
||||||
|
"linux": "natives-linux",
|
||||||
|
"osx": "natives-osx",
|
||||||
|
"windows": "natives-windows"
|
||||||
|
},
|
||||||
|
"rules": [
|
||||||
|
{
|
||||||
|
"action": "allow"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"action": "disallow",
|
||||||
|
"os": {
|
||||||
|
"name": "osx"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"downloads": {
|
||||||
|
"classifiers": {
|
||||||
|
"natives-linux": {
|
||||||
|
"size": 578680,
|
||||||
|
"sha1": "931074f46c795d2f7b30ed6395df5715cfd7675b",
|
||||||
|
"path": "org/lwjgl/lwjgl/lwjgl-platform/2.9.4-nightly-20150209/lwjgl-platform-2.9.4-nightly-20150209-natives-linux.jar",
|
||||||
|
"url": "https://libraries.minecraft.net/org/lwjgl/lwjgl/lwjgl-platform/2.9.4-nightly-20150209/lwjgl-platform-2.9.4-nightly-20150209-natives-linux.jar"
|
||||||
|
},
|
||||||
|
"natives-osx": {
|
||||||
|
"size": 426822,
|
||||||
|
"sha1": "bcab850f8f487c3f4c4dbabde778bb82bd1a40ed",
|
||||||
|
"path": "org/lwjgl/lwjgl/lwjgl-platform/2.9.4-nightly-20150209/lwjgl-platform-2.9.4-nightly-20150209-natives-osx.jar",
|
||||||
|
"url": "https://libraries.minecraft.net/org/lwjgl/lwjgl/lwjgl-platform/2.9.4-nightly-20150209/lwjgl-platform-2.9.4-nightly-20150209-natives-osx.jar"
|
||||||
|
},
|
||||||
|
"natives-windows": {
|
||||||
|
"size": 613748,
|
||||||
|
"sha1": "b84d5102b9dbfabfeb5e43c7e2828d98a7fc80e0",
|
||||||
|
"path": "org/lwjgl/lwjgl/lwjgl-platform/2.9.4-nightly-20150209/lwjgl-platform-2.9.4-nightly-20150209-natives-windows.jar",
|
||||||
|
"url": "https://libraries.minecraft.net/org/lwjgl/lwjgl/lwjgl-platform/2.9.4-nightly-20150209/lwjgl-platform-2.9.4-nightly-20150209-natives-windows.jar"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"artifact": {
|
||||||
|
"size": 22,
|
||||||
|
"sha1": "b04f3ee8f5e43fa3b162981b50bb72fe1acabb33",
|
||||||
|
"path": "org/lwjgl/lwjgl/lwjgl-platform/2.9.4-nightly-20150209/lwjgl-platform-2.9.4-nightly-20150209.jar",
|
||||||
|
"url": "https://libraries.minecraft.net/org/lwjgl/lwjgl/lwjgl-platform/2.9.4-nightly-20150209/lwjgl-platform-2.9.4-nightly-20150209.jar"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "org.lwjgl.lwjgl:lwjgl:2.9.2-nightly-20140822",
|
||||||
|
"rules": [
|
||||||
|
{
|
||||||
|
"action": "allow",
|
||||||
|
"os": {
|
||||||
|
"name": "osx"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"downloads": {
|
||||||
|
"artifact": {
|
||||||
|
"size": 1045632,
|
||||||
|
"sha1": "7707204c9ffa5d91662de95f0a224e2f721b22af",
|
||||||
|
"path": "org/lwjgl/lwjgl/lwjgl/2.9.2-nightly-20140822/lwjgl-2.9.2-nightly-20140822.jar",
|
||||||
|
"url": "https://libraries.minecraft.net/org/lwjgl/lwjgl/lwjgl/2.9.2-nightly-20140822/lwjgl-2.9.2-nightly-20140822.jar"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "org.lwjgl.lwjgl:lwjgl_util:2.9.2-nightly-20140822",
|
||||||
|
"rules": [
|
||||||
|
{
|
||||||
|
"action": "allow",
|
||||||
|
"os": {
|
||||||
|
"name": "osx"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"downloads": {
|
||||||
|
"artifact": {
|
||||||
|
"size": 173887,
|
||||||
|
"sha1": "f0e612c840a7639c1f77f68d72a28dae2f0c8490",
|
||||||
|
"path": "org/lwjgl/lwjgl/lwjgl_util/2.9.2-nightly-20140822/lwjgl_util-2.9.2-nightly-20140822.jar",
|
||||||
|
"url": "https://libraries.minecraft.net/org/lwjgl/lwjgl/lwjgl_util/2.9.2-nightly-20140822/lwjgl_util-2.9.2-nightly-20140822.jar"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"extract": {
|
||||||
|
"exclude": [
|
||||||
|
"META-INF/"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"name": "org.lwjgl.lwjgl:lwjgl-platform:2.9.2-nightly-20140822",
|
||||||
|
"natives": {
|
||||||
|
"linux": "natives-linux",
|
||||||
|
"osx": "natives-osx",
|
||||||
|
"windows": "natives-windows"
|
||||||
|
},
|
||||||
|
"rules": [
|
||||||
|
{
|
||||||
|
"action": "allow",
|
||||||
|
"os": {
|
||||||
|
"name": "osx"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"downloads": {
|
||||||
|
"classifiers": {
|
||||||
|
"natives-linux": {
|
||||||
|
"size": 578539,
|
||||||
|
"sha1": "d898a33b5d0a6ef3fed3a4ead506566dce6720a5",
|
||||||
|
"path": "org/lwjgl/lwjgl/lwjgl-platform/2.9.2-nightly-20140822/lwjgl-platform-2.9.2-nightly-20140822-natives-linux.jar",
|
||||||
|
"url": "https://libraries.minecraft.net/org/lwjgl/lwjgl/lwjgl-platform/2.9.2-nightly-20140822/lwjgl-platform-2.9.2-nightly-20140822-natives-linux.jar"
|
||||||
|
},
|
||||||
|
"natives-osx": {
|
||||||
|
"size": 468116,
|
||||||
|
"sha1": "79f5ce2fea02e77fe47a3c745219167a542121d7",
|
||||||
|
"path": "org/lwjgl/lwjgl/lwjgl-platform/2.9.2-nightly-20140822/lwjgl-platform-2.9.2-nightly-20140822-natives-osx.jar",
|
||||||
|
"url": "https://libraries.minecraft.net/org/lwjgl/lwjgl/lwjgl-platform/2.9.2-nightly-20140822/lwjgl-platform-2.9.2-nightly-20140822-natives-osx.jar"
|
||||||
|
},
|
||||||
|
"natives-windows": {
|
||||||
|
"size": 613680,
|
||||||
|
"sha1": "78b2a55ce4dc29c6b3ec4df8ca165eba05f9b341",
|
||||||
|
"path": "org/lwjgl/lwjgl/lwjgl-platform/2.9.2-nightly-20140822/lwjgl-platform-2.9.2-nightly-20140822-natives-windows.jar",
|
||||||
|
"url": "https://libraries.minecraft.net/org/lwjgl/lwjgl/lwjgl-platform/2.9.2-nightly-20140822/lwjgl-platform-2.9.2-nightly-20140822-natives-windows.jar"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"extract": {
|
||||||
|
"exclude": [
|
||||||
|
"META-INF/"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"name": "net.java.jinput:jinput-platform:2.0.5",
|
||||||
|
"natives": {
|
||||||
|
"linux": "natives-linux",
|
||||||
|
"osx": "natives-osx",
|
||||||
|
"windows": "natives-windows"
|
||||||
|
},
|
||||||
|
"downloads": {
|
||||||
|
"classifiers": {
|
||||||
|
"natives-linux": {
|
||||||
|
"size": 10362,
|
||||||
|
"sha1": "7ff832a6eb9ab6a767f1ade2b548092d0fa64795",
|
||||||
|
"path": "net/java/jinput/jinput-platform/2.0.5/jinput-platform-2.0.5-natives-linux.jar",
|
||||||
|
"url": "https://libraries.minecraft.net/net/java/jinput/jinput-platform/2.0.5/jinput-platform-2.0.5-natives-linux.jar"
|
||||||
|
},
|
||||||
|
"natives-osx": {
|
||||||
|
"size": 12186,
|
||||||
|
"sha1": "53f9c919f34d2ca9de8c51fc4e1e8282029a9232",
|
||||||
|
"path": "net/java/jinput/jinput-platform/2.0.5/jinput-platform-2.0.5-natives-osx.jar",
|
||||||
|
"url": "https://libraries.minecraft.net/net/java/jinput/jinput-platform/2.0.5/jinput-platform-2.0.5-natives-osx.jar"
|
||||||
|
},
|
||||||
|
"natives-windows": {
|
||||||
|
"size": 155179,
|
||||||
|
"sha1": "385ee093e01f587f30ee1c8a2ee7d408fd732e16",
|
||||||
|
"path": "net/java/jinput/jinput-platform/2.0.5/jinput-platform-2.0.5-natives-windows.jar",
|
||||||
|
"url": "https://libraries.minecraft.net/net/java/jinput/jinput-platform/2.0.5/jinput-platform-2.0.5-natives-windows.jar"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"logging": {
|
||||||
|
"client": {
|
||||||
|
"file": {
|
||||||
|
"id": "client-1.7.xml",
|
||||||
|
"sha1": "49e2e41bc339698bd8199e0da9398c926e68c95d",
|
||||||
|
"size": 467,
|
||||||
|
"url": "https://launchermeta.mojang.com/mc/log_configs/client-1.7.xml/49e2e41bc339698bd8199e0da9398c926e68c95d/client-1.7.xml"
|
||||||
|
},
|
||||||
|
"argument": "-Dlog4j.configurationFile=${path}",
|
||||||
|
"type": "log4j2-xml"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"mainClass": "net.minecraft.client.main.Main",
|
||||||
|
"minecraftArguments": "--username ${auth_player_name} --version ${version_name} --gameDir ${game_directory} --assetsDir ${assets_root} --assetIndex ${assets_index_name} --uuid ${auth_uuid} --accessToken ${auth_access_token} --userType ${user_type} --versionType ${version_type}",
|
||||||
|
"minimumLauncherVersion": 18,
|
||||||
|
"releaseTime": "2016-11-08T13:42:50+00:00",
|
||||||
|
"time": "2016-11-08T13:44:29+00:00",
|
||||||
|
"type": "snapshot"
|
||||||
|
}
|
||||||
@@ -0,0 +1,153 @@
|
|||||||
|
{
|
||||||
|
"install": {
|
||||||
|
"profileName": "@project@",
|
||||||
|
"target":"@minecraft_version@-@project@@version@",
|
||||||
|
"path":"@artifact@",
|
||||||
|
"version":"@project@ @version@",
|
||||||
|
"filePath":"@universal_jar@",
|
||||||
|
"welcome":"Welcome to the simple @project@ installer.",
|
||||||
|
"minecraft":"@minecraft_version@",
|
||||||
|
"mirrorList" : "http://files.minecraftforge.net/mirror-brand.list",
|
||||||
|
"logo":"/big_logo.png",
|
||||||
|
"modList":"none"
|
||||||
|
},
|
||||||
|
"versionInfo": {
|
||||||
|
"id": "@minecraft_version@-@project@@version@",
|
||||||
|
"time": "@timestamp@",
|
||||||
|
"releaseTime": "1960-01-01T00:00:00-0700",
|
||||||
|
"type": "release",
|
||||||
|
"minecraftArguments": "--username ${auth_player_name} --version ${version_name} --gameDir ${game_directory} --assetsDir ${assets_root} --assetIndex ${assets_index_name} --uuid ${auth_uuid} --accessToken ${auth_access_token} --userType ${user_type} --tweakClass net.minecraftforge.fml.common.launcher.FMLTweaker --versionType Forge",
|
||||||
|
"mainClass": "net.minecraft.launchwrapper.Launch",
|
||||||
|
"inheritsFrom": "1.11",
|
||||||
|
"jar": "1.11",
|
||||||
|
"libraries": [
|
||||||
|
{
|
||||||
|
"name": "@artifact@",
|
||||||
|
"url": "http://files.minecraftforge.net/maven/"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "net.minecraft:launchwrapper:1.12",
|
||||||
|
"serverreq":true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "org.ow2.asm:asm-all:5.0.3",
|
||||||
|
"serverreq":true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "jline:jline:2.13",
|
||||||
|
"url" : "http://files.minecraftforge.net/maven/",
|
||||||
|
"checksums" : [ "2d9530d0a25daffaffda7c35037b046b627bb171" ],
|
||||||
|
"serverreq":true,
|
||||||
|
"clientreq":false
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "com.typesafe.akka:akka-actor_2.11:2.3.3",
|
||||||
|
"url" : "http://files.minecraftforge.net/maven/",
|
||||||
|
"checksums" : [ "ed62e9fc709ca0f2ff1a3220daa8b70a2870078e", "25a86ccfdb6f6dfe08971f4825d0a01be83a6f2e" ],
|
||||||
|
"serverreq":true,
|
||||||
|
"clientreq":true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "com.typesafe:config:1.2.1",
|
||||||
|
"url" : "http://files.minecraftforge.net/maven/",
|
||||||
|
"checksums" : [ "f771f71fdae3df231bcd54d5ca2d57f0bf93f467", "7d7bc36df0989d72f2d5d057309675777acc528b" ],
|
||||||
|
"serverreq":true,
|
||||||
|
"clientreq":true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "org.scala-lang:scala-actors-migration_2.11:1.1.0",
|
||||||
|
"url" : "http://files.minecraftforge.net/maven/",
|
||||||
|
"checksums" : [ "dfa8bc42b181d5b9f1a5dd147f8ae308b893eb6f", "8c9aaeeb68487ca519411a14068e1b4d69739207" ],
|
||||||
|
"serverreq":true,
|
||||||
|
"clientreq":true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "org.scala-lang:scala-compiler:2.11.1",
|
||||||
|
"url" : "http://files.minecraftforge.net/maven/",
|
||||||
|
"checksums" : [ "56ea2e6c025e0821f28d73ca271218b8dd04926a", "1444992390544ba3780867a13ff696a89d7d1639" ],
|
||||||
|
"serverreq":true,
|
||||||
|
"clientreq":true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "org.scala-lang.plugins:scala-continuations-library_2.11:1.0.2",
|
||||||
|
"url" : "http://files.minecraftforge.net/maven/",
|
||||||
|
"checksums" : [ "87213338cd5a153a7712cb574c0ddd2edfee0386", "0b4c1bf8d48993f138d6e10c0c144e50acfff581" ],
|
||||||
|
"serverreq":true,
|
||||||
|
"clientreq":true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "org.scala-lang.plugins:scala-continuations-plugin_2.11.1:1.0.2",
|
||||||
|
"url" : "http://files.minecraftforge.net/maven/",
|
||||||
|
"checksums" : [ "1f7371605d4ba42aa26d3443440c0083c587b4e9", "1ea655dda4504ae0a367327e2340cd3beaee6c73" ],
|
||||||
|
"serverreq":true,
|
||||||
|
"clientreq":true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "org.scala-lang:scala-library:2.11.1",
|
||||||
|
"url" : "http://files.minecraftforge.net/maven/",
|
||||||
|
"checksums" : [ "0e11da23da3eabab9f4777b9220e60d44c1aab6a", "1e4df76e835201c6eabd43adca89ab11f225f134" ],
|
||||||
|
"serverreq":true,
|
||||||
|
"clientreq":true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "org.scala-lang:scala-parser-combinators_2.11:1.0.1",
|
||||||
|
"url" : "http://files.minecraftforge.net/maven/",
|
||||||
|
"checksums" : [ "f05d7345bf5a58924f2837c6c1f4d73a938e1ff0", "a1cbbcbde1dcc614f4253ed1aa0b320bc78d8f1d" ],
|
||||||
|
"serverreq":true,
|
||||||
|
"clientreq":true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "org.scala-lang:scala-reflect:2.11.1",
|
||||||
|
"url" : "http://files.minecraftforge.net/maven/",
|
||||||
|
"checksums" : [ "6580347e61cc7f8e802941e7fde40fa83b8badeb", "91ce0f0be20f4a536321724b4b3bbc6530ddcd88" ],
|
||||||
|
"serverreq":true,
|
||||||
|
"clientreq":true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "org.scala-lang:scala-swing_2.11:1.0.1",
|
||||||
|
"url" : "http://files.minecraftforge.net/maven/",
|
||||||
|
"checksums" : [ "b1cdd92bd47b1e1837139c1c53020e86bb9112ae", "d77152691dcf5bbdb00529af37aa7d3d887b3e63" ],
|
||||||
|
"serverreq":true,
|
||||||
|
"clientreq":true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "org.scala-lang:scala-xml_2.11:1.0.2",
|
||||||
|
"url" : "http://files.minecraftforge.net/maven/",
|
||||||
|
"checksums" : [ "7a80ec00aec122fba7cd4e0d4cdd87ff7e4cb6d0", "62736b01689d56b6d09a0164b7ef9da2b0b9633d" ],
|
||||||
|
"serverreq":true,
|
||||||
|
"clientreq":true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "lzma:lzma:0.0.1",
|
||||||
|
"serverreq":true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "net.sf.jopt-simple:jopt-simple:4.6",
|
||||||
|
"serverreq":true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "java3d:vecmath:1.5.2",
|
||||||
|
"clientreq":true,
|
||||||
|
"serverreq":true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "net.sf.trove4j:trove4j:3.0.3",
|
||||||
|
"clientreq":true,
|
||||||
|
"serverreq":true
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"optionals": [
|
||||||
|
{
|
||||||
|
"name": "Mercurius",
|
||||||
|
"client": true,
|
||||||
|
"server": true,
|
||||||
|
"default": true,
|
||||||
|
"inject": true,
|
||||||
|
"desc": "A mod that collects statistics about Minecraft and your system.<br>Useful for Forge to understand how Minecraft/Forge are used.",
|
||||||
|
"url": "http://www.minecraftforge.net/forum/index.php?topic=43278.0",
|
||||||
|
"artifact": "net.minecraftforge:MercuriusUpdater:1.11",
|
||||||
|
"maven": "http://files.minecraftforge.net/maven/"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
@@ -0,0 +1,92 @@
|
|||||||
|
{
|
||||||
|
"id": "@minecraft_version@-@project@@version@",
|
||||||
|
"time": "@timestamp@",
|
||||||
|
"releaseTime": "1960-01-01T00:00:00-0700",
|
||||||
|
"type": "release",
|
||||||
|
"inheritsFrom": "1.11.2",
|
||||||
|
"minecraftArguments": "--version FML_DEV --tweakClass net.minecraftforge.fml.common.launcher.FMLTweaker",
|
||||||
|
"libraries": [
|
||||||
|
{
|
||||||
|
"name": "net.minecraft:launchwrapper:1.12"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "jline:jline:2.13",
|
||||||
|
"children": ["sources"],
|
||||||
|
"url" : "http://repo.maven.apache.org/maven2"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "com.google.code.findbugs:jsr305:1.3.9",
|
||||||
|
"children": ["sources"],
|
||||||
|
"url" : "http://repo.maven.apache.org/maven2"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "org.ow2.asm:asm-debug-all:5.0.3",
|
||||||
|
"children" : ["sources"],
|
||||||
|
"url" : "http://repo.maven.apache.org/maven2"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "com.typesafe.akka:akka-actor_2.11:2.3.3",
|
||||||
|
"children" : ["sources"],
|
||||||
|
"url" : "http://repo.maven.apache.org/maven2"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "com.typesafe:config:1.2.1",
|
||||||
|
"children" : ["sources"],
|
||||||
|
"url" : "http://repo.maven.apache.org/maven2"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "org.scala-lang:scala-actors-migration_2.11:1.1.0",
|
||||||
|
"children" : ["sources"],
|
||||||
|
"url" : "http://repo.maven.apache.org/maven2"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "org.scala-lang:scala-compiler:2.11.1",
|
||||||
|
"children" : ["sources"],
|
||||||
|
"url" : "http://repo.maven.apache.org/maven2"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "org.scala-lang.plugins:scala-continuations-library_2.11:1.0.2",
|
||||||
|
"children" : ["sources"],
|
||||||
|
"url" : "http://repo.maven.apache.org/maven2"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "org.scala-lang.plugins:scala-continuations-plugin_2.11.1:1.0.2",
|
||||||
|
"children" : ["sources"],
|
||||||
|
"url" : "http://repo.maven.apache.org/maven2"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "org.scala-lang:scala-library:2.11.1",
|
||||||
|
"children" : ["sources"],
|
||||||
|
"url" : "http://repo.maven.apache.org/maven2"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "org.scala-lang.modules:scala-parser-combinators_2.11:1.0.1",
|
||||||
|
"children" : ["sources"],
|
||||||
|
"url" : "http://repo.maven.apache.org/maven2"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "org.scala-lang:scala-reflect:2.11.1",
|
||||||
|
"children" : ["sources"],
|
||||||
|
"url" : "http://repo.maven.apache.org/maven2"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "org.scala-lang.modules:scala-swing_2.11:1.0.1",
|
||||||
|
"children" : ["sources"],
|
||||||
|
"url" : "http://repo.maven.apache.org/maven2"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "org.scala-lang.modules:scala-xml_2.11:1.0.2",
|
||||||
|
"children" : ["sources"],
|
||||||
|
"url" : "http://repo.maven.apache.org/maven2"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "lzma:lzma:0.0.1"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "java3d:vecmath:1.5.2"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "net.sf.trove4j:trove4j:3.0.3"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
@@ -0,0 +1,154 @@
|
|||||||
|
{
|
||||||
|
"install": {
|
||||||
|
"profileName": "@project@",
|
||||||
|
"target":"@minecraft_version@-@project@@version@",
|
||||||
|
"path":"@artifact@",
|
||||||
|
"version":"@project@ @version@",
|
||||||
|
"filePath":"@universal_jar@",
|
||||||
|
"welcome":"Welcome to the simple @project@ installer.",
|
||||||
|
"minecraft":"@minecraft_version@",
|
||||||
|
"mirrorList" : "http://files.minecraftforge.net/mirror-brand.list",
|
||||||
|
"logo":"/big_logo.png",
|
||||||
|
"modList":"none"
|
||||||
|
},
|
||||||
|
"versionInfo": {
|
||||||
|
"id": "@minecraft_version@-@project@@version@",
|
||||||
|
"time": "@timestamp@",
|
||||||
|
"releaseTime": "1960-01-01T00:00:00-0700",
|
||||||
|
"type": "release",
|
||||||
|
"minecraftArguments": "--username ${auth_player_name} --version ${version_name} --gameDir ${game_directory} --assetsDir ${assets_root} --assetIndex ${assets_index_name} --uuid ${auth_uuid} --accessToken ${auth_access_token} --userType ${user_type} --tweakClass net.minecraftforge.fml.common.launcher.FMLTweaker --versionType Forge",
|
||||||
|
"mainClass": "net.minecraft.launchwrapper.Launch",
|
||||||
|
"inheritsFrom": "1.11.2",
|
||||||
|
"jar": "1.11.2",
|
||||||
|
"logging": {},
|
||||||
|
"libraries": [
|
||||||
|
{
|
||||||
|
"name": "@artifact@",
|
||||||
|
"url": "http://files.minecraftforge.net/maven/"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "net.minecraft:launchwrapper:1.12",
|
||||||
|
"serverreq":true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "org.ow2.asm:asm-all:5.0.3",
|
||||||
|
"serverreq":true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "jline:jline:2.13",
|
||||||
|
"url" : "http://files.minecraftforge.net/maven/",
|
||||||
|
"checksums" : [ "2d9530d0a25daffaffda7c35037b046b627bb171" ],
|
||||||
|
"serverreq":true,
|
||||||
|
"clientreq":false
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "com.typesafe.akka:akka-actor_2.11:2.3.3",
|
||||||
|
"url" : "http://files.minecraftforge.net/maven/",
|
||||||
|
"checksums" : [ "ed62e9fc709ca0f2ff1a3220daa8b70a2870078e", "25a86ccfdb6f6dfe08971f4825d0a01be83a6f2e" ],
|
||||||
|
"serverreq":true,
|
||||||
|
"clientreq":true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "com.typesafe:config:1.2.1",
|
||||||
|
"url" : "http://files.minecraftforge.net/maven/",
|
||||||
|
"checksums" : [ "f771f71fdae3df231bcd54d5ca2d57f0bf93f467", "7d7bc36df0989d72f2d5d057309675777acc528b" ],
|
||||||
|
"serverreq":true,
|
||||||
|
"clientreq":true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "org.scala-lang:scala-actors-migration_2.11:1.1.0",
|
||||||
|
"url" : "http://files.minecraftforge.net/maven/",
|
||||||
|
"checksums" : [ "dfa8bc42b181d5b9f1a5dd147f8ae308b893eb6f", "8c9aaeeb68487ca519411a14068e1b4d69739207" ],
|
||||||
|
"serverreq":true,
|
||||||
|
"clientreq":true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "org.scala-lang:scala-compiler:2.11.1",
|
||||||
|
"url" : "http://files.minecraftforge.net/maven/",
|
||||||
|
"checksums" : [ "56ea2e6c025e0821f28d73ca271218b8dd04926a", "1444992390544ba3780867a13ff696a89d7d1639" ],
|
||||||
|
"serverreq":true,
|
||||||
|
"clientreq":true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "org.scala-lang.plugins:scala-continuations-library_2.11:1.0.2",
|
||||||
|
"url" : "http://files.minecraftforge.net/maven/",
|
||||||
|
"checksums" : [ "87213338cd5a153a7712cb574c0ddd2edfee0386", "0b4c1bf8d48993f138d6e10c0c144e50acfff581" ],
|
||||||
|
"serverreq":true,
|
||||||
|
"clientreq":true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "org.scala-lang.plugins:scala-continuations-plugin_2.11.1:1.0.2",
|
||||||
|
"url" : "http://files.minecraftforge.net/maven/",
|
||||||
|
"checksums" : [ "1f7371605d4ba42aa26d3443440c0083c587b4e9", "1ea655dda4504ae0a367327e2340cd3beaee6c73" ],
|
||||||
|
"serverreq":true,
|
||||||
|
"clientreq":true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "org.scala-lang:scala-library:2.11.1",
|
||||||
|
"url" : "http://files.minecraftforge.net/maven/",
|
||||||
|
"checksums" : [ "0e11da23da3eabab9f4777b9220e60d44c1aab6a", "1e4df76e835201c6eabd43adca89ab11f225f134" ],
|
||||||
|
"serverreq":true,
|
||||||
|
"clientreq":true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "org.scala-lang:scala-parser-combinators_2.11:1.0.1",
|
||||||
|
"url" : "http://files.minecraftforge.net/maven/",
|
||||||
|
"checksums" : [ "f05d7345bf5a58924f2837c6c1f4d73a938e1ff0", "a1cbbcbde1dcc614f4253ed1aa0b320bc78d8f1d" ],
|
||||||
|
"serverreq":true,
|
||||||
|
"clientreq":true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "org.scala-lang:scala-reflect:2.11.1",
|
||||||
|
"url" : "http://files.minecraftforge.net/maven/",
|
||||||
|
"checksums" : [ "6580347e61cc7f8e802941e7fde40fa83b8badeb", "91ce0f0be20f4a536321724b4b3bbc6530ddcd88" ],
|
||||||
|
"serverreq":true,
|
||||||
|
"clientreq":true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "org.scala-lang:scala-swing_2.11:1.0.1",
|
||||||
|
"url" : "http://files.minecraftforge.net/maven/",
|
||||||
|
"checksums" : [ "b1cdd92bd47b1e1837139c1c53020e86bb9112ae", "d77152691dcf5bbdb00529af37aa7d3d887b3e63" ],
|
||||||
|
"serverreq":true,
|
||||||
|
"clientreq":true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "org.scala-lang:scala-xml_2.11:1.0.2",
|
||||||
|
"url" : "http://files.minecraftforge.net/maven/",
|
||||||
|
"checksums" : [ "7a80ec00aec122fba7cd4e0d4cdd87ff7e4cb6d0", "62736b01689d56b6d09a0164b7ef9da2b0b9633d" ],
|
||||||
|
"serverreq":true,
|
||||||
|
"clientreq":true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "lzma:lzma:0.0.1",
|
||||||
|
"serverreq":true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "net.sf.jopt-simple:jopt-simple:4.6",
|
||||||
|
"serverreq":true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "java3d:vecmath:1.5.2",
|
||||||
|
"clientreq":true,
|
||||||
|
"serverreq":true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "net.sf.trove4j:trove4j:3.0.3",
|
||||||
|
"clientreq":true,
|
||||||
|
"serverreq":true
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"optionals": [
|
||||||
|
{
|
||||||
|
"name": "Mercurius",
|
||||||
|
"client": true,
|
||||||
|
"server": true,
|
||||||
|
"default": true,
|
||||||
|
"inject": true,
|
||||||
|
"desc": "A mod that collects statistics about Minecraft and your system.<br>Useful for Forge to understand how Minecraft/Forge are used.",
|
||||||
|
"url": "http://www.minecraftforge.net/forum/index.php?topic=43278.0",
|
||||||
|
"artifact": "net.minecraftforge:MercuriusUpdater:1.11.2",
|
||||||
|
"maven": "http://files.minecraftforge.net/maven/"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
@@ -0,0 +1,563 @@
|
|||||||
|
{
|
||||||
|
"assetIndex": {
|
||||||
|
"id": "1.11",
|
||||||
|
"sha1": "ea7f56173691250e9805db5e3dda2d65b951ede3",
|
||||||
|
"size": 157395,
|
||||||
|
"url": "https://launchermeta.mojang.com/mc/assets/1.11/ea7f56173691250e9805db5e3dda2d65b951ede3/1.11.json",
|
||||||
|
"totalSize": 124627552
|
||||||
|
},
|
||||||
|
"assets": "1.11",
|
||||||
|
"downloads": {
|
||||||
|
"client": {
|
||||||
|
"sha1": "db5aa600f0b0bf508aaf579509b345c4e34087be",
|
||||||
|
"size": 9198097,
|
||||||
|
"url": "https://launcher.mojang.com/mc/game/1.11.2/client/db5aa600f0b0bf508aaf579509b345c4e34087be/client.jar"
|
||||||
|
},
|
||||||
|
"server": {
|
||||||
|
"sha1": "f00c294a1576e03fddcac777c3cf4c7d404c4ba4",
|
||||||
|
"size": 9720835,
|
||||||
|
"url": "https://launcher.mojang.com/mc/game/1.11.2/server/f00c294a1576e03fddcac777c3cf4c7d404c4ba4/server.jar"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"id": "1.11.2",
|
||||||
|
"libraries": [
|
||||||
|
{
|
||||||
|
"name": "com.mojang:netty:1.6",
|
||||||
|
"downloads": {
|
||||||
|
"artifact": {
|
||||||
|
"size": 7877,
|
||||||
|
"sha1": "4b75825a06139752bd800d9e29c5fd55b8b1b1e4",
|
||||||
|
"path": "com/mojang/netty/1.6/netty-1.6.jar",
|
||||||
|
"url": "https://libraries.minecraft.net/com/mojang/netty/1.6/netty-1.6.jar"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "oshi-project:oshi-core:1.1",
|
||||||
|
"downloads": {
|
||||||
|
"artifact": {
|
||||||
|
"size": 30973,
|
||||||
|
"sha1": "9ddf7b048a8d701be231c0f4f95fd986198fd2d8",
|
||||||
|
"path": "oshi-project/oshi-core/1.1/oshi-core-1.1.jar",
|
||||||
|
"url": "https://libraries.minecraft.net/oshi-project/oshi-core/1.1/oshi-core-1.1.jar"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "net.java.dev.jna:jna:3.4.0",
|
||||||
|
"downloads": {
|
||||||
|
"artifact": {
|
||||||
|
"size": 1008730,
|
||||||
|
"sha1": "803ff252fedbd395baffd43b37341dc4a150a554",
|
||||||
|
"path": "net/java/dev/jna/jna/3.4.0/jna-3.4.0.jar",
|
||||||
|
"url": "https://libraries.minecraft.net/net/java/dev/jna/jna/3.4.0/jna-3.4.0.jar"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "net.java.dev.jna:platform:3.4.0",
|
||||||
|
"downloads": {
|
||||||
|
"artifact": {
|
||||||
|
"size": 913436,
|
||||||
|
"sha1": "e3f70017be8100d3d6923f50b3d2ee17714e9c13",
|
||||||
|
"path": "net/java/dev/jna/platform/3.4.0/platform-3.4.0.jar",
|
||||||
|
"url": "https://libraries.minecraft.net/net/java/dev/jna/platform/3.4.0/platform-3.4.0.jar"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "com.ibm.icu:icu4j-core-mojang:51.2",
|
||||||
|
"downloads": {
|
||||||
|
"artifact": {
|
||||||
|
"size": 1634692,
|
||||||
|
"sha1": "63d216a9311cca6be337c1e458e587f99d382b84",
|
||||||
|
"path": "com/ibm/icu/icu4j-core-mojang/51.2/icu4j-core-mojang-51.2.jar",
|
||||||
|
"url": "https://libraries.minecraft.net/com/ibm/icu/icu4j-core-mojang/51.2/icu4j-core-mojang-51.2.jar"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "net.sf.jopt-simple:jopt-simple:4.6",
|
||||||
|
"downloads": {
|
||||||
|
"artifact": {
|
||||||
|
"size": 62477,
|
||||||
|
"sha1": "306816fb57cf94f108a43c95731b08934dcae15c",
|
||||||
|
"path": "net/sf/jopt-simple/jopt-simple/4.6/jopt-simple-4.6.jar",
|
||||||
|
"url": "https://libraries.minecraft.net/net/sf/jopt-simple/jopt-simple/4.6/jopt-simple-4.6.jar"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "com.paulscode:codecjorbis:20101023",
|
||||||
|
"downloads": {
|
||||||
|
"artifact": {
|
||||||
|
"size": 103871,
|
||||||
|
"sha1": "c73b5636faf089d9f00e8732a829577de25237ee",
|
||||||
|
"path": "com/paulscode/codecjorbis/20101023/codecjorbis-20101023.jar",
|
||||||
|
"url": "https://libraries.minecraft.net/com/paulscode/codecjorbis/20101023/codecjorbis-20101023.jar"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "com.paulscode:codecwav:20101023",
|
||||||
|
"downloads": {
|
||||||
|
"artifact": {
|
||||||
|
"size": 5618,
|
||||||
|
"sha1": "12f031cfe88fef5c1dd36c563c0a3a69bd7261da",
|
||||||
|
"path": "com/paulscode/codecwav/20101023/codecwav-20101023.jar",
|
||||||
|
"url": "https://libraries.minecraft.net/com/paulscode/codecwav/20101023/codecwav-20101023.jar"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "com.paulscode:libraryjavasound:20101123",
|
||||||
|
"downloads": {
|
||||||
|
"artifact": {
|
||||||
|
"size": 21679,
|
||||||
|
"sha1": "5c5e304366f75f9eaa2e8cca546a1fb6109348b3",
|
||||||
|
"path": "com/paulscode/libraryjavasound/20101123/libraryjavasound-20101123.jar",
|
||||||
|
"url": "https://libraries.minecraft.net/com/paulscode/libraryjavasound/20101123/libraryjavasound-20101123.jar"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "com.paulscode:librarylwjglopenal:20100824",
|
||||||
|
"downloads": {
|
||||||
|
"artifact": {
|
||||||
|
"size": 18981,
|
||||||
|
"sha1": "73e80d0794c39665aec3f62eee88ca91676674ef",
|
||||||
|
"path": "com/paulscode/librarylwjglopenal/20100824/librarylwjglopenal-20100824.jar",
|
||||||
|
"url": "https://libraries.minecraft.net/com/paulscode/librarylwjglopenal/20100824/librarylwjglopenal-20100824.jar"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "com.paulscode:soundsystem:20120107",
|
||||||
|
"downloads": {
|
||||||
|
"artifact": {
|
||||||
|
"size": 65020,
|
||||||
|
"sha1": "419c05fe9be71f792b2d76cfc9b67f1ed0fec7f6",
|
||||||
|
"path": "com/paulscode/soundsystem/20120107/soundsystem-20120107.jar",
|
||||||
|
"url": "https://libraries.minecraft.net/com/paulscode/soundsystem/20120107/soundsystem-20120107.jar"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "io.netty:netty-all:4.0.23.Final",
|
||||||
|
"downloads": {
|
||||||
|
"artifact": {
|
||||||
|
"size": 1779991,
|
||||||
|
"sha1": "0294104aaf1781d6a56a07d561e792c5d0c95f45",
|
||||||
|
"path": "io/netty/netty-all/4.0.23.Final/netty-all-4.0.23.Final.jar",
|
||||||
|
"url": "https://libraries.minecraft.net/io/netty/netty-all/4.0.23.Final/netty-all-4.0.23.Final.jar"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "com.google.guava:guava:17.0",
|
||||||
|
"downloads": {
|
||||||
|
"artifact": {
|
||||||
|
"size": 2243036,
|
||||||
|
"sha1": "9c6ef172e8de35fd8d4d8783e4821e57cdef7445",
|
||||||
|
"path": "com/google/guava/guava/17.0/guava-17.0.jar",
|
||||||
|
"url": "https://libraries.minecraft.net/com/google/guava/guava/17.0/guava-17.0.jar"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "org.apache.commons:commons-lang3:3.3.2",
|
||||||
|
"downloads": {
|
||||||
|
"artifact": {
|
||||||
|
"size": 412739,
|
||||||
|
"sha1": "90a3822c38ec8c996e84c16a3477ef632cbc87a3",
|
||||||
|
"path": "org/apache/commons/commons-lang3/3.3.2/commons-lang3-3.3.2.jar",
|
||||||
|
"url": "https://libraries.minecraft.net/org/apache/commons/commons-lang3/3.3.2/commons-lang3-3.3.2.jar"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "commons-io:commons-io:2.4",
|
||||||
|
"downloads": {
|
||||||
|
"artifact": {
|
||||||
|
"size": 185140,
|
||||||
|
"sha1": "b1b6ea3b7e4aa4f492509a4952029cd8e48019ad",
|
||||||
|
"path": "commons-io/commons-io/2.4/commons-io-2.4.jar",
|
||||||
|
"url": "https://libraries.minecraft.net/commons-io/commons-io/2.4/commons-io-2.4.jar"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "commons-codec:commons-codec:1.9",
|
||||||
|
"downloads": {
|
||||||
|
"artifact": {
|
||||||
|
"size": 263965,
|
||||||
|
"sha1": "9ce04e34240f674bc72680f8b843b1457383161a",
|
||||||
|
"path": "commons-codec/commons-codec/1.9/commons-codec-1.9.jar",
|
||||||
|
"url": "https://libraries.minecraft.net/commons-codec/commons-codec/1.9/commons-codec-1.9.jar"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "net.java.jinput:jinput:2.0.5",
|
||||||
|
"downloads": {
|
||||||
|
"artifact": {
|
||||||
|
"size": 208338,
|
||||||
|
"sha1": "39c7796b469a600f72380316f6b1f11db6c2c7c4",
|
||||||
|
"path": "net/java/jinput/jinput/2.0.5/jinput-2.0.5.jar",
|
||||||
|
"url": "https://libraries.minecraft.net/net/java/jinput/jinput/2.0.5/jinput-2.0.5.jar"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "net.java.jutils:jutils:1.0.0",
|
||||||
|
"downloads": {
|
||||||
|
"artifact": {
|
||||||
|
"size": 7508,
|
||||||
|
"sha1": "e12fe1fda814bd348c1579329c86943d2cd3c6a6",
|
||||||
|
"path": "net/java/jutils/jutils/1.0.0/jutils-1.0.0.jar",
|
||||||
|
"url": "https://libraries.minecraft.net/net/java/jutils/jutils/1.0.0/jutils-1.0.0.jar"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "com.google.code.gson:gson:2.2.4",
|
||||||
|
"downloads": {
|
||||||
|
"artifact": {
|
||||||
|
"size": 190432,
|
||||||
|
"sha1": "a60a5e993c98c864010053cb901b7eab25306568",
|
||||||
|
"path": "com/google/code/gson/gson/2.2.4/gson-2.2.4.jar",
|
||||||
|
"url": "https://libraries.minecraft.net/com/google/code/gson/gson/2.2.4/gson-2.2.4.jar"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "com.mojang:authlib:1.5.24",
|
||||||
|
"downloads": {
|
||||||
|
"artifact": {
|
||||||
|
"size": 64353,
|
||||||
|
"sha1": "0889ff5477b844800cff734babbf42c1bbda4b10",
|
||||||
|
"path": "com/mojang/authlib/1.5.24/authlib-1.5.24.jar",
|
||||||
|
"url": "https://libraries.minecraft.net/com/mojang/authlib/1.5.24/authlib-1.5.24.jar"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "com.mojang:realms:1.10.16",
|
||||||
|
"downloads": {
|
||||||
|
"artifact": {
|
||||||
|
"size": 3257394,
|
||||||
|
"sha1": "b4948eb06ff238e45044f47aa69c2c977ce69dcb",
|
||||||
|
"path": "com/mojang/realms/1.10.16/realms-1.10.16.jar",
|
||||||
|
"url": "https://libraries.minecraft.net/com/mojang/realms/1.10.16/realms-1.10.16.jar"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "org.apache.commons:commons-compress:1.8.1",
|
||||||
|
"downloads": {
|
||||||
|
"artifact": {
|
||||||
|
"size": 365552,
|
||||||
|
"sha1": "a698750c16740fd5b3871425f4cb3bbaa87f529d",
|
||||||
|
"path": "org/apache/commons/commons-compress/1.8.1/commons-compress-1.8.1.jar",
|
||||||
|
"url": "https://libraries.minecraft.net/org/apache/commons/commons-compress/1.8.1/commons-compress-1.8.1.jar"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "org.apache.httpcomponents:httpclient:4.3.3",
|
||||||
|
"downloads": {
|
||||||
|
"artifact": {
|
||||||
|
"size": 589512,
|
||||||
|
"sha1": "18f4247ff4572a074444572cee34647c43e7c9c7",
|
||||||
|
"path": "org/apache/httpcomponents/httpclient/4.3.3/httpclient-4.3.3.jar",
|
||||||
|
"url": "https://libraries.minecraft.net/org/apache/httpcomponents/httpclient/4.3.3/httpclient-4.3.3.jar"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "commons-logging:commons-logging:1.1.3",
|
||||||
|
"downloads": {
|
||||||
|
"artifact": {
|
||||||
|
"size": 62050,
|
||||||
|
"sha1": "f6f66e966c70a83ffbdb6f17a0919eaf7c8aca7f",
|
||||||
|
"path": "commons-logging/commons-logging/1.1.3/commons-logging-1.1.3.jar",
|
||||||
|
"url": "https://libraries.minecraft.net/commons-logging/commons-logging/1.1.3/commons-logging-1.1.3.jar"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "org.apache.httpcomponents:httpcore:4.3.2",
|
||||||
|
"downloads": {
|
||||||
|
"artifact": {
|
||||||
|
"size": 282269,
|
||||||
|
"sha1": "31fbbff1ddbf98f3aa7377c94d33b0447c646b6e",
|
||||||
|
"path": "org/apache/httpcomponents/httpcore/4.3.2/httpcore-4.3.2.jar",
|
||||||
|
"url": "https://libraries.minecraft.net/org/apache/httpcomponents/httpcore/4.3.2/httpcore-4.3.2.jar"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "it.unimi.dsi:fastutil:7.0.12_mojang",
|
||||||
|
"downloads": {
|
||||||
|
"artifact": {
|
||||||
|
"size": 522306,
|
||||||
|
"sha1": "ba787e741efdc425fc5d2ea654b57c15fba27efa",
|
||||||
|
"path": "it/unimi/dsi/fastutil/7.0.12_mojang/fastutil-7.0.12_mojang.jar",
|
||||||
|
"url": "https://libraries.minecraft.net/it/unimi/dsi/fastutil/7.0.12_mojang/fastutil-7.0.12_mojang.jar"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "org.apache.logging.log4j:log4j-api:2.0-beta9",
|
||||||
|
"downloads": {
|
||||||
|
"artifact": {
|
||||||
|
"size": 108161,
|
||||||
|
"sha1": "1dd66e68cccd907880229f9e2de1314bd13ff785",
|
||||||
|
"path": "org/apache/logging/log4j/log4j-api/2.0-beta9/log4j-api-2.0-beta9.jar",
|
||||||
|
"url": "https://libraries.minecraft.net/org/apache/logging/log4j/log4j-api/2.0-beta9/log4j-api-2.0-beta9.jar"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "org.apache.logging.log4j:log4j-core:2.0-beta9",
|
||||||
|
"downloads": {
|
||||||
|
"artifact": {
|
||||||
|
"size": 681134,
|
||||||
|
"sha1": "678861ba1b2e1fccb594bb0ca03114bb05da9695",
|
||||||
|
"path": "org/apache/logging/log4j/log4j-core/2.0-beta9/log4j-core-2.0-beta9.jar",
|
||||||
|
"url": "https://libraries.minecraft.net/org/apache/logging/log4j/log4j-core/2.0-beta9/log4j-core-2.0-beta9.jar"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "org.lwjgl.lwjgl:lwjgl:2.9.4-nightly-20150209",
|
||||||
|
"rules": [
|
||||||
|
{
|
||||||
|
"action": "allow"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"action": "disallow",
|
||||||
|
"os": {
|
||||||
|
"name": "osx"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"downloads": {
|
||||||
|
"artifact": {
|
||||||
|
"size": 1047168,
|
||||||
|
"sha1": "697517568c68e78ae0b4544145af031c81082dfe",
|
||||||
|
"path": "org/lwjgl/lwjgl/lwjgl/2.9.4-nightly-20150209/lwjgl-2.9.4-nightly-20150209.jar",
|
||||||
|
"url": "https://libraries.minecraft.net/org/lwjgl/lwjgl/lwjgl/2.9.4-nightly-20150209/lwjgl-2.9.4-nightly-20150209.jar"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "org.lwjgl.lwjgl:lwjgl_util:2.9.4-nightly-20150209",
|
||||||
|
"rules": [
|
||||||
|
{
|
||||||
|
"action": "allow"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"action": "disallow",
|
||||||
|
"os": {
|
||||||
|
"name": "osx"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"downloads": {
|
||||||
|
"artifact": {
|
||||||
|
"size": 173887,
|
||||||
|
"sha1": "d51a7c040a721d13efdfbd34f8b257b2df882ad0",
|
||||||
|
"path": "org/lwjgl/lwjgl/lwjgl_util/2.9.4-nightly-20150209/lwjgl_util-2.9.4-nightly-20150209.jar",
|
||||||
|
"url": "https://libraries.minecraft.net/org/lwjgl/lwjgl/lwjgl_util/2.9.4-nightly-20150209/lwjgl_util-2.9.4-nightly-20150209.jar"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"extract": {
|
||||||
|
"exclude": [
|
||||||
|
"META-INF/"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"name": "org.lwjgl.lwjgl:lwjgl-platform:2.9.4-nightly-20150209",
|
||||||
|
"natives": {
|
||||||
|
"linux": "natives-linux",
|
||||||
|
"osx": "natives-osx",
|
||||||
|
"windows": "natives-windows"
|
||||||
|
},
|
||||||
|
"rules": [
|
||||||
|
{
|
||||||
|
"action": "allow"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"action": "disallow",
|
||||||
|
"os": {
|
||||||
|
"name": "osx"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"downloads": {
|
||||||
|
"classifiers": {
|
||||||
|
"natives-linux": {
|
||||||
|
"size": 578680,
|
||||||
|
"sha1": "931074f46c795d2f7b30ed6395df5715cfd7675b",
|
||||||
|
"path": "org/lwjgl/lwjgl/lwjgl-platform/2.9.4-nightly-20150209/lwjgl-platform-2.9.4-nightly-20150209-natives-linux.jar",
|
||||||
|
"url": "https://libraries.minecraft.net/org/lwjgl/lwjgl/lwjgl-platform/2.9.4-nightly-20150209/lwjgl-platform-2.9.4-nightly-20150209-natives-linux.jar"
|
||||||
|
},
|
||||||
|
"natives-osx": {
|
||||||
|
"size": 426822,
|
||||||
|
"sha1": "bcab850f8f487c3f4c4dbabde778bb82bd1a40ed",
|
||||||
|
"path": "org/lwjgl/lwjgl/lwjgl-platform/2.9.4-nightly-20150209/lwjgl-platform-2.9.4-nightly-20150209-natives-osx.jar",
|
||||||
|
"url": "https://libraries.minecraft.net/org/lwjgl/lwjgl/lwjgl-platform/2.9.4-nightly-20150209/lwjgl-platform-2.9.4-nightly-20150209-natives-osx.jar"
|
||||||
|
},
|
||||||
|
"natives-windows": {
|
||||||
|
"size": 613748,
|
||||||
|
"sha1": "b84d5102b9dbfabfeb5e43c7e2828d98a7fc80e0",
|
||||||
|
"path": "org/lwjgl/lwjgl/lwjgl-platform/2.9.4-nightly-20150209/lwjgl-platform-2.9.4-nightly-20150209-natives-windows.jar",
|
||||||
|
"url": "https://libraries.minecraft.net/org/lwjgl/lwjgl/lwjgl-platform/2.9.4-nightly-20150209/lwjgl-platform-2.9.4-nightly-20150209-natives-windows.jar"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"artifact": {
|
||||||
|
"size": 22,
|
||||||
|
"sha1": "b04f3ee8f5e43fa3b162981b50bb72fe1acabb33",
|
||||||
|
"path": "org/lwjgl/lwjgl/lwjgl-platform/2.9.4-nightly-20150209/lwjgl-platform-2.9.4-nightly-20150209.jar",
|
||||||
|
"url": "https://libraries.minecraft.net/org/lwjgl/lwjgl/lwjgl-platform/2.9.4-nightly-20150209/lwjgl-platform-2.9.4-nightly-20150209.jar"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "org.lwjgl.lwjgl:lwjgl:2.9.2-nightly-20140822",
|
||||||
|
"rules": [
|
||||||
|
{
|
||||||
|
"action": "allow",
|
||||||
|
"os": {
|
||||||
|
"name": "osx"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"downloads": {
|
||||||
|
"artifact": {
|
||||||
|
"size": 1045632,
|
||||||
|
"sha1": "7707204c9ffa5d91662de95f0a224e2f721b22af",
|
||||||
|
"path": "org/lwjgl/lwjgl/lwjgl/2.9.2-nightly-20140822/lwjgl-2.9.2-nightly-20140822.jar",
|
||||||
|
"url": "https://libraries.minecraft.net/org/lwjgl/lwjgl/lwjgl/2.9.2-nightly-20140822/lwjgl-2.9.2-nightly-20140822.jar"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "org.lwjgl.lwjgl:lwjgl_util:2.9.2-nightly-20140822",
|
||||||
|
"rules": [
|
||||||
|
{
|
||||||
|
"action": "allow",
|
||||||
|
"os": {
|
||||||
|
"name": "osx"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"downloads": {
|
||||||
|
"artifact": {
|
||||||
|
"size": 173887,
|
||||||
|
"sha1": "f0e612c840a7639c1f77f68d72a28dae2f0c8490",
|
||||||
|
"path": "org/lwjgl/lwjgl/lwjgl_util/2.9.2-nightly-20140822/lwjgl_util-2.9.2-nightly-20140822.jar",
|
||||||
|
"url": "https://libraries.minecraft.net/org/lwjgl/lwjgl/lwjgl_util/2.9.2-nightly-20140822/lwjgl_util-2.9.2-nightly-20140822.jar"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"extract": {
|
||||||
|
"exclude": [
|
||||||
|
"META-INF/"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"name": "org.lwjgl.lwjgl:lwjgl-platform:2.9.2-nightly-20140822",
|
||||||
|
"natives": {
|
||||||
|
"linux": "natives-linux",
|
||||||
|
"osx": "natives-osx",
|
||||||
|
"windows": "natives-windows"
|
||||||
|
},
|
||||||
|
"rules": [
|
||||||
|
{
|
||||||
|
"action": "allow",
|
||||||
|
"os": {
|
||||||
|
"name": "osx"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"downloads": {
|
||||||
|
"classifiers": {
|
||||||
|
"natives-linux": {
|
||||||
|
"size": 578539,
|
||||||
|
"sha1": "d898a33b5d0a6ef3fed3a4ead506566dce6720a5",
|
||||||
|
"path": "org/lwjgl/lwjgl/lwjgl-platform/2.9.2-nightly-20140822/lwjgl-platform-2.9.2-nightly-20140822-natives-linux.jar",
|
||||||
|
"url": "https://libraries.minecraft.net/org/lwjgl/lwjgl/lwjgl-platform/2.9.2-nightly-20140822/lwjgl-platform-2.9.2-nightly-20140822-natives-linux.jar"
|
||||||
|
},
|
||||||
|
"natives-osx": {
|
||||||
|
"size": 468116,
|
||||||
|
"sha1": "79f5ce2fea02e77fe47a3c745219167a542121d7",
|
||||||
|
"path": "org/lwjgl/lwjgl/lwjgl-platform/2.9.2-nightly-20140822/lwjgl-platform-2.9.2-nightly-20140822-natives-osx.jar",
|
||||||
|
"url": "https://libraries.minecraft.net/org/lwjgl/lwjgl/lwjgl-platform/2.9.2-nightly-20140822/lwjgl-platform-2.9.2-nightly-20140822-natives-osx.jar"
|
||||||
|
},
|
||||||
|
"natives-windows": {
|
||||||
|
"size": 613680,
|
||||||
|
"sha1": "78b2a55ce4dc29c6b3ec4df8ca165eba05f9b341",
|
||||||
|
"path": "org/lwjgl/lwjgl/lwjgl-platform/2.9.2-nightly-20140822/lwjgl-platform-2.9.2-nightly-20140822-natives-windows.jar",
|
||||||
|
"url": "https://libraries.minecraft.net/org/lwjgl/lwjgl/lwjgl-platform/2.9.2-nightly-20140822/lwjgl-platform-2.9.2-nightly-20140822-natives-windows.jar"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"extract": {
|
||||||
|
"exclude": [
|
||||||
|
"META-INF/"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"name": "net.java.jinput:jinput-platform:2.0.5",
|
||||||
|
"natives": {
|
||||||
|
"linux": "natives-linux",
|
||||||
|
"osx": "natives-osx",
|
||||||
|
"windows": "natives-windows"
|
||||||
|
},
|
||||||
|
"downloads": {
|
||||||
|
"classifiers": {
|
||||||
|
"natives-linux": {
|
||||||
|
"size": 10362,
|
||||||
|
"sha1": "7ff832a6eb9ab6a767f1ade2b548092d0fa64795",
|
||||||
|
"path": "net/java/jinput/jinput-platform/2.0.5/jinput-platform-2.0.5-natives-linux.jar",
|
||||||
|
"url": "https://libraries.minecraft.net/net/java/jinput/jinput-platform/2.0.5/jinput-platform-2.0.5-natives-linux.jar"
|
||||||
|
},
|
||||||
|
"natives-osx": {
|
||||||
|
"size": 12186,
|
||||||
|
"sha1": "53f9c919f34d2ca9de8c51fc4e1e8282029a9232",
|
||||||
|
"path": "net/java/jinput/jinput-platform/2.0.5/jinput-platform-2.0.5-natives-osx.jar",
|
||||||
|
"url": "https://libraries.minecraft.net/net/java/jinput/jinput-platform/2.0.5/jinput-platform-2.0.5-natives-osx.jar"
|
||||||
|
},
|
||||||
|
"natives-windows": {
|
||||||
|
"size": 155179,
|
||||||
|
"sha1": "385ee093e01f587f30ee1c8a2ee7d408fd732e16",
|
||||||
|
"path": "net/java/jinput/jinput-platform/2.0.5/jinput-platform-2.0.5-natives-windows.jar",
|
||||||
|
"url": "https://libraries.minecraft.net/net/java/jinput/jinput-platform/2.0.5/jinput-platform-2.0.5-natives-windows.jar"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"logging": {
|
||||||
|
"client": {
|
||||||
|
"file": {
|
||||||
|
"id": "client-1.7.xml",
|
||||||
|
"sha1": "6605d632a2399010c0085d3e4da58974d62ccdfe",
|
||||||
|
"size": 871,
|
||||||
|
"url": "https://launchermeta.mojang.com/mc/log_configs/client-1.7.xml/6605d632a2399010c0085d3e4da58974d62ccdfe/client-1.7.xml"
|
||||||
|
},
|
||||||
|
"argument": "-Dlog4j.configurationFile=${path}",
|
||||||
|
"type": "log4j2-xml"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"mainClass": "net.minecraft.client.main.Main",
|
||||||
|
"minecraftArguments": "--username ${auth_player_name} --version ${version_name} --gameDir ${game_directory} --assetsDir ${assets_root} --assetIndex ${assets_index_name} --uuid ${auth_uuid} --accessToken ${auth_access_token} --userType ${user_type} --versionType ${version_type}",
|
||||||
|
"minimumLauncherVersion": 18,
|
||||||
|
"releaseTime": "2016-12-21T09:29:12+00:00",
|
||||||
|
"time": "2017-04-07T11:44:29+00:00",
|
||||||
|
"type": "release"
|
||||||
|
}
|
||||||
+563
@@ -0,0 +1,563 @@
|
|||||||
|
{
|
||||||
|
"assetIndex": {
|
||||||
|
"id": "1.11",
|
||||||
|
"sha1": "e02b8fba4390e173057895c56ecc91e3ce3bbd40",
|
||||||
|
"size": 157392,
|
||||||
|
"url": "https://launchermeta.mojang.com/mc/assets/1.11/e02b8fba4390e173057895c56ecc91e3ce3bbd40/1.11.json",
|
||||||
|
"totalSize": 124275381
|
||||||
|
},
|
||||||
|
"assets": "1.11",
|
||||||
|
"downloads": {
|
||||||
|
"client": {
|
||||||
|
"sha1": "780e46b3a96091a7f42c028c615af45974629072",
|
||||||
|
"size": 9183701,
|
||||||
|
"url": "https://launcher.mojang.com/mc/game/1.11/client/780e46b3a96091a7f42c028c615af45974629072/client.jar"
|
||||||
|
},
|
||||||
|
"server": {
|
||||||
|
"sha1": "48820c84cb1ed502cb5b2fe23b8153d5e4fa61c0",
|
||||||
|
"size": 9713666,
|
||||||
|
"url": "https://launcher.mojang.com/mc/game/1.11/server/48820c84cb1ed502cb5b2fe23b8153d5e4fa61c0/server.jar"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"id": "1.11",
|
||||||
|
"libraries": [
|
||||||
|
{
|
||||||
|
"name": "com.mojang:netty:1.6",
|
||||||
|
"downloads": {
|
||||||
|
"artifact": {
|
||||||
|
"size": 7877,
|
||||||
|
"sha1": "4b75825a06139752bd800d9e29c5fd55b8b1b1e4",
|
||||||
|
"path": "com/mojang/netty/1.6/netty-1.6.jar",
|
||||||
|
"url": "https://libraries.minecraft.net/com/mojang/netty/1.6/netty-1.6.jar"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "oshi-project:oshi-core:1.1",
|
||||||
|
"downloads": {
|
||||||
|
"artifact": {
|
||||||
|
"size": 30973,
|
||||||
|
"sha1": "9ddf7b048a8d701be231c0f4f95fd986198fd2d8",
|
||||||
|
"path": "oshi-project/oshi-core/1.1/oshi-core-1.1.jar",
|
||||||
|
"url": "https://libraries.minecraft.net/oshi-project/oshi-core/1.1/oshi-core-1.1.jar"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "net.java.dev.jna:jna:3.4.0",
|
||||||
|
"downloads": {
|
||||||
|
"artifact": {
|
||||||
|
"size": 1008730,
|
||||||
|
"sha1": "803ff252fedbd395baffd43b37341dc4a150a554",
|
||||||
|
"path": "net/java/dev/jna/jna/3.4.0/jna-3.4.0.jar",
|
||||||
|
"url": "https://libraries.minecraft.net/net/java/dev/jna/jna/3.4.0/jna-3.4.0.jar"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "net.java.dev.jna:platform:3.4.0",
|
||||||
|
"downloads": {
|
||||||
|
"artifact": {
|
||||||
|
"size": 913436,
|
||||||
|
"sha1": "e3f70017be8100d3d6923f50b3d2ee17714e9c13",
|
||||||
|
"path": "net/java/dev/jna/platform/3.4.0/platform-3.4.0.jar",
|
||||||
|
"url": "https://libraries.minecraft.net/net/java/dev/jna/platform/3.4.0/platform-3.4.0.jar"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "com.ibm.icu:icu4j-core-mojang:51.2",
|
||||||
|
"downloads": {
|
||||||
|
"artifact": {
|
||||||
|
"size": 1634692,
|
||||||
|
"sha1": "63d216a9311cca6be337c1e458e587f99d382b84",
|
||||||
|
"path": "com/ibm/icu/icu4j-core-mojang/51.2/icu4j-core-mojang-51.2.jar",
|
||||||
|
"url": "https://libraries.minecraft.net/com/ibm/icu/icu4j-core-mojang/51.2/icu4j-core-mojang-51.2.jar"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "net.sf.jopt-simple:jopt-simple:4.6",
|
||||||
|
"downloads": {
|
||||||
|
"artifact": {
|
||||||
|
"size": 62477,
|
||||||
|
"sha1": "306816fb57cf94f108a43c95731b08934dcae15c",
|
||||||
|
"path": "net/sf/jopt-simple/jopt-simple/4.6/jopt-simple-4.6.jar",
|
||||||
|
"url": "https://libraries.minecraft.net/net/sf/jopt-simple/jopt-simple/4.6/jopt-simple-4.6.jar"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "com.paulscode:codecjorbis:20101023",
|
||||||
|
"downloads": {
|
||||||
|
"artifact": {
|
||||||
|
"size": 103871,
|
||||||
|
"sha1": "c73b5636faf089d9f00e8732a829577de25237ee",
|
||||||
|
"path": "com/paulscode/codecjorbis/20101023/codecjorbis-20101023.jar",
|
||||||
|
"url": "https://libraries.minecraft.net/com/paulscode/codecjorbis/20101023/codecjorbis-20101023.jar"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "com.paulscode:codecwav:20101023",
|
||||||
|
"downloads": {
|
||||||
|
"artifact": {
|
||||||
|
"size": 5618,
|
||||||
|
"sha1": "12f031cfe88fef5c1dd36c563c0a3a69bd7261da",
|
||||||
|
"path": "com/paulscode/codecwav/20101023/codecwav-20101023.jar",
|
||||||
|
"url": "https://libraries.minecraft.net/com/paulscode/codecwav/20101023/codecwav-20101023.jar"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "com.paulscode:libraryjavasound:20101123",
|
||||||
|
"downloads": {
|
||||||
|
"artifact": {
|
||||||
|
"size": 21679,
|
||||||
|
"sha1": "5c5e304366f75f9eaa2e8cca546a1fb6109348b3",
|
||||||
|
"path": "com/paulscode/libraryjavasound/20101123/libraryjavasound-20101123.jar",
|
||||||
|
"url": "https://libraries.minecraft.net/com/paulscode/libraryjavasound/20101123/libraryjavasound-20101123.jar"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "com.paulscode:librarylwjglopenal:20100824",
|
||||||
|
"downloads": {
|
||||||
|
"artifact": {
|
||||||
|
"size": 18981,
|
||||||
|
"sha1": "73e80d0794c39665aec3f62eee88ca91676674ef",
|
||||||
|
"path": "com/paulscode/librarylwjglopenal/20100824/librarylwjglopenal-20100824.jar",
|
||||||
|
"url": "https://libraries.minecraft.net/com/paulscode/librarylwjglopenal/20100824/librarylwjglopenal-20100824.jar"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "com.paulscode:soundsystem:20120107",
|
||||||
|
"downloads": {
|
||||||
|
"artifact": {
|
||||||
|
"size": 65020,
|
||||||
|
"sha1": "419c05fe9be71f792b2d76cfc9b67f1ed0fec7f6",
|
||||||
|
"path": "com/paulscode/soundsystem/20120107/soundsystem-20120107.jar",
|
||||||
|
"url": "https://libraries.minecraft.net/com/paulscode/soundsystem/20120107/soundsystem-20120107.jar"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "io.netty:netty-all:4.0.23.Final",
|
||||||
|
"downloads": {
|
||||||
|
"artifact": {
|
||||||
|
"size": 1779991,
|
||||||
|
"sha1": "0294104aaf1781d6a56a07d561e792c5d0c95f45",
|
||||||
|
"path": "io/netty/netty-all/4.0.23.Final/netty-all-4.0.23.Final.jar",
|
||||||
|
"url": "https://libraries.minecraft.net/io/netty/netty-all/4.0.23.Final/netty-all-4.0.23.Final.jar"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "com.google.guava:guava:17.0",
|
||||||
|
"downloads": {
|
||||||
|
"artifact": {
|
||||||
|
"size": 2243036,
|
||||||
|
"sha1": "9c6ef172e8de35fd8d4d8783e4821e57cdef7445",
|
||||||
|
"path": "com/google/guava/guava/17.0/guava-17.0.jar",
|
||||||
|
"url": "https://libraries.minecraft.net/com/google/guava/guava/17.0/guava-17.0.jar"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "org.apache.commons:commons-lang3:3.3.2",
|
||||||
|
"downloads": {
|
||||||
|
"artifact": {
|
||||||
|
"size": 412739,
|
||||||
|
"sha1": "90a3822c38ec8c996e84c16a3477ef632cbc87a3",
|
||||||
|
"path": "org/apache/commons/commons-lang3/3.3.2/commons-lang3-3.3.2.jar",
|
||||||
|
"url": "https://libraries.minecraft.net/org/apache/commons/commons-lang3/3.3.2/commons-lang3-3.3.2.jar"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "commons-io:commons-io:2.4",
|
||||||
|
"downloads": {
|
||||||
|
"artifact": {
|
||||||
|
"size": 185140,
|
||||||
|
"sha1": "b1b6ea3b7e4aa4f492509a4952029cd8e48019ad",
|
||||||
|
"path": "commons-io/commons-io/2.4/commons-io-2.4.jar",
|
||||||
|
"url": "https://libraries.minecraft.net/commons-io/commons-io/2.4/commons-io-2.4.jar"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "commons-codec:commons-codec:1.9",
|
||||||
|
"downloads": {
|
||||||
|
"artifact": {
|
||||||
|
"size": 263965,
|
||||||
|
"sha1": "9ce04e34240f674bc72680f8b843b1457383161a",
|
||||||
|
"path": "commons-codec/commons-codec/1.9/commons-codec-1.9.jar",
|
||||||
|
"url": "https://libraries.minecraft.net/commons-codec/commons-codec/1.9/commons-codec-1.9.jar"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "net.java.jinput:jinput:2.0.5",
|
||||||
|
"downloads": {
|
||||||
|
"artifact": {
|
||||||
|
"size": 208338,
|
||||||
|
"sha1": "39c7796b469a600f72380316f6b1f11db6c2c7c4",
|
||||||
|
"path": "net/java/jinput/jinput/2.0.5/jinput-2.0.5.jar",
|
||||||
|
"url": "https://libraries.minecraft.net/net/java/jinput/jinput/2.0.5/jinput-2.0.5.jar"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "net.java.jutils:jutils:1.0.0",
|
||||||
|
"downloads": {
|
||||||
|
"artifact": {
|
||||||
|
"size": 7508,
|
||||||
|
"sha1": "e12fe1fda814bd348c1579329c86943d2cd3c6a6",
|
||||||
|
"path": "net/java/jutils/jutils/1.0.0/jutils-1.0.0.jar",
|
||||||
|
"url": "https://libraries.minecraft.net/net/java/jutils/jutils/1.0.0/jutils-1.0.0.jar"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "com.google.code.gson:gson:2.2.4",
|
||||||
|
"downloads": {
|
||||||
|
"artifact": {
|
||||||
|
"size": 190432,
|
||||||
|
"sha1": "a60a5e993c98c864010053cb901b7eab25306568",
|
||||||
|
"path": "com/google/code/gson/gson/2.2.4/gson-2.2.4.jar",
|
||||||
|
"url": "https://libraries.minecraft.net/com/google/code/gson/gson/2.2.4/gson-2.2.4.jar"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "com.mojang:authlib:1.5.24",
|
||||||
|
"downloads": {
|
||||||
|
"artifact": {
|
||||||
|
"size": 64353,
|
||||||
|
"sha1": "0889ff5477b844800cff734babbf42c1bbda4b10",
|
||||||
|
"path": "com/mojang/authlib/1.5.24/authlib-1.5.24.jar",
|
||||||
|
"url": "https://libraries.minecraft.net/com/mojang/authlib/1.5.24/authlib-1.5.24.jar"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "com.mojang:realms:1.10.4",
|
||||||
|
"downloads": {
|
||||||
|
"artifact": {
|
||||||
|
"size": 3025166,
|
||||||
|
"sha1": "7e837a5eae3fc08b13d5e1baf5ddf5b5d31aa2ff",
|
||||||
|
"path": "com/mojang/realms/1.10.4/realms-1.10.4.jar",
|
||||||
|
"url": "https://libraries.minecraft.net/com/mojang/realms/1.10.4/realms-1.10.4.jar"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "org.apache.commons:commons-compress:1.8.1",
|
||||||
|
"downloads": {
|
||||||
|
"artifact": {
|
||||||
|
"size": 365552,
|
||||||
|
"sha1": "a698750c16740fd5b3871425f4cb3bbaa87f529d",
|
||||||
|
"path": "org/apache/commons/commons-compress/1.8.1/commons-compress-1.8.1.jar",
|
||||||
|
"url": "https://libraries.minecraft.net/org/apache/commons/commons-compress/1.8.1/commons-compress-1.8.1.jar"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "org.apache.httpcomponents:httpclient:4.3.3",
|
||||||
|
"downloads": {
|
||||||
|
"artifact": {
|
||||||
|
"size": 589512,
|
||||||
|
"sha1": "18f4247ff4572a074444572cee34647c43e7c9c7",
|
||||||
|
"path": "org/apache/httpcomponents/httpclient/4.3.3/httpclient-4.3.3.jar",
|
||||||
|
"url": "https://libraries.minecraft.net/org/apache/httpcomponents/httpclient/4.3.3/httpclient-4.3.3.jar"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "commons-logging:commons-logging:1.1.3",
|
||||||
|
"downloads": {
|
||||||
|
"artifact": {
|
||||||
|
"size": 62050,
|
||||||
|
"sha1": "f6f66e966c70a83ffbdb6f17a0919eaf7c8aca7f",
|
||||||
|
"path": "commons-logging/commons-logging/1.1.3/commons-logging-1.1.3.jar",
|
||||||
|
"url": "https://libraries.minecraft.net/commons-logging/commons-logging/1.1.3/commons-logging-1.1.3.jar"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "org.apache.httpcomponents:httpcore:4.3.2",
|
||||||
|
"downloads": {
|
||||||
|
"artifact": {
|
||||||
|
"size": 282269,
|
||||||
|
"sha1": "31fbbff1ddbf98f3aa7377c94d33b0447c646b6e",
|
||||||
|
"path": "org/apache/httpcomponents/httpcore/4.3.2/httpcore-4.3.2.jar",
|
||||||
|
"url": "https://libraries.minecraft.net/org/apache/httpcomponents/httpcore/4.3.2/httpcore-4.3.2.jar"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "it.unimi.dsi:fastutil:7.0.12_mojang",
|
||||||
|
"downloads": {
|
||||||
|
"artifact": {
|
||||||
|
"size": 522306,
|
||||||
|
"sha1": "ba787e741efdc425fc5d2ea654b57c15fba27efa",
|
||||||
|
"path": "it/unimi/dsi/fastutil/7.0.12_mojang/fastutil-7.0.12_mojang.jar",
|
||||||
|
"url": "https://libraries.minecraft.net/it/unimi/dsi/fastutil/7.0.12_mojang/fastutil-7.0.12_mojang.jar"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "org.apache.logging.log4j:log4j-api:2.0-beta9",
|
||||||
|
"downloads": {
|
||||||
|
"artifact": {
|
||||||
|
"size": 108161,
|
||||||
|
"sha1": "1dd66e68cccd907880229f9e2de1314bd13ff785",
|
||||||
|
"path": "org/apache/logging/log4j/log4j-api/2.0-beta9/log4j-api-2.0-beta9.jar",
|
||||||
|
"url": "https://libraries.minecraft.net/org/apache/logging/log4j/log4j-api/2.0-beta9/log4j-api-2.0-beta9.jar"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "org.apache.logging.log4j:log4j-core:2.0-beta9",
|
||||||
|
"downloads": {
|
||||||
|
"artifact": {
|
||||||
|
"size": 681134,
|
||||||
|
"sha1": "678861ba1b2e1fccb594bb0ca03114bb05da9695",
|
||||||
|
"path": "org/apache/logging/log4j/log4j-core/2.0-beta9/log4j-core-2.0-beta9.jar",
|
||||||
|
"url": "https://libraries.minecraft.net/org/apache/logging/log4j/log4j-core/2.0-beta9/log4j-core-2.0-beta9.jar"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "org.lwjgl.lwjgl:lwjgl:2.9.4-nightly-20150209",
|
||||||
|
"rules": [
|
||||||
|
{
|
||||||
|
"action": "allow"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"action": "disallow",
|
||||||
|
"os": {
|
||||||
|
"name": "osx"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"downloads": {
|
||||||
|
"artifact": {
|
||||||
|
"size": 1047168,
|
||||||
|
"sha1": "697517568c68e78ae0b4544145af031c81082dfe",
|
||||||
|
"path": "org/lwjgl/lwjgl/lwjgl/2.9.4-nightly-20150209/lwjgl-2.9.4-nightly-20150209.jar",
|
||||||
|
"url": "https://libraries.minecraft.net/org/lwjgl/lwjgl/lwjgl/2.9.4-nightly-20150209/lwjgl-2.9.4-nightly-20150209.jar"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "org.lwjgl.lwjgl:lwjgl_util:2.9.4-nightly-20150209",
|
||||||
|
"rules": [
|
||||||
|
{
|
||||||
|
"action": "allow"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"action": "disallow",
|
||||||
|
"os": {
|
||||||
|
"name": "osx"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"downloads": {
|
||||||
|
"artifact": {
|
||||||
|
"size": 173887,
|
||||||
|
"sha1": "d51a7c040a721d13efdfbd34f8b257b2df882ad0",
|
||||||
|
"path": "org/lwjgl/lwjgl/lwjgl_util/2.9.4-nightly-20150209/lwjgl_util-2.9.4-nightly-20150209.jar",
|
||||||
|
"url": "https://libraries.minecraft.net/org/lwjgl/lwjgl/lwjgl_util/2.9.4-nightly-20150209/lwjgl_util-2.9.4-nightly-20150209.jar"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"extract": {
|
||||||
|
"exclude": [
|
||||||
|
"META-INF/"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"name": "org.lwjgl.lwjgl:lwjgl-platform:2.9.4-nightly-20150209",
|
||||||
|
"natives": {
|
||||||
|
"linux": "natives-linux",
|
||||||
|
"osx": "natives-osx",
|
||||||
|
"windows": "natives-windows"
|
||||||
|
},
|
||||||
|
"rules": [
|
||||||
|
{
|
||||||
|
"action": "allow"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"action": "disallow",
|
||||||
|
"os": {
|
||||||
|
"name": "osx"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"downloads": {
|
||||||
|
"classifiers": {
|
||||||
|
"natives-linux": {
|
||||||
|
"size": 578680,
|
||||||
|
"sha1": "931074f46c795d2f7b30ed6395df5715cfd7675b",
|
||||||
|
"path": "org/lwjgl/lwjgl/lwjgl-platform/2.9.4-nightly-20150209/lwjgl-platform-2.9.4-nightly-20150209-natives-linux.jar",
|
||||||
|
"url": "https://libraries.minecraft.net/org/lwjgl/lwjgl/lwjgl-platform/2.9.4-nightly-20150209/lwjgl-platform-2.9.4-nightly-20150209-natives-linux.jar"
|
||||||
|
},
|
||||||
|
"natives-osx": {
|
||||||
|
"size": 426822,
|
||||||
|
"sha1": "bcab850f8f487c3f4c4dbabde778bb82bd1a40ed",
|
||||||
|
"path": "org/lwjgl/lwjgl/lwjgl-platform/2.9.4-nightly-20150209/lwjgl-platform-2.9.4-nightly-20150209-natives-osx.jar",
|
||||||
|
"url": "https://libraries.minecraft.net/org/lwjgl/lwjgl/lwjgl-platform/2.9.4-nightly-20150209/lwjgl-platform-2.9.4-nightly-20150209-natives-osx.jar"
|
||||||
|
},
|
||||||
|
"natives-windows": {
|
||||||
|
"size": 613748,
|
||||||
|
"sha1": "b84d5102b9dbfabfeb5e43c7e2828d98a7fc80e0",
|
||||||
|
"path": "org/lwjgl/lwjgl/lwjgl-platform/2.9.4-nightly-20150209/lwjgl-platform-2.9.4-nightly-20150209-natives-windows.jar",
|
||||||
|
"url": "https://libraries.minecraft.net/org/lwjgl/lwjgl/lwjgl-platform/2.9.4-nightly-20150209/lwjgl-platform-2.9.4-nightly-20150209-natives-windows.jar"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"artifact": {
|
||||||
|
"size": 22,
|
||||||
|
"sha1": "b04f3ee8f5e43fa3b162981b50bb72fe1acabb33",
|
||||||
|
"path": "org/lwjgl/lwjgl/lwjgl-platform/2.9.4-nightly-20150209/lwjgl-platform-2.9.4-nightly-20150209.jar",
|
||||||
|
"url": "https://libraries.minecraft.net/org/lwjgl/lwjgl/lwjgl-platform/2.9.4-nightly-20150209/lwjgl-platform-2.9.4-nightly-20150209.jar"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "org.lwjgl.lwjgl:lwjgl:2.9.2-nightly-20140822",
|
||||||
|
"rules": [
|
||||||
|
{
|
||||||
|
"action": "allow",
|
||||||
|
"os": {
|
||||||
|
"name": "osx"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"downloads": {
|
||||||
|
"artifact": {
|
||||||
|
"size": 1045632,
|
||||||
|
"sha1": "7707204c9ffa5d91662de95f0a224e2f721b22af",
|
||||||
|
"path": "org/lwjgl/lwjgl/lwjgl/2.9.2-nightly-20140822/lwjgl-2.9.2-nightly-20140822.jar",
|
||||||
|
"url": "https://libraries.minecraft.net/org/lwjgl/lwjgl/lwjgl/2.9.2-nightly-20140822/lwjgl-2.9.2-nightly-20140822.jar"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "org.lwjgl.lwjgl:lwjgl_util:2.9.2-nightly-20140822",
|
||||||
|
"rules": [
|
||||||
|
{
|
||||||
|
"action": "allow",
|
||||||
|
"os": {
|
||||||
|
"name": "osx"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"downloads": {
|
||||||
|
"artifact": {
|
||||||
|
"size": 173887,
|
||||||
|
"sha1": "f0e612c840a7639c1f77f68d72a28dae2f0c8490",
|
||||||
|
"path": "org/lwjgl/lwjgl/lwjgl_util/2.9.2-nightly-20140822/lwjgl_util-2.9.2-nightly-20140822.jar",
|
||||||
|
"url": "https://libraries.minecraft.net/org/lwjgl/lwjgl/lwjgl_util/2.9.2-nightly-20140822/lwjgl_util-2.9.2-nightly-20140822.jar"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"extract": {
|
||||||
|
"exclude": [
|
||||||
|
"META-INF/"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"name": "org.lwjgl.lwjgl:lwjgl-platform:2.9.2-nightly-20140822",
|
||||||
|
"natives": {
|
||||||
|
"linux": "natives-linux",
|
||||||
|
"osx": "natives-osx",
|
||||||
|
"windows": "natives-windows"
|
||||||
|
},
|
||||||
|
"rules": [
|
||||||
|
{
|
||||||
|
"action": "allow",
|
||||||
|
"os": {
|
||||||
|
"name": "osx"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"downloads": {
|
||||||
|
"classifiers": {
|
||||||
|
"natives-linux": {
|
||||||
|
"size": 578539,
|
||||||
|
"sha1": "d898a33b5d0a6ef3fed3a4ead506566dce6720a5",
|
||||||
|
"path": "org/lwjgl/lwjgl/lwjgl-platform/2.9.2-nightly-20140822/lwjgl-platform-2.9.2-nightly-20140822-natives-linux.jar",
|
||||||
|
"url": "https://libraries.minecraft.net/org/lwjgl/lwjgl/lwjgl-platform/2.9.2-nightly-20140822/lwjgl-platform-2.9.2-nightly-20140822-natives-linux.jar"
|
||||||
|
},
|
||||||
|
"natives-osx": {
|
||||||
|
"size": 468116,
|
||||||
|
"sha1": "79f5ce2fea02e77fe47a3c745219167a542121d7",
|
||||||
|
"path": "org/lwjgl/lwjgl/lwjgl-platform/2.9.2-nightly-20140822/lwjgl-platform-2.9.2-nightly-20140822-natives-osx.jar",
|
||||||
|
"url": "https://libraries.minecraft.net/org/lwjgl/lwjgl/lwjgl-platform/2.9.2-nightly-20140822/lwjgl-platform-2.9.2-nightly-20140822-natives-osx.jar"
|
||||||
|
},
|
||||||
|
"natives-windows": {
|
||||||
|
"size": 613680,
|
||||||
|
"sha1": "78b2a55ce4dc29c6b3ec4df8ca165eba05f9b341",
|
||||||
|
"path": "org/lwjgl/lwjgl/lwjgl-platform/2.9.2-nightly-20140822/lwjgl-platform-2.9.2-nightly-20140822-natives-windows.jar",
|
||||||
|
"url": "https://libraries.minecraft.net/org/lwjgl/lwjgl/lwjgl-platform/2.9.2-nightly-20140822/lwjgl-platform-2.9.2-nightly-20140822-natives-windows.jar"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"extract": {
|
||||||
|
"exclude": [
|
||||||
|
"META-INF/"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"name": "net.java.jinput:jinput-platform:2.0.5",
|
||||||
|
"natives": {
|
||||||
|
"linux": "natives-linux",
|
||||||
|
"osx": "natives-osx",
|
||||||
|
"windows": "natives-windows"
|
||||||
|
},
|
||||||
|
"downloads": {
|
||||||
|
"classifiers": {
|
||||||
|
"natives-linux": {
|
||||||
|
"size": 10362,
|
||||||
|
"sha1": "7ff832a6eb9ab6a767f1ade2b548092d0fa64795",
|
||||||
|
"path": "net/java/jinput/jinput-platform/2.0.5/jinput-platform-2.0.5-natives-linux.jar",
|
||||||
|
"url": "https://libraries.minecraft.net/net/java/jinput/jinput-platform/2.0.5/jinput-platform-2.0.5-natives-linux.jar"
|
||||||
|
},
|
||||||
|
"natives-osx": {
|
||||||
|
"size": 12186,
|
||||||
|
"sha1": "53f9c919f34d2ca9de8c51fc4e1e8282029a9232",
|
||||||
|
"path": "net/java/jinput/jinput-platform/2.0.5/jinput-platform-2.0.5-natives-osx.jar",
|
||||||
|
"url": "https://libraries.minecraft.net/net/java/jinput/jinput-platform/2.0.5/jinput-platform-2.0.5-natives-osx.jar"
|
||||||
|
},
|
||||||
|
"natives-windows": {
|
||||||
|
"size": 155179,
|
||||||
|
"sha1": "385ee093e01f587f30ee1c8a2ee7d408fd732e16",
|
||||||
|
"path": "net/java/jinput/jinput-platform/2.0.5/jinput-platform-2.0.5-natives-windows.jar",
|
||||||
|
"url": "https://libraries.minecraft.net/net/java/jinput/jinput-platform/2.0.5/jinput-platform-2.0.5-natives-windows.jar"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"logging": {
|
||||||
|
"client": {
|
||||||
|
"file": {
|
||||||
|
"id": "client-1.7.xml",
|
||||||
|
"sha1": "49e2e41bc339698bd8199e0da9398c926e68c95d",
|
||||||
|
"size": 467,
|
||||||
|
"url": "https://launchermeta.mojang.com/mc/log_configs/client-1.7.xml/49e2e41bc339698bd8199e0da9398c926e68c95d/client-1.7.xml"
|
||||||
|
},
|
||||||
|
"argument": "-Dlog4j.configurationFile=${path}",
|
||||||
|
"type": "log4j2-xml"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"mainClass": "net.minecraft.client.main.Main",
|
||||||
|
"minecraftArguments": "--username ${auth_player_name} --version ${version_name} --gameDir ${game_directory} --assetsDir ${assets_root} --assetIndex ${assets_index_name} --uuid ${auth_uuid} --accessToken ${auth_access_token} --userType ${user_type} --versionType ${version_type}",
|
||||||
|
"minimumLauncherVersion": 18,
|
||||||
|
"releaseTime": "2016-11-14T14:34:40+00:00",
|
||||||
|
"time": "2016-11-16T14:39:37+00:00",
|
||||||
|
"type": "release"
|
||||||
|
}
|
||||||
+12
-17
@@ -1,29 +1,25 @@
|
|||||||
|
|
||||||
// For those who want the bleeding edge
|
|
||||||
buildscript {
|
buildscript {
|
||||||
repositories {
|
repositories {
|
||||||
jcenter()
|
jcenter()
|
||||||
maven {
|
maven { url = "http://files.minecraftforge.net/maven" }
|
||||||
name = "forge"
|
|
||||||
url = "http://files.minecraftforge.net/maven"
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
dependencies {
|
dependencies {
|
||||||
classpath 'net.minecraftforge.gradle:ForgeGradle:2.2-SNAPSHOT'
|
classpath 'net.minecraftforge.gradle:ForgeGradle:2.2-SNAPSHOT'
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
apply plugin: 'net.minecraftforge.gradle.forge'
|
apply plugin: 'net.minecraftforge.gradle.forge'
|
||||||
|
//Only edit below this line, the above code adds and enables the necessary things for Forge to be setup.
|
||||||
|
|
||||||
|
|
||||||
/*
|
|
||||||
// for people who want stable - not yet functional for MC 1.8.8 - we require the forgegradle 2.1 snapshot
|
|
||||||
plugins {
|
|
||||||
id "net.minecraftforge.gradle.forge" version "2.0.2"
|
|
||||||
}
|
|
||||||
*/
|
|
||||||
version = "1.0"
|
version = "1.0"
|
||||||
group= "com.yourname.modid" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
|
group = "com.yourname.modid" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
|
||||||
archivesBaseName = "modid"
|
archivesBaseName = "modid"
|
||||||
|
|
||||||
|
sourceCompatibility = targetCompatibility = "1.6" // Need this here so eclipse task generates correctly.
|
||||||
|
compileJava {
|
||||||
|
sourceCompatibility = targetCompatibility = "1.6"
|
||||||
|
}
|
||||||
|
|
||||||
minecraft {
|
minecraft {
|
||||||
version = "@VERSION@"
|
version = "@VERSION@"
|
||||||
runDir = "run"
|
runDir = "run"
|
||||||
@@ -31,7 +27,7 @@ minecraft {
|
|||||||
// the mappings can be changed at any time, and must be in the following format.
|
// the mappings can be changed at any time, and must be in the following format.
|
||||||
// snapshot_YYYYMMDD snapshot are built nightly.
|
// snapshot_YYYYMMDD snapshot are built nightly.
|
||||||
// stable_# stables are built at the discretion of the MCP team.
|
// stable_# stables are built at the discretion of the MCP team.
|
||||||
// Use non-default mappings at your own risk. they may not allways work.
|
// Use non-default mappings at your own risk. they may not always work.
|
||||||
// simply re-run your setup task after changing the mappings to update your workspace.
|
// simply re-run your setup task after changing the mappings to update your workspace.
|
||||||
mappings = "@MAPPINGS@"
|
mappings = "@MAPPINGS@"
|
||||||
// makeObfSourceJar = false // an Srg named sources jar is made by default. uncomment this to disable.
|
// makeObfSourceJar = false // an Srg named sources jar is made by default. uncomment this to disable.
|
||||||
@@ -61,8 +57,7 @@ dependencies {
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
processResources
|
processResources {
|
||||||
{
|
|
||||||
// this will ensure that this task is redone when the versions change.
|
// this will ensure that this task is redone when the versions change.
|
||||||
inputs.property "version", project.version
|
inputs.property "version", project.version
|
||||||
inputs.property "mcversion", project.minecraft.version
|
inputs.property "mcversion", project.minecraft.version
|
||||||
@@ -75,7 +70,7 @@ processResources
|
|||||||
expand 'version':project.version, 'mcversion':project.minecraft.version
|
expand 'version':project.version, 'mcversion':project.minecraft.version
|
||||||
}
|
}
|
||||||
|
|
||||||
// copy everything else, thats not the mcmod.info
|
// copy everything else except the mcmod.info
|
||||||
from(sourceSets.main.resources.srcDirs) {
|
from(sourceSets.main.resources.srcDirs) {
|
||||||
exclude 'mcmod.info'
|
exclude 'mcmod.info'
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,3 @@
|
|||||||
|
# Sets default memory used for gradle commands. Can be overridden by user or command line properties.
|
||||||
|
# This is required to provide enough memory for the Minecraft decompilation process.
|
||||||
|
org.gradle.jvmargs=-Xmx3G
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
{
|
||||||
|
"pack": {
|
||||||
|
"description": "examplemod resources",
|
||||||
|
"pack_format": 3,
|
||||||
|
"_comment": "A pack_format of 3 should be used starting with Minecraft 1.11. All resources, including language files, should be lowercase (eg: en_us.lang). A pack_format of 2 will load your mod resources with LegacyV2Adapter, which requires language files to have uppercase letters (eg: en_US.lang)."
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
--- ../src-base/minecraft/net/minecraft/block/Block.java
|
--- ../src-base/minecraft/net/minecraft/block/Block.java
|
||||||
+++ ../src-work/minecraft/net/minecraft/block/Block.java
|
+++ ../src-work/minecraft/net/minecraft/block/Block.java
|
||||||
@@ -44,11 +44,12 @@
|
@@ -50,11 +50,12 @@
|
||||||
import net.minecraftforge.fml.relauncher.Side;
|
import net.minecraftforge.fml.relauncher.Side;
|
||||||
import net.minecraftforge.fml.relauncher.SideOnly;
|
import net.minecraftforge.fml.relauncher.SideOnly;
|
||||||
|
|
||||||
@@ -14,19 +14,17 @@
|
|||||||
+ @Deprecated //Modders: DO NOT use this! Use GameRegistry
|
+ @Deprecated //Modders: DO NOT use this! Use GameRegistry
|
||||||
+ public static final ObjectIntIdentityMap<IBlockState> field_176229_d = net.minecraftforge.fml.common.registry.GameData.getBlockStateIDMap();
|
+ public static final ObjectIntIdentityMap<IBlockState> field_176229_d = net.minecraftforge.fml.common.registry.GameData.getBlockStateIDMap();
|
||||||
public static final AxisAlignedBB field_185505_j = new AxisAlignedBB(0.0D, 0.0D, 0.0D, 1.0D, 1.0D, 1.0D);
|
public static final AxisAlignedBB field_185505_j = new AxisAlignedBB(0.0D, 0.0D, 0.0D, 1.0D, 1.0D, 1.0D);
|
||||||
|
@Nullable
|
||||||
public static final AxisAlignedBB field_185506_k = null;
|
public static final AxisAlignedBB field_185506_k = null;
|
||||||
private CreativeTabs field_149772_a;
|
@@ -73,6 +74,7 @@
|
||||||
@@ -84,7 +85,8 @@
|
public float field_149763_I;
|
||||||
|
protected final Material field_149764_J;
|
||||||
public static Block func_149729_e(int p_149729_0_)
|
protected final MapColor field_181083_K;
|
||||||
{
|
+ @Deprecated // Forge: State/world/pos/entity sensitive version below
|
||||||
- return (Block)field_149771_c.func_148754_a(p_149729_0_);
|
public float field_149765_K;
|
||||||
+ Block ret = (Block)field_149771_c.func_148754_a(p_149729_0_);
|
protected final BlockStateContainer field_176227_L;
|
||||||
+ return ret == null ? net.minecraft.init.Blocks.field_150350_a : ret;
|
private IBlockState field_176228_M;
|
||||||
}
|
@@ -307,7 +309,7 @@
|
||||||
|
|
||||||
public static IBlockState func_176220_d(int p_176220_0_)
|
|
||||||
@@ -292,7 +294,7 @@
|
|
||||||
|
|
||||||
public boolean func_176200_f(IBlockAccess p_176200_1_, BlockPos p_176200_2_)
|
public boolean func_176200_f(IBlockAccess p_176200_1_, BlockPos p_176200_2_)
|
||||||
{
|
{
|
||||||
@@ -35,7 +33,7 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
public Block func_149711_c(float p_149711_1_)
|
public Block func_149711_c(float p_149711_1_)
|
||||||
@@ -330,9 +332,10 @@
|
@@ -345,9 +347,10 @@
|
||||||
return this.field_149789_z;
|
return this.field_149789_z;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -47,7 +45,7 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Deprecated
|
@Deprecated
|
||||||
@@ -376,13 +379,13 @@
|
@@ -360,13 +363,13 @@
|
||||||
@SideOnly(Side.CLIENT)
|
@SideOnly(Side.CLIENT)
|
||||||
public int func_185484_c(IBlockState p_185484_1_, IBlockAccess p_185484_2_, BlockPos p_185484_3_)
|
public int func_185484_c(IBlockState p_185484_1_, IBlockAccess p_185484_2_, BlockPos p_185484_3_)
|
||||||
{
|
{
|
||||||
@@ -63,7 +61,7 @@
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@@ -446,7 +449,7 @@
|
@@ -430,7 +433,7 @@
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -71,8 +69,8 @@
|
|||||||
+ return !p_176225_2_.func_180495_p(p_176225_3_.func_177972_a(p_176225_4_)).doesSideBlockRendering(p_176225_2_, p_176225_3_.func_177972_a(p_176225_4_), p_176225_4_.func_176734_d());
|
+ return !p_176225_2_.func_180495_p(p_176225_3_.func_177972_a(p_176225_4_)).doesSideBlockRendering(p_176225_2_, p_176225_3_.func_177972_a(p_176225_4_), p_176225_4_.func_176734_d());
|
||||||
}
|
}
|
||||||
|
|
||||||
@Deprecated
|
public boolean func_176212_b(IBlockAccess p_176212_1_, BlockPos p_176212_2_, EnumFacing p_176212_3_)
|
||||||
@@ -506,6 +509,10 @@
|
@@ -521,6 +524,10 @@
|
||||||
|
|
||||||
public void func_180663_b(World p_180663_1_, BlockPos p_180663_2_, IBlockState p_180663_3_)
|
public void func_180663_b(World p_180663_1_, BlockPos p_180663_2_, IBlockState p_180663_3_)
|
||||||
{
|
{
|
||||||
@@ -83,7 +81,7 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
public int func_149745_a(Random p_149745_1_)
|
public int func_149745_a(Random p_149745_1_)
|
||||||
@@ -522,8 +529,7 @@
|
@@ -536,8 +543,7 @@
|
||||||
@Deprecated
|
@Deprecated
|
||||||
public float func_180647_a(IBlockState p_180647_1_, EntityPlayer p_180647_2_, World p_180647_3_, BlockPos p_180647_4_)
|
public float func_180647_a(IBlockState p_180647_1_, EntityPlayer p_180647_2_, World p_180647_3_, BlockPos p_180647_4_)
|
||||||
{
|
{
|
||||||
@@ -93,7 +91,7 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
public final void func_176226_b(World p_176226_1_, BlockPos p_176226_2_, IBlockState p_176226_3_, int p_176226_4_)
|
public final void func_176226_b(World p_176226_1_, BlockPos p_176226_2_, IBlockState p_176226_3_, int p_176226_4_)
|
||||||
@@ -533,20 +539,16 @@
|
@@ -547,20 +553,17 @@
|
||||||
|
|
||||||
public void func_180653_a(World p_180653_1_, BlockPos p_180653_2_, IBlockState p_180653_3_, float p_180653_4_, int p_180653_5_)
|
public void func_180653_a(World p_180653_1_, BlockPos p_180653_2_, IBlockState p_180653_3_, float p_180653_4_, int p_180653_5_)
|
||||||
{
|
{
|
||||||
@@ -101,7 +99,8 @@
|
|||||||
+ if (!p_180653_1_.field_72995_K && !p_180653_1_.restoringBlockSnapshots) // do not drop items while restoring blockstates, prevents item dupe
|
+ if (!p_180653_1_.field_72995_K && !p_180653_1_.restoringBlockSnapshots) // do not drop items while restoring blockstates, prevents item dupe
|
||||||
{
|
{
|
||||||
- int i = this.func_149679_a(p_180653_5_, p_180653_1_.field_73012_v);
|
- int i = this.func_149679_a(p_180653_5_, p_180653_1_.field_73012_v);
|
||||||
+ java.util.List<ItemStack> items = getDrops(p_180653_1_, p_180653_2_, p_180653_3_, p_180653_5_);
|
+ List<ItemStack> items = NonNullList.func_191196_a();
|
||||||
|
+ items.addAll(getDrops(p_180653_1_, p_180653_2_, p_180653_3_, p_180653_5_));
|
||||||
+ p_180653_4_ = net.minecraftforge.event.ForgeEventFactory.fireBlockHarvesting(items, p_180653_1_, p_180653_2_, p_180653_3_, p_180653_5_, p_180653_4_, false, harvesters.get());
|
+ p_180653_4_ = net.minecraftforge.event.ForgeEventFactory.fireBlockHarvesting(items, p_180653_1_, p_180653_2_, p_180653_3_, p_180653_5_, p_180653_4_, false, harvesters.get());
|
||||||
|
|
||||||
- for (int j = 0; j < i; ++j)
|
- for (int j = 0; j < i; ++j)
|
||||||
@@ -111,7 +110,7 @@
|
|||||||
{
|
{
|
||||||
- Item item = this.func_180660_a(p_180653_3_, p_180653_1_.field_73012_v, p_180653_5_);
|
- Item item = this.func_180660_a(p_180653_3_, p_180653_1_.field_73012_v, p_180653_5_);
|
||||||
-
|
-
|
||||||
- if (item != null)
|
- if (item != Items.field_190931_a)
|
||||||
- {
|
- {
|
||||||
- func_180635_a(p_180653_1_, p_180653_2_, new ItemStack(item, 1, this.func_180651_a(p_180653_3_)));
|
- func_180635_a(p_180653_1_, p_180653_2_, new ItemStack(item, 1, this.func_180651_a(p_180653_3_)));
|
||||||
- }
|
- }
|
||||||
@@ -119,12 +118,12 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -554,8 +556,13 @@
|
@@ -568,8 +571,13 @@
|
||||||
|
|
||||||
public static void func_180635_a(World p_180635_0_, BlockPos p_180635_1_, ItemStack p_180635_2_)
|
public static void func_180635_a(World p_180635_0_, BlockPos p_180635_1_, ItemStack p_180635_2_)
|
||||||
{
|
{
|
||||||
- if (!p_180635_0_.field_72995_K && p_180635_0_.func_82736_K().func_82766_b("doTileDrops"))
|
- if (!p_180635_0_.field_72995_K && !p_180635_2_.func_190926_b() && p_180635_0_.func_82736_K().func_82766_b("doTileDrops"))
|
||||||
+ if (!p_180635_0_.field_72995_K && p_180635_0_.func_82736_K().func_82766_b("doTileDrops") && !p_180635_0_.restoringBlockSnapshots) // do not drop items while restoring blockstates, prevents item dupe
|
+ if (!p_180635_0_.field_72995_K && !p_180635_2_.func_190926_b() && p_180635_0_.func_82736_K().func_82766_b("doTileDrops")&& !p_180635_0_.restoringBlockSnapshots) // do not drop items while restoring blockstates, prevents item dupe
|
||||||
{
|
{
|
||||||
+ if (captureDrops.get())
|
+ if (captureDrops.get())
|
||||||
+ {
|
+ {
|
||||||
@@ -134,7 +133,15 @@
|
|||||||
float f = 0.5F;
|
float f = 0.5F;
|
||||||
double d0 = (double)(p_180635_0_.field_73012_v.nextFloat() * 0.5F) + 0.25D;
|
double d0 = (double)(p_180635_0_.field_73012_v.nextFloat() * 0.5F) + 0.25D;
|
||||||
double d1 = (double)(p_180635_0_.field_73012_v.nextFloat() * 0.5F) + 0.25D;
|
double d1 = (double)(p_180635_0_.field_73012_v.nextFloat() * 0.5F) + 0.25D;
|
||||||
@@ -627,7 +634,7 @@
|
@@ -598,6 +606,7 @@
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
+ @Deprecated //Forge: State sensitive version
|
||||||
|
public float func_149638_a(Entity p_149638_1_)
|
||||||
|
{
|
||||||
|
return this.field_149781_w / 5.0F;
|
||||||
|
@@ -636,7 +645,7 @@
|
||||||
|
|
||||||
public boolean func_176196_c(World p_176196_1_, BlockPos p_176196_2_)
|
public boolean func_176196_c(World p_176196_1_, BlockPos p_176196_2_)
|
||||||
{
|
{
|
||||||
@@ -142,22 +149,31 @@
|
|||||||
+ return p_176196_1_.func_180495_p(p_176196_2_).func_177230_c().func_176200_f(p_176196_1_, p_176196_2_);
|
+ return p_176196_1_.func_180495_p(p_176196_2_).func_177230_c().func_176200_f(p_176196_1_, p_176196_2_);
|
||||||
}
|
}
|
||||||
|
|
||||||
public boolean func_180639_a(World p_180639_1_, BlockPos p_180639_2_, IBlockState p_180639_3_, EntityPlayer p_180639_4_, EnumHand p_180639_5_, @Nullable ItemStack p_180639_6_, EnumFacing p_180639_7_, float p_180639_8_, float p_180639_9_, float p_180639_10_)
|
public boolean func_180639_a(World p_180639_1_, BlockPos p_180639_2_, IBlockState p_180639_3_, EntityPlayer p_180639_4_, EnumHand p_180639_5_, EnumFacing p_180639_6_, float p_180639_7_, float p_180639_8_, float p_180639_9_)
|
||||||
@@ -680,25 +687,35 @@
|
@@ -648,6 +657,8 @@
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
+ // Forge: use getStateForPlacement
|
||||||
|
+ @Deprecated
|
||||||
|
public IBlockState func_180642_a(World p_180642_1_, BlockPos p_180642_2_, EnumFacing p_180642_3_, float p_180642_4_, float p_180642_5_, float p_180642_6_, int p_180642_7_, EntityLivingBase p_180642_8_)
|
||||||
|
{
|
||||||
|
return this.func_176203_a(p_180642_7_);
|
||||||
|
@@ -689,21 +700,35 @@
|
||||||
p_180657_2_.func_71029_a(StatList.func_188055_a(this));
|
p_180657_2_.func_71029_a(StatList.func_188055_a(this));
|
||||||
p_180657_2_.func_71020_j(0.025F);
|
p_180657_2_.func_71020_j(0.005F);
|
||||||
|
|
||||||
- if (this.func_149700_E() && EnchantmentHelper.func_77506_a(Enchantments.field_185306_r, p_180657_6_) > 0)
|
- if (this.func_149700_E() && EnchantmentHelper.func_77506_a(Enchantments.field_185306_r, p_180657_6_) > 0)
|
||||||
+ if (this.canSilkHarvest(p_180657_1_, p_180657_3_, p_180657_4_, p_180657_2_) && EnchantmentHelper.func_77506_a(Enchantments.field_185306_r, p_180657_6_) > 0)
|
+ if (this.canSilkHarvest(p_180657_1_, p_180657_3_, p_180657_4_, p_180657_2_) && EnchantmentHelper.func_77506_a(Enchantments.field_185306_r, p_180657_6_) > 0)
|
||||||
{
|
{
|
||||||
+ java.util.List<ItemStack> items = new java.util.ArrayList<ItemStack>();
|
+ java.util.List<ItemStack> items = new java.util.ArrayList<ItemStack>();
|
||||||
ItemStack itemstack = this.func_180643_i(p_180657_4_);
|
ItemStack itemstack = this.func_180643_i(p_180657_4_);
|
||||||
|
- func_180635_a(p_180657_1_, p_180657_3_, itemstack);
|
||||||
if (itemstack != null)
|
+
|
||||||
{
|
+ if (!itemstack.func_190926_b())
|
||||||
- func_180635_a(p_180657_1_, p_180657_3_, itemstack);
|
+ {
|
||||||
+ items.add(itemstack);
|
+ items.add(itemstack);
|
||||||
}
|
+ }
|
||||||
+
|
+
|
||||||
+ net.minecraftforge.event.ForgeEventFactory.fireBlockHarvesting(items, p_180657_1_, p_180657_3_, p_180657_4_, 0, 1.0f, true, p_180657_2_);
|
+ net.minecraftforge.event.ForgeEventFactory.fireBlockHarvesting(items, p_180657_1_, p_180657_3_, p_180657_4_, 0, 1.0f, true, p_180657_2_);
|
||||||
+ for (ItemStack item : items)
|
+ for (ItemStack item : items)
|
||||||
@@ -181,22 +197,25 @@
|
|||||||
+ return this.func_176223_P().func_185917_h() && !this.hasTileEntity(silk_check_state.get());
|
+ return this.func_176223_P().func_185917_h() && !this.hasTileEntity(silk_check_state.get());
|
||||||
}
|
}
|
||||||
|
|
||||||
@Nullable
|
protected ItemStack func_180643_i(IBlockState p_180643_1_)
|
||||||
@@ -794,9 +811,11 @@
|
@@ -789,6 +814,7 @@
|
||||||
|
p_176216_2_.field_70181_x = 0.0D;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Nullable
|
|
||||||
+ @Deprecated // Forge: Use more sensitive version below: getPickBlock
|
+ @Deprecated // Forge: Use more sensitive version below: getPickBlock
|
||||||
public ItemStack func_185473_a(World p_185473_1_, BlockPos p_185473_2_, IBlockState p_185473_3_)
|
public ItemStack func_185473_a(World p_185473_1_, BlockPos p_185473_2_, IBlockState p_185473_3_)
|
||||||
{
|
{
|
||||||
- return new ItemStack(Item.func_150898_a(this), 1, this.func_180651_a(p_185473_3_));
|
return new ItemStack(Item.func_150898_a(this), 1, this.func_180651_a(p_185473_3_));
|
||||||
+ Item item = Item.func_150898_a(this);
|
@@ -893,6 +919,7 @@
|
||||||
+ return item == null ? null : new ItemStack(item, 1, this.func_180651_a(p_185473_3_));
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@SideOnly(Side.CLIENT)
|
+ @Deprecated // Forge - World/state/pos/entity sensitive version below
|
||||||
@@ -893,6 +912,1141 @@
|
public SoundType func_185467_w()
|
||||||
return "Block{" + field_149771_c.func_177774_c(this) + "}";
|
{
|
||||||
|
return this.field_149762_H;
|
||||||
|
@@ -908,6 +935,1249 @@
|
||||||
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
+ /* ======================================== FORGE START =====================================*/
|
+ /* ======================================== FORGE START =====================================*/
|
||||||
@@ -204,8 +223,45 @@
|
|||||||
+ protected ThreadLocal<EntityPlayer> harvesters = new ThreadLocal();
|
+ protected ThreadLocal<EntityPlayer> harvesters = new ThreadLocal();
|
||||||
+ private ThreadLocal<IBlockState> silk_check_state = new ThreadLocal();
|
+ private ThreadLocal<IBlockState> silk_check_state = new ThreadLocal();
|
||||||
+ protected static java.util.Random RANDOM = new java.util.Random(); // Useful for random things without a seed.
|
+ protected static java.util.Random RANDOM = new java.util.Random(); // Useful for random things without a seed.
|
||||||
|
+
|
||||||
+ /**
|
+ /**
|
||||||
+ * Get a light value for the block at the specified coordinates, normal ranges are between 0 and 15
|
+ * Gets the slipperiness at the given location at the given state. Normally
|
||||||
|
+ * between 0 and 1.
|
||||||
|
+ * <p>
|
||||||
|
+ * Note that entities may reduce slipperiness by a certain factor of their own;
|
||||||
|
+ * for {@link net.minecraft.entity.EntityLivingBase}, this is {@code .91}.
|
||||||
|
+ * {@link net.minecraft.entity.item.EntityItem} uses {@code .98}, and
|
||||||
|
+ * {@link net.minecraft.entity.projectile.EntityFishHook} uses {@code .92}.
|
||||||
|
+ *
|
||||||
|
+ * @param state state of the block
|
||||||
|
+ * @param world the world
|
||||||
|
+ * @param pos the position in the world
|
||||||
|
+ * @param entity the entity in question
|
||||||
|
+ * @return the factor by which the entity's motion should be multiplied
|
||||||
|
+ */
|
||||||
|
+ public float getSlipperiness(IBlockState state, IBlockAccess world, BlockPos pos, @Nullable Entity entity)
|
||||||
|
+ {
|
||||||
|
+ return field_149765_K;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ /**
|
||||||
|
+ * Sets the base slipperiness level. Normally between 0 and 1.
|
||||||
|
+ * <p>
|
||||||
|
+ * <b>Calling this method may have no effect on the function of this block</b>,
|
||||||
|
+ * or may not have the expected result. This block is free to caclculate
|
||||||
|
+ * its slipperiness arbitrarily. This method is guaranteed to work on the
|
||||||
|
+ * base {@code Block} class.
|
||||||
|
+ *
|
||||||
|
+ * @param slipperiness the base slipperiness of this block
|
||||||
|
+ * @see #getSlipperiness(IBlockState, IBlockAccess, BlockPos, Entity)
|
||||||
|
+ */
|
||||||
|
+ public void setDefaultSlipperiness(float slipperiness)
|
||||||
|
+ {
|
||||||
|
+ this.field_149765_K = slipperiness;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ /**
|
||||||
|
+ * Get a light value for this block, taking into account the given state and coordinates, normal ranges are between 0 and 15
|
||||||
+ *
|
+ *
|
||||||
+ * @param state Block state
|
+ * @param state Block state
|
||||||
+ * @param world The current world
|
+ * @param world The current world
|
||||||
@@ -214,11 +270,6 @@
|
|||||||
+ */
|
+ */
|
||||||
+ public int getLightValue(IBlockState state, IBlockAccess world, BlockPos pos)
|
+ public int getLightValue(IBlockState state, IBlockAccess world, BlockPos pos)
|
||||||
+ {
|
+ {
|
||||||
+ IBlockState other = world.func_180495_p(pos);
|
|
||||||
+ if (other.func_177230_c() != this)
|
|
||||||
+ {
|
|
||||||
+ return other.getLightValue(world, pos);
|
|
||||||
+ }
|
|
||||||
+ return state.func_185906_d();
|
+ return state.func_185906_d();
|
||||||
+ }
|
+ }
|
||||||
+
|
+
|
||||||
@@ -245,7 +296,7 @@
|
|||||||
+ */
|
+ */
|
||||||
+ public boolean isNormalCube(IBlockState state, IBlockAccess world, BlockPos pos)
|
+ public boolean isNormalCube(IBlockState state, IBlockAccess world, BlockPos pos)
|
||||||
+ {
|
+ {
|
||||||
+ return state.func_185904_a().func_76218_k() && state.func_185917_h() && !state.func_185897_m();
|
+ return state.func_185915_l();
|
||||||
+ }
|
+ }
|
||||||
+
|
+
|
||||||
+ /**
|
+ /**
|
||||||
@@ -346,7 +397,7 @@
|
|||||||
+ * useful for creating pure logic-blocks that will be invisible
|
+ * useful for creating pure logic-blocks that will be invisible
|
||||||
+ * to the player and otherwise interact as air would.
|
+ * to the player and otherwise interact as air would.
|
||||||
+ *
|
+ *
|
||||||
+ * @param sata The current state
|
+ * @param state The current state
|
||||||
+ * @param world The current world
|
+ * @param world The current world
|
||||||
+ * @param pos Block position in world
|
+ * @param pos Block position in world
|
||||||
+ * @return True if the block considered air
|
+ * @return True if the block considered air
|
||||||
@@ -359,8 +410,8 @@
|
|||||||
+ /**
|
+ /**
|
||||||
+ * Determines if the player can harvest this block, obtaining it's drops when the block is destroyed.
|
+ * Determines if the player can harvest this block, obtaining it's drops when the block is destroyed.
|
||||||
+ *
|
+ *
|
||||||
+ * @param player The player damaging the block, may be null
|
+ * @param player The player damaging the block
|
||||||
+ * @param meta The block's current metadata
|
+ * @param pos The block's current position
|
||||||
+ * @return True to spawn the drops
|
+ * @return True to spawn the drops
|
||||||
+ */
|
+ */
|
||||||
+ public boolean canHarvestBlock(IBlockAccess world, BlockPos pos, EntityPlayer player)
|
+ public boolean canHarvestBlock(IBlockAccess world, BlockPos pos, EntityPlayer player)
|
||||||
@@ -442,7 +493,6 @@
|
|||||||
+ *
|
+ *
|
||||||
+ * @param world The current world
|
+ * @param world The current world
|
||||||
+ * @param pos Block position in world
|
+ * @param pos Block position in world
|
||||||
+ * @param metadata The blocks current metadata
|
|
||||||
+ * @param side The face that the fire is coming from
|
+ * @param side The face that the fire is coming from
|
||||||
+ * @return True if this block sustains fire, meaning it will never go out.
|
+ * @return True if this block sustains fire, meaning it will never go out.
|
||||||
+ */
|
+ */
|
||||||
@@ -480,9 +530,10 @@
|
|||||||
+ * Return the same thing you would from that function.
|
+ * Return the same thing you would from that function.
|
||||||
+ * This will fall back to ITileEntityProvider.createNewTileEntity(World) if this block is a ITileEntityProvider
|
+ * This will fall back to ITileEntityProvider.createNewTileEntity(World) if this block is a ITileEntityProvider
|
||||||
+ *
|
+ *
|
||||||
+ * @param metadata The Metadata of the current block
|
+ * @param state The state of the current block
|
||||||
+ * @return A instance of a class extending TileEntity
|
+ * @return A instance of a class extending TileEntity
|
||||||
+ */
|
+ */
|
||||||
|
+ @Nullable
|
||||||
+ public TileEntity createTileEntity(World world, IBlockState state)
|
+ public TileEntity createTileEntity(World world, IBlockState state)
|
||||||
+ {
|
+ {
|
||||||
+ if (isTileProvider)
|
+ if (isTileProvider)
|
||||||
@@ -525,7 +576,7 @@
|
|||||||
+ for(int i = 0; i < count; i++)
|
+ for(int i = 0; i < count; i++)
|
||||||
+ {
|
+ {
|
||||||
+ Item item = this.func_180660_a(state, rand, fortune);
|
+ Item item = this.func_180660_a(state, rand, fortune);
|
||||||
+ if (item != null)
|
+ if (item != Items.field_190931_a)
|
||||||
+ {
|
+ {
|
||||||
+ ret.add(new ItemStack(item, 1, this.func_180651_a(state)));
|
+ ret.add(new ItemStack(item, 1, this.func_180651_a(state)));
|
||||||
+ }
|
+ }
|
||||||
@@ -576,7 +627,7 @@
|
|||||||
+ * @param player The player or camera entity, null in some cases.
|
+ * @param player The player or camera entity, null in some cases.
|
||||||
+ * @return True to treat this as a bed
|
+ * @return True to treat this as a bed
|
||||||
+ */
|
+ */
|
||||||
+ public boolean isBed(IBlockState state, IBlockAccess world, BlockPos pos, Entity player)
|
+ public boolean isBed(IBlockState state, IBlockAccess world, BlockPos pos, @Nullable Entity player)
|
||||||
+ {
|
+ {
|
||||||
+ return this == net.minecraft.init.Blocks.field_150324_C;
|
+ return this == net.minecraft.init.Blocks.field_150324_C;
|
||||||
+ }
|
+ }
|
||||||
@@ -591,7 +642,8 @@
|
|||||||
+ * @param player The player or camera entity, null in some cases.
|
+ * @param player The player or camera entity, null in some cases.
|
||||||
+ * @return The spawn position
|
+ * @return The spawn position
|
||||||
+ */
|
+ */
|
||||||
+ public BlockPos getBedSpawnPosition(IBlockState state, IBlockAccess world, BlockPos pos, EntityPlayer player)
|
+ @Nullable
|
||||||
|
+ public BlockPos getBedSpawnPosition(IBlockState state, IBlockAccess world, BlockPos pos, @Nullable EntityPlayer player)
|
||||||
+ {
|
+ {
|
||||||
+ if (world instanceof World)
|
+ if (world instanceof World)
|
||||||
+ return BlockBed.func_176468_a((World)world, pos, 0);
|
+ return BlockBed.func_176468_a((World)world, pos, 0);
|
||||||
@@ -612,7 +664,7 @@
|
|||||||
+ {
|
+ {
|
||||||
+ IBlockState state = world.func_180495_p(pos);
|
+ IBlockState state = world.func_180495_p(pos);
|
||||||
+ state = state.func_177230_c().func_176221_a(state, world, pos);
|
+ state = state.func_177230_c().func_176221_a(state, world, pos);
|
||||||
+ state = state.func_177226_a(BlockBed.field_176471_b, true);
|
+ state = state.func_177226_a(BlockBed.field_176471_b, occupied);
|
||||||
+ ((World)world).func_180501_a(pos, state, 4);
|
+ ((World)world).func_180501_a(pos, state, 4);
|
||||||
+ }
|
+ }
|
||||||
+ }
|
+ }
|
||||||
@@ -717,7 +769,7 @@
|
|||||||
+ }
|
+ }
|
||||||
+
|
+
|
||||||
+ /**
|
+ /**
|
||||||
+ * Location sensitive version of getExplosionRestance
|
+ * Location sensitive version of getExplosionResistance
|
||||||
+ *
|
+ *
|
||||||
+ * @param world The current world
|
+ * @param world The current world
|
||||||
+ * @param pos Block position in world
|
+ * @param pos Block position in world
|
||||||
@@ -725,7 +777,7 @@
|
|||||||
+ * @param explosion The explosion
|
+ * @param explosion The explosion
|
||||||
+ * @return The amount of the explosion absorbed.
|
+ * @return The amount of the explosion absorbed.
|
||||||
+ */
|
+ */
|
||||||
+ public float getExplosionResistance(World world, BlockPos pos, Entity exploder, Explosion explosion)
|
+ public float getExplosionResistance(World world, BlockPos pos, @Nullable Entity exploder, Explosion explosion)
|
||||||
+ {
|
+ {
|
||||||
+ return func_149638_a(exploder);
|
+ return func_149638_a(exploder);
|
||||||
+ }
|
+ }
|
||||||
@@ -737,7 +789,7 @@
|
|||||||
+ *
|
+ *
|
||||||
+ * @param world The current world
|
+ * @param world The current world
|
||||||
+ * @param pos Block position in world
|
+ * @param pos Block position in world
|
||||||
+ * @param Explosion The explosion instance affecting the block
|
+ * @param explosion The explosion instance affecting the block
|
||||||
+ */
|
+ */
|
||||||
+ public void onBlockExploded(World world, BlockPos pos, Explosion explosion)
|
+ public void onBlockExploded(World world, BlockPos pos, Explosion explosion)
|
||||||
+ {
|
+ {
|
||||||
@@ -755,7 +807,7 @@
|
|||||||
+ * @param side The side that is trying to make the connection, CAN BE NULL
|
+ * @param side The side that is trying to make the connection, CAN BE NULL
|
||||||
+ * @return True to make the connection
|
+ * @return True to make the connection
|
||||||
+ */
|
+ */
|
||||||
+ public boolean canConnectRedstone(IBlockState state, IBlockAccess world, BlockPos pos, EnumFacing side)
|
+ public boolean canConnectRedstone(IBlockState state, IBlockAccess world, BlockPos pos, @Nullable EnumFacing side)
|
||||||
+ {
|
+ {
|
||||||
+ return state.func_185897_m() && side != null;
|
+ return state.func_185897_m() && side != null;
|
||||||
+ }
|
+ }
|
||||||
@@ -781,24 +833,11 @@
|
|||||||
+ }
|
+ }
|
||||||
+ }
|
+ }
|
||||||
+
|
+
|
||||||
+ /** Dont think this exists in 1.8 anymore
|
|
||||||
+ /**
|
|
||||||
+ * Determines if this block should render in this pass.
|
|
||||||
+ *
|
|
||||||
+ * @param pass The pass in question
|
|
||||||
+ * @return True to render
|
|
||||||
+ * /
|
|
||||||
+ public boolean canRenderInPass(int pass)
|
|
||||||
+ {
|
|
||||||
+ return pass == func_149701_w();
|
|
||||||
+ }
|
|
||||||
+ */
|
|
||||||
+
|
|
||||||
+ /**
|
+ /**
|
||||||
+ * Called when a user uses the creative pick block button on this block
|
+ * Called when a user uses the creative pick block button on this block
|
||||||
+ *
|
+ *
|
||||||
+ * @param target The full target the player is looking at
|
+ * @param target The full target the player is looking at
|
||||||
+ * @return A ItemStack to add to the player's inventory, Null if nothing should be added.
|
+ * @return A ItemStack to add to the player's inventory, empty itemstack if nothing should be added.
|
||||||
+ */
|
+ */
|
||||||
+ public ItemStack getPickBlock(IBlockState state, RayTraceResult target, World world, BlockPos pos, EntityPlayer player)
|
+ public ItemStack getPickBlock(IBlockState state, RayTraceResult target, World world, BlockPos pos, EntityPlayer player)
|
||||||
+ {
|
+ {
|
||||||
@@ -891,9 +930,9 @@
|
|||||||
+ IBlockState plant = plantable.getPlant(world, pos.func_177972_a(direction));
|
+ IBlockState plant = plantable.getPlant(world, pos.func_177972_a(direction));
|
||||||
+ net.minecraftforge.common.EnumPlantType plantType = plantable.getPlantType(world, pos.func_177972_a(direction));
|
+ net.minecraftforge.common.EnumPlantType plantType = plantable.getPlantType(world, pos.func_177972_a(direction));
|
||||||
+
|
+
|
||||||
+ if (plant.func_177230_c() == net.minecraft.init.Blocks.field_150434_aF && this == net.minecraft.init.Blocks.field_150434_aF)
|
+ if (plant.func_177230_c() == net.minecraft.init.Blocks.field_150434_aF)
|
||||||
+ {
|
+ {
|
||||||
+ return true;
|
+ return this == net.minecraft.init.Blocks.field_150434_aF || this == net.minecraft.init.Blocks.field_150354_m;
|
||||||
+ }
|
+ }
|
||||||
+
|
+
|
||||||
+ if (plant.func_177230_c() == net.minecraft.init.Blocks.field_150436_aH && this == net.minecraft.init.Blocks.field_150436_aH)
|
+ if (plant.func_177230_c() == net.minecraft.init.Blocks.field_150436_aH && this == net.minecraft.init.Blocks.field_150436_aH)
|
||||||
@@ -908,7 +947,7 @@
|
|||||||
+
|
+
|
||||||
+ switch (plantType)
|
+ switch (plantType)
|
||||||
+ {
|
+ {
|
||||||
+ case Desert: return this == net.minecraft.init.Blocks.field_150354_m || this == net.minecraft.init.Blocks.field_150405_ch || this == net.minecraft.init.Blocks.field_150406_ce || this == net.minecraft.init.Blocks.field_150346_d;
|
+ case Desert: return this == net.minecraft.init.Blocks.field_150354_m || this == net.minecraft.init.Blocks.field_150405_ch || this == net.minecraft.init.Blocks.field_150406_ce;
|
||||||
+ case Nether: return this == net.minecraft.init.Blocks.field_150425_aM;
|
+ case Nether: return this == net.minecraft.init.Blocks.field_150425_aM;
|
||||||
+ case Crop: return this == net.minecraft.init.Blocks.field_150458_ak;
|
+ case Crop: return this == net.minecraft.init.Blocks.field_150458_ak;
|
||||||
+ case Cave: return state.isSideSolid(world, pos, EnumFacing.UP);
|
+ case Cave: return state.isSideSolid(world, pos, EnumFacing.UP);
|
||||||
@@ -1009,7 +1048,8 @@
|
|||||||
+ this != net.minecraft.init.Blocks.field_150411_aY &&
|
+ this != net.minecraft.init.Blocks.field_150411_aY &&
|
||||||
+ this != net.minecraft.init.Blocks.field_185775_db;
|
+ this != net.minecraft.init.Blocks.field_185775_db;
|
||||||
+ }
|
+ }
|
||||||
+ else if (entity instanceof net.minecraft.entity.boss.EntityWither)
|
+ else if ((entity instanceof net.minecraft.entity.boss.EntityWither) ||
|
||||||
|
+ (entity instanceof net.minecraft.entity.projectile.EntityWitherSkull))
|
||||||
+ {
|
+ {
|
||||||
+ return net.minecraft.entity.boss.EntityWither.func_181033_a(this);
|
+ return net.minecraft.entity.boss.EntityWither.func_181033_a(this);
|
||||||
+ }
|
+ }
|
||||||
@@ -1046,10 +1086,39 @@
|
|||||||
+ IBlockState state = world.func_180495_p(pos);
|
+ IBlockState state = world.func_180495_p(pos);
|
||||||
+ for (IProperty<?> prop : state.func_177228_b().keySet())
|
+ for (IProperty<?> prop : state.func_177228_b().keySet())
|
||||||
+ {
|
+ {
|
||||||
+ if (prop.func_177701_a().equals("facing") || prop.func_177701_a().equals("rotation"))
|
+ if ((prop.func_177701_a().equals("facing") || prop.func_177701_a().equals("rotation")) && prop.func_177699_b() == EnumFacing.class)
|
||||||
+ {
|
+ {
|
||||||
+ world.func_175656_a(pos, state.func_177231_a(prop));
|
+ Block block = state.func_177230_c();
|
||||||
+ return true;
|
+ if (!(block instanceof BlockBed) && !(block instanceof BlockPistonExtension))
|
||||||
|
+ {
|
||||||
|
+ IBlockState newState;
|
||||||
|
+ //noinspection unchecked
|
||||||
|
+ IProperty<EnumFacing> facingProperty = (IProperty<EnumFacing>) prop;
|
||||||
|
+ EnumFacing facing = state.func_177229_b(facingProperty);
|
||||||
|
+ java.util.Collection<EnumFacing> validFacings = facingProperty.func_177700_c();
|
||||||
|
+
|
||||||
|
+ // rotate horizontal facings clockwise
|
||||||
|
+ if (validFacings.size() == 4 && !validFacings.contains(EnumFacing.UP) && !validFacings.contains(EnumFacing.DOWN))
|
||||||
|
+ {
|
||||||
|
+ newState = state.func_177226_a(facingProperty, facing.func_176746_e());
|
||||||
|
+ }
|
||||||
|
+ else
|
||||||
|
+ {
|
||||||
|
+ // rotate other facings about the axis
|
||||||
|
+ EnumFacing rotatedFacing = facing.func_176732_a(axis.func_176740_k());
|
||||||
|
+ if (validFacings.contains(rotatedFacing))
|
||||||
|
+ {
|
||||||
|
+ newState = state.func_177226_a(facingProperty, rotatedFacing);
|
||||||
|
+ }
|
||||||
|
+ else // abnormal facing property, just cycle it
|
||||||
|
+ {
|
||||||
|
+ newState = state.func_177231_a(facingProperty);
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ world.func_175656_a(pos, newState);
|
||||||
|
+ return true;
|
||||||
|
+ }
|
||||||
+ }
|
+ }
|
||||||
+ }
|
+ }
|
||||||
+ return false;
|
+ return false;
|
||||||
@@ -1062,12 +1131,13 @@
|
|||||||
+ * @param pos Block position in world
|
+ * @param pos Block position in world
|
||||||
+ * @return An array of valid axes to rotate around, or null for none or unknown
|
+ * @return An array of valid axes to rotate around, or null for none or unknown
|
||||||
+ */
|
+ */
|
||||||
|
+ @Nullable
|
||||||
+ public EnumFacing[] getValidRotations(World world, BlockPos pos)
|
+ public EnumFacing[] getValidRotations(World world, BlockPos pos)
|
||||||
+ {
|
+ {
|
||||||
+ IBlockState state = world.func_180495_p(pos);
|
+ IBlockState state = world.func_180495_p(pos);
|
||||||
+ for (IProperty<?> prop : state.func_177228_b().keySet())
|
+ for (IProperty<?> prop : state.func_177228_b().keySet())
|
||||||
+ {
|
+ {
|
||||||
+ if (prop.func_177701_a().equals("facing") && prop.func_177699_b() == EnumFacing.class)
|
+ if ((prop.func_177701_a().equals("facing") || prop.func_177701_a().equals("rotation")) && prop.func_177699_b() == EnumFacing.class)
|
||||||
+ {
|
+ {
|
||||||
+ @SuppressWarnings("unchecked")
|
+ @SuppressWarnings("unchecked")
|
||||||
+ java.util.Collection<EnumFacing> values = ((java.util.Collection<EnumFacing>)prop.func_177700_c());
|
+ java.util.Collection<EnumFacing> values = ((java.util.Collection<EnumFacing>)prop.func_177700_c());
|
||||||
@@ -1138,6 +1208,17 @@
|
|||||||
+ public void onNeighborChange(IBlockAccess world, BlockPos pos, BlockPos neighbor){}
|
+ public void onNeighborChange(IBlockAccess world, BlockPos pos, BlockPos neighbor){}
|
||||||
+
|
+
|
||||||
+ /**
|
+ /**
|
||||||
|
+ * Called on an Observer block whenever an update for an Observer is received.
|
||||||
|
+ *
|
||||||
|
+ * @param observerState The Observer block's state.
|
||||||
|
+ * @param world The current world.
|
||||||
|
+ * @param observerPos The Observer block's position.
|
||||||
|
+ * @param changedBlock The updated block.
|
||||||
|
+ * @param changedBlockPos The updated block's position.
|
||||||
|
+ */
|
||||||
|
+ public void observedNeighborChange(IBlockState observerState, World world, BlockPos observerPos, Block changedBlock, BlockPos changedBlockPos){}
|
||||||
|
+
|
||||||
|
+ /**
|
||||||
+ * Called to determine whether to allow the a block to handle its own indirect power rather than using the default rules.
|
+ * Called to determine whether to allow the a block to handle its own indirect power rather than using the default rules.
|
||||||
+ * @param world The world
|
+ * @param world The world
|
||||||
+ * @param pos Block position in world
|
+ * @param pos Block position in world
|
||||||
@@ -1156,7 +1237,6 @@
|
|||||||
+ *
|
+ *
|
||||||
+ * @param world The current world
|
+ * @param world The current world
|
||||||
+ * @param pos Block position in world
|
+ * @param pos Block position in world
|
||||||
+ * @param side The side to check
|
|
||||||
+ * @return true To be notified of changes
|
+ * @return true To be notified of changes
|
||||||
+ */
|
+ */
|
||||||
+ public boolean getWeakChanges(IBlockAccess world, BlockPos pos)
|
+ public boolean getWeakChanges(IBlockAccess world, BlockPos pos)
|
||||||
@@ -1209,7 +1289,7 @@
|
|||||||
+ * Queries the class of tool required to harvest this block, if null is returned
|
+ * Queries the class of tool required to harvest this block, if null is returned
|
||||||
+ * we assume that anything can harvest this block.
|
+ * we assume that anything can harvest this block.
|
||||||
+ */
|
+ */
|
||||||
+ public String getHarvestTool(IBlockState state)
|
+ @Nullable public String getHarvestTool(IBlockState state)
|
||||||
+ {
|
+ {
|
||||||
+ return harvestTool[func_176201_c(state)];
|
+ return harvestTool[func_176201_c(state)];
|
||||||
+ }
|
+ }
|
||||||
@@ -1218,7 +1298,6 @@
|
|||||||
+ * Queries the harvest level of this item stack for the specified tool class,
|
+ * Queries the harvest level of this item stack for the specified tool class,
|
||||||
+ * Returns -1 if this tool is not of the specified type
|
+ * Returns -1 if this tool is not of the specified type
|
||||||
+ *
|
+ *
|
||||||
+ * @param stack This item stack instance
|
|
||||||
+ * @return Harvest level, or -1 if not the specified tool type.
|
+ * @return Harvest level, or -1 if not the specified tool type.
|
||||||
+ */
|
+ */
|
||||||
+ public int getHarvestLevel(IBlockState state)
|
+ public int getHarvestLevel(IBlockState state)
|
||||||
@@ -1258,10 +1337,11 @@
|
|||||||
+ * @param testingHead when true, its testing the entities head for vision, breathing ect... otherwise its testing the body, for swimming and movement adjustment.
|
+ * @param testingHead when true, its testing the entities head for vision, breathing ect... otherwise its testing the body, for swimming and movement adjustment.
|
||||||
+ * @return null for default behavior, true if the entity is within the material, false if it was not.
|
+ * @return null for default behavior, true if the entity is within the material, false if it was not.
|
||||||
+ */
|
+ */
|
||||||
+ public Boolean isEntityInsideMaterial(IBlockAccess world, BlockPos blockpos, IBlockState iblockstate, Entity entity, double yToTest, Material materialIn, boolean testingHead)
|
+ @Nullable
|
||||||
+ {
|
+ public Boolean isEntityInsideMaterial(IBlockAccess world, BlockPos blockpos, IBlockState iblockstate, Entity entity, double yToTest, Material materialIn, boolean testingHead)
|
||||||
+ return null;
|
+ {
|
||||||
+ }
|
+ return null;
|
||||||
|
+ }
|
||||||
+
|
+
|
||||||
+ /**
|
+ /**
|
||||||
+ * Called when boats or fishing hooks are inside the block to check if they are inside
|
+ * Called when boats or fishing hooks are inside the block to check if they are inside
|
||||||
@@ -1273,6 +1353,7 @@
|
|||||||
+ * @param materialIn to check for.
|
+ * @param materialIn to check for.
|
||||||
+ * @return null for default behavior, true if the box is within the material, false if it was not.
|
+ * @return null for default behavior, true if the box is within the material, false if it was not.
|
||||||
+ */
|
+ */
|
||||||
|
+ @Nullable
|
||||||
+ public Boolean isAABBInsideMaterial(World world, BlockPos pos, AxisAlignedBB boundingBox, Material materialIn)
|
+ public Boolean isAABBInsideMaterial(World world, BlockPos pos, AxisAlignedBB boundingBox, Material materialIn)
|
||||||
+ {
|
+ {
|
||||||
+ return null;
|
+ return null;
|
||||||
@@ -1280,23 +1361,11 @@
|
|||||||
+
|
+
|
||||||
+ /**
|
+ /**
|
||||||
+ * Queries if this block should render in a given layer.
|
+ * Queries if this block should render in a given layer.
|
||||||
+ * ISmartBlockModel can use {@link MinecraftForgeClient#getRenderLayer()} to alter their model based on layer.
|
+ * ISmartBlockModel can use {@link net.minecraftforge.client.MinecraftForgeClient#getRenderLayer()} to alter their model based on layer.
|
||||||
+ *
|
|
||||||
+ * @deprecated New method with state sensitivity: {@link #canRenderInLayer(IBlockState, BlockRenderLayer)}
|
|
||||||
+ */
|
|
||||||
+ @Deprecated
|
|
||||||
+ public boolean canRenderInLayer(BlockRenderLayer layer)
|
|
||||||
+ {
|
|
||||||
+ return func_180664_k() == layer;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ /**
|
|
||||||
+ * Queries if this block should render in a given layer.
|
|
||||||
+ * ISmartBlockModel can use {@link MinecraftForgeClient#getRenderLayer()} to alter their model based on layer.
|
|
||||||
+ */
|
+ */
|
||||||
+ public boolean canRenderInLayer(IBlockState state, BlockRenderLayer layer)
|
+ public boolean canRenderInLayer(IBlockState state, BlockRenderLayer layer)
|
||||||
+ {
|
+ {
|
||||||
+ return canRenderInLayer(layer);
|
+ return func_180664_k() == layer;
|
||||||
+ }
|
+ }
|
||||||
+ // For Internal use only to capture droped items inside getDrops
|
+ // For Internal use only to capture droped items inside getDrops
|
||||||
+ protected static ThreadLocal<Boolean> captureDrops = new ThreadLocal<Boolean>()
|
+ protected static ThreadLocal<Boolean> captureDrops = new ThreadLocal<Boolean>()
|
||||||
@@ -1313,7 +1382,7 @@
|
|||||||
+ {
|
+ {
|
||||||
+ captureDrops.set(true);
|
+ captureDrops.set(true);
|
||||||
+ capturedDrops.get().clear();
|
+ capturedDrops.get().clear();
|
||||||
+ return null;
|
+ return java.util.Collections.emptyList();
|
||||||
+ }
|
+ }
|
||||||
+ else
|
+ else
|
||||||
+ {
|
+ {
|
||||||
@@ -1323,17 +1392,91 @@
|
|||||||
+ }
|
+ }
|
||||||
+
|
+
|
||||||
+ /**
|
+ /**
|
||||||
+ * Add information to the blocks tooltip, called from the default implementation of {@link ItemBlock#addInformation(ItemStack, EntityPlayer, List, boolean)}
|
+ * Sensitive version of getSoundType
|
||||||
+ * @param stack The stack the tooltip is being retrieved for
|
+ * @param state The state
|
||||||
+ * @param player The player retrieving the tooltip
|
+ * @param world The world
|
||||||
+ * @param tooltip The lines to be displayed on the tooltip
|
+ * @param pos The position. Note that the world may not necessarily have {@code state} here!
|
||||||
+ * @param advanced If the client has advanced debug tooltips enabled
|
+ * @param entity The entity that is breaking/stepping on/placing/hitting/falling on this block, or null if no entity is in this context
|
||||||
|
+ * @return A SoundType to use
|
||||||
+ */
|
+ */
|
||||||
+ public void addInformation(ItemStack stack, EntityPlayer player, List<String> tooltip, boolean advanced)
|
+ public SoundType getSoundType(IBlockState state, World world, BlockPos pos, @Nullable Entity entity)
|
||||||
+ {
|
+ {
|
||||||
|
+ return func_185467_w();
|
||||||
+ }
|
+ }
|
||||||
|
+
|
||||||
|
+ /**
|
||||||
|
+ * @param state The state
|
||||||
|
+ * @param world The world
|
||||||
|
+ * @param pos The position of this state
|
||||||
|
+ * @param beaconPos The position of the beacon
|
||||||
|
+ * @return A float RGB [0.0, 1.0] array to be averaged with a beacon's existing beam color, or null to do nothing to the beam
|
||||||
|
+ */
|
||||||
|
+ @Nullable
|
||||||
|
+ public float[] getBeaconColorMultiplier(IBlockState state, World world, BlockPos pos, BlockPos beaconPos)
|
||||||
|
+ {
|
||||||
|
+ return null;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ /**
|
||||||
|
+ * Gets the {@link IBlockState} to place
|
||||||
|
+ * @param world The world the block is being placed in
|
||||||
|
+ * @param pos The position the block is being placed at
|
||||||
|
+ * @param facing The side the block is being placed on
|
||||||
|
+ * @param hitX The X coordinate of the hit vector
|
||||||
|
+ * @param hitY The Y coordinate of the hit vector
|
||||||
|
+ * @param hitZ The Z coordinate of the hit vector
|
||||||
|
+ * @param meta The metadata of {@link ItemStack} as processed by {@link Item#getMetadata(int)}
|
||||||
|
+ * @param placer The entity placing the block
|
||||||
|
+ * @param hand The player hand used to place this block
|
||||||
|
+ * @return The state to be placed in the world
|
||||||
|
+ */
|
||||||
|
+ public IBlockState getStateForPlacement(World world, BlockPos pos, EnumFacing facing, float hitX, float hitY, float hitZ, int meta, EntityLivingBase placer, EnumHand hand)
|
||||||
|
+ {
|
||||||
|
+ return func_180642_a(world, pos, facing, hitX, hitY, hitZ, meta, placer);
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ /**
|
||||||
|
+ * Determines if another block can connect to this block
|
||||||
|
+ *
|
||||||
|
+ * @param world The current world
|
||||||
|
+ * @param pos The position of this block
|
||||||
|
+ * @param facing The side the connecting block is on
|
||||||
|
+ * @return True to allow another block to connect to this block
|
||||||
|
+ */
|
||||||
|
+ public boolean canBeConnectedTo(IBlockAccess world, BlockPos pos, EnumFacing facing)
|
||||||
|
+ {
|
||||||
|
+ return false;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ /**
|
||||||
|
+ * Get the {@code PathNodeType} for this block. Return {@code null} for vanilla behavior.
|
||||||
|
+ *
|
||||||
|
+ * @return the PathNodeType
|
||||||
|
+ */
|
||||||
|
+ @Nullable
|
||||||
|
+ public net.minecraft.pathfinding.PathNodeType getAiPathNodeType(IBlockState state, IBlockAccess world, BlockPos pos)
|
||||||
|
+ {
|
||||||
|
+ return isBurning(world, pos) ? net.minecraft.pathfinding.PathNodeType.DAMAGE_FIRE : null;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
+ /* ========================================= FORGE END ======================================*/
|
+ /* ========================================= FORGE END ======================================*/
|
||||||
+
|
+
|
||||||
public static void func_149671_p()
|
public static void func_149671_p()
|
||||||
{
|
{
|
||||||
func_176215_a(0, field_176230_a, (new BlockAir()).func_149663_c("air"));
|
func_176215_a(0, field_176230_a, (new BlockAir()).func_149663_c("air"));
|
||||||
|
@@ -1201,14 +2471,7 @@
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
- UnmodifiableIterator lvt_18_2_ = block16.func_176194_O().func_177619_a().iterator();
|
||||||
|
-
|
||||||
|
- while (lvt_18_2_.hasNext())
|
||||||
|
- {
|
||||||
|
- IBlockState iblockstate = (IBlockState)lvt_18_2_.next();
|
||||||
|
- int k = field_149771_c.func_148757_b(block16) << 4 | block16.func_176201_c(iblockstate);
|
||||||
|
- field_176229_d.func_148746_a(iblockstate, k);
|
||||||
|
- }
|
||||||
|
+// Handled in GameData.BlockCallbacks - leaving tripwire as it seems to be special cased
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,21 +1,23 @@
|
|||||||
--- ../src-base/minecraft/net/minecraft/block/BlockBanner.java
|
--- ../src-base/minecraft/net/minecraft/block/BlockBanner.java
|
||||||
+++ ../src-work/minecraft/net/minecraft/block/BlockBanner.java
|
+++ ../src-work/minecraft/net/minecraft/block/BlockBanner.java
|
||||||
@@ -107,14 +107,7 @@
|
@@ -89,16 +89,9 @@
|
||||||
|
|
||||||
public void func_180653_a(World p_180653_1_, BlockPos p_180653_2_, IBlockState p_180653_3_, float p_180653_4_, int p_180653_5_)
|
public void func_180653_a(World p_180653_1_, BlockPos p_180653_2_, IBlockState p_180653_3_, float p_180653_4_, int p_180653_5_)
|
||||||
{
|
{
|
||||||
- ItemStack itemstack = this.func_185549_e(p_180653_1_, p_180653_2_, p_180653_3_);
|
- ItemStack itemstack = this.func_185549_e(p_180653_1_, p_180653_2_);
|
||||||
-
|
-
|
||||||
- if (itemstack != null)
|
- if (itemstack.func_190926_b())
|
||||||
{
|
{
|
||||||
- func_180635_a(p_180653_1_, p_180653_2_, itemstack);
|
|
||||||
- }
|
|
||||||
- else
|
|
||||||
- {
|
|
||||||
super.func_180653_a(p_180653_1_, p_180653_2_, p_180653_3_, p_180653_4_, p_180653_5_);
|
super.func_180653_a(p_180653_1_, p_180653_2_, p_180653_3_, p_180653_4_, p_180653_5_);
|
||||||
}
|
}
|
||||||
|
- else
|
||||||
|
- {
|
||||||
|
- func_180635_a(p_180653_1_, p_180653_2_, itemstack);
|
||||||
|
- }
|
||||||
}
|
}
|
||||||
@@ -141,6 +134,28 @@
|
|
||||||
|
public boolean func_176196_c(World p_176196_1_, BlockPos p_176196_2_)
|
||||||
|
@@ -120,6 +113,25 @@
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -27,12 +29,9 @@
|
|||||||
+ java.util.List<ItemStack> ret = new java.util.ArrayList<ItemStack>();
|
+ java.util.List<ItemStack> ret = new java.util.ArrayList<ItemStack>();
|
||||||
+ if (te instanceof TileEntityBanner)
|
+ if (te instanceof TileEntityBanner)
|
||||||
+ {
|
+ {
|
||||||
+ TileEntityBanner banner = (TileEntityBanner)te;
|
+ TileEntityBanner tileentitybanner = (TileEntityBanner)te;
|
||||||
+ ItemStack item = new ItemStack(Items.field_179564_cE, 1, banner.func_175115_b());
|
+ ItemStack itemstack = tileentitybanner.func_190615_l();
|
||||||
+ NBTTagCompound nbt = new NBTTagCompound();
|
+ ret.add(itemstack);
|
||||||
+ TileEntityBanner.func_181020_a(nbt, banner.func_175115_b(), banner.func_181021_d());
|
|
||||||
+ item.func_77983_a("BlockEntityTag", nbt);
|
|
||||||
+ ret.add(item);
|
|
||||||
+ }
|
+ }
|
||||||
+ else
|
+ else
|
||||||
+ {
|
+ {
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
--- ../src-base/minecraft/net/minecraft/block/BlockButton.java
|
--- ../src-base/minecraft/net/minecraft/block/BlockButton.java
|
||||||
+++ ../src-work/minecraft/net/minecraft/block/BlockButton.java
|
+++ ../src-work/minecraft/net/minecraft/block/BlockButton.java
|
||||||
@@ -91,7 +91,7 @@
|
@@ -90,7 +90,7 @@
|
||||||
protected static boolean func_181088_a(World p_181088_0_, BlockPos p_181088_1_, EnumFacing p_181088_2_)
|
protected static boolean func_181088_a(World p_181088_0_, BlockPos p_181088_1_, EnumFacing p_181088_2_)
|
||||||
{
|
{
|
||||||
BlockPos blockpos = p_181088_1_.func_177972_a(p_181088_2_);
|
BlockPos blockpos = p_181088_1_.func_177972_a(p_181088_2_);
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
--- ../src-base/minecraft/net/minecraft/block/BlockCactus.java
|
--- ../src-base/minecraft/net/minecraft/block/BlockCactus.java
|
||||||
+++ ../src-work/minecraft/net/minecraft/block/BlockCactus.java
|
+++ ../src-work/minecraft/net/minecraft/block/BlockCactus.java
|
||||||
@@ -18,7 +18,7 @@
|
@@ -19,7 +19,7 @@
|
||||||
import net.minecraftforge.fml.relauncher.Side;
|
import net.minecraftforge.fml.relauncher.Side;
|
||||||
import net.minecraftforge.fml.relauncher.SideOnly;
|
import net.minecraftforge.fml.relauncher.SideOnly;
|
||||||
|
|
||||||
@@ -9,7 +9,25 @@
|
|||||||
{
|
{
|
||||||
public static final PropertyInteger field_176587_a = PropertyInteger.func_177719_a("age", 0, 15);
|
public static final PropertyInteger field_176587_a = PropertyInteger.func_177719_a("age", 0, 15);
|
||||||
protected static final AxisAlignedBB field_185593_b = new AxisAlignedBB(0.0625D, 0.0D, 0.0625D, 0.9375D, 0.9375D, 0.9375D);
|
protected static final AxisAlignedBB field_185593_b = new AxisAlignedBB(0.0625D, 0.0D, 0.0625D, 0.9375D, 0.9375D, 0.9375D);
|
||||||
@@ -110,8 +110,8 @@
|
@@ -50,6 +50,8 @@
|
||||||
|
{
|
||||||
|
int j = ((Integer)p_180650_3_.func_177229_b(field_176587_a)).intValue();
|
||||||
|
|
||||||
|
+ if(net.minecraftforge.common.ForgeHooks.onCropsGrowPre(p_180650_1_, blockpos, p_180650_3_, true))
|
||||||
|
+ {
|
||||||
|
if (j == 15)
|
||||||
|
{
|
||||||
|
p_180650_1_.func_175656_a(blockpos, this.func_176223_P());
|
||||||
|
@@ -61,6 +63,8 @@
|
||||||
|
{
|
||||||
|
p_180650_1_.func_180501_a(p_180650_2_, p_180650_3_.func_177226_a(field_176587_a, Integer.valueOf(j + 1)), 4);
|
||||||
|
}
|
||||||
|
+ net.minecraftforge.common.ForgeHooks.onCropsGrowPost(p_180650_1_, p_180650_2_, p_180650_3_, p_180650_1_.func_180495_p(p_180650_2_));
|
||||||
|
+ }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
@@ -111,8 +115,8 @@
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -20,7 +38,7 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
public void func_180634_a(World p_180634_1_, BlockPos p_180634_2_, IBlockState p_180634_3_, Entity p_180634_4_)
|
public void func_180634_a(World p_180634_1_, BlockPos p_180634_2_, IBlockState p_180634_3_, Entity p_180634_4_)
|
||||||
@@ -135,6 +135,18 @@
|
@@ -136,6 +140,18 @@
|
||||||
return ((Integer)p_176201_1_.func_177229_b(field_176587_a)).intValue();
|
return ((Integer)p_176201_1_.func_177229_b(field_176587_a)).intValue();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
--- ../src-base/minecraft/net/minecraft/block/BlockChest.java
|
--- ../src-base/minecraft/net/minecraft/block/BlockChest.java
|
||||||
+++ ../src-work/minecraft/net/minecraft/block/BlockChest.java
|
+++ ../src-work/minecraft/net/minecraft/block/BlockChest.java
|
||||||
@@ -514,7 +514,7 @@
|
@@ -522,7 +522,7 @@
|
||||||
|
|
||||||
private boolean func_176456_n(World p_176456_1_, BlockPos p_176456_2_)
|
private boolean func_176456_n(World p_176456_1_, BlockPos p_176456_2_)
|
||||||
{
|
{
|
||||||
@@ -9,3 +9,14 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
private boolean func_176453_o(World p_176453_1_, BlockPos p_176453_2_)
|
private boolean func_176453_o(World p_176453_1_, BlockPos p_176453_2_)
|
||||||
|
@@ -587,4 +587,10 @@
|
||||||
|
BASIC,
|
||||||
|
TRAP;
|
||||||
|
}
|
||||||
|
+
|
||||||
|
+ /* ======================================== FORGE START =====================================*/
|
||||||
|
+ public boolean rotateBlock(World world, BlockPos pos, EnumFacing axis)
|
||||||
|
+ {
|
||||||
|
+ return !func_176454_e(world, pos) && super.rotateBlock(world, pos, axis);
|
||||||
|
+ }
|
||||||
|
}
|
||||||
@@ -0,0 +1,19 @@
|
|||||||
|
--- ../src-base/minecraft/net/minecraft/block/BlockChorusFlower.java
|
||||||
|
+++ ../src-work/minecraft/net/minecraft/block/BlockChorusFlower.java
|
||||||
|
@@ -53,7 +53,7 @@
|
||||||
|
{
|
||||||
|
int i = ((Integer)p_180650_3_.func_177229_b(field_185607_a)).intValue();
|
||||||
|
|
||||||
|
- if (i < 5 && p_180650_4_.nextInt(1) == 0)
|
||||||
|
+ if (i < 5 && net.minecraftforge.common.ForgeHooks.onCropsGrowPre(p_180650_1_, blockpos, p_180650_3_, p_180650_4_.nextInt(1) == 0))
|
||||||
|
{
|
||||||
|
boolean flag = false;
|
||||||
|
boolean flag1 = false;
|
||||||
|
@@ -142,6 +142,7 @@
|
||||||
|
{
|
||||||
|
this.func_185605_c(p_180650_1_, p_180650_2_);
|
||||||
|
}
|
||||||
|
+ net.minecraftforge.common.ForgeHooks.onCropsGrowPost(p_180650_1_, p_180650_2_, p_180650_3_, p_180650_1_.func_180495_p(p_180650_2_));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,6 +1,23 @@
|
|||||||
--- ../src-base/minecraft/net/minecraft/block/BlockCocoa.java
|
--- ../src-base/minecraft/net/minecraft/block/BlockCocoa.java
|
||||||
+++ ../src-work/minecraft/net/minecraft/block/BlockCocoa.java
|
+++ ../src-work/minecraft/net/minecraft/block/BlockCocoa.java
|
||||||
@@ -131,7 +131,14 @@
|
@@ -43,13 +43,14 @@
|
||||||
|
{
|
||||||
|
this.func_176500_f(p_180650_1_, p_180650_2_, p_180650_3_);
|
||||||
|
}
|
||||||
|
- else if (p_180650_1_.field_73012_v.nextInt(5) == 0)
|
||||||
|
+ else
|
||||||
|
{
|
||||||
|
int i = ((Integer)p_180650_3_.func_177229_b(field_176501_a)).intValue();
|
||||||
|
|
||||||
|
- if (i < 2)
|
||||||
|
+ if (i < 2 && net.minecraftforge.common.ForgeHooks.onCropsGrowPre(p_180650_1_, p_180650_2_, p_180650_3_, p_180650_4_.nextInt(5) == 0))
|
||||||
|
{
|
||||||
|
p_180650_1_.func_180501_a(p_180650_2_, p_180650_3_.func_177226_a(field_176501_a, Integer.valueOf(i + 1)), 2);
|
||||||
|
+ net.minecraftforge.common.ForgeHooks.onCropsGrowPost(p_180650_1_, p_180650_2_, p_180650_3_, p_180650_1_.func_180495_p(p_180650_2_));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
@@ -131,7 +132,14 @@
|
||||||
|
|
||||||
public void func_180653_a(World p_180653_1_, BlockPos p_180653_2_, IBlockState p_180653_3_, float p_180653_4_, int p_180653_5_)
|
public void func_180653_a(World p_180653_1_, BlockPos p_180653_2_, IBlockState p_180653_3_, float p_180653_4_, int p_180653_5_)
|
||||||
{
|
{
|
||||||
@@ -16,7 +33,7 @@
|
|||||||
int j = 1;
|
int j = 1;
|
||||||
|
|
||||||
if (i >= 2)
|
if (i >= 2)
|
||||||
@@ -141,8 +148,9 @@
|
@@ -141,8 +149,9 @@
|
||||||
|
|
||||||
for (int k = 0; k < j; ++k)
|
for (int k = 0; k < j; ++k)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -1,6 +1,18 @@
|
|||||||
--- ../src-base/minecraft/net/minecraft/block/BlockCrops.java
|
--- ../src-base/minecraft/net/minecraft/block/BlockCrops.java
|
||||||
+++ ../src-work/minecraft/net/minecraft/block/BlockCrops.java
|
+++ ../src-work/minecraft/net/minecraft/block/BlockCrops.java
|
||||||
@@ -117,11 +117,11 @@
|
@@ -78,9 +78,10 @@
|
||||||
|
{
|
||||||
|
float f = func_180672_a(this, p_180650_1_, p_180650_2_);
|
||||||
|
|
||||||
|
- if (p_180650_4_.nextInt((int)(25.0F / f) + 1) == 0)
|
||||||
|
+ if(net.minecraftforge.common.ForgeHooks.onCropsGrowPre(p_180650_1_, p_180650_2_, p_180650_3_, p_180650_4_.nextInt((int)(25.0F / f) + 1) == 0))
|
||||||
|
{
|
||||||
|
p_180650_1_.func_180501_a(p_180650_2_, this.func_185528_e(i + 1), 2);
|
||||||
|
+ net.minecraftforge.common.ForgeHooks.onCropsGrowPost(p_180650_1_, p_180650_2_, p_180650_3_, p_180650_1_.func_180495_p(p_180650_2_));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
@@ -116,11 +117,11 @@
|
||||||
float f1 = 0.0F;
|
float f1 = 0.0F;
|
||||||
IBlockState iblockstate = p_180672_1_.func_180495_p(blockpos.func_177982_a(i, 0, j));
|
IBlockState iblockstate = p_180672_1_.func_180495_p(blockpos.func_177982_a(i, 0, j));
|
||||||
|
|
||||||
@@ -14,7 +26,7 @@
|
|||||||
{
|
{
|
||||||
f1 = 3.0F;
|
f1 = 3.0F;
|
||||||
}
|
}
|
||||||
@@ -162,7 +162,8 @@
|
@@ -161,7 +162,8 @@
|
||||||
|
|
||||||
public boolean func_180671_f(World p_180671_1_, BlockPos p_180671_2_, IBlockState p_180671_3_)
|
public boolean func_180671_f(World p_180671_1_, BlockPos p_180671_2_, IBlockState p_180671_3_)
|
||||||
{
|
{
|
||||||
@@ -24,14 +36,14 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
protected Item func_149866_i()
|
protected Item func_149866_i()
|
||||||
@@ -175,11 +176,33 @@
|
@@ -174,11 +176,33 @@
|
||||||
return Items.field_151015_O;
|
return Items.field_151015_O;
|
||||||
}
|
}
|
||||||
|
|
||||||
+ @Override
|
+ @Override
|
||||||
+ public java.util.List<ItemStack> getDrops(net.minecraft.world.IBlockAccess world, BlockPos pos, IBlockState state, int fortune)
|
+ public java.util.List<ItemStack> getDrops(net.minecraft.world.IBlockAccess world, BlockPos pos, IBlockState state, int fortune)
|
||||||
+ {
|
+ {
|
||||||
+ java.util.List<ItemStack> ret = super.getDrops(world, pos, state, fortune);
|
+ java.util.List<ItemStack> ret = super.getDrops(world, pos, state, 0);
|
||||||
+ int age = func_185527_x(state);
|
+ int age = func_185527_x(state);
|
||||||
+ Random rand = world instanceof World ? ((World)world).field_73012_v : new Random();
|
+ Random rand = world instanceof World ? ((World)world).field_73012_v : new Random();
|
||||||
+
|
+
|
||||||
@@ -52,7 +64,8 @@
|
|||||||
+
|
+
|
||||||
public void func_180653_a(World p_180653_1_, BlockPos p_180653_2_, IBlockState p_180653_3_, float p_180653_4_, int p_180653_5_)
|
public void func_180653_a(World p_180653_1_, BlockPos p_180653_2_, IBlockState p_180653_3_, float p_180653_4_, int p_180653_5_)
|
||||||
{
|
{
|
||||||
super.func_180653_a(p_180653_1_, p_180653_2_, p_180653_3_, p_180653_4_, 0);
|
- super.func_180653_a(p_180653_1_, p_180653_2_, p_180653_3_, p_180653_4_, 0);
|
||||||
|
+ super.func_180653_a(p_180653_1_, p_180653_2_, p_180653_3_, p_180653_4_, p_180653_5_);
|
||||||
|
|
||||||
- if (!p_180653_1_.field_72995_K)
|
- if (!p_180653_1_.field_72995_K)
|
||||||
+ if (false && !p_180653_1_.field_72995_K) // Forge: NOP all this.
|
+ if (false && !p_180653_1_.field_72995_K) // Forge: NOP all this.
|
||||||
|
|||||||
@@ -9,16 +9,7 @@
|
|||||||
{
|
{
|
||||||
protected static final AxisAlignedBB field_185516_a = new AxisAlignedBB(0.09999999403953552D, 0.0D, 0.09999999403953552D, 0.8999999761581421D, 0.800000011920929D, 0.8999999761581421D);
|
protected static final AxisAlignedBB field_185516_a = new AxisAlignedBB(0.09999999403953552D, 0.0D, 0.09999999403953552D, 0.8999999761581421D, 0.800000011920929D, 0.8999999761581421D);
|
||||||
|
|
||||||
@@ -59,7 +59,7 @@
|
@@ -68,4 +68,11 @@
|
||||||
|
|
||||||
public void func_180657_a(World p_180657_1_, EntityPlayer p_180657_2_, BlockPos p_180657_3_, IBlockState p_180657_4_, @Nullable TileEntity p_180657_5_, @Nullable ItemStack p_180657_6_)
|
|
||||||
{
|
|
||||||
- if (!p_180657_1_.field_72995_K && p_180657_6_ != null && p_180657_6_.func_77973_b() == Items.field_151097_aZ)
|
|
||||||
+ if (false && !p_180657_1_.field_72995_K && p_180657_6_ != null && p_180657_6_.func_77973_b() == Items.field_151097_aZ) // Forge: Noop
|
|
||||||
{
|
|
||||||
p_180657_2_.func_71029_a(StatList.func_188055_a(this));
|
|
||||||
func_180635_a(p_180657_1_, p_180657_3_, new ItemStack(Blocks.field_150330_I, 1, 0));
|
|
||||||
@@ -69,4 +69,11 @@
|
|
||||||
super.func_180657_a(p_180657_1_, p_180657_2_, p_180657_3_, p_180657_4_, p_180657_5_, p_180657_6_);
|
super.func_180657_a(p_180657_1_, p_180657_2_, p_180657_3_, p_180657_4_, p_180657_5_, p_180657_6_);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,15 +1,15 @@
|
|||||||
--- ../src-base/minecraft/net/minecraft/block/BlockDoor.java
|
--- ../src-base/minecraft/net/minecraft/block/BlockDoor.java
|
||||||
+++ ../src-work/minecraft/net/minecraft/block/BlockDoor.java
|
+++ ../src-work/minecraft/net/minecraft/block/BlockDoor.java
|
||||||
@@ -108,7 +108,7 @@
|
@@ -107,7 +107,7 @@
|
||||||
{
|
{
|
||||||
if (this.field_149764_J == Material.field_151573_f)
|
if (this.field_149764_J == Material.field_151573_f)
|
||||||
{
|
{
|
||||||
- return true;
|
- return false;
|
||||||
+ return false; //Allow items to interact with the door
|
+ return false; //Allow items to interact with the door
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@@ -176,7 +176,7 @@
|
@@ -175,7 +175,7 @@
|
||||||
flag1 = true;
|
flag1 = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -18,7 +18,7 @@
|
|||||||
{
|
{
|
||||||
p_189540_2_.func_175698_g(p_189540_3_);
|
p_189540_2_.func_175698_g(p_189540_3_);
|
||||||
flag1 = true;
|
flag1 = true;
|
||||||
@@ -221,7 +221,7 @@
|
@@ -219,7 +219,7 @@
|
||||||
|
|
||||||
public boolean func_176196_c(World p_176196_1_, BlockPos p_176196_2_)
|
public boolean func_176196_c(World p_176196_1_, BlockPos p_176196_2_)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -37,15 +37,15 @@
|
|||||||
if (p_180671_3_.func_177229_b(field_176492_b) == BlockDoublePlant.EnumBlockHalf.UPPER)
|
if (p_180671_3_.func_177229_b(field_176492_b) == BlockDoublePlant.EnumBlockHalf.UPPER)
|
||||||
{
|
{
|
||||||
return p_180671_1_.func_180495_p(p_180671_2_.func_177977_b()).func_177230_c() == this;
|
return p_180671_1_.func_180495_p(p_180671_2_.func_177977_b()).func_177230_c() == this;
|
||||||
@@ -151,7 +149,6 @@
|
@@ -150,7 +148,6 @@
|
||||||
|
|
||||||
public void func_180657_a(World p_180657_1_, EntityPlayer p_180657_2_, BlockPos p_180657_3_, IBlockState p_180657_4_, @Nullable TileEntity p_180657_5_, @Nullable ItemStack p_180657_6_)
|
public void func_180657_a(World p_180657_1_, EntityPlayer p_180657_2_, BlockPos p_180657_3_, IBlockState p_180657_4_, @Nullable TileEntity p_180657_5_, ItemStack p_180657_6_)
|
||||||
{
|
{
|
||||||
- if (p_180657_1_.field_72995_K || p_180657_6_ == null || p_180657_6_.func_77973_b() != Items.field_151097_aZ || p_180657_4_.func_177229_b(field_176492_b) != BlockDoublePlant.EnumBlockHalf.LOWER || !this.func_176489_b(p_180657_1_, p_180657_3_, p_180657_4_, p_180657_2_))
|
- if (p_180657_1_.field_72995_K || p_180657_6_.func_77973_b() != Items.field_151097_aZ || p_180657_4_.func_177229_b(field_176492_b) != BlockDoublePlant.EnumBlockHalf.LOWER || !this.func_176489_b(p_180657_1_, p_180657_3_, p_180657_4_, p_180657_2_))
|
||||||
{
|
{
|
||||||
super.func_180657_a(p_180657_1_, p_180657_2_, p_180657_3_, p_180657_4_, p_180657_5_, p_180657_6_);
|
super.func_180657_a(p_180657_1_, p_180657_2_, p_180657_3_, p_180657_4_, p_180657_5_, p_180657_6_);
|
||||||
}
|
}
|
||||||
@@ -211,8 +208,6 @@
|
@@ -210,8 +207,6 @@
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
p_176489_4_.func_71029_a(StatList.func_188055_a(this));
|
p_176489_4_.func_71029_a(StatList.func_188055_a(this));
|
||||||
@@ -54,7 +54,7 @@
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -283,6 +278,33 @@
|
@@ -281,6 +276,33 @@
|
||||||
return Block.EnumOffsetType.XZ;
|
return Block.EnumOffsetType.XZ;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
--- ../src-base/minecraft/net/minecraft/block/BlockDragonEgg.java
|
--- ../src-base/minecraft/net/minecraft/block/BlockDragonEgg.java
|
||||||
+++ ../src-work/minecraft/net/minecraft/block/BlockDragonEgg.java
|
+++ ../src-work/minecraft/net/minecraft/block/BlockDragonEgg.java
|
||||||
@@ -49,7 +49,7 @@
|
@@ -47,7 +47,7 @@
|
||||||
|
|
||||||
private void func_180683_d(World p_180683_1_, BlockPos p_180683_2_)
|
private void func_180683_d(World p_180683_1_, BlockPos p_180683_2_)
|
||||||
{
|
{
|
||||||
@@ -9,7 +9,7 @@
|
|||||||
{
|
{
|
||||||
int i = 32;
|
int i = 32;
|
||||||
|
|
||||||
@@ -62,7 +62,7 @@
|
@@ -60,7 +60,7 @@
|
||||||
p_180683_1_.func_175698_g(p_180683_2_);
|
p_180683_1_.func_175698_g(p_180683_2_);
|
||||||
BlockPos blockpos;
|
BlockPos blockpos;
|
||||||
|
|
||||||
|
|||||||
@@ -1,11 +1,11 @@
|
|||||||
--- ../src-base/minecraft/net/minecraft/block/BlockDropper.java
|
--- ../src-base/minecraft/net/minecraft/block/BlockDropper.java
|
||||||
+++ ../src-work/minecraft/net/minecraft/block/BlockDropper.java
|
+++ ../src-work/minecraft/net/minecraft/block/BlockDropper.java
|
||||||
@@ -44,7 +44,7 @@
|
@@ -43,7 +43,7 @@
|
||||||
{
|
{
|
||||||
ItemStack itemstack = tileentitydispenser.func_70301_a(i);
|
ItemStack itemstack = tileentitydispenser.func_70301_a(i);
|
||||||
|
|
||||||
- if (itemstack != null)
|
- if (!itemstack.func_190926_b())
|
||||||
+ if (itemstack != null && net.minecraftforge.items.VanillaInventoryCodeHooks.dropperInsertHook(p_176439_1_, p_176439_2_, tileentitydispenser, i, itemstack))
|
+ if (!itemstack.func_190926_b() && net.minecraftforge.items.VanillaInventoryCodeHooks.dropperInsertHook(p_176439_1_, p_176439_2_, tileentitydispenser, i, itemstack))
|
||||||
{
|
{
|
||||||
EnumFacing enumfacing = (EnumFacing)p_176439_1_.func_180495_p(p_176439_2_).func_177229_b(field_176441_a);
|
EnumFacing enumfacing = (EnumFacing)p_176439_1_.func_180495_p(p_176439_2_).func_177229_b(field_176441_a);
|
||||||
BlockPos blockpos = p_176439_2_.func_177972_a(enumfacing);
|
BlockPos blockpos = p_176439_2_.func_177972_a(enumfacing);
|
||||||
@@ -0,0 +1,19 @@
|
|||||||
|
--- ../src-base/minecraft/net/minecraft/block/BlockDynamicLiquid.java
|
||||||
|
+++ ../src-work/minecraft/net/minecraft/block/BlockDynamicLiquid.java
|
||||||
|
@@ -67,7 +67,7 @@
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
- if (this.field_149815_a >= 2 && this.field_149764_J == Material.field_151586_h)
|
||||||
|
+ if (this.field_149815_a >= 2 && net.minecraftforge.event.ForgeEventFactory.canCreateFluidSource(p_180650_1_, p_180650_2_, p_180650_3_, this.field_149764_J == Material.field_151586_h))
|
||||||
|
{
|
||||||
|
IBlockState iblockstate = p_180650_1_.func_180495_p(p_180650_2_.func_177977_b());
|
||||||
|
|
||||||
|
@@ -166,6 +166,7 @@
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
+ if (p_176375_3_.func_177230_c() != Blocks.field_150431_aC) //Forge: Vanilla has a 'bug' where snowballs don't drop like every other block. So special case because ewww...
|
||||||
|
p_176375_3_.func_177230_c().func_176226_b(p_176375_1_, p_176375_2_, p_176375_3_, 0);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,11 @@
|
|||||||
|
--- ../src-base/minecraft/net/minecraft/block/BlockEnchantmentTable.java
|
||||||
|
+++ ../src-work/minecraft/net/minecraft/block/BlockEnchantmentTable.java
|
||||||
|
@@ -63,7 +63,7 @@
|
||||||
|
{
|
||||||
|
BlockPos blockpos = p_180655_3_.func_177982_a(i, k, j);
|
||||||
|
|
||||||
|
- if (p_180655_2_.func_180495_p(blockpos).func_177230_c() == Blocks.field_150342_X)
|
||||||
|
+ if (net.minecraftforge.common.ForgeHooks.getEnchantPower(p_180655_2_, blockpos) > 0)
|
||||||
|
{
|
||||||
|
if (!p_180655_2_.func_175623_d(p_180655_3_.func_177982_a(i / 2, 0, j / 2)))
|
||||||
|
{
|
||||||
@@ -9,7 +9,11 @@
|
|||||||
{
|
{
|
||||||
int i = 32;
|
int i = 32;
|
||||||
|
|
||||||
@@ -65,7 +65,7 @@
|
@@ -62,17 +62,18 @@
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
+ IBlockState state = p_176503_1_.func_180495_p(p_176503_2_);
|
||||||
p_176503_1_.func_175698_g(p_176503_2_);
|
p_176503_1_.func_175698_g(p_176503_2_);
|
||||||
BlockPos blockpos;
|
BlockPos blockpos;
|
||||||
|
|
||||||
@@ -18,3 +22,11 @@
|
|||||||
{
|
{
|
||||||
;
|
;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (blockpos.func_177956_o() > 0)
|
||||||
|
{
|
||||||
|
- p_176503_1_.func_175656_a(blockpos.func_177984_a(), this.func_176223_P());
|
||||||
|
+ p_176503_1_.func_175656_a(blockpos.func_177984_a(), state); //Forge: Fix loss of state information during world gen.
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,6 +1,15 @@
|
|||||||
--- ../src-base/minecraft/net/minecraft/block/BlockFarmland.java
|
--- ../src-base/minecraft/net/minecraft/block/BlockFarmland.java
|
||||||
+++ ../src-work/minecraft/net/minecraft/block/BlockFarmland.java
|
+++ ../src-work/minecraft/net/minecraft/block/BlockFarmland.java
|
||||||
@@ -83,7 +83,7 @@
|
@@ -70,7 +70,7 @@
|
||||||
|
|
||||||
|
public void func_180658_a(World p_180658_1_, BlockPos p_180658_2_, Entity p_180658_3_, float p_180658_4_)
|
||||||
|
{
|
||||||
|
- if (!p_180658_1_.field_72995_K && p_180658_1_.field_73012_v.nextFloat() < p_180658_4_ - 0.5F && p_180658_3_ instanceof EntityLivingBase && (p_180658_3_ instanceof EntityPlayer || p_180658_1_.func_82736_K().func_82766_b("mobGriefing")) && p_180658_3_.field_70130_N * p_180658_3_.field_70130_N * p_180658_3_.field_70131_O > 0.512F)
|
||||||
|
+ if (!p_180658_1_.field_72995_K && p_180658_3_.canTrample(p_180658_1_, this, p_180658_2_, p_180658_4_)) // Forge: Move logic to Entity#canTrample
|
||||||
|
{
|
||||||
|
this.func_190970_b(p_180658_1_, p_180658_2_);
|
||||||
|
}
|
||||||
|
@@ -93,7 +93,7 @@
|
||||||
private boolean func_176529_d(World p_176529_1_, BlockPos p_176529_2_)
|
private boolean func_176529_d(World p_176529_1_, BlockPos p_176529_2_)
|
||||||
{
|
{
|
||||||
Block block = p_176529_1_.func_180495_p(p_176529_2_.func_177984_a()).func_177230_c();
|
Block block = p_176529_1_.func_180495_p(p_176529_2_.func_177984_a()).func_177230_c();
|
||||||
|
|||||||
@@ -0,0 +1,49 @@
|
|||||||
|
--- ../src-base/minecraft/net/minecraft/block/BlockFence.java
|
||||||
|
+++ ../src-work/minecraft/net/minecraft/block/BlockFence.java
|
||||||
|
@@ -157,7 +157,10 @@
|
||||||
|
|
||||||
|
public IBlockState func_176221_a(IBlockState p_176221_1_, IBlockAccess p_176221_2_, BlockPos p_176221_3_)
|
||||||
|
{
|
||||||
|
- return p_176221_1_.func_177226_a(field_176526_a, Boolean.valueOf(this.func_176524_e(p_176221_2_, p_176221_3_.func_177978_c()))).func_177226_a(field_176525_b, Boolean.valueOf(this.func_176524_e(p_176221_2_, p_176221_3_.func_177974_f()))).func_177226_a(field_176527_M, Boolean.valueOf(this.func_176524_e(p_176221_2_, p_176221_3_.func_177968_d()))).func_177226_a(field_176528_N, Boolean.valueOf(this.func_176524_e(p_176221_2_, p_176221_3_.func_177976_e())));
|
||||||
|
+ return p_176221_1_.func_177226_a(field_176526_a, canFenceConnectTo(p_176221_2_, p_176221_3_, EnumFacing.NORTH))
|
||||||
|
+ .func_177226_a(field_176525_b, canFenceConnectTo(p_176221_2_, p_176221_3_, EnumFacing.EAST))
|
||||||
|
+ .func_177226_a(field_176527_M, canFenceConnectTo(p_176221_2_, p_176221_3_, EnumFacing.SOUTH))
|
||||||
|
+ .func_177226_a(field_176528_N, canFenceConnectTo(p_176221_2_, p_176221_3_, EnumFacing.WEST));
|
||||||
|
}
|
||||||
|
|
||||||
|
public IBlockState func_185499_a(IBlockState p_185499_1_, Rotation p_185499_2_)
|
||||||
|
@@ -192,4 +195,34 @@
|
||||||
|
{
|
||||||
|
return new BlockStateContainer(this, new IProperty[] {field_176526_a, field_176525_b, field_176528_N, field_176527_M});
|
||||||
|
}
|
||||||
|
+
|
||||||
|
+ /* ======================================== FORGE START ======================================== */
|
||||||
|
+
|
||||||
|
+ @Override
|
||||||
|
+ public boolean canBeConnectedTo(IBlockAccess world, BlockPos pos, EnumFacing facing)
|
||||||
|
+ {
|
||||||
|
+ Block connector = world.func_180495_p(pos.func_177972_a(facing)).func_177230_c();
|
||||||
|
+
|
||||||
|
+ if(connector instanceof BlockFence)
|
||||||
|
+ {
|
||||||
|
+ if(this != Blocks.field_150386_bk && connector == Blocks.field_150386_bk)
|
||||||
|
+ {
|
||||||
|
+ return false;
|
||||||
|
+ }
|
||||||
|
+ else if(this == Blocks.field_150386_bk && connector != Blocks.field_150386_bk)
|
||||||
|
+ {
|
||||||
|
+ return false;
|
||||||
|
+ }
|
||||||
|
+ return true;
|
||||||
|
+ }
|
||||||
|
+ return false;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ private boolean canFenceConnectTo(IBlockAccess world, BlockPos pos, EnumFacing facing)
|
||||||
|
+ {
|
||||||
|
+ Block block = world.func_180495_p(pos.func_177972_a(facing)).func_177230_c();
|
||||||
|
+ return block.canBeConnectedTo(world, pos.func_177972_a(facing), facing.func_176734_d()) || func_176524_e(world, pos.func_177972_a(facing));
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ /* ======================================== FORGE END ======================================== */
|
||||||
|
}
|
||||||
@@ -0,0 +1,33 @@
|
|||||||
|
--- ../src-base/minecraft/net/minecraft/block/BlockFenceGate.java
|
||||||
|
+++ ../src-work/minecraft/net/minecraft/block/BlockFenceGate.java
|
||||||
|
@@ -50,7 +50,7 @@
|
||||||
|
{
|
||||||
|
EnumFacing.Axis enumfacing$axis = ((EnumFacing)p_176221_1_.func_177229_b(field_185512_D)).func_176740_k();
|
||||||
|
|
||||||
|
- if (enumfacing$axis == EnumFacing.Axis.Z && (p_176221_2_.func_180495_p(p_176221_3_.func_177976_e()).func_177230_c() == Blocks.field_150463_bK || p_176221_2_.func_180495_p(p_176221_3_.func_177974_f()).func_177230_c() == Blocks.field_150463_bK) || enumfacing$axis == EnumFacing.Axis.X && (p_176221_2_.func_180495_p(p_176221_3_.func_177978_c()).func_177230_c() == Blocks.field_150463_bK || p_176221_2_.func_180495_p(p_176221_3_.func_177968_d()).func_177230_c() == Blocks.field_150463_bK))
|
||||||
|
+ if (enumfacing$axis == EnumFacing.Axis.Z && (canFenceGateConnectTo(p_176221_2_, p_176221_3_, EnumFacing.WEST) || canFenceGateConnectTo(p_176221_2_, p_176221_3_, EnumFacing.EAST)) || enumfacing$axis == EnumFacing.Axis.X && (canFenceGateConnectTo(p_176221_2_, p_176221_3_, EnumFacing.NORTH) || canFenceGateConnectTo(p_176221_2_, p_176221_3_, EnumFacing.SOUTH)))
|
||||||
|
{
|
||||||
|
p_176221_1_ = p_176221_1_.func_177226_a(field_176467_M, Boolean.valueOf(true));
|
||||||
|
}
|
||||||
|
@@ -175,4 +175,21 @@
|
||||||
|
{
|
||||||
|
return new BlockStateContainer(this, new IProperty[] {field_185512_D, field_176466_a, field_176465_b, field_176467_M});
|
||||||
|
}
|
||||||
|
+
|
||||||
|
+ /* ======================================== FORGE START ======================================== */
|
||||||
|
+
|
||||||
|
+ @Override
|
||||||
|
+ public boolean canBeConnectedTo(IBlockAccess world, BlockPos pos, EnumFacing facing)
|
||||||
|
+ {
|
||||||
|
+ Block connector = world.func_180495_p(pos.func_177972_a(facing)).func_177230_c();
|
||||||
|
+ return connector instanceof BlockFence || connector instanceof BlockWall;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ private boolean canFenceGateConnectTo(IBlockAccess world, BlockPos pos, EnumFacing facing)
|
||||||
|
+ {
|
||||||
|
+ Block block = world.func_180495_p(pos.func_177972_a(facing)).func_177230_c();
|
||||||
|
+ return block.canBeConnectedTo(world, pos.func_177972_a(facing), facing.func_176734_d());
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ /* ======================================== FORGE END ======================================== */
|
||||||
|
}
|
||||||
@@ -123,7 +123,7 @@
|
|||||||
for (EnumFacing enumfacing : EnumFacing.values())
|
for (EnumFacing enumfacing : EnumFacing.values())
|
||||||
{
|
{
|
||||||
- i = Math.max(this.func_176534_d(p_176538_1_.func_180495_p(p_176538_2_.func_177972_a(enumfacing)).func_177230_c()), i);
|
- i = Math.max(this.func_176534_d(p_176538_1_.func_180495_p(p_176538_2_.func_177972_a(enumfacing)).func_177230_c()), i);
|
||||||
+ i = Math.max(p_176538_1_.func_180495_p(p_176538_2_.func_177972_a(enumfacing)).func_177230_c().getFlammability(p_176538_1_, p_176538_2_.func_177972_a(enumfacing), enumfacing.func_176734_d()), i);
|
+ i = Math.max(p_176538_1_.func_180495_p(p_176538_2_.func_177972_a(enumfacing)).func_177230_c().getFireSpreadSpeed(p_176538_1_, p_176538_2_.func_177972_a(enumfacing), enumfacing.func_176734_d()), i);
|
||||||
}
|
}
|
||||||
|
|
||||||
return i;
|
return i;
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
--- ../src-base/minecraft/net/minecraft/block/BlockFlowerPot.java
|
--- ../src-base/minecraft/net/minecraft/block/BlockFlowerPot.java
|
||||||
+++ ../src-work/minecraft/net/minecraft/block/BlockFlowerPot.java
|
+++ ../src-work/minecraft/net/minecraft/block/BlockFlowerPot.java
|
||||||
@@ -151,13 +151,6 @@
|
@@ -165,13 +165,6 @@
|
||||||
|
|
||||||
public void func_180663_b(World p_180663_1_, BlockPos p_180663_2_, IBlockState p_180663_3_)
|
public void func_180663_b(World p_180663_1_, BlockPos p_180663_2_, IBlockState p_180663_3_)
|
||||||
{
|
{
|
||||||
@@ -14,7 +14,7 @@
|
|||||||
super.func_180663_b(p_180663_1_, p_180663_2_, p_180663_3_);
|
super.func_180663_b(p_180663_1_, p_180663_2_, p_180663_3_);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -379,6 +372,31 @@
|
@@ -392,6 +385,31 @@
|
||||||
return BlockRenderLayer.CUTOUT;
|
return BlockRenderLayer.CUTOUT;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -36,7 +36,7 @@
|
|||||||
+ return super.removedByPlayer(state, world, pos, player, willHarvest);
|
+ return super.removedByPlayer(state, world, pos, player, willHarvest);
|
||||||
+ }
|
+ }
|
||||||
+ @Override
|
+ @Override
|
||||||
+ public void func_180657_a(World world, EntityPlayer player, BlockPos pos, IBlockState state, TileEntity te, ItemStack tool)
|
+ public void func_180657_a(World world, EntityPlayer player, BlockPos pos, IBlockState state, @Nullable TileEntity te, ItemStack tool)
|
||||||
+ {
|
+ {
|
||||||
+ super.func_180657_a(world, player, pos, state, te, tool);
|
+ super.func_180657_a(world, player, pos, state, te, tool);
|
||||||
+ world.func_175698_g(pos);
|
+ world.func_175698_g(pos);
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
--- ../src-base/minecraft/net/minecraft/block/BlockGrass.java
|
--- ../src-base/minecraft/net/minecraft/block/BlockGrass.java
|
||||||
+++ ../src-work/minecraft/net/minecraft/block/BlockGrass.java
|
+++ ../src-work/minecraft/net/minecraft/block/BlockGrass.java
|
||||||
@@ -39,7 +39,7 @@
|
@@ -38,7 +38,7 @@
|
||||||
{
|
{
|
||||||
if (!p_180650_1_.field_72995_K)
|
if (!p_180650_1_.field_72995_K)
|
||||||
{
|
{
|
||||||
@@ -9,7 +9,7 @@
|
|||||||
{
|
{
|
||||||
p_180650_1_.func_175656_a(p_180650_2_, Blocks.field_150346_d.func_176223_P());
|
p_180650_1_.func_175656_a(p_180650_2_, Blocks.field_150346_d.func_176223_P());
|
||||||
}
|
}
|
||||||
@@ -59,7 +59,7 @@
|
@@ -58,7 +58,7 @@
|
||||||
IBlockState iblockstate = p_180650_1_.func_180495_p(blockpos.func_177984_a());
|
IBlockState iblockstate = p_180650_1_.func_180495_p(blockpos.func_177984_a());
|
||||||
IBlockState iblockstate1 = p_180650_1_.func_180495_p(blockpos);
|
IBlockState iblockstate1 = p_180650_1_.func_180495_p(blockpos);
|
||||||
|
|
||||||
@@ -18,7 +18,7 @@
|
|||||||
{
|
{
|
||||||
p_180650_1_.func_175656_a(blockpos, Blocks.field_150349_c.func_176223_P());
|
p_180650_1_.func_175656_a(blockpos, Blocks.field_150349_c.func_176223_P());
|
||||||
}
|
}
|
||||||
@@ -98,7 +98,7 @@
|
@@ -96,18 +96,11 @@
|
||||||
{
|
{
|
||||||
if (j >= i / 16)
|
if (j >= i / 16)
|
||||||
{
|
{
|
||||||
@@ -27,3 +27,15 @@
|
|||||||
{
|
{
|
||||||
if (p_176474_2_.nextInt(8) == 0)
|
if (p_176474_2_.nextInt(8) == 0)
|
||||||
{
|
{
|
||||||
|
- BlockFlower.EnumFlowerType blockflower$enumflowertype = p_176474_1_.func_180494_b(blockpos1).func_180623_a(p_176474_2_, blockpos1);
|
||||||
|
- BlockFlower blockflower = blockflower$enumflowertype.func_176964_a().func_180346_a();
|
||||||
|
- IBlockState iblockstate = blockflower.func_176223_P().func_177226_a(blockflower.func_176494_l(), blockflower$enumflowertype);
|
||||||
|
-
|
||||||
|
- if (blockflower.func_180671_f(p_176474_1_, blockpos1, iblockstate))
|
||||||
|
- {
|
||||||
|
- p_176474_1_.func_180501_a(blockpos1, iblockstate, 3);
|
||||||
|
- }
|
||||||
|
+ p_176474_1_.func_180494_b(blockpos1).plantFlower(p_176474_1_, p_176474_2_, blockpos1);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
--- ../src-base/minecraft/net/minecraft/block/BlockHugeMushroom.java
|
--- ../src-base/minecraft/net/minecraft/block/BlockHugeMushroom.java
|
||||||
+++ ../src-work/minecraft/net/minecraft/block/BlockHugeMushroom.java
|
+++ ../src-work/minecraft/net/minecraft/block/BlockHugeMushroom.java
|
||||||
@@ -223,6 +223,20 @@
|
@@ -221,6 +221,20 @@
|
||||||
return new BlockStateContainer(this, new IProperty[] {field_176380_a});
|
return new BlockStateContainer(this, new IProperty[] {field_176380_a});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,20 +1,15 @@
|
|||||||
--- ../src-base/minecraft/net/minecraft/block/BlockIce.java
|
--- ../src-base/minecraft/net/minecraft/block/BlockIce.java
|
||||||
+++ ../src-work/minecraft/net/minecraft/block/BlockIce.java
|
+++ ../src-work/minecraft/net/minecraft/block/BlockIce.java
|
||||||
@@ -41,14 +41,19 @@
|
@@ -41,9 +41,14 @@
|
||||||
p_180657_2_.func_71029_a(StatList.func_188055_a(this));
|
p_180657_2_.func_71029_a(StatList.func_188055_a(this));
|
||||||
p_180657_2_.func_71020_j(0.025F);
|
p_180657_2_.func_71020_j(0.005F);
|
||||||
|
|
||||||
- if (this.func_149700_E() && EnchantmentHelper.func_77506_a(Enchantments.field_185306_r, p_180657_6_) > 0)
|
- if (this.func_149700_E() && EnchantmentHelper.func_77506_a(Enchantments.field_185306_r, p_180657_6_) > 0)
|
||||||
+ if (this.canSilkHarvest(p_180657_1_, p_180657_3_, p_180657_4_, p_180657_2_) && EnchantmentHelper.func_77506_a(Enchantments.field_185306_r, p_180657_6_) > 0)
|
+ if (this.canSilkHarvest(p_180657_1_, p_180657_3_, p_180657_4_, p_180657_2_) && EnchantmentHelper.func_77506_a(Enchantments.field_185306_r, p_180657_6_) > 0)
|
||||||
{
|
{
|
||||||
|
- func_180635_a(p_180657_1_, p_180657_3_, this.func_180643_i(p_180657_4_));
|
||||||
+ java.util.List<ItemStack> items = new java.util.ArrayList<ItemStack>();
|
+ java.util.List<ItemStack> items = new java.util.ArrayList<ItemStack>();
|
||||||
ItemStack itemstack = this.func_180643_i(p_180657_4_);
|
+ items.add(this.func_180643_i(p_180657_4_));
|
||||||
|
|
||||||
if (itemstack != null)
|
|
||||||
{
|
|
||||||
- func_180635_a(p_180657_1_, p_180657_3_, itemstack);
|
|
||||||
+ items.add(itemstack);
|
|
||||||
}
|
|
||||||
+
|
+
|
||||||
+ net.minecraftforge.event.ForgeEventFactory.fireBlockHarvesting(items, p_180657_1_, p_180657_3_, p_180657_4_, 0, 1.0f, true, p_180657_2_);
|
+ net.minecraftforge.event.ForgeEventFactory.fireBlockHarvesting(items, p_180657_1_, p_180657_3_, p_180657_4_, 0, 1.0f, true, p_180657_2_);
|
||||||
+ for (ItemStack is : items)
|
+ for (ItemStack is : items)
|
||||||
@@ -22,7 +17,7 @@
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@@ -59,7 +64,9 @@
|
@@ -54,7 +59,9 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
int i = EnchantmentHelper.func_77506_a(Enchantments.field_185308_t, p_180657_6_);
|
int i = EnchantmentHelper.func_77506_a(Enchantments.field_185308_t, p_180657_6_);
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
--- ../src-base/minecraft/net/minecraft/block/BlockLeaves.java
|
--- ../src-base/minecraft/net/minecraft/block/BlockLeaves.java
|
||||||
+++ ../src-work/minecraft/net/minecraft/block/BlockLeaves.java
|
+++ ../src-work/minecraft/net/minecraft/block/BlockLeaves.java
|
||||||
@@ -18,7 +18,7 @@
|
@@ -17,7 +17,7 @@
|
||||||
import net.minecraftforge.fml.relauncher.Side;
|
import net.minecraftforge.fml.relauncher.Side;
|
||||||
import net.minecraftforge.fml.relauncher.SideOnly;
|
import net.minecraftforge.fml.relauncher.SideOnly;
|
||||||
|
|
||||||
@@ -9,7 +9,7 @@
|
|||||||
{
|
{
|
||||||
public static final PropertyBool field_176237_a = PropertyBool.func_177716_a("decayable");
|
public static final PropertyBool field_176237_a = PropertyBool.func_177716_a("decayable");
|
||||||
public static final PropertyBool field_176236_b = PropertyBool.func_177716_a("check_decay");
|
public static final PropertyBool field_176236_b = PropertyBool.func_177716_a("check_decay");
|
||||||
@@ -54,9 +54,9 @@
|
@@ -53,9 +53,9 @@
|
||||||
BlockPos blockpos = p_180663_2_.func_177982_a(j1, k1, l1);
|
BlockPos blockpos = p_180663_2_.func_177982_a(j1, k1, l1);
|
||||||
IBlockState iblockstate = p_180663_1_.func_180495_p(blockpos);
|
IBlockState iblockstate = p_180663_1_.func_180495_p(blockpos);
|
||||||
|
|
||||||
@@ -21,7 +21,7 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -97,9 +97,9 @@
|
@@ -96,9 +96,9 @@
|
||||||
IBlockState iblockstate = p_180650_1_.func_180495_p(blockpos$mutableblockpos.func_181079_c(k + i2, l + j2, i1 + k2));
|
IBlockState iblockstate = p_180650_1_.func_180495_p(blockpos$mutableblockpos.func_181079_c(k + i2, l + j2, i1 + k2));
|
||||||
Block block = iblockstate.func_177230_c();
|
Block block = iblockstate.func_177230_c();
|
||||||
|
|
||||||
@@ -33,7 +33,7 @@
|
|||||||
{
|
{
|
||||||
this.field_150128_a[(i2 + 16) * 1024 + (j2 + 16) * 32 + k2 + 16] = -2;
|
this.field_150128_a[(i2 + 16) * 1024 + (j2 + 16) * 32 + k2 + 16] = -2;
|
||||||
}
|
}
|
||||||
@@ -207,40 +207,7 @@
|
@@ -205,40 +205,7 @@
|
||||||
|
|
||||||
public void func_180653_a(World p_180653_1_, BlockPos p_180653_2_, IBlockState p_180653_3_, float p_180653_4_, int p_180653_5_)
|
public void func_180653_a(World p_180653_1_, BlockPos p_180653_2_, IBlockState p_180653_3_, float p_180653_4_, int p_180653_5_)
|
||||||
{
|
{
|
||||||
@@ -75,7 +75,7 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
protected void func_176234_a(World p_176234_1_, BlockPos p_176234_2_, IBlockState p_176234_3_, int p_176234_4_)
|
protected void func_176234_a(World p_176234_1_, BlockPos p_176234_2_, IBlockState p_176234_3_, int p_176234_4_)
|
||||||
@@ -276,6 +243,49 @@
|
@@ -274,6 +241,53 @@
|
||||||
|
|
||||||
public abstract BlockPlanks.EnumType func_176233_b(int p_176233_1_);
|
public abstract BlockPlanks.EnumType func_176233_b(int p_176233_1_);
|
||||||
|
|
||||||
@@ -105,7 +105,11 @@
|
|||||||
+ }
|
+ }
|
||||||
+
|
+
|
||||||
+ if (rand.nextInt(chance) == 0)
|
+ if (rand.nextInt(chance) == 0)
|
||||||
+ ret.add(new ItemStack(func_180660_a(state, rand, fortune), 1, func_180651_a(state)));
|
+ {
|
||||||
|
+ ItemStack drop = new ItemStack(func_180660_a(state, rand, fortune), 1, func_180651_a(state));
|
||||||
|
+ if (!drop.func_190926_b())
|
||||||
|
+ ret.add(drop);
|
||||||
|
+ }
|
||||||
+
|
+
|
||||||
+ chance = 200;
|
+ chance = 200;
|
||||||
+ if (fortune > 0)
|
+ if (fortune > 0)
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
--- ../src-base/minecraft/net/minecraft/block/BlockLever.java
|
--- ../src-base/minecraft/net/minecraft/block/BlockLever.java
|
||||||
+++ ../src-work/minecraft/net/minecraft/block/BlockLever.java
|
+++ ../src-work/minecraft/net/minecraft/block/BlockLever.java
|
||||||
@@ -297,6 +297,12 @@
|
@@ -296,6 +296,12 @@
|
||||||
return new BlockStateContainer(this, new IProperty[] {field_176360_a, field_176359_b});
|
return new BlockStateContainer(this, new IProperty[] {field_176360_a, field_176359_b});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
--- ../src-base/minecraft/net/minecraft/block/BlockMobSpawner.java
|
--- ../src-base/minecraft/net/minecraft/block/BlockMobSpawner.java
|
||||||
+++ ../src-work/minecraft/net/minecraft/block/BlockMobSpawner.java
|
+++ ../src-work/minecraft/net/minecraft/block/BlockMobSpawner.java
|
||||||
@@ -41,10 +41,14 @@
|
@@ -40,10 +40,14 @@
|
||||||
public void func_180653_a(World p_180653_1_, BlockPos p_180653_2_, IBlockState p_180653_3_, float p_180653_4_, int p_180653_5_)
|
public void func_180653_a(World p_180653_1_, BlockPos p_180653_2_, IBlockState p_180653_3_, float p_180653_4_, int p_180653_5_)
|
||||||
{
|
{
|
||||||
super.func_180653_a(p_180653_1_, p_180653_2_, p_180653_3_, p_180653_4_, p_180653_5_);
|
super.func_180653_a(p_180653_1_, p_180653_2_, p_180653_3_, p_180653_4_, p_180653_5_);
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
--- ../src-base/minecraft/net/minecraft/block/BlockMycelium.java
|
--- ../src-base/minecraft/net/minecraft/block/BlockMycelium.java
|
||||||
+++ ../src-work/minecraft/net/minecraft/block/BlockMycelium.java
|
+++ ../src-work/minecraft/net/minecraft/block/BlockMycelium.java
|
||||||
@@ -40,7 +40,7 @@
|
@@ -39,7 +39,7 @@
|
||||||
{
|
{
|
||||||
if (!p_180650_1_.field_72995_K)
|
if (!p_180650_1_.field_72995_K)
|
||||||
{
|
{
|
||||||
@@ -9,7 +9,7 @@
|
|||||||
{
|
{
|
||||||
p_180650_1_.func_175656_a(p_180650_2_, Blocks.field_150346_d.func_176223_P().func_177226_a(BlockDirt.field_176386_a, BlockDirt.DirtType.DIRT));
|
p_180650_1_.func_175656_a(p_180650_2_, Blocks.field_150346_d.func_176223_P().func_177226_a(BlockDirt.field_176386_a, BlockDirt.DirtType.DIRT));
|
||||||
}
|
}
|
||||||
@@ -54,7 +54,7 @@
|
@@ -53,7 +53,7 @@
|
||||||
IBlockState iblockstate = p_180650_1_.func_180495_p(blockpos);
|
IBlockState iblockstate = p_180650_1_.func_180495_p(blockpos);
|
||||||
IBlockState iblockstate1 = p_180650_1_.func_180495_p(blockpos.func_177984_a());
|
IBlockState iblockstate1 = p_180650_1_.func_180495_p(blockpos.func_177984_a());
|
||||||
|
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
--- ../src-base/minecraft/net/minecraft/block/BlockNetherWart.java
|
--- ../src-base/minecraft/net/minecraft/block/BlockNetherWart.java
|
||||||
+++ ../src-work/minecraft/net/minecraft/block/BlockNetherWart.java
|
+++ ../src-work/minecraft/net/minecraft/block/BlockNetherWart.java
|
||||||
@@ -43,7 +43,7 @@
|
@@ -42,25 +42,28 @@
|
||||||
|
|
||||||
public boolean func_180671_f(World p_180671_1_, BlockPos p_180671_2_, IBlockState p_180671_3_)
|
public boolean func_180671_f(World p_180671_1_, BlockPos p_180671_2_, IBlockState p_180671_3_)
|
||||||
{
|
{
|
||||||
@@ -9,7 +9,17 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
public void func_180650_b(World p_180650_1_, BlockPos p_180650_2_, IBlockState p_180650_3_, Random p_180650_4_)
|
public void func_180650_b(World p_180650_1_, BlockPos p_180650_2_, IBlockState p_180650_3_, Random p_180650_4_)
|
||||||
@@ -59,9 +59,11 @@
|
{
|
||||||
|
int i = ((Integer)p_180650_3_.func_177229_b(field_176486_a)).intValue();
|
||||||
|
|
||||||
|
- if (i < 3 && p_180650_4_.nextInt(10) == 0)
|
||||||
|
+ if (i < 3 && net.minecraftforge.common.ForgeHooks.onCropsGrowPre(p_180650_1_, p_180650_2_, p_180650_3_, p_180650_4_.nextInt(10) == 0))
|
||||||
|
{
|
||||||
|
p_180650_3_ = p_180650_3_.func_177226_a(field_176486_a, Integer.valueOf(i + 1));
|
||||||
|
p_180650_1_.func_180501_a(p_180650_2_, p_180650_3_, 2);
|
||||||
|
+ net.minecraftforge.common.ForgeHooks.onCropsGrowPost(p_180650_1_, p_180650_2_, p_180650_3_, p_180650_1_.func_180495_p(p_180650_2_));
|
||||||
|
}
|
||||||
|
|
||||||
super.func_180650_b(p_180650_1_, p_180650_2_, p_180650_3_, p_180650_4_);
|
super.func_180650_b(p_180650_1_, p_180650_2_, p_180650_3_, p_180650_4_);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -22,7 +32,7 @@
|
|||||||
{
|
{
|
||||||
int i = 1;
|
int i = 1;
|
||||||
|
|
||||||
@@ -108,6 +110,26 @@
|
@@ -106,6 +109,26 @@
|
||||||
return ((Integer)p_176201_1_.func_177229_b(field_176486_a)).intValue();
|
return ((Integer)p_176201_1_.func_177229_b(field_176486_a)).intValue();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,22 +1,13 @@
|
|||||||
--- ../src-base/minecraft/net/minecraft/block/BlockNewLeaf.java
|
--- ../src-base/minecraft/net/minecraft/block/BlockNewLeaf.java
|
||||||
+++ ../src-work/minecraft/net/minecraft/block/BlockNewLeaf.java
|
+++ ../src-work/minecraft/net/minecraft/block/BlockNewLeaf.java
|
||||||
@@ -99,7 +99,7 @@
|
|
||||||
|
|
||||||
public void func_180657_a(World p_180657_1_, EntityPlayer p_180657_2_, BlockPos p_180657_3_, IBlockState p_180657_4_, @Nullable TileEntity p_180657_5_, @Nullable ItemStack p_180657_6_)
|
|
||||||
{
|
|
||||||
- if (!p_180657_1_.field_72995_K && p_180657_6_ != null && p_180657_6_.func_77973_b() == Items.field_151097_aZ)
|
|
||||||
+ if (false && !p_180657_1_.field_72995_K && p_180657_6_ != null && p_180657_6_.func_77973_b() == Items.field_151097_aZ) //Forge: Noop this
|
|
||||||
{
|
|
||||||
p_180657_2_.func_71029_a(StatList.func_188055_a(this));
|
|
||||||
func_180635_a(p_180657_1_, p_180657_3_, new ItemStack(Item.func_150898_a(this), 1, ((BlockPlanks.EnumType)p_180657_4_.func_177229_b(field_176240_P)).func_176839_a() - 4));
|
|
||||||
@@ -109,4 +109,10 @@
|
@@ -109,4 +109,10 @@
|
||||||
super.func_180657_a(p_180657_1_, p_180657_2_, p_180657_3_, p_180657_4_, p_180657_5_, p_180657_6_);
|
super.func_180657_a(p_180657_1_, p_180657_2_, p_180657_3_, p_180657_4_, p_180657_5_, p_180657_6_);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
+
|
+
|
||||||
+ @Override
|
+ @Override
|
||||||
+ public List<ItemStack> onSheared(ItemStack item, net.minecraft.world.IBlockAccess world, BlockPos pos, int fortune)
|
+ public NonNullList<ItemStack> onSheared(ItemStack item, net.minecraft.world.IBlockAccess world, BlockPos pos, int fortune)
|
||||||
+ {
|
+ {
|
||||||
+ return java.util.Arrays.asList(new ItemStack(this, 1, world.func_180495_p(pos).func_177229_b(field_176240_P).func_176839_a() - 4));
|
+ return NonNullList.func_191197_a(1, new ItemStack(this, 1, world.func_180495_p(pos).func_177229_b(field_176240_P).func_176839_a() - 4));
|
||||||
+ }
|
+ }
|
||||||
}
|
}
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
--- ../src-base/minecraft/net/minecraft/block/BlockNote.java
|
--- ../src-base/minecraft/net/minecraft/block/BlockNote.java
|
||||||
+++ ../src-work/minecraft/net/minecraft/block/BlockNote.java
|
+++ ../src-work/minecraft/net/minecraft/block/BlockNote.java
|
||||||
@@ -65,7 +65,9 @@
|
@@ -63,7 +63,9 @@
|
||||||
if (tileentity instanceof TileEntityNote)
|
if (tileentity instanceof TileEntityNote)
|
||||||
{
|
{
|
||||||
TileEntityNote tileentitynote = (TileEntityNote)tileentity;
|
TileEntityNote tileentitynote = (TileEntityNote)tileentity;
|
||||||
@@ -10,7 +10,7 @@
|
|||||||
tileentitynote.func_175108_a(p_180639_1_, p_180639_2_);
|
tileentitynote.func_175108_a(p_180639_1_, p_180639_2_);
|
||||||
p_180639_4_.func_71029_a(StatList.field_188087_U);
|
p_180639_4_.func_71029_a(StatList.field_188087_U);
|
||||||
}
|
}
|
||||||
@@ -105,6 +107,10 @@
|
@@ -103,6 +105,10 @@
|
||||||
|
|
||||||
public boolean func_189539_a(IBlockState p_189539_1_, World p_189539_2_, BlockPos p_189539_3_, int p_189539_4_, int p_189539_5_)
|
public boolean func_189539_a(IBlockState p_189539_1_, World p_189539_2_, BlockPos p_189539_3_, int p_189539_4_, int p_189539_5_)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -0,0 +1,15 @@
|
|||||||
|
--- ../src-base/minecraft/net/minecraft/block/BlockObserver.java
|
||||||
|
+++ ../src-work/minecraft/net/minecraft/block/BlockObserver.java
|
||||||
|
@@ -145,4 +145,12 @@
|
||||||
|
{
|
||||||
|
return this.func_176223_P().func_177226_a(field_176387_N, EnumFacing.func_82600_a(p_176203_1_ & 7));
|
||||||
|
}
|
||||||
|
+
|
||||||
|
+ /* ======================================== FORGE START =====================================*/
|
||||||
|
+ @Override
|
||||||
|
+ public void observedNeighborChange(IBlockState observerState, World world, BlockPos observerPos, Block changedBlock, BlockPos changedBlockPos)
|
||||||
|
+ {
|
||||||
|
+ func_190962_b(observerState, world, observerPos, changedBlock, changedBlockPos);
|
||||||
|
+ }
|
||||||
|
+ /* ========================================= FORGE END ======================================*/
|
||||||
|
}
|
||||||
@@ -1,7 +1,7 @@
|
|||||||
--- ../src-base/minecraft/net/minecraft/block/BlockOldLeaf.java
|
--- ../src-base/minecraft/net/minecraft/block/BlockOldLeaf.java
|
||||||
+++ ../src-work/minecraft/net/minecraft/block/BlockOldLeaf.java
|
+++ ../src-work/minecraft/net/minecraft/block/BlockOldLeaf.java
|
||||||
@@ -104,11 +104,16 @@
|
@@ -104,11 +104,16 @@
|
||||||
if (!p_180657_1_.field_72995_K && p_180657_6_ != null && p_180657_6_.func_77973_b() == Items.field_151097_aZ)
|
if (!p_180657_1_.field_72995_K && p_180657_6_.func_77973_b() == Items.field_151097_aZ)
|
||||||
{
|
{
|
||||||
p_180657_2_.func_71029_a(StatList.func_188055_a(this));
|
p_180657_2_.func_71029_a(StatList.func_188055_a(this));
|
||||||
- func_180635_a(p_180657_1_, p_180657_3_, new ItemStack(Item.func_150898_a(this), 1, ((BlockPlanks.EnumType)p_180657_4_.func_177229_b(field_176239_P)).func_176839_a()));
|
- func_180635_a(p_180657_1_, p_180657_3_, new ItemStack(Item.func_150898_a(this), 1, ((BlockPlanks.EnumType)p_180657_4_.func_177229_b(field_176239_P)).func_176839_a()));
|
||||||
@@ -13,8 +13,8 @@
|
|||||||
}
|
}
|
||||||
+
|
+
|
||||||
+ @Override
|
+ @Override
|
||||||
+ public List<ItemStack> onSheared(ItemStack item, net.minecraft.world.IBlockAccess world, BlockPos pos, int fortune)
|
+ public NonNullList<ItemStack> onSheared(ItemStack item, net.minecraft.world.IBlockAccess world, BlockPos pos, int fortune)
|
||||||
+ {
|
+ {
|
||||||
+ return java.util.Arrays.asList(new ItemStack(this, 1, world.func_180495_p(pos).func_177229_b(field_176239_P).func_176839_a()));
|
+ return NonNullList.func_191197_a(1, new ItemStack(this, 1, world.func_180495_p(pos).func_177229_b(field_176239_P).func_176839_a()));
|
||||||
+ }
|
+ }
|
||||||
}
|
}
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
--- ../src-base/minecraft/net/minecraft/block/BlockOre.java
|
--- ../src-base/minecraft/net/minecraft/block/BlockOre.java
|
||||||
+++ ../src-work/minecraft/net/minecraft/block/BlockOre.java
|
+++ ../src-work/minecraft/net/minecraft/block/BlockOre.java
|
||||||
@@ -61,34 +61,39 @@
|
@@ -59,34 +59,39 @@
|
||||||
public void func_180653_a(World p_180653_1_, BlockPos p_180653_2_, IBlockState p_180653_3_, float p_180653_4_, int p_180653_5_)
|
public void func_180653_a(World p_180653_1_, BlockPos p_180653_2_, IBlockState p_180653_3_, float p_180653_4_, int p_180653_5_)
|
||||||
{
|
{
|
||||||
super.func_180653_a(p_180653_1_, p_180653_2_, p_180653_3_, p_180653_4_, p_180653_5_);
|
super.func_180653_a(p_180653_1_, p_180653_2_, p_180653_3_, p_180653_4_, p_180653_5_);
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
--- ../src-base/minecraft/net/minecraft/block/BlockPane.java
|
--- ../src-base/minecraft/net/minecraft/block/BlockPane.java
|
||||||
+++ ../src-work/minecraft/net/minecraft/block/BlockPane.java
|
+++ ../src-work/minecraft/net/minecraft/block/BlockPane.java
|
||||||
@@ -106,7 +106,10 @@
|
@@ -111,7 +111,10 @@
|
||||||
|
|
||||||
public IBlockState func_176221_a(IBlockState p_176221_1_, IBlockAccess p_176221_2_, BlockPos p_176221_3_)
|
public IBlockState func_176221_a(IBlockState p_176221_1_, IBlockAccess p_176221_2_, BlockPos p_176221_3_)
|
||||||
{
|
{
|
||||||
@@ -11,16 +11,26 @@
|
|||||||
+ .func_177226_a(field_176242_M, canPaneConnectTo(p_176221_2_, p_176221_3_, EnumFacing.EAST));
|
+ .func_177226_a(field_176242_M, canPaneConnectTo(p_176221_2_, p_176221_3_, EnumFacing.EAST));
|
||||||
}
|
}
|
||||||
|
|
||||||
@Nullable
|
public Item func_180660_a(IBlockState p_180660_1_, Random p_180660_2_, int p_180660_3_)
|
||||||
@@ -184,4 +187,11 @@
|
@@ -188,4 +191,21 @@
|
||||||
{
|
{
|
||||||
return new BlockStateContainer(this, new IProperty[] {field_176241_b, field_176242_M, field_176244_O, field_176243_N});
|
return new BlockStateContainer(this, new IProperty[] {field_176241_b, field_176242_M, field_176244_O, field_176243_N});
|
||||||
}
|
}
|
||||||
+
|
+
|
||||||
|
+ /* ======================================== FORGE START ======================================== */
|
||||||
|
+
|
||||||
|
+ @Override
|
||||||
|
+ public boolean canBeConnectedTo(IBlockAccess world, BlockPos pos, EnumFacing facing)
|
||||||
|
+ {
|
||||||
|
+ Block connector = world.func_180495_p(pos.func_177972_a(facing)).func_177230_c();
|
||||||
|
+ return connector instanceof BlockPane;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
+ public boolean canPaneConnectTo(IBlockAccess world, BlockPos pos, EnumFacing dir)
|
+ public boolean canPaneConnectTo(IBlockAccess world, BlockPos pos, EnumFacing dir)
|
||||||
+ {
|
+ {
|
||||||
+ BlockPos off = pos.func_177972_a(dir);
|
+ IBlockState state = world.func_180495_p(pos.func_177972_a(dir));
|
||||||
+ IBlockState state = world.func_180495_p(off);
|
+ return state.func_177230_c().canBeConnectedTo(world, pos.func_177972_a(dir), dir.func_176734_d()) || func_150098_a(state.func_177230_c()) || state.isSideSolid(world, pos.func_177972_a(dir), dir.func_176734_d());
|
||||||
+ return func_150098_a(state.func_177230_c()) || state.isSideSolid(world, off, dir.func_176734_d());
|
|
||||||
+ }
|
+ }
|
||||||
|
+
|
||||||
|
+ /* ======================================== FORGE END ======================================== */
|
||||||
}
|
}
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
--- ../src-base/minecraft/net/minecraft/block/BlockPistonBase.java
|
--- ../src-base/minecraft/net/minecraft/block/BlockPistonBase.java
|
||||||
+++ ../src-work/minecraft/net/minecraft/block/BlockPistonBase.java
|
+++ ../src-work/minecraft/net/minecraft/block/BlockPistonBase.java
|
||||||
@@ -236,7 +236,7 @@
|
@@ -240,7 +240,7 @@
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -9,7 +9,7 @@
|
|||||||
{
|
{
|
||||||
this.func_176319_a(p_189539_2_, p_189539_3_, enumfacing, false);
|
this.func_176319_a(p_189539_2_, p_189539_3_, enumfacing, false);
|
||||||
}
|
}
|
||||||
@@ -322,7 +322,7 @@
|
@@ -306,7 +306,7 @@
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -18,7 +18,7 @@
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@@ -368,7 +368,9 @@
|
@@ -352,7 +352,9 @@
|
||||||
{
|
{
|
||||||
BlockPos blockpos1 = (BlockPos)list2.get(j);
|
BlockPos blockpos1 = (BlockPos)list2.get(j);
|
||||||
IBlockState iblockstate = p_176319_1_.func_180495_p(blockpos1);
|
IBlockState iblockstate = p_176319_1_.func_180495_p(blockpos1);
|
||||||
@@ -26,6 +26,18 @@
|
|||||||
+ // Forge: With our change to how snowballs are dropped this needs to disallow to mimic vanilla behavior.
|
+ // Forge: With our change to how snowballs are dropped this needs to disallow to mimic vanilla behavior.
|
||||||
+ float chance = iblockstate.func_177230_c() instanceof BlockSnow ? -1.0f : 1.0f;
|
+ float chance = iblockstate.func_177230_c() instanceof BlockSnow ? -1.0f : 1.0f;
|
||||||
+ iblockstate.func_177230_c().func_180653_a(p_176319_1_, blockpos1, iblockstate, chance, 0);
|
+ iblockstate.func_177230_c().func_180653_a(p_176319_1_, blockpos1, iblockstate, chance, 0);
|
||||||
p_176319_1_.func_175698_g(blockpos1);
|
p_176319_1_.func_180501_a(blockpos1, Blocks.field_150350_a.func_176223_P(), 4);
|
||||||
--k;
|
--k;
|
||||||
aiblockstate[k] = iblockstate;
|
aiblockstate[k] = iblockstate;
|
||||||
|
@@ -432,4 +434,11 @@
|
||||||
|
{
|
||||||
|
return new BlockStateContainer(this, new IProperty[] {field_176387_N, field_176320_b});
|
||||||
|
}
|
||||||
|
+
|
||||||
|
+ /* ======================================== FORGE START =====================================*/
|
||||||
|
+ public boolean rotateBlock(World world, BlockPos pos, EnumFacing axis)
|
||||||
|
+ {
|
||||||
|
+ IBlockState state = world.func_180495_p(pos);
|
||||||
|
+ return !state.func_177229_b(field_176320_b) && super.rotateBlock(world, pos, axis);
|
||||||
|
+ }
|
||||||
|
}
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
--- ../src-base/minecraft/net/minecraft/block/BlockPistonMoving.java
|
--- ../src-base/minecraft/net/minecraft/block/BlockPistonMoving.java
|
||||||
+++ ../src-work/minecraft/net/minecraft/block/BlockPistonMoving.java
|
+++ ../src-work/minecraft/net/minecraft/block/BlockPistonMoving.java
|
||||||
@@ -112,7 +112,7 @@
|
@@ -115,7 +115,7 @@
|
||||||
|
|
||||||
public void func_180653_a(World p_180653_1_, BlockPos p_180653_2_, IBlockState p_180653_3_, float p_180653_4_, int p_180653_5_)
|
public void func_180653_a(World p_180653_1_, BlockPos p_180653_2_, IBlockState p_180653_3_, float p_180653_4_, int p_180653_5_)
|
||||||
{
|
{
|
||||||
@@ -9,15 +9,15 @@
|
|||||||
{
|
{
|
||||||
TileEntityPiston tileentitypiston = this.func_185589_c(p_180653_1_, p_180653_2_);
|
TileEntityPiston tileentitypiston = this.func_185589_c(p_180653_1_, p_180653_2_);
|
||||||
|
|
||||||
@@ -122,6 +122,7 @@
|
@@ -125,6 +125,7 @@
|
||||||
iblockstate.func_177230_c().func_176226_b(p_180653_1_, p_180653_2_, iblockstate, 0);
|
iblockstate.func_177230_c().func_176226_b(p_180653_1_, p_180653_2_, iblockstate, 0);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
+ super.func_180653_a(p_180653_1_, p_180653_2_, p_180653_3_, 1, p_180653_5_); // mimic vanilla behavior from above and ignore chance
|
+ super.func_180653_a(p_180653_1_, p_180653_2_, p_180653_3_, 1, p_180653_5_); // mimic vanilla behavior from above and ignore chance
|
||||||
}
|
}
|
||||||
|
|
||||||
public RayTraceResult func_180636_a(IBlockState p_180636_1_, World p_180636_2_, BlockPos p_180636_3_, Vec3d p_180636_4_, Vec3d p_180636_5_)
|
@Nullable
|
||||||
@@ -195,4 +196,16 @@
|
@@ -208,4 +209,16 @@
|
||||||
{
|
{
|
||||||
return new BlockStateContainer(this, new IProperty[] {field_176426_a, field_176425_b});
|
return new BlockStateContainer(this, new IProperty[] {field_176426_a, field_176425_b});
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
--- ../src-base/minecraft/net/minecraft/block/BlockRailBase.java
|
--- ../src-base/minecraft/net/minecraft/block/BlockRailBase.java
|
||||||
+++ ../src-work/minecraft/net/minecraft/block/BlockRailBase.java
|
+++ ../src-work/minecraft/net/minecraft/block/BlockRailBase.java
|
||||||
@@ -32,7 +32,7 @@
|
@@ -33,7 +33,7 @@
|
||||||
public static boolean func_176563_d(IBlockState p_176563_0_)
|
public static boolean func_176563_d(IBlockState p_176563_0_)
|
||||||
{
|
{
|
||||||
Block block = p_176563_0_.func_177230_c();
|
Block block = p_176563_0_.func_177230_c();
|
||||||
@@ -9,7 +9,16 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
protected BlockRailBase(boolean p_i45389_1_)
|
protected BlockRailBase(boolean p_i45389_1_)
|
||||||
@@ -66,7 +66,7 @@
|
@@ -56,7 +56,7 @@
|
||||||
|
|
||||||
|
public AxisAlignedBB func_185496_a(IBlockState p_185496_1_, IBlockAccess p_185496_2_, BlockPos p_185496_3_)
|
||||||
|
{
|
||||||
|
- BlockRailBase.EnumRailDirection blockrailbase$enumraildirection = p_185496_1_.func_177230_c() == this ? (BlockRailBase.EnumRailDirection)p_185496_1_.func_177229_b(this.func_176560_l()) : null;
|
||||||
|
+ BlockRailBase.EnumRailDirection blockrailbase$enumraildirection = p_185496_1_.func_177230_c() == this ? getRailDirection(p_185496_2_, p_185496_3_, p_185496_1_, null) : null;
|
||||||
|
return blockrailbase$enumraildirection != null && blockrailbase$enumraildirection.func_177018_c() ? field_190959_b : field_185590_a;
|
||||||
|
}
|
||||||
|
|
||||||
|
@@ -67,7 +67,7 @@
|
||||||
|
|
||||||
public boolean func_176196_c(World p_176196_1_, BlockPos p_176196_2_)
|
public boolean func_176196_c(World p_176196_1_, BlockPos p_176196_2_)
|
||||||
{
|
{
|
||||||
@@ -18,8 +27,12 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
public void func_176213_c(World p_176213_1_, BlockPos p_176213_2_, IBlockState p_176213_3_)
|
public void func_176213_c(World p_176213_1_, BlockPos p_176213_2_, IBlockState p_176213_3_)
|
||||||
@@ -89,24 +89,24 @@
|
@@ -87,27 +87,27 @@
|
||||||
BlockRailBase.EnumRailDirection blockrailbase$enumraildirection = (BlockRailBase.EnumRailDirection)p_189540_1_.func_177229_b(this.func_176560_l());
|
{
|
||||||
|
if (!p_189540_2_.field_72995_K)
|
||||||
|
{
|
||||||
|
- BlockRailBase.EnumRailDirection blockrailbase$enumraildirection = (BlockRailBase.EnumRailDirection)p_189540_1_.func_177229_b(this.func_176560_l());
|
||||||
|
+ BlockRailBase.EnumRailDirection blockrailbase$enumraildirection = getRailDirection(p_189540_2_, p_189540_3_, p_189540_2_.func_180495_p(p_189540_3_), null);
|
||||||
boolean flag = false;
|
boolean flag = false;
|
||||||
|
|
||||||
- if (!p_189540_2_.func_180495_p(p_189540_3_.func_177977_b()).func_185896_q())
|
- if (!p_189540_2_.func_180495_p(p_189540_3_.func_177977_b()).func_185896_q())
|
||||||
@@ -48,8 +61,20 @@
|
|||||||
{
|
{
|
||||||
flag = true;
|
flag = true;
|
||||||
}
|
}
|
||||||
@@ -161,6 +161,98 @@
|
@@ -148,7 +148,7 @@
|
||||||
|
{
|
||||||
|
super.func_180663_b(p_180663_1_, p_180663_2_, p_180663_3_);
|
||||||
|
|
||||||
|
- if (((BlockRailBase.EnumRailDirection)p_180663_3_.func_177229_b(this.func_176560_l())).func_177018_c())
|
||||||
|
+ if (getRailDirection(p_180663_1_, p_180663_2_, p_180663_3_, null).func_177018_c())
|
||||||
|
{
|
||||||
|
p_180663_1_.func_175685_c(p_180663_2_.func_177984_a(), this, false);
|
||||||
|
}
|
||||||
|
@@ -160,8 +160,101 @@
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
+ //Forge: Use getRailDirection(IBlockAccess, BlockPos, IBlockState, EntityMinecart) for enhanced ability
|
||||||
public abstract IProperty<BlockRailBase.EnumRailDirection> func_176560_l();
|
public abstract IProperty<BlockRailBase.EnumRailDirection> func_176560_l();
|
||||||
|
|
||||||
+ /* ======================================== FORGE START =====================================*/
|
+ /* ======================================== FORGE START =====================================*/
|
||||||
@@ -147,7 +172,7 @@
|
|||||||
public static enum EnumRailDirection implements IStringSerializable
|
public static enum EnumRailDirection implements IStringSerializable
|
||||||
{
|
{
|
||||||
NORTH_SOUTH(0, "north_south"),
|
NORTH_SOUTH(0, "north_south"),
|
||||||
@@ -231,6 +323,7 @@
|
@@ -232,6 +325,7 @@
|
||||||
private IBlockState field_180366_e;
|
private IBlockState field_180366_e;
|
||||||
private final boolean field_150656_f;
|
private final boolean field_150656_f;
|
||||||
private final List<BlockPos> field_150657_g = Lists.<BlockPos>newArrayList();
|
private final List<BlockPos> field_150657_g = Lists.<BlockPos>newArrayList();
|
||||||
@@ -155,7 +180,7 @@
|
|||||||
|
|
||||||
public Rail(World p_i45739_2_, BlockPos p_i45739_3_, IBlockState p_i45739_4_)
|
public Rail(World p_i45739_2_, BlockPos p_i45739_3_, IBlockState p_i45739_4_)
|
||||||
{
|
{
|
||||||
@@ -238,8 +331,9 @@
|
@@ -239,8 +333,9 @@
|
||||||
this.field_180367_c = p_i45739_3_;
|
this.field_180367_c = p_i45739_3_;
|
||||||
this.field_180366_e = p_i45739_4_;
|
this.field_180366_e = p_i45739_4_;
|
||||||
this.field_180365_d = (BlockRailBase)p_i45739_4_.func_177230_c();
|
this.field_180365_d = (BlockRailBase)p_i45739_4_.func_177230_c();
|
||||||
@@ -167,7 +192,7 @@
|
|||||||
this.func_180360_a(blockrailbase$enumraildirection);
|
this.func_180360_a(blockrailbase$enumraildirection);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -431,7 +525,7 @@
|
@@ -432,7 +527,7 @@
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -176,7 +201,7 @@
|
|||||||
{
|
{
|
||||||
if (BlockRailBase.func_176562_d(this.field_150660_b, blockpos.func_177984_a()))
|
if (BlockRailBase.func_176562_d(this.field_150660_b, blockpos.func_177984_a()))
|
||||||
{
|
{
|
||||||
@@ -444,7 +538,7 @@
|
@@ -445,7 +540,7 @@
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -185,7 +210,7 @@
|
|||||||
{
|
{
|
||||||
if (BlockRailBase.func_176562_d(this.field_150660_b, blockpos3.func_177984_a()))
|
if (BlockRailBase.func_176562_d(this.field_150660_b, blockpos3.func_177984_a()))
|
||||||
{
|
{
|
||||||
@@ -587,7 +681,7 @@
|
@@ -588,7 +683,7 @@
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -194,7 +219,7 @@
|
|||||||
{
|
{
|
||||||
if (BlockRailBase.func_176562_d(this.field_150660_b, blockpos.func_177984_a()))
|
if (BlockRailBase.func_176562_d(this.field_150660_b, blockpos.func_177984_a()))
|
||||||
{
|
{
|
||||||
@@ -600,7 +694,7 @@
|
@@ -601,7 +696,7 @@
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,11 @@
|
|||||||
|
--- ../src-base/minecraft/net/minecraft/block/BlockRailDetector.java
|
||||||
|
+++ ../src-work/minecraft/net/minecraft/block/BlockRailDetector.java
|
||||||
|
@@ -156,6 +156,8 @@
|
||||||
|
{
|
||||||
|
if (((Boolean)p_180641_1_.func_177229_b(field_176574_M)).booleanValue())
|
||||||
|
{
|
||||||
|
+ List<EntityMinecart> carts = this.func_176571_a(p_180641_2_, p_180641_3_, EntityMinecart.class);
|
||||||
|
+ if (!carts.isEmpty() && carts.get(0).getComparatorLevel() > -1) return carts.get(0).getComparatorLevel();
|
||||||
|
List<EntityMinecartCommandBlock> list = this.<EntityMinecartCommandBlock>func_176571_a(p_180641_2_, p_180641_3_, EntityMinecartCommandBlock.class, new Predicate[0]);
|
||||||
|
|
||||||
|
if (!list.isEmpty())
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
--- ../src-base/minecraft/net/minecraft/block/BlockRedstoneComparator.java
|
--- ../src-base/minecraft/net/minecraft/block/BlockRedstoneComparator.java
|
||||||
+++ ../src-work/minecraft/net/minecraft/block/BlockRedstoneComparator.java
|
+++ ../src-work/minecraft/net/minecraft/block/BlockRedstoneComparator.java
|
||||||
@@ -312,6 +312,21 @@
|
@@ -311,6 +311,21 @@
|
||||||
return this.func_176223_P().func_177226_a(field_185512_D, p_180642_8_.func_174811_aO().func_176734_d()).func_177226_a(field_176464_a, Boolean.valueOf(false)).func_177226_a(field_176463_b, BlockRedstoneComparator.Mode.COMPARE);
|
return this.func_176223_P().func_177226_a(field_185512_D, p_180642_8_.func_174811_aO().func_176734_d()).func_177226_a(field_176464_a, Boolean.valueOf(false)).func_177226_a(field_176463_b, BlockRedstoneComparator.Mode.COMPARE);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -9,7 +9,7 @@
|
|||||||
+ {
|
+ {
|
||||||
+ if (pos.func_177956_o() == neighbor.func_177956_o() && world instanceof World)
|
+ if (pos.func_177956_o() == neighbor.func_177956_o() && world instanceof World)
|
||||||
+ {
|
+ {
|
||||||
+ func_189540_a(world.func_180495_p(pos), (World)world, pos, world.func_180495_p(neighbor).func_177230_c());
|
+ func_189540_a(world.func_180495_p(pos), (World)world, pos, world.func_180495_p(neighbor).func_177230_c(), neighbor);
|
||||||
+ }
|
+ }
|
||||||
+ }
|
+ }
|
||||||
+
|
+
|
||||||
|
|||||||
@@ -4,8 +4,32 @@
|
|||||||
{
|
{
|
||||||
EnumFacing enumfacing = (EnumFacing)p_176400_3_.func_177229_b(field_185512_D);
|
EnumFacing enumfacing = (EnumFacing)p_176400_3_.func_177229_b(field_185512_D);
|
||||||
BlockPos blockpos = p_176400_2_.func_177972_a(enumfacing.func_176734_d());
|
BlockPos blockpos = p_176400_2_.func_177972_a(enumfacing.func_176734_d());
|
||||||
+ if(net.minecraftforge.event.ForgeEventFactory.onNeighborNotify(p_176400_1_, p_176400_2_, p_176400_1_.func_180495_p(p_176400_2_), java.util.EnumSet.of(enumfacing.func_176734_d())).isCanceled())
|
+ if(net.minecraftforge.event.ForgeEventFactory.onNeighborNotify(p_176400_1_, p_176400_2_, p_176400_1_.func_180495_p(p_176400_2_), java.util.EnumSet.of(enumfacing.func_176734_d()), false).isCanceled())
|
||||||
+ return;
|
+ return;
|
||||||
p_176400_1_.func_180496_d(blockpos, this);
|
p_176400_1_.func_190524_a(blockpos, this, p_176400_2_);
|
||||||
p_176400_1_.func_175695_a(blockpos, this, enumfacing);
|
p_176400_1_.func_175695_a(blockpos, this, enumfacing);
|
||||||
}
|
}
|
||||||
|
@@ -275,4 +277,23 @@
|
||||||
|
{
|
||||||
|
return BlockRenderLayer.CUTOUT;
|
||||||
|
}
|
||||||
|
+
|
||||||
|
+ /* ======================================== FORGE START =====================================*/
|
||||||
|
+ @Override
|
||||||
|
+ public boolean rotateBlock(World world, BlockPos pos, EnumFacing axis)
|
||||||
|
+ {
|
||||||
|
+ if (super.rotateBlock(world, pos, axis))
|
||||||
|
+ {
|
||||||
|
+ IBlockState state = world.func_180495_p(pos);
|
||||||
|
+ state = func_180675_k(state);
|
||||||
|
+ world.func_175656_a(pos, state);
|
||||||
|
+
|
||||||
|
+ if (func_176404_e(world, pos, state))
|
||||||
|
+ {
|
||||||
|
+ world.func_175684_a(pos, this, 1);
|
||||||
|
+ }
|
||||||
|
+ return true;
|
||||||
|
+ }
|
||||||
|
+ return false;
|
||||||
|
+ }
|
||||||
|
}
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
--- ../src-base/minecraft/net/minecraft/block/BlockRedstoneOre.java
|
--- ../src-base/minecraft/net/minecraft/block/BlockRedstoneOre.java
|
||||||
+++ ../src-work/minecraft/net/minecraft/block/BlockRedstoneOre.java
|
+++ ../src-work/minecraft/net/minecraft/block/BlockRedstoneOre.java
|
||||||
@@ -94,12 +94,16 @@
|
@@ -92,12 +92,16 @@
|
||||||
public void func_180653_a(World p_180653_1_, BlockPos p_180653_2_, IBlockState p_180653_3_, float p_180653_4_, int p_180653_5_)
|
public void func_180653_a(World p_180653_1_, BlockPos p_180653_2_, IBlockState p_180653_3_, float p_180653_4_, int p_180653_5_)
|
||||||
{
|
{
|
||||||
super.func_180653_a(p_180653_1_, p_180653_2_, p_180653_3_, p_180653_4_, p_180653_5_);
|
super.func_180653_a(p_180653_1_, p_180653_2_, p_180653_3_, p_180653_4_, p_180653_5_);
|
||||||
|
|||||||
@@ -0,0 +1,11 @@
|
|||||||
|
--- ../src-base/minecraft/net/minecraft/block/BlockRedstoneTorch.java
|
||||||
|
+++ ../src-work/minecraft/net/minecraft/block/BlockRedstoneTorch.java
|
||||||
|
@@ -23,7 +23,7 @@
|
||||||
|
|
||||||
|
public class BlockRedstoneTorch extends BlockTorch
|
||||||
|
{
|
||||||
|
- private static final Map<World, List<BlockRedstoneTorch.Toggle>> field_150112_b = Maps.<World, List<BlockRedstoneTorch.Toggle>>newHashMap();
|
||||||
|
+ private static final Map<World, List<BlockRedstoneTorch.Toggle>> field_150112_b = new java.util.WeakHashMap<World, List<Toggle>>(); // FORGE - fix vanilla MC-101233
|
||||||
|
private final boolean field_150113_a;
|
||||||
|
|
||||||
|
private boolean func_176598_a(World p_176598_1_, BlockPos p_176598_2_, boolean p_176598_3_)
|
||||||
@@ -19,7 +19,7 @@
|
|||||||
{
|
{
|
||||||
if (iblockstate.func_185898_k())
|
if (iblockstate.func_185898_k())
|
||||||
{
|
{
|
||||||
@@ -409,21 +409,16 @@
|
@@ -408,21 +408,16 @@
|
||||||
IBlockState iblockstate = p_176339_1_.func_180495_p(blockpos);
|
IBlockState iblockstate = p_176339_1_.func_180495_p(blockpos);
|
||||||
boolean flag = iblockstate.func_185915_l();
|
boolean flag = iblockstate.func_185915_l();
|
||||||
boolean flag1 = p_176339_1_.func_180495_p(p_176339_2_.func_177984_a()).func_185915_l();
|
boolean flag1 = p_176339_1_.func_180495_p(p_176339_2_.func_177984_a()).func_185915_l();
|
||||||
@@ -44,12 +44,12 @@
|
|||||||
Block block = p_176343_0_.func_177230_c();
|
Block block = p_176343_0_.func_177230_c();
|
||||||
|
|
||||||
if (block == Blocks.field_150488_af)
|
if (block == Blocks.field_150488_af)
|
||||||
@@ -437,7 +432,7 @@
|
@@ -436,7 +431,7 @@
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
- return p_176343_0_.func_185897_m() && p_176343_1_ != null;
|
- return Blocks.field_190976_dk == p_176343_0_.func_177230_c() ? p_176343_1_ == p_176343_0_.func_177229_b(BlockObserver.field_176387_N) : p_176343_0_.func_185897_m() && p_176343_1_ != null;
|
||||||
+ return p_176343_0_.func_177230_c().canConnectRedstone(p_176343_0_, world, pos, p_176343_1_);
|
+ return Blocks.field_190976_dk == p_176343_0_.func_177230_c() ? p_176343_1_ == p_176343_0_.func_177229_b(BlockObserver.field_176387_N) : p_176343_0_.func_177230_c().canConnectRedstone(p_176343_0_, world, pos, p_176343_1_);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -9,7 +9,25 @@
|
|||||||
{
|
{
|
||||||
public static final PropertyInteger field_176355_a = PropertyInteger.func_177719_a("age", 0, 15);
|
public static final PropertyInteger field_176355_a = PropertyInteger.func_177719_a("age", 0, 15);
|
||||||
protected static final AxisAlignedBB field_185701_b = new AxisAlignedBB(0.125D, 0.0D, 0.125D, 0.875D, 1.0D, 0.875D);
|
protected static final AxisAlignedBB field_185701_b = new AxisAlignedBB(0.125D, 0.0D, 0.125D, 0.875D, 1.0D, 0.875D);
|
||||||
@@ -70,7 +70,9 @@
|
@@ -54,6 +54,8 @@
|
||||||
|
{
|
||||||
|
int j = ((Integer)p_180650_3_.func_177229_b(field_176355_a)).intValue();
|
||||||
|
|
||||||
|
+ if(net.minecraftforge.common.ForgeHooks.onCropsGrowPre(p_180650_1_, p_180650_2_, p_180650_3_, true))
|
||||||
|
+ {
|
||||||
|
if (j == 15)
|
||||||
|
{
|
||||||
|
p_180650_1_.func_175656_a(p_180650_2_.func_177984_a(), this.func_176223_P());
|
||||||
|
@@ -63,6 +65,8 @@
|
||||||
|
{
|
||||||
|
p_180650_1_.func_180501_a(p_180650_2_, p_180650_3_.func_177226_a(field_176355_a, Integer.valueOf(j + 1)), 4);
|
||||||
|
}
|
||||||
|
+ net.minecraftforge.common.ForgeHooks.onCropsGrowPost(p_180650_1_, p_180650_2_, p_180650_3_, p_180650_1_.func_180495_p(p_180650_2_));
|
||||||
|
+ }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
@@ -70,7 +74,9 @@
|
||||||
|
|
||||||
public boolean func_176196_c(World p_176196_1_, BlockPos p_176196_2_)
|
public boolean func_176196_c(World p_176196_1_, BlockPos p_176196_2_)
|
||||||
{
|
{
|
||||||
@@ -20,7 +38,7 @@
|
|||||||
|
|
||||||
if (block == this)
|
if (block == this)
|
||||||
{
|
{
|
||||||
@@ -165,6 +167,17 @@
|
@@ -164,6 +170,17 @@
|
||||||
return ((Integer)p_176201_1_.func_177229_b(field_176355_a)).intValue();
|
return ((Integer)p_176201_1_.func_177229_b(field_176355_a)).intValue();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
--- ../src-base/minecraft/net/minecraft/block/BlockSkull.java
|
--- ../src-base/minecraft/net/minecraft/block/BlockSkull.java
|
||||||
+++ ../src-work/minecraft/net/minecraft/block/BlockSkull.java
|
+++ ../src-work/minecraft/net/minecraft/block/BlockSkull.java
|
||||||
@@ -118,10 +118,6 @@
|
@@ -126,10 +126,6 @@
|
||||||
return new ItemStack(Items.field_151144_bL, 1, i);
|
return new ItemStack(Items.field_151144_bL, 1, i);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -11,7 +11,7 @@
|
|||||||
public void func_176208_a(World p_176208_1_, BlockPos p_176208_2_, IBlockState p_176208_3_, EntityPlayer p_176208_4_)
|
public void func_176208_a(World p_176208_1_, BlockPos p_176208_2_, IBlockState p_176208_3_, EntityPlayer p_176208_4_)
|
||||||
{
|
{
|
||||||
if (p_176208_4_.field_71075_bZ.field_75098_d)
|
if (p_176208_4_.field_71075_bZ.field_75098_d)
|
||||||
@@ -129,13 +125,18 @@
|
@@ -137,13 +133,18 @@
|
||||||
p_176208_3_ = p_176208_3_.func_177226_a(field_176417_b, Boolean.valueOf(true));
|
p_176208_3_ = p_176208_3_.func_177226_a(field_176417_b, Boolean.valueOf(true));
|
||||||
p_176208_1_.func_180501_a(p_176208_2_, p_176208_3_, 4);
|
p_176208_1_.func_180501_a(p_176208_2_, p_176208_3_, 4);
|
||||||
}
|
}
|
||||||
@@ -31,7 +31,7 @@
|
|||||||
{
|
{
|
||||||
if (!((Boolean)p_180663_3_.func_177229_b(field_176417_b)).booleanValue())
|
if (!((Boolean)p_180663_3_.func_177229_b(field_176417_b)).booleanValue())
|
||||||
{
|
{
|
||||||
@@ -144,7 +145,7 @@
|
@@ -152,7 +153,7 @@
|
||||||
if (tileentity instanceof TileEntitySkull)
|
if (tileentity instanceof TileEntitySkull)
|
||||||
{
|
{
|
||||||
TileEntitySkull tileentityskull = (TileEntitySkull)tileentity;
|
TileEntitySkull tileentityskull = (TileEntitySkull)tileentity;
|
||||||
@@ -40,7 +40,7 @@
|
|||||||
|
|
||||||
if (tileentityskull.func_145904_a() == 3 && tileentityskull.func_152108_a() != null)
|
if (tileentityskull.func_145904_a() == 3 && tileentityskull.func_152108_a() != null)
|
||||||
{
|
{
|
||||||
@@ -154,12 +155,11 @@
|
@@ -162,12 +163,11 @@
|
||||||
itemstack.func_77978_p().func_74782_a("SkullOwner", nbttagcompound);
|
itemstack.func_77978_p().func_74782_a("SkullOwner", nbttagcompound);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -54,4 +54,4 @@
|
|||||||
+ return ret;
|
+ return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Nullable
|
public Item func_180660_a(IBlockState p_180660_1_, Random p_180660_2_, int p_180660_3_)
|
||||||
@@ -1,12 +1,15 @@
|
|||||||
--- ../src-base/minecraft/net/minecraft/block/BlockSlab.java
|
--- ../src-base/minecraft/net/minecraft/block/BlockSlab.java
|
||||||
+++ ../src-work/minecraft/net/minecraft/block/BlockSlab.java
|
+++ ../src-work/minecraft/net/minecraft/block/BlockSlab.java
|
||||||
@@ -50,6 +50,16 @@
|
@@ -56,6 +56,19 @@
|
||||||
return this.func_176552_j();
|
return this.func_176552_j();
|
||||||
}
|
}
|
||||||
|
|
||||||
+ @Override
|
+ @Override
|
||||||
+ public boolean doesSideBlockRendering(IBlockState state, IBlockAccess world, BlockPos pos, EnumFacing face)
|
+ public boolean doesSideBlockRendering(IBlockState state, IBlockAccess world, BlockPos pos, EnumFacing face)
|
||||||
+ {
|
+ {
|
||||||
|
+ if (net.minecraftforge.common.ForgeModContainer.disableStairSlabCulling)
|
||||||
|
+ return super.doesSideBlockRendering(state, world, pos, face);
|
||||||
|
+
|
||||||
+ if ( state.func_185914_p() )
|
+ if ( state.func_185914_p() )
|
||||||
+ return true;
|
+ return true;
|
||||||
+
|
+
|
||||||
@@ -17,7 +20,7 @@
|
|||||||
public IBlockState func_180642_a(World p_180642_1_, BlockPos p_180642_2_, EnumFacing p_180642_3_, float p_180642_4_, float p_180642_5_, float p_180642_6_, int p_180642_7_, EntityLivingBase p_180642_8_)
|
public IBlockState func_180642_a(World p_180642_1_, BlockPos p_180642_2_, EnumFacing p_180642_3_, float p_180642_4_, float p_180642_5_, float p_180642_6_, int p_180642_7_, EntityLivingBase p_180642_8_)
|
||||||
{
|
{
|
||||||
IBlockState iblockstate = super.func_180642_a(p_180642_1_, p_180642_2_, p_180642_3_, p_180642_4_, p_180642_5_, p_180642_6_, p_180642_7_, p_180642_8_).func_177226_a(field_176554_a, BlockSlab.EnumBlockHalf.BOTTOM);
|
IBlockState iblockstate = super.func_180642_a(p_180642_1_, p_180642_2_, p_180642_3_, p_180642_4_, p_180642_5_, p_180642_6_, p_180642_7_, p_180642_8_).func_177226_a(field_176554_a, BlockSlab.EnumBlockHalf.BOTTOM);
|
||||||
@@ -77,13 +87,14 @@
|
@@ -83,13 +96,14 @@
|
||||||
{
|
{
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -4,11 +4,11 @@
|
|||||||
{
|
{
|
||||||
IBlockState iblockstate = p_176196_1_.func_180495_p(p_176196_2_.func_177977_b());
|
IBlockState iblockstate = p_176196_1_.func_180495_p(p_176196_2_.func_177977_b());
|
||||||
Block block = iblockstate.func_177230_c();
|
Block block = iblockstate.func_177230_c();
|
||||||
- return block != Blocks.field_150432_aD && block != Blocks.field_150403_cj ? (iblockstate.func_185904_a() == Material.field_151584_j ? true : (block == this && ((Integer)iblockstate.func_177229_b(field_176315_a)).intValue() >= 7 ? true : iblockstate.func_185914_p() && iblockstate.func_185904_a().func_76230_c())) : false;
|
- return block != Blocks.field_150432_aD && block != Blocks.field_150403_cj ? (iblockstate.func_185904_a() == Material.field_151584_j ? true : (block == this && ((Integer)iblockstate.func_177229_b(field_176315_a)).intValue() == 8 ? true : iblockstate.func_185914_p() && iblockstate.func_185904_a().func_76230_c())) : false;
|
||||||
+ return block != Blocks.field_150432_aD && block != Blocks.field_150403_cj ? (iblockstate.func_177230_c().isLeaves(iblockstate, p_176196_1_, p_176196_2_.func_177977_b()) ? true : (block == this && ((Integer)iblockstate.func_177229_b(field_176315_a)).intValue() >= 7 ? true : iblockstate.func_185914_p() && iblockstate.func_185904_a().func_76230_c())) : false;
|
+ return block != Blocks.field_150432_aD && block != Blocks.field_150403_cj ? (iblockstate.func_177230_c().isLeaves(iblockstate, p_176196_1_, p_176196_2_.func_177977_b()) ? true : (block == this && ((Integer)iblockstate.func_177229_b(field_176315_a)).intValue() == 8 ? true : iblockstate.func_185914_p() && iblockstate.func_185904_a().func_76230_c())) : false;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void func_189540_a(IBlockState p_189540_1_, World p_189540_2_, BlockPos p_189540_3_, Block p_189540_4_)
|
public void func_189540_a(IBlockState p_189540_1_, World p_189540_2_, BlockPos p_189540_3_, Block p_189540_4_, BlockPos p_189540_5_)
|
||||||
@@ -87,7 +87,6 @@
|
@@ -87,7 +87,6 @@
|
||||||
{
|
{
|
||||||
if (!this.func_176196_c(p_176314_1_, p_176314_2_))
|
if (!this.func_176196_c(p_176314_1_, p_176314_2_))
|
||||||
@@ -19,7 +19,7 @@
|
|||||||
}
|
}
|
||||||
@@ -99,9 +98,8 @@
|
@@ -99,9 +98,8 @@
|
||||||
|
|
||||||
public void func_180657_a(World p_180657_1_, EntityPlayer p_180657_2_, BlockPos p_180657_3_, IBlockState p_180657_4_, @Nullable TileEntity p_180657_5_, @Nullable ItemStack p_180657_6_)
|
public void func_180657_a(World p_180657_1_, EntityPlayer p_180657_2_, BlockPos p_180657_3_, IBlockState p_180657_4_, @Nullable TileEntity p_180657_5_, ItemStack p_180657_6_)
|
||||||
{
|
{
|
||||||
- func_180635_a(p_180657_1_, p_180657_3_, new ItemStack(Items.field_151126_ay, ((Integer)p_180657_4_.func_177229_b(field_176315_a)).intValue() + 1, 0));
|
- func_180635_a(p_180657_1_, p_180657_3_, new ItemStack(Items.field_151126_ay, ((Integer)p_180657_4_.func_177229_b(field_176315_a)).intValue() + 1, 0));
|
||||||
+ super.func_180657_a(p_180657_1_, p_180657_2_, p_180657_3_, p_180657_4_, p_180657_5_, p_180657_6_);
|
+ super.func_180657_a(p_180657_1_, p_180657_2_, p_180657_3_, p_180657_4_, p_180657_5_, p_180657_6_);
|
||||||
@@ -27,8 +27,8 @@
|
|||||||
- p_180657_2_.func_71029_a(StatList.func_188055_a(this));
|
- p_180657_2_.func_71029_a(StatList.func_188055_a(this));
|
||||||
}
|
}
|
||||||
|
|
||||||
@Nullable
|
public Item func_180660_a(IBlockState p_180660_1_, Random p_180660_2_, int p_180660_3_)
|
||||||
@@ -112,14 +110,13 @@
|
@@ -111,14 +109,13 @@
|
||||||
|
|
||||||
public int func_149745_a(Random p_149745_1_)
|
public int func_149745_a(Random p_149745_1_)
|
||||||
{
|
{
|
||||||
@@ -44,7 +44,7 @@
|
|||||||
p_180650_1_.func_175698_g(p_180650_2_);
|
p_180650_1_.func_175698_g(p_180650_2_);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -153,6 +150,8 @@
|
@@ -152,6 +149,8 @@
|
||||||
return ((Integer)p_176201_1_.func_177229_b(field_176315_a)).intValue() - 1;
|
return ((Integer)p_176201_1_.func_177229_b(field_176315_a)).intValue() - 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,18 +1,30 @@
|
|||||||
--- ../src-base/minecraft/net/minecraft/block/BlockStairs.java
|
--- ../src-base/minecraft/net/minecraft/block/BlockStairs.java
|
||||||
+++ ../src-work/minecraft/net/minecraft/block/BlockStairs.java
|
+++ ../src-work/minecraft/net/minecraft/block/BlockStairs.java
|
||||||
@@ -445,6 +445,17 @@
|
@@ -447,6 +447,29 @@
|
||||||
return new BlockStateContainer(this, new IProperty[] {field_176309_a, field_176308_b, field_176310_M});
|
return new BlockStateContainer(this, new IProperty[] {field_176309_a, field_176308_b, field_176310_M});
|
||||||
}
|
}
|
||||||
|
|
||||||
+ @Override
|
+ @Override
|
||||||
+ public boolean doesSideBlockRendering(IBlockState state, IBlockAccess world, BlockPos pos, EnumFacing face)
|
+ public boolean doesSideBlockRendering(IBlockState state, IBlockAccess world, BlockPos pos, EnumFacing face)
|
||||||
+ {
|
+ {
|
||||||
|
+ if (net.minecraftforge.common.ForgeModContainer.disableStairSlabCulling)
|
||||||
|
+ return super.doesSideBlockRendering(state, world, pos, face);
|
||||||
|
+
|
||||||
+ if ( state.func_185914_p() )
|
+ if ( state.func_185914_p() )
|
||||||
+ return true;
|
+ return true;
|
||||||
+
|
+
|
||||||
|
+ state = this.func_176221_a(state, world, pos);
|
||||||
|
+
|
||||||
+ EnumHalf half = state.func_177229_b(field_176308_b);
|
+ EnumHalf half = state.func_177229_b(field_176308_b);
|
||||||
+ EnumFacing side = state.func_177229_b(field_176309_a);
|
+ EnumFacing side = state.func_177229_b(field_176309_a);
|
||||||
+ return side == face || (half == EnumHalf.TOP && face == EnumFacing.UP) || (half == EnumHalf.BOTTOM && face == EnumFacing.DOWN);
|
+ EnumShape shape = state.func_177229_b(field_176310_M);
|
||||||
|
+ if (face == EnumFacing.UP) return half == EnumHalf.TOP;
|
||||||
|
+ if (face == EnumFacing.DOWN) return half == EnumHalf.BOTTOM;
|
||||||
|
+ if (shape == EnumShape.OUTER_LEFT || shape == EnumShape.OUTER_RIGHT) return false;
|
||||||
|
+ if (face == side) return true;
|
||||||
|
+ if (shape == EnumShape.INNER_LEFT && face.func_176746_e() == side) return true;
|
||||||
|
+ if (shape == EnumShape.INNER_RIGHT && face.func_176735_f() == side) return true;
|
||||||
|
+ return false;
|
||||||
+ }
|
+ }
|
||||||
+
|
+
|
||||||
public static enum EnumHalf implements IStringSerializable
|
public static enum EnumHalf implements IStringSerializable
|
||||||
|
|||||||
@@ -1,6 +1,15 @@
|
|||||||
--- ../src-base/minecraft/net/minecraft/block/BlockStem.java
|
--- ../src-base/minecraft/net/minecraft/block/BlockStem.java
|
||||||
+++ ../src-work/minecraft/net/minecraft/block/BlockStem.java
|
+++ ../src-work/minecraft/net/minecraft/block/BlockStem.java
|
||||||
@@ -90,9 +90,10 @@
|
@@ -70,7 +70,7 @@
|
||||||
|
{
|
||||||
|
float f = BlockCrops.func_180672_a(this, p_180650_1_, p_180650_2_);
|
||||||
|
|
||||||
|
- if (p_180650_4_.nextInt((int)(25.0F / f) + 1) == 0)
|
||||||
|
+ if(net.minecraftforge.common.ForgeHooks.onCropsGrowPre(p_180650_1_, p_180650_2_, p_180650_3_, p_180650_4_.nextInt((int)(25.0F / f) + 1) == 0))
|
||||||
|
{
|
||||||
|
int i = ((Integer)p_180650_3_.func_177229_b(field_176484_a)).intValue();
|
||||||
|
|
||||||
|
@@ -90,13 +90,15 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
p_180650_2_ = p_180650_2_.func_177972_a(EnumFacing.Plane.HORIZONTAL.func_179518_a(p_180650_4_));
|
p_180650_2_ = p_180650_2_.func_177972_a(EnumFacing.Plane.HORIZONTAL.func_179518_a(p_180650_4_));
|
||||||
@@ -13,7 +22,12 @@
|
|||||||
{
|
{
|
||||||
p_180650_1_.func_175656_a(p_180650_2_, this.field_149877_a.func_176223_P());
|
p_180650_1_.func_175656_a(p_180650_2_, this.field_149877_a.func_176223_P());
|
||||||
}
|
}
|
||||||
@@ -110,24 +111,29 @@
|
}
|
||||||
|
+ net.minecraftforge.common.ForgeHooks.onCropsGrowPost(p_180650_1_, p_180650_2_, p_180650_3_, p_180650_1_.func_180495_p(p_180650_2_));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
@@ -110,24 +112,29 @@
|
||||||
public void func_180653_a(World p_180653_1_, BlockPos p_180653_2_, IBlockState p_180653_3_, float p_180653_4_, int p_180653_5_)
|
public void func_180653_a(World p_180653_1_, BlockPos p_180653_2_, IBlockState p_180653_3_, float p_180653_4_, int p_180653_5_)
|
||||||
{
|
{
|
||||||
super.func_180653_a(p_180653_1_, p_180653_2_, p_180653_3_, p_180653_4_, p_180653_5_);
|
super.func_180653_a(p_180653_1_, p_180653_2_, p_180653_3_, p_180653_4_, p_180653_5_);
|
||||||
|
|||||||
@@ -18,44 +18,34 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
public boolean func_176200_f(IBlockAccess p_176200_1_, BlockPos p_176200_2_)
|
public boolean func_176200_f(IBlockAccess p_176200_1_, BlockPos p_176200_2_)
|
||||||
@@ -53,7 +53,7 @@
|
@@ -52,7 +52,7 @@
|
||||||
@Nullable
|
|
||||||
public Item func_180660_a(IBlockState p_180660_1_, Random p_180660_2_, int p_180660_3_)
|
public Item func_180660_a(IBlockState p_180660_1_, Random p_180660_2_, int p_180660_3_)
|
||||||
{
|
{
|
||||||
- return p_180660_2_.nextInt(8) == 0 ? Items.field_151014_N : null;
|
- return p_180660_2_.nextInt(8) == 0 ? Items.field_151014_N : Items.field_190931_a;
|
||||||
+ return null;
|
+ return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
public int func_149679_a(int p_149679_1_, Random p_149679_2_)
|
public int func_149679_a(int p_149679_1_, Random p_149679_2_)
|
||||||
@@ -63,7 +63,7 @@
|
@@ -181,4 +181,21 @@
|
||||||
|
|
||||||
public void func_180657_a(World p_180657_1_, EntityPlayer p_180657_2_, BlockPos p_180657_3_, IBlockState p_180657_4_, @Nullable TileEntity p_180657_5_, @Nullable ItemStack p_180657_6_)
|
|
||||||
{
|
|
||||||
- if (!p_180657_1_.field_72995_K && p_180657_6_ != null && p_180657_6_.func_77973_b() == Items.field_151097_aZ)
|
|
||||||
+ if (false && !p_180657_1_.field_72995_K && p_180657_6_ != null && p_180657_6_.func_77973_b() == Items.field_151097_aZ) // Forge: Noop Taken care of by IShearable
|
|
||||||
{
|
|
||||||
p_180657_2_.func_71029_a(StatList.func_188055_a(this));
|
|
||||||
func_180635_a(p_180657_1_, p_180657_3_, new ItemStack(Blocks.field_150329_H, 1, ((BlockTallGrass.EnumType)p_180657_4_.func_177229_b(field_176497_a)).func_177044_a()));
|
|
||||||
@@ -183,4 +183,22 @@
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
+
|
+
|
||||||
+ @Override public boolean isShearable(ItemStack item, IBlockAccess world, BlockPos pos){ return true; }
|
+ @Override public boolean isShearable(ItemStack item, IBlockAccess world, BlockPos pos){ return true; }
|
||||||
+ @Override
|
+ @Override
|
||||||
+ public List<ItemStack> onSheared(ItemStack item, IBlockAccess world, BlockPos pos, int fortune)
|
+ public NonNullList<ItemStack> onSheared(ItemStack item, IBlockAccess world, BlockPos pos, int fortune)
|
||||||
+ {
|
+ {
|
||||||
+ List<ItemStack> ret = new java.util.ArrayList<ItemStack>();
|
+ return NonNullList.func_191197_a(1, new ItemStack(Blocks.field_150329_H, 1, ((BlockTallGrass.EnumType)world.func_180495_p(pos).func_177229_b(field_176497_a)).func_177044_a()));
|
||||||
+ ret.add(new ItemStack(Blocks.field_150329_H, 1, ((BlockTallGrass.EnumType)world.func_180495_p(pos).func_177229_b(field_176497_a)).func_177044_a()));
|
|
||||||
+ return ret;
|
|
||||||
+ }
|
+ }
|
||||||
+ @Override
|
+ @Override
|
||||||
+ public List<ItemStack> getDrops(IBlockAccess world, BlockPos pos, IBlockState state, int fortune)
|
+ public NonNullList<ItemStack> getDrops(IBlockAccess world, BlockPos pos, IBlockState state, int fortune)
|
||||||
+ {
|
+ {
|
||||||
+ List<ItemStack> ret = new java.util.ArrayList<ItemStack>();
|
+ if (RANDOM.nextInt(8) != 0) return NonNullList.func_191196_a();
|
||||||
+ if (RANDOM.nextInt(8) != 0) return ret;
|
|
||||||
+ ItemStack seed = net.minecraftforge.common.ForgeHooks.getGrassSeed(RANDOM, fortune);
|
+ ItemStack seed = net.minecraftforge.common.ForgeHooks.getGrassSeed(RANDOM, fortune);
|
||||||
+ if (seed != null) ret.add(seed);
|
+ if (!seed.func_190926_b())
|
||||||
+ return ret;
|
+ return NonNullList.func_191197_a(1, seed);
|
||||||
|
+ else
|
||||||
|
+ return NonNullList.func_191196_a();
|
||||||
+ }
|
+ }
|
||||||
}
|
}
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
--- ../src-base/minecraft/net/minecraft/block/BlockTrapDoor.java
|
--- ../src-base/minecraft/net/minecraft/block/BlockTrapDoor.java
|
||||||
+++ ../src-work/minecraft/net/minecraft/block/BlockTrapDoor.java
|
+++ ../src-work/minecraft/net/minecraft/block/BlockTrapDoor.java
|
||||||
@@ -240,6 +240,18 @@
|
@@ -244,6 +244,18 @@
|
||||||
return new BlockStateContainer(this, new IProperty[] {field_176284_a, field_176283_b, field_176285_M});
|
return new BlockStateContainer(this, new IProperty[] {field_176284_a, field_176283_b, field_176285_M});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -9,16 +9,7 @@
|
|||||||
{
|
{
|
||||||
public static final PropertyBool field_176277_a = PropertyBool.func_177716_a("up");
|
public static final PropertyBool field_176277_a = PropertyBool.func_177716_a("up");
|
||||||
public static final PropertyBool field_176273_b = PropertyBool.func_177716_a("north");
|
public static final PropertyBool field_176273_b = PropertyBool.func_177716_a("north");
|
||||||
@@ -345,7 +345,7 @@
|
@@ -459,4 +459,14 @@
|
||||||
|
|
||||||
public void func_180657_a(World p_180657_1_, EntityPlayer p_180657_2_, BlockPos p_180657_3_, IBlockState p_180657_4_, @Nullable TileEntity p_180657_5_, @Nullable ItemStack p_180657_6_)
|
|
||||||
{
|
|
||||||
- if (!p_180657_1_.field_72995_K && p_180657_6_ != null && p_180657_6_.func_77973_b() == Items.field_151097_aZ)
|
|
||||||
+ if (false && !p_180657_1_.field_72995_K && p_180657_6_ != null && p_180657_6_.func_77973_b() == Items.field_151097_aZ) // Forge: Noop, Covered by IShearable
|
|
||||||
{
|
|
||||||
p_180657_2_.func_71029_a(StatList.func_188055_a(this));
|
|
||||||
func_180635_a(p_180657_1_, p_180657_3_, new ItemStack(Blocks.field_150395_bd, 1, 0));
|
|
||||||
@@ -460,4 +460,14 @@
|
|
||||||
|
|
||||||
return i;
|
return i;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,41 @@
|
|||||||
|
--- ../src-base/minecraft/net/minecraft/block/BlockWall.java
|
||||||
|
+++ ../src-work/minecraft/net/minecraft/block/BlockWall.java
|
||||||
|
@@ -154,10 +154,10 @@
|
||||||
|
|
||||||
|
public IBlockState func_176221_a(IBlockState p_176221_1_, IBlockAccess p_176221_2_, BlockPos p_176221_3_)
|
||||||
|
{
|
||||||
|
- boolean flag = this.func_176253_e(p_176221_2_, p_176221_3_.func_177978_c());
|
||||||
|
- boolean flag1 = this.func_176253_e(p_176221_2_, p_176221_3_.func_177974_f());
|
||||||
|
- boolean flag2 = this.func_176253_e(p_176221_2_, p_176221_3_.func_177968_d());
|
||||||
|
- boolean flag3 = this.func_176253_e(p_176221_2_, p_176221_3_.func_177976_e());
|
||||||
|
+ boolean flag = canWallConnectTo(p_176221_2_, p_176221_3_, EnumFacing.NORTH);
|
||||||
|
+ boolean flag1 = canWallConnectTo(p_176221_2_, p_176221_3_, EnumFacing.EAST);
|
||||||
|
+ boolean flag2 = canWallConnectTo(p_176221_2_, p_176221_3_, EnumFacing.SOUTH);
|
||||||
|
+ boolean flag3 = canWallConnectTo(p_176221_2_, p_176221_3_, EnumFacing.WEST);
|
||||||
|
boolean flag4 = flag && !flag1 && flag2 && !flag3 || !flag && flag1 && !flag2 && flag3;
|
||||||
|
return p_176221_1_.func_177226_a(field_176256_a, Boolean.valueOf(!flag4 || !p_176221_2_.func_175623_d(p_176221_3_.func_177984_a()))).func_177226_a(field_176254_b, Boolean.valueOf(flag)).func_177226_a(field_176257_M, Boolean.valueOf(flag1)).func_177226_a(field_176258_N, Boolean.valueOf(flag2)).func_177226_a(field_176259_O, Boolean.valueOf(flag3));
|
||||||
|
}
|
||||||
|
@@ -167,6 +167,23 @@
|
||||||
|
return new BlockStateContainer(this, new IProperty[] {field_176256_a, field_176254_b, field_176257_M, field_176259_O, field_176258_N, field_176255_P});
|
||||||
|
}
|
||||||
|
|
||||||
|
+ /* ======================================== FORGE START ======================================== */
|
||||||
|
+
|
||||||
|
+ @Override
|
||||||
|
+ public boolean canBeConnectedTo(IBlockAccess world, BlockPos pos, EnumFacing facing)
|
||||||
|
+ {
|
||||||
|
+ Block connector = world.func_180495_p(pos.func_177972_a(facing)).func_177230_c();
|
||||||
|
+ return connector instanceof BlockWall || connector instanceof BlockFenceGate;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ private boolean canWallConnectTo(IBlockAccess world, BlockPos pos, EnumFacing facing)
|
||||||
|
+ {
|
||||||
|
+ Block block = world.func_180495_p(pos.func_177972_a(facing)).func_177230_c();
|
||||||
|
+ return block.canBeConnectedTo(world, pos.func_177972_a(facing), facing.func_176734_d()) || func_176253_e(world, pos.func_177972_a(facing));
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ /* ======================================== FORGE END ======================================== */
|
||||||
|
+
|
||||||
|
public static enum EnumType implements IStringSerializable
|
||||||
|
{
|
||||||
|
NORMAL(0, "cobblestone", "normal"),
|
||||||
@@ -0,0 +1,22 @@
|
|||||||
|
--- ../src-base/minecraft/net/minecraft/block/BlockWeb.java
|
||||||
|
+++ ../src-work/minecraft/net/minecraft/block/BlockWeb.java
|
||||||
|
@@ -20,7 +20,7 @@
|
||||||
|
import net.minecraftforge.fml.relauncher.Side;
|
||||||
|
import net.minecraftforge.fml.relauncher.SideOnly;
|
||||||
|
|
||||||
|
-public class BlockWeb extends Block
|
||||||
|
+public class BlockWeb extends Block implements net.minecraftforge.common.IShearable
|
||||||
|
{
|
||||||
|
public BlockWeb()
|
||||||
|
{
|
||||||
|
@@ -77,4 +77,10 @@
|
||||||
|
super.func_180657_a(p_180657_1_, p_180657_2_, p_180657_3_, p_180657_4_, p_180657_5_, p_180657_6_);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
+
|
||||||
|
+ @Override public boolean isShearable(ItemStack item, IBlockAccess world, BlockPos pos) { return true; }
|
||||||
|
+ @Override
|
||||||
|
+ public java.util.List<ItemStack> onSheared(ItemStack item, IBlockAccess world, BlockPos pos, int fortune) {
|
||||||
|
+ return com.google.common.collect.Lists.newArrayList(new ItemStack(Item.func_150898_a(this)));
|
||||||
|
+ }
|
||||||
|
}
|
||||||
@@ -0,0 +1,18 @@
|
|||||||
|
--- ../src-base/minecraft/net/minecraft/block/SoundType.java
|
||||||
|
+++ ../src-work/minecraft/net/minecraft/block/SoundType.java
|
||||||
|
@@ -48,7 +48,6 @@
|
||||||
|
return this.field_185861_n;
|
||||||
|
}
|
||||||
|
|
||||||
|
- @SideOnly(Side.CLIENT)
|
||||||
|
public SoundEvent func_185845_c()
|
||||||
|
{
|
||||||
|
return this.field_185862_o;
|
||||||
|
@@ -64,7 +63,6 @@
|
||||||
|
return this.field_185864_q;
|
||||||
|
}
|
||||||
|
|
||||||
|
- @SideOnly(Side.CLIENT)
|
||||||
|
public SoundEvent func_185846_f()
|
||||||
|
{
|
||||||
|
return this.field_185865_r;
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
--- ../src-base/minecraft/net/minecraft/block/state/BlockStateContainer.java
|
--- ../src-base/minecraft/net/minecraft/block/state/BlockStateContainer.java
|
||||||
+++ ../src-work/minecraft/net/minecraft/block/state/BlockStateContainer.java
|
+++ ../src-work/minecraft/net/minecraft/block/state/BlockStateContainer.java
|
||||||
@@ -57,12 +57,22 @@
|
@@ -59,12 +59,22 @@
|
||||||
|
|
||||||
public BlockStateContainer(Block p_i45663_1_, IProperty<?>... p_i45663_2_)
|
public BlockStateContainer(Block p_i45663_1_, IProperty<?>... p_i45663_2_)
|
||||||
{
|
{
|
||||||
@@ -8,7 +8,7 @@
|
|||||||
+ this(p_i45663_1_, p_i45663_2_, null);
|
+ this(p_i45663_1_, p_i45663_2_, null);
|
||||||
+ }
|
+ }
|
||||||
+
|
+
|
||||||
+ protected StateImplementation createState(Block block, ImmutableMap<IProperty<?>, Comparable<?>> properties, ImmutableMap<net.minecraftforge.common.property.IUnlistedProperty<?>, com.google.common.base.Optional<?>> unlistedProperties)
|
+ protected StateImplementation createState(Block block, ImmutableMap<IProperty<?>, Comparable<?>> properties, @Nullable ImmutableMap<net.minecraftforge.common.property.IUnlistedProperty<?>, com.google.common.base.Optional<?>> unlistedProperties)
|
||||||
+ {
|
+ {
|
||||||
+ return new StateImplementation(block, properties);
|
+ return new StateImplementation(block, properties);
|
||||||
+ }
|
+ }
|
||||||
@@ -26,7 +26,7 @@
|
|||||||
map.put(iproperty.func_177701_a(), iproperty);
|
map.put(iproperty.func_177701_a(), iproperty);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -73,7 +83,7 @@
|
@@ -75,7 +85,7 @@
|
||||||
for (List < Comparable<? >> list : Cartesian.func_179321_a(this.func_177620_e()))
|
for (List < Comparable<? >> list : Cartesian.func_179321_a(this.func_177620_e()))
|
||||||
{
|
{
|
||||||
Map < IProperty<?>, Comparable<? >> map1 = MapPopulator. < IProperty<?>, Comparable<? >> func_179400_b(this.field_177624_d.values(), list);
|
Map < IProperty<?>, Comparable<? >> map1 = MapPopulator. < IProperty<?>, Comparable<? >> func_179400_b(this.field_177624_d.values(), list);
|
||||||
@@ -35,7 +35,7 @@
|
|||||||
map2.put(map1, blockstatecontainer$stateimplementation);
|
map2.put(map1, blockstatecontainer$stateimplementation);
|
||||||
list1.add(blockstatecontainer$stateimplementation);
|
list1.add(blockstatecontainer$stateimplementation);
|
||||||
}
|
}
|
||||||
@@ -165,6 +175,13 @@
|
@@ -170,6 +180,13 @@
|
||||||
this.field_177237_b = p_i45660_2_;
|
this.field_177237_b = p_i45660_2_;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -49,9 +49,9 @@
|
|||||||
public Collection < IProperty<? >> func_177227_a()
|
public Collection < IProperty<? >> func_177227_a()
|
||||||
{
|
{
|
||||||
return Collections. < IProperty<? >> unmodifiableCollection(this.field_177237_b.keySet());
|
return Collections. < IProperty<? >> unmodifiableCollection(this.field_177237_b.keySet());
|
||||||
@@ -445,5 +462,86 @@
|
@@ -468,5 +485,86 @@
|
||||||
{
|
{
|
||||||
this.field_177239_a.func_189540_a(this, p_189546_1_, p_189546_2_, p_189546_3_);
|
return this.field_177239_a.func_176214_u(this);
|
||||||
}
|
}
|
||||||
+
|
+
|
||||||
+ //Forge Start
|
+ //Forge Start
|
||||||
|
|||||||
@@ -14,14 +14,17 @@
|
|||||||
|
|
||||||
@SideOnly(Side.CLIENT)
|
@SideOnly(Side.CLIENT)
|
||||||
boolean func_185895_e();
|
boolean func_185895_e();
|
||||||
@@ -92,5 +96,10 @@
|
@@ -95,8 +99,13 @@
|
||||||
|
|
||||||
RayTraceResult func_185910_a(World p_185910_1_, BlockPos p_185910_2_, Vec3d p_185910_3_, Vec3d p_185910_4_);
|
RayTraceResult func_185910_a(World p_185910_1_, BlockPos p_185910_2_, Vec3d p_185910_3_, Vec3d p_185910_4_);
|
||||||
|
|
||||||
+ @Deprecated // Forge: Use isSideSolid(IBlockAccess, BlockPos, EnumFacing.UP) instead
|
+ @Deprecated // Forge: Use isSideSolid(IBlockAccess, BlockPos, EnumFacing.UP) instead
|
||||||
boolean func_185896_q();
|
boolean func_185896_q();
|
||||||
+
|
|
||||||
+ //Forge added functions
|
+ //Forge added functions
|
||||||
+ boolean doesSideBlockRendering(IBlockAccess world, BlockPos pos, EnumFacing side);
|
+ boolean doesSideBlockRendering(IBlockAccess world, BlockPos pos, EnumFacing side);
|
||||||
+ boolean isSideSolid(IBlockAccess world, BlockPos pos, EnumFacing side);
|
+ boolean isSideSolid(IBlockAccess world, BlockPos pos, EnumFacing side);
|
||||||
}
|
+
|
||||||
|
Vec3d func_191059_e(IBlockAccess p_191059_1_, BlockPos p_191059_2_);
|
||||||
|
|
||||||
|
boolean func_191058_s();
|
||||||
@@ -8,12 +8,12 @@
|
|||||||
this.field_71459_aj = p_i45547_1_.field_178741_d.field_178756_a;
|
this.field_71459_aj = p_i45547_1_.field_178741_d.field_178756_a;
|
||||||
this.field_71443_c = p_i45547_1_.field_178743_b.field_178764_a > 0 ? p_i45547_1_.field_178743_b.field_178764_a : 1;
|
this.field_71443_c = p_i45547_1_.field_178743_b.field_178764_a > 0 ? p_i45547_1_.field_178743_b.field_178764_a : 1;
|
||||||
this.field_71440_d = p_i45547_1_.field_178743_b.field_178762_b > 0 ? p_i45547_1_.field_178743_b.field_178762_b : 1;
|
this.field_71440_d = p_i45547_1_.field_178743_b.field_178762_b > 0 ? p_i45547_1_.field_178743_b.field_178762_b : 1;
|
||||||
@@ -437,10 +436,10 @@
|
@@ -438,10 +437,10 @@
|
||||||
this.field_110451_am = new SimpleReloadableResourceManager(this.field_110452_an);
|
this.field_110451_am = new SimpleReloadableResourceManager(this.field_110452_an);
|
||||||
this.field_135017_as = new LanguageManager(this.field_110452_an, this.field_71474_y.field_74363_ab);
|
this.field_135017_as = new LanguageManager(this.field_110452_an, this.field_71474_y.field_74363_ab);
|
||||||
this.field_110451_am.func_110542_a(this.field_135017_as);
|
this.field_110451_am.func_110542_a(this.field_135017_as);
|
||||||
- this.func_110436_a();
|
- this.func_110436_a();
|
||||||
+ net.minecraftforge.fml.client.FMLClientHandler.instance().beginMinecraftLoading(this, this.field_110449_ao, this.field_110451_am);
|
+ net.minecraftforge.fml.client.FMLClientHandler.instance().beginMinecraftLoading(this, this.field_110449_ao, this.field_110451_am, this.field_110452_an);
|
||||||
this.field_71446_o = new TextureManager(this.field_110451_am);
|
this.field_71446_o = new TextureManager(this.field_110451_am);
|
||||||
this.field_110451_am.func_110542_a(this.field_71446_o);
|
this.field_110451_am.func_110542_a(this.field_71446_o);
|
||||||
- this.func_180510_a(this.field_71446_o);
|
- this.func_180510_a(this.field_71446_o);
|
||||||
@@ -21,7 +21,7 @@
|
|||||||
this.field_152350_aA = new SkinManager(this.field_71446_o, new File(this.field_110446_Y, "skins"), this.field_152355_az);
|
this.field_152350_aA = new SkinManager(this.field_71446_o, new File(this.field_110446_Y, "skins"), this.field_152355_az);
|
||||||
this.field_71469_aa = new AnvilSaveConverter(new File(this.field_71412_D, "saves"), this.field_184131_U);
|
this.field_71469_aa = new AnvilSaveConverter(new File(this.field_71412_D, "saves"), this.field_184131_U);
|
||||||
this.field_147127_av = new SoundHandler(this.field_110451_am, this.field_71474_y);
|
this.field_147127_av = new SoundHandler(this.field_110451_am, this.field_71474_y);
|
||||||
@@ -465,7 +464,7 @@
|
@@ -466,7 +465,7 @@
|
||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
@@ -30,7 +30,7 @@
|
|||||||
}
|
}
|
||||||
catch (Exception exception)
|
catch (Exception exception)
|
||||||
{
|
{
|
||||||
@@ -474,6 +473,8 @@
|
@@ -475,6 +474,8 @@
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
this.field_71417_B = new MouseHelper();
|
this.field_71417_B = new MouseHelper();
|
||||||
@@ -39,7 +39,7 @@
|
|||||||
this.func_71361_d("Pre startup");
|
this.func_71361_d("Pre startup");
|
||||||
GlStateManager.func_179098_w();
|
GlStateManager.func_179098_w();
|
||||||
GlStateManager.func_179103_j(7425);
|
GlStateManager.func_179103_j(7425);
|
||||||
@@ -487,19 +488,24 @@
|
@@ -488,19 +489,24 @@
|
||||||
GlStateManager.func_179096_D();
|
GlStateManager.func_179096_D();
|
||||||
GlStateManager.func_179128_n(5888);
|
GlStateManager.func_179128_n(5888);
|
||||||
this.func_71361_d("Startup");
|
this.func_71361_d("Startup");
|
||||||
@@ -65,7 +65,7 @@
|
|||||||
this.field_71460_t = new EntityRenderer(this, this.field_110451_am);
|
this.field_71460_t = new EntityRenderer(this, this.field_110451_am);
|
||||||
this.field_110451_am.func_110542_a(this.field_71460_t);
|
this.field_110451_am.func_110542_a(this.field_71460_t);
|
||||||
this.field_175618_aM = new BlockRendererDispatcher(this.field_175617_aL.func_174954_c(), this.field_184127_aH);
|
this.field_175618_aM = new BlockRendererDispatcher(this.field_175617_aL.func_174954_c(), this.field_184127_aH);
|
||||||
@@ -509,23 +515,27 @@
|
@@ -510,23 +516,27 @@
|
||||||
this.field_71458_u = new GuiAchievement(this);
|
this.field_71458_u = new GuiAchievement(this);
|
||||||
GlStateManager.func_179083_b(0, 0, this.field_71443_c, this.field_71440_d);
|
GlStateManager.func_179083_b(0, 0, this.field_71443_c, this.field_71440_d);
|
||||||
this.field_71452_i = new ParticleManager(this.field_71441_e, this.field_71446_o);
|
this.field_71452_i = new ParticleManager(this.field_71441_e, this.field_71446_o);
|
||||||
@@ -96,7 +96,7 @@
|
|||||||
if (this.field_71474_y.field_74353_u && !this.field_71431_Q)
|
if (this.field_71474_y.field_74353_u && !this.field_71431_Q)
|
||||||
{
|
{
|
||||||
this.func_71352_k();
|
this.func_71352_k();
|
||||||
@@ -697,21 +707,23 @@
|
@@ -698,21 +708,23 @@
|
||||||
File file2 = new File(file1, "crash-" + (new SimpleDateFormat("yyyy-MM-dd_HH.mm.ss")).format(new Date()) + "-client.txt");
|
File file2 = new File(file1, "crash-" + (new SimpleDateFormat("yyyy-MM-dd_HH.mm.ss")).format(new Date()) + "-client.txt");
|
||||||
Bootstrap.func_179870_a(p_71377_1_.func_71502_e());
|
Bootstrap.func_179870_a(p_71377_1_.func_71502_e());
|
||||||
|
|
||||||
@@ -123,7 +123,7 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
public boolean func_152349_b()
|
public boolean func_152349_b()
|
||||||
@@ -904,11 +916,6 @@
|
@@ -905,11 +917,6 @@
|
||||||
|
|
||||||
public void func_147108_a(@Nullable GuiScreen p_147108_1_)
|
public void func_147108_a(@Nullable GuiScreen p_147108_1_)
|
||||||
{
|
{
|
||||||
@@ -135,7 +135,7 @@
|
|||||||
if (p_147108_1_ == null && this.field_71441_e == null)
|
if (p_147108_1_ == null && this.field_71441_e == null)
|
||||||
{
|
{
|
||||||
p_147108_1_ = new GuiMainMenu();
|
p_147108_1_ = new GuiMainMenu();
|
||||||
@@ -918,6 +925,17 @@
|
@@ -919,6 +926,17 @@
|
||||||
p_147108_1_ = new GuiGameOver((ITextComponent)null);
|
p_147108_1_ = new GuiGameOver((ITextComponent)null);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -153,7 +153,7 @@
|
|||||||
if (p_147108_1_ instanceof GuiMainMenu || p_147108_1_ instanceof GuiMultiplayer)
|
if (p_147108_1_ instanceof GuiMainMenu || p_147108_1_ instanceof GuiMultiplayer)
|
||||||
{
|
{
|
||||||
this.field_71474_y.field_74330_P = false;
|
this.field_71474_y.field_74330_P = false;
|
||||||
@@ -1053,9 +1071,11 @@
|
@@ -1054,9 +1072,11 @@
|
||||||
|
|
||||||
if (!this.field_71454_w)
|
if (!this.field_71454_w)
|
||||||
{
|
{
|
||||||
@@ -165,7 +165,7 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
this.field_71424_I.func_76319_b();
|
this.field_71424_I.func_76319_b();
|
||||||
@@ -1398,9 +1418,9 @@
|
@@ -1399,9 +1419,9 @@
|
||||||
{
|
{
|
||||||
BlockPos blockpos = this.field_71476_x.func_178782_a();
|
BlockPos blockpos = this.field_71476_x.func_178782_a();
|
||||||
|
|
||||||
@@ -177,7 +177,7 @@
|
|||||||
this.field_71439_g.func_184609_a(EnumHand.MAIN_HAND);
|
this.field_71439_g.func_184609_a(EnumHand.MAIN_HAND);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1434,7 +1454,7 @@
|
@@ -1435,7 +1455,7 @@
|
||||||
case BLOCK:
|
case BLOCK:
|
||||||
BlockPos blockpos = this.field_71476_x.func_178782_a();
|
BlockPos blockpos = this.field_71476_x.func_178782_a();
|
||||||
|
|
||||||
@@ -186,32 +186,23 @@
|
|||||||
{
|
{
|
||||||
this.field_71442_b.func_180511_b(blockpos, this.field_71476_x.field_178784_b);
|
this.field_71442_b.func_180511_b(blockpos, this.field_71476_x.field_178784_b);
|
||||||
break;
|
break;
|
||||||
@@ -1448,6 +1468,7 @@
|
@@ -1449,6 +1469,7 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
this.field_71439_g.func_184821_cY();
|
this.field_71439_g.func_184821_cY();
|
||||||
+ net.minecraftforge.common.ForgeHooks.onEmptyLeftClick(this.field_71439_g, this.field_71439_g.func_184614_ca());
|
+ net.minecraftforge.common.ForgeHooks.onEmptyLeftClick(this.field_71439_g);
|
||||||
}
|
}
|
||||||
|
|
||||||
this.field_71439_g.func_184609_a(EnumHand.MAIN_HAND);
|
this.field_71439_g.func_184609_a(EnumHand.MAIN_HAND);
|
||||||
@@ -1477,7 +1498,6 @@
|
@@ -1514,6 +1535,7 @@
|
||||||
switch (this.field_71476_x.field_72313_a)
|
}
|
||||||
{
|
|
||||||
case ENTITY:
|
|
||||||
-
|
|
||||||
if (this.field_71442_b.func_187102_a(this.field_71439_g, this.field_71476_x.field_72308_g, this.field_71476_x, this.field_71439_g.func_184586_b(enumhand), enumhand) == EnumActionResult.SUCCESS)
|
|
||||||
{
|
|
||||||
return;
|
|
||||||
@@ -1520,7 +1540,7 @@
|
|
||||||
}
|
}
|
||||||
|
|
||||||
ItemStack itemstack1 = this.field_71439_g.func_184586_b(enumhand);
|
+ if (itemstack.func_190926_b() && (this.field_71476_x == null || this.field_71476_x.field_72313_a == RayTraceResult.Type.MISS)) net.minecraftforge.common.ForgeHooks.onEmptyClick(this.field_71439_g, enumhand);
|
||||||
-
|
if (!itemstack.func_190926_b() && this.field_71442_b.func_187101_a(this.field_71439_g, this.field_71441_e, enumhand) == EnumActionResult.SUCCESS)
|
||||||
+ if (itemstack1 == null && (this.field_71476_x == null || this.field_71476_x.field_72313_a == RayTraceResult.Type.MISS)) net.minecraftforge.common.ForgeHooks.onEmptyClick(this.field_71439_g, enumhand);
|
|
||||||
if (itemstack1 != null && this.field_71442_b.func_187101_a(this.field_71439_g, this.field_71441_e, itemstack1, enumhand) == EnumActionResult.SUCCESS)
|
|
||||||
{
|
{
|
||||||
this.field_71460_t.field_78516_c.func_187460_a(enumhand);
|
this.field_71460_t.field_78516_c.func_187460_a(enumhand);
|
||||||
@@ -1627,6 +1647,8 @@
|
@@ -1620,6 +1642,8 @@
|
||||||
--this.field_71467_ac;
|
--this.field_71467_ac;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -220,7 +211,7 @@
|
|||||||
this.field_71424_I.func_76320_a("gui");
|
this.field_71424_I.func_76320_a("gui");
|
||||||
|
|
||||||
if (!this.field_71445_n)
|
if (!this.field_71445_n)
|
||||||
@@ -1738,6 +1760,7 @@
|
@@ -1731,6 +1755,7 @@
|
||||||
this.field_71457_ai = 0;
|
this.field_71457_ai = 0;
|
||||||
this.field_71441_e.func_72897_h(this.field_71439_g);
|
this.field_71441_e.func_72897_h(this.field_71439_g);
|
||||||
}
|
}
|
||||||
@@ -228,15 +219,15 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
this.field_71424_I.func_76318_c("gameRenderer");
|
this.field_71424_I.func_76318_c("gameRenderer");
|
||||||
@@ -1825,6 +1848,7 @@
|
@@ -1819,6 +1844,7 @@
|
||||||
this.field_71453_ak.func_74428_b();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
+ net.minecraftforge.fml.common.FMLCommonHandler.instance().onPostClientTick();
|
|
||||||
this.field_71424_I.func_76319_b();
|
this.field_71424_I.func_76319_b();
|
||||||
|
+ net.minecraftforge.fml.common.FMLCommonHandler.instance().onPostClientTick();
|
||||||
this.field_71423_H = func_71386_F();
|
this.field_71423_H = func_71386_F();
|
||||||
}
|
}
|
||||||
@@ -1931,6 +1955,7 @@
|
|
||||||
|
@@ -1924,6 +1950,7 @@
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -244,7 +235,7 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
this.func_184117_aA();
|
this.func_184117_aA();
|
||||||
@@ -2177,6 +2202,8 @@
|
@@ -2170,6 +2197,8 @@
|
||||||
{
|
{
|
||||||
while (Mouse.next())
|
while (Mouse.next())
|
||||||
{
|
{
|
||||||
@@ -253,7 +244,7 @@
|
|||||||
int i = Mouse.getEventButton();
|
int i = Mouse.getEventButton();
|
||||||
KeyBinding.func_74510_a(i - 100, Mouse.getEventButtonState());
|
KeyBinding.func_74510_a(i - 100, Mouse.getEventButtonState());
|
||||||
|
|
||||||
@@ -2242,6 +2269,7 @@
|
@@ -2235,6 +2264,7 @@
|
||||||
|
|
||||||
public void func_71371_a(String p_71371_1_, String p_71371_2_, @Nullable WorldSettings p_71371_3_)
|
public void func_71371_a(String p_71371_1_, String p_71371_2_, @Nullable WorldSettings p_71371_3_)
|
||||||
{
|
{
|
||||||
@@ -261,7 +252,7 @@
|
|||||||
this.func_71403_a((WorldClient)null);
|
this.func_71403_a((WorldClient)null);
|
||||||
System.gc();
|
System.gc();
|
||||||
ISaveHandler isavehandler = this.field_71469_aa.func_75804_a(p_71371_1_, false);
|
ISaveHandler isavehandler = this.field_71469_aa.func_75804_a(p_71371_1_, false);
|
||||||
@@ -2284,6 +2312,12 @@
|
@@ -2277,6 +2307,12 @@
|
||||||
|
|
||||||
while (!this.field_71437_Z.func_71200_ad())
|
while (!this.field_71437_Z.func_71200_ad())
|
||||||
{
|
{
|
||||||
@@ -274,13 +265,13 @@
|
|||||||
String s = this.field_71437_Z.func_71195_b_();
|
String s = this.field_71437_Z.func_71195_b_();
|
||||||
|
|
||||||
if (s != null)
|
if (s != null)
|
||||||
@@ -2309,8 +2343,14 @@
|
@@ -2302,8 +2338,14 @@
|
||||||
SocketAddress socketaddress = this.field_71437_Z.func_147137_ag().func_151270_a();
|
SocketAddress socketaddress = this.field_71437_Z.func_147137_ag().func_151270_a();
|
||||||
NetworkManager networkmanager = NetworkManager.func_150722_a(socketaddress);
|
NetworkManager networkmanager = NetworkManager.func_150722_a(socketaddress);
|
||||||
networkmanager.func_150719_a(new NetHandlerLoginClient(networkmanager, this, (GuiScreen)null));
|
networkmanager.func_150719_a(new NetHandlerLoginClient(networkmanager, this, (GuiScreen)null));
|
||||||
- networkmanager.func_179290_a(new C00Handshake(210, socketaddress.toString(), 0, EnumConnectionState.LOGIN));
|
- networkmanager.func_179290_a(new C00Handshake(316, socketaddress.toString(), 0, EnumConnectionState.LOGIN));
|
||||||
- networkmanager.func_179290_a(new CPacketLoginStart(this.func_110432_I().func_148256_e()));
|
- networkmanager.func_179290_a(new CPacketLoginStart(this.func_110432_I().func_148256_e()));
|
||||||
+ networkmanager.func_179290_a(new C00Handshake(210, socketaddress.toString(), 0, EnumConnectionState.LOGIN, true));
|
+ networkmanager.func_179290_a(new C00Handshake(316, socketaddress.toString(), 0, EnumConnectionState.LOGIN, true));
|
||||||
+ com.mojang.authlib.GameProfile gameProfile = this.func_110432_I().func_148256_e();
|
+ com.mojang.authlib.GameProfile gameProfile = this.func_110432_I().func_148256_e();
|
||||||
+ if (!this.func_110432_I().hasCachedProperties())
|
+ if (!this.func_110432_I().hasCachedProperties())
|
||||||
+ {
|
+ {
|
||||||
@@ -291,7 +282,7 @@
|
|||||||
this.field_71453_ak = networkmanager;
|
this.field_71453_ak = networkmanager;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -2321,6 +2361,8 @@
|
@@ -2314,6 +2356,8 @@
|
||||||
|
|
||||||
public void func_71353_a(@Nullable WorldClient p_71353_1_, String p_71353_2_)
|
public void func_71353_a(@Nullable WorldClient p_71353_1_, String p_71353_2_)
|
||||||
{
|
{
|
||||||
@@ -300,11 +291,11 @@
|
|||||||
if (p_71353_1_ == null)
|
if (p_71353_1_ == null)
|
||||||
{
|
{
|
||||||
NetHandlerPlayClient nethandlerplayclient = this.func_147114_u();
|
NetHandlerPlayClient nethandlerplayclient = this.func_147114_u();
|
||||||
@@ -2333,6 +2375,18 @@
|
@@ -2326,6 +2370,18 @@
|
||||||
if (this.field_71437_Z != null && this.field_71437_Z.func_175578_N())
|
if (this.field_71437_Z != null && this.field_71437_Z.func_175578_N())
|
||||||
{
|
{
|
||||||
this.field_71437_Z.func_71263_m();
|
this.field_71437_Z.func_71263_m();
|
||||||
+ if (field_71461_s != null)
|
+ if (field_71461_s != null && this.field_71425_J)
|
||||||
+ {
|
+ {
|
||||||
+ this.field_71461_s.func_73719_c(I18n.func_135052_a("forge.client.shutdown.internal"));
|
+ this.field_71461_s.func_73719_c(I18n.func_135052_a("forge.client.shutdown.internal"));
|
||||||
+ }
|
+ }
|
||||||
@@ -319,7 +310,7 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
this.field_71437_Z = null;
|
this.field_71437_Z = null;
|
||||||
@@ -2356,6 +2410,7 @@
|
@@ -2349,6 +2405,7 @@
|
||||||
this.field_71456_v.func_181029_i();
|
this.field_71456_v.func_181029_i();
|
||||||
this.func_71351_a((ServerData)null);
|
this.func_71351_a((ServerData)null);
|
||||||
this.field_71455_al = false;
|
this.field_71455_al = false;
|
||||||
@@ -327,7 +318,7 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
this.field_147127_av.func_147690_c();
|
this.field_147127_av.func_147690_c();
|
||||||
@@ -2473,159 +2528,8 @@
|
@@ -2466,159 +2523,8 @@
|
||||||
{
|
{
|
||||||
if (this.field_71476_x != null && this.field_71476_x.field_72313_a != RayTraceResult.Type.MISS)
|
if (this.field_71476_x != null && this.field_71476_x.field_72313_a != RayTraceResult.Type.MISS)
|
||||||
{
|
{
|
||||||
@@ -348,7 +339,7 @@
|
|||||||
-
|
-
|
||||||
- itemstack = block.func_185473_a(this.field_71441_e, blockpos, iblockstate);
|
- itemstack = block.func_185473_a(this.field_71441_e, blockpos, iblockstate);
|
||||||
-
|
-
|
||||||
- if (itemstack == null)
|
- if (itemstack.func_190926_b())
|
||||||
- {
|
- {
|
||||||
- return;
|
- return;
|
||||||
- }
|
- }
|
||||||
@@ -378,13 +369,13 @@
|
|||||||
- EntityItemFrame entityitemframe = (EntityItemFrame)this.field_71476_x.field_72308_g;
|
- EntityItemFrame entityitemframe = (EntityItemFrame)this.field_71476_x.field_72308_g;
|
||||||
- ItemStack itemstack1 = entityitemframe.func_82335_i();
|
- ItemStack itemstack1 = entityitemframe.func_82335_i();
|
||||||
-
|
-
|
||||||
- if (itemstack1 == null)
|
- if (itemstack1.func_190926_b())
|
||||||
- {
|
- {
|
||||||
- itemstack = new ItemStack(Items.field_151160_bD);
|
- itemstack = new ItemStack(Items.field_151160_bD);
|
||||||
- }
|
- }
|
||||||
- else
|
- else
|
||||||
- {
|
- {
|
||||||
- itemstack = ItemStack.func_77944_b(itemstack1);
|
- itemstack = itemstack1.func_77946_l();
|
||||||
- }
|
- }
|
||||||
- }
|
- }
|
||||||
- else if (this.field_71476_x.field_72308_g instanceof EntityMinecart)
|
- else if (this.field_71476_x.field_72308_g instanceof EntityMinecart)
|
||||||
@@ -429,32 +420,32 @@
|
|||||||
- }
|
- }
|
||||||
- else
|
- else
|
||||||
- {
|
- {
|
||||||
- String s = EntityList.func_75621_b(this.field_71476_x.field_72308_g);
|
- ResourceLocation resourcelocation = EntityList.func_191301_a(this.field_71476_x.field_72308_g);
|
||||||
-
|
-
|
||||||
- if (!EntityList.field_75627_a.containsKey(s))
|
- if (resourcelocation == null || !EntityList.field_75627_a.containsKey(resourcelocation))
|
||||||
- {
|
- {
|
||||||
- return;
|
- return;
|
||||||
- }
|
- }
|
||||||
-
|
-
|
||||||
- itemstack = new ItemStack(Items.field_151063_bx);
|
- itemstack = new ItemStack(Items.field_151063_bx);
|
||||||
- ItemMonsterPlacer.func_185078_a(itemstack, s);
|
- ItemMonsterPlacer.func_185078_a(itemstack, resourcelocation);
|
||||||
- }
|
- }
|
||||||
- }
|
- }
|
||||||
-
|
-
|
||||||
- if (itemstack.func_77973_b() == null)
|
- if (itemstack.func_190926_b())
|
||||||
- {
|
- {
|
||||||
- String s1 = "";
|
- String s = "";
|
||||||
-
|
-
|
||||||
- if (this.field_71476_x.field_72313_a == RayTraceResult.Type.BLOCK)
|
- if (this.field_71476_x.field_72313_a == RayTraceResult.Type.BLOCK)
|
||||||
- {
|
- {
|
||||||
- s1 = ((ResourceLocation)Block.field_149771_c.func_177774_c(this.field_71441_e.func_180495_p(this.field_71476_x.func_178782_a()).func_177230_c())).toString();
|
- s = ((ResourceLocation)Block.field_149771_c.func_177774_c(this.field_71441_e.func_180495_p(this.field_71476_x.func_178782_a()).func_177230_c())).toString();
|
||||||
- }
|
- }
|
||||||
- else if (this.field_71476_x.field_72313_a == RayTraceResult.Type.ENTITY)
|
- else if (this.field_71476_x.field_72313_a == RayTraceResult.Type.ENTITY)
|
||||||
- {
|
- {
|
||||||
- s1 = EntityList.func_75621_b(this.field_71476_x.field_72308_g);
|
- s = EntityList.func_191301_a(this.field_71476_x.field_72308_g).toString();
|
||||||
- }
|
- }
|
||||||
-
|
-
|
||||||
- field_147123_G.warn("Picking on: [{}] {} gave null item", new Object[] {this.field_71476_x.field_72313_a, s1});
|
- field_147123_G.warn("Picking on: [{}] {} gave null item", new Object[] {this.field_71476_x.field_72313_a, s});
|
||||||
- }
|
- }
|
||||||
- else
|
- else
|
||||||
- {
|
- {
|
||||||
@@ -489,7 +480,7 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -2927,18 +2831,8 @@
|
@@ -2921,18 +2827,8 @@
|
||||||
|
|
||||||
public static int func_71369_N()
|
public static int func_71369_N()
|
||||||
{
|
{
|
||||||
@@ -510,7 +501,7 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
public boolean func_70002_Q()
|
public boolean func_70002_Q()
|
||||||
@@ -3077,15 +2971,16 @@
|
@@ -3071,15 +2967,16 @@
|
||||||
{
|
{
|
||||||
if (Keyboard.getEventKeyState())
|
if (Keyboard.getEventKeyState())
|
||||||
{
|
{
|
||||||
@@ -529,7 +520,7 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -3205,6 +3100,12 @@
|
@@ -3199,6 +3096,12 @@
|
||||||
return this.field_184127_aH;
|
return this.field_184127_aH;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -16,7 +16,15 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
private synchronized void func_148608_i()
|
private synchronized void func_148608_i()
|
||||||
@@ -338,6 +340,9 @@
|
@@ -205,6 +207,7 @@
|
||||||
|
this.field_148620_e.stop(s);
|
||||||
|
}
|
||||||
|
|
||||||
|
+ this.field_189000_p.clear(); //Forge: MC-35856 Fixed paused sounds repeating when switching worlds
|
||||||
|
this.field_148629_h.clear();
|
||||||
|
this.field_148626_m.clear();
|
||||||
|
this.field_148625_l.clear();
|
||||||
|
@@ -338,6 +341,9 @@
|
||||||
{
|
{
|
||||||
if (this.field_148617_f)
|
if (this.field_148617_f)
|
||||||
{
|
{
|
||||||
@@ -26,7 +34,7 @@
|
|||||||
SoundEventAccessor soundeventaccessor = p_148611_1_.func_184366_a(this.field_148622_c);
|
SoundEventAccessor soundeventaccessor = p_148611_1_.func_184366_a(this.field_148622_c);
|
||||||
ResourceLocation resourcelocation = p_148611_1_.func_147650_b();
|
ResourceLocation resourcelocation = p_148611_1_.func_147650_b();
|
||||||
|
|
||||||
@@ -400,10 +405,12 @@
|
@@ -400,10 +406,12 @@
|
||||||
if (sound.func_188723_h())
|
if (sound.func_188723_h())
|
||||||
{
|
{
|
||||||
this.field_148620_e.newStreamingSource(false, s, func_148612_a(resourcelocation1), resourcelocation1.toString(), flag, p_148611_1_.func_147649_g(), p_148611_1_.func_147654_h(), p_148611_1_.func_147651_i(), p_148611_1_.func_147656_j().func_148586_a(), f);
|
this.field_148620_e.newStreamingSource(false, s, func_148612_a(resourcelocation1), resourcelocation1.toString(), flag, p_148611_1_.func_147649_g(), p_148611_1_.func_147654_h(), p_148611_1_.func_147651_i(), p_148611_1_.func_147656_j().func_148586_a(), f);
|
||||||
@@ -38,4 +46,4 @@
|
|||||||
+ net.minecraftforge.common.MinecraftForge.EVENT_BUS.post(new net.minecraftforge.client.event.sound.PlaySoundSourceEvent(this, p_148611_1_, s));
|
+ net.minecraftforge.common.MinecraftForge.EVENT_BUS.post(new net.minecraftforge.client.event.sound.PlaySoundSourceEvent(this, p_148611_1_, s));
|
||||||
}
|
}
|
||||||
|
|
||||||
field_148621_b.debug(field_148623_a, "Playing sound {} for event {} as channel {}", new Object[] {sound.func_188719_a(), resourcelocation1, s});
|
field_148621_b.debug(field_148623_a, "Playing sound {} for event {} as channel {}", new Object[] {sound.func_188719_a(), resourcelocation, s});
|
||||||
@@ -0,0 +1,10 @@
|
|||||||
|
--- ../src-base/minecraft/net/minecraft/client/entity/EntityOtherPlayerMP.java
|
||||||
|
+++ ../src-work/minecraft/net/minecraft/client/entity/EntityOtherPlayerMP.java
|
||||||
|
@@ -43,6 +43,7 @@
|
||||||
|
|
||||||
|
public boolean func_70097_a(DamageSource p_70097_1_, float p_70097_2_)
|
||||||
|
{
|
||||||
|
+ net.minecraftforge.common.ForgeHooks.onLivingAttack(this, p_70097_1_, p_70097_2_);
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
@@ -1,7 +1,15 @@
|
|||||||
--- ../src-base/minecraft/net/minecraft/client/entity/EntityPlayerSP.java
|
--- ../src-base/minecraft/net/minecraft/client/entity/EntityPlayerSP.java
|
||||||
+++ ../src-work/minecraft/net/minecraft/client/entity/EntityPlayerSP.java
|
+++ ../src-work/minecraft/net/minecraft/client/entity/EntityPlayerSP.java
|
||||||
@@ -415,6 +415,15 @@
|
@@ -125,6 +125,7 @@
|
||||||
this.field_71159_c.field_71456_v.func_146158_b().func_146227_a(p_146105_1_);
|
|
||||||
|
public boolean func_70097_a(DamageSource p_70097_1_, float p_70097_2_)
|
||||||
|
{
|
||||||
|
+ net.minecraftforge.common.ForgeHooks.onLivingAttack(this, p_70097_1_, p_70097_2_);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
@@ -428,6 +429,15 @@
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
+ private boolean isHeadspaceFree(BlockPos pos, int height)
|
+ private boolean isHeadspaceFree(BlockPos pos, int height)
|
||||||
@@ -16,7 +24,7 @@
|
|||||||
protected boolean func_145771_j(double p_145771_1_, double p_145771_3_, double p_145771_5_)
|
protected boolean func_145771_j(double p_145771_1_, double p_145771_3_, double p_145771_5_)
|
||||||
{
|
{
|
||||||
if (this.field_70145_X)
|
if (this.field_70145_X)
|
||||||
@@ -427,30 +436,34 @@
|
@@ -440,30 +450,34 @@
|
||||||
double d0 = p_145771_1_ - (double)blockpos.func_177958_n();
|
double d0 = p_145771_1_ - (double)blockpos.func_177958_n();
|
||||||
double d1 = p_145771_5_ - (double)blockpos.func_177952_p();
|
double d1 = p_145771_5_ - (double)blockpos.func_177952_p();
|
||||||
|
|
||||||
@@ -56,16 +64,17 @@
|
|||||||
{
|
{
|
||||||
d2 = 1.0D - d1;
|
d2 = 1.0D - d1;
|
||||||
i = 5;
|
i = 5;
|
||||||
@@ -485,7 +498,7 @@
|
@@ -498,7 +512,8 @@
|
||||||
|
|
||||||
private boolean func_175162_d(BlockPos p_175162_1_)
|
private boolean func_175162_d(BlockPos p_175162_1_)
|
||||||
{
|
{
|
||||||
- return !this.field_70170_p.func_180495_p(p_175162_1_).func_185915_l() && !this.field_70170_p.func_180495_p(p_175162_1_.func_177984_a()).func_185915_l();
|
- return !this.field_70170_p.func_180495_p(p_175162_1_).func_185915_l() && !this.field_70170_p.func_180495_p(p_175162_1_.func_177984_a()).func_185915_l();
|
||||||
+ return !this.field_70170_p.func_180495_p(p_175162_1_).func_185915_l();
|
+ IBlockState iblockstate = field_70170_p.func_180495_p(p_175162_1_);
|
||||||
|
+ return !iblockstate.func_177230_c().isNormalCube(iblockstate, field_70170_p, p_175162_1_);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void func_70031_b(boolean p_70031_1_)
|
public void func_70031_b(boolean p_70031_1_)
|
||||||
@@ -530,7 +543,13 @@
|
@@ -543,7 +558,13 @@
|
||||||
|
|
||||||
public void func_184185_a(SoundEvent p_184185_1_, float p_184185_2_, float p_184185_3_)
|
public void func_184185_a(SoundEvent p_184185_1_, float p_184185_2_, float p_184185_3_)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -9,15 +9,7 @@
|
|||||||
|
|
||||||
for (int i = 0; i < 32; ++i)
|
for (int i = 0; i < 32; ++i)
|
||||||
{
|
{
|
||||||
@@ -97,6 +97,7 @@
|
@@ -107,7 +107,7 @@
|
||||||
public void func_110549_a(IResourceManager p_110549_1_)
|
|
||||||
{
|
|
||||||
this.func_111272_d();
|
|
||||||
+ this.func_98306_d();
|
|
||||||
}
|
|
||||||
|
|
||||||
private void func_111272_d()
|
|
||||||
@@ -106,7 +107,7 @@
|
|
||||||
|
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
@@ -26,7 +18,7 @@
|
|||||||
bufferedimage = TextureUtil.func_177053_a(iresource.func_110527_b());
|
bufferedimage = TextureUtil.func_177053_a(iresource.func_110527_b());
|
||||||
}
|
}
|
||||||
catch (IOException ioexception)
|
catch (IOException ioexception)
|
||||||
@@ -171,7 +172,7 @@
|
@@ -172,7 +172,7 @@
|
||||||
|
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
@@ -35,7 +27,15 @@
|
|||||||
iresource.func_110527_b().read(this.field_78287_e);
|
iresource.func_110527_b().read(this.field_78287_e);
|
||||||
}
|
}
|
||||||
catch (IOException ioexception)
|
catch (IOException ioexception)
|
||||||
@@ -202,7 +203,7 @@
|
@@ -187,6 +187,7 @@
|
||||||
|
|
||||||
|
private float func_181559_a(char p_181559_1_, boolean p_181559_2_)
|
||||||
|
{
|
||||||
|
+ if (p_181559_1_ == 160) return 4.0F; // forge: display nbsp as space. MC-2595
|
||||||
|
if (p_181559_1_ == 32)
|
||||||
|
{
|
||||||
|
return 4.0F;
|
||||||
|
@@ -203,7 +204,7 @@
|
||||||
int i = p_78266_1_ % 16 * 8;
|
int i = p_78266_1_ % 16 * 8;
|
||||||
int j = p_78266_1_ / 16 * 8;
|
int j = p_78266_1_ / 16 * 8;
|
||||||
int k = p_78266_2_ ? 1 : 0;
|
int k = p_78266_2_ ? 1 : 0;
|
||||||
@@ -44,7 +44,7 @@
|
|||||||
int l = this.field_78286_d[p_78266_1_];
|
int l = this.field_78286_d[p_78266_1_];
|
||||||
float f = (float)l - 0.01F;
|
float f = (float)l - 0.01F;
|
||||||
GlStateManager.func_187447_r(5);
|
GlStateManager.func_187447_r(5);
|
||||||
@@ -230,7 +231,7 @@
|
@@ -231,7 +232,7 @@
|
||||||
|
|
||||||
private void func_78257_a(int p_78257_1_)
|
private void func_78257_a(int p_78257_1_)
|
||||||
{
|
{
|
||||||
@@ -53,7 +53,7 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
protected float func_78277_a(char p_78277_1_, boolean p_78277_2_)
|
protected float func_78277_a(char p_78277_1_, boolean p_78277_2_)
|
||||||
@@ -279,7 +280,7 @@
|
@@ -280,7 +281,7 @@
|
||||||
|
|
||||||
public int func_175065_a(String p_175065_1_, float p_175065_2_, float p_175065_3_, int p_175065_4_, boolean p_175065_5_)
|
public int func_175065_a(String p_175065_1_, float p_175065_2_, float p_175065_3_, int p_175065_4_, boolean p_175065_5_)
|
||||||
{
|
{
|
||||||
@@ -62,7 +62,7 @@
|
|||||||
this.func_78265_b();
|
this.func_78265_b();
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
@@ -349,7 +350,7 @@
|
@@ -350,7 +351,7 @@
|
||||||
|
|
||||||
int j1 = this.field_78285_g[i1];
|
int j1 = this.field_78285_g[i1];
|
||||||
this.field_78304_r = j1;
|
this.field_78304_r = j1;
|
||||||
@@ -71,7 +71,7 @@
|
|||||||
}
|
}
|
||||||
else if (i1 == 16)
|
else if (i1 == 16)
|
||||||
{
|
{
|
||||||
@@ -378,7 +379,7 @@
|
@@ -379,7 +380,7 @@
|
||||||
this.field_78299_w = false;
|
this.field_78299_w = false;
|
||||||
this.field_78300_v = false;
|
this.field_78300_v = false;
|
||||||
this.field_78301_u = false;
|
this.field_78301_u = false;
|
||||||
@@ -80,7 +80,7 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
++i;
|
++i;
|
||||||
@@ -406,7 +407,7 @@
|
@@ -407,7 +408,7 @@
|
||||||
c0 = c1;
|
c0 = c1;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -89,7 +89,7 @@
|
|||||||
boolean flag = (c0 == 0 || j == -1 || this.field_78293_l) && p_78255_2_;
|
boolean flag = (c0 == 0 || j == -1 || this.field_78293_l) && p_78255_2_;
|
||||||
|
|
||||||
if (flag)
|
if (flag)
|
||||||
@@ -444,7 +445,16 @@
|
@@ -445,7 +446,16 @@
|
||||||
|
|
||||||
++f;
|
++f;
|
||||||
}
|
}
|
||||||
@@ -106,7 +106,7 @@
|
|||||||
if (this.field_78299_w)
|
if (this.field_78299_w)
|
||||||
{
|
{
|
||||||
Tessellator tessellator = Tessellator.func_178181_a();
|
Tessellator tessellator = Tessellator.func_178181_a();
|
||||||
@@ -517,7 +527,7 @@
|
@@ -518,7 +528,7 @@
|
||||||
this.field_78292_o = (float)(p_180455_4_ >> 8 & 255) / 255.0F;
|
this.field_78292_o = (float)(p_180455_4_ >> 8 & 255) / 255.0F;
|
||||||
this.field_78306_p = (float)(p_180455_4_ & 255) / 255.0F;
|
this.field_78306_p = (float)(p_180455_4_ & 255) / 255.0F;
|
||||||
this.field_78305_q = (float)(p_180455_4_ >> 24 & 255) / 255.0F;
|
this.field_78305_q = (float)(p_180455_4_ >> 24 & 255) / 255.0F;
|
||||||
@@ -115,7 +115,15 @@
|
|||||||
this.field_78295_j = p_180455_2_;
|
this.field_78295_j = p_180455_2_;
|
||||||
this.field_78296_k = p_180455_3_;
|
this.field_78296_k = p_180455_3_;
|
||||||
this.func_78255_a(p_180455_1_, p_180455_5_);
|
this.func_78255_a(p_180455_1_, p_180455_5_);
|
||||||
@@ -848,6 +858,26 @@
|
@@ -576,6 +586,7 @@
|
||||||
|
|
||||||
|
public int func_78263_a(char p_78263_1_)
|
||||||
|
{
|
||||||
|
+ if (p_78263_1_ == 160) return 4; // forge: display nbsp as space. MC-2595
|
||||||
|
if (p_78263_1_ == 167)
|
||||||
|
{
|
||||||
|
return -1;
|
||||||
|
@@ -849,6 +860,26 @@
|
||||||
return this.field_78294_m;
|
return this.field_78294_m;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,26 @@
|
|||||||
|
--- ../src-base/minecraft/net/minecraft/client/gui/GuiEnchantment.java
|
||||||
|
+++ ../src-work/minecraft/net/minecraft/client/gui/GuiEnchantment.java
|
||||||
|
@@ -171,7 +171,7 @@
|
||||||
|
FontRenderer fontrenderer = this.field_146297_k.field_71464_q;
|
||||||
|
int i2 = 6839882;
|
||||||
|
|
||||||
|
- if ((k < l + 1 || this.field_146297_k.field_71439_g.field_71068_ca < k1) && !this.field_146297_k.field_71439_g.field_71075_bZ.field_75098_d)
|
||||||
|
+ if (((k < l + 1 || this.field_146297_k.field_71439_g.field_71068_ca < k1) && !this.field_146297_k.field_71439_g.field_71075_bZ.field_75098_d) || this.field_147075_G.field_185001_h[l] == -1) // Forge: render buttons as disabled when enchantable but enchantability not met on lower levels
|
||||||
|
{
|
||||||
|
this.func_73729_b(i1, j + 14 + 19 * l, 0, 185, 108, 19);
|
||||||
|
this.func_73729_b(i1 + 1, j + 15 + 19 * l, 16 * l, 239, 16, 16);
|
||||||
|
@@ -217,11 +217,12 @@
|
||||||
|
int l = this.field_147075_G.field_185002_i[j];
|
||||||
|
int i1 = j + 1;
|
||||||
|
|
||||||
|
- if (this.func_146978_c(60, 14 + 19 * j, 108, 17, p_73863_1_, p_73863_2_) && k > 0 && l >= 0 && enchantment != null)
|
||||||
|
+ if (this.func_146978_c(60, 14 + 19 * j, 108, 17, p_73863_1_, p_73863_2_) && k > 0)
|
||||||
|
{
|
||||||
|
List<String> list = Lists.<String>newArrayList();
|
||||||
|
- list.add("" + TextFormatting.WHITE + TextFormatting.ITALIC + I18n.func_135052_a("container.enchant.clue", new Object[] {enchantment.func_77316_c(l)}));
|
||||||
|
+ list.add("" + TextFormatting.WHITE + TextFormatting.ITALIC + I18n.func_135052_a("container.enchant.clue", new Object[] {enchantment == null ? "" : enchantment.func_77316_c(l)}));
|
||||||
|
|
||||||
|
+ if(enchantment == null) java.util.Collections.addAll(list, "", TextFormatting.RED + I18n.func_135052_a("forge.container.enchant.limitedEnchantability")); else
|
||||||
|
if (!flag)
|
||||||
|
{
|
||||||
|
list.add("");
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
--- ../src-base/minecraft/net/minecraft/client/gui/GuiIngame.java
|
--- ../src-base/minecraft/net/minecraft/client/gui/GuiIngame.java
|
||||||
+++ ../src-work/minecraft/net/minecraft/client/gui/GuiIngame.java
|
+++ ../src-work/minecraft/net/minecraft/client/gui/GuiIngame.java
|
||||||
@@ -360,7 +360,8 @@
|
@@ -359,7 +359,8 @@
|
||||||
|
|
||||||
BlockPos blockpos = raytraceresult.func_178782_a();
|
BlockPos blockpos = raytraceresult.func_178782_a();
|
||||||
|
|
||||||
@@ -10,7 +10,7 @@
|
|||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -418,7 +419,10 @@
|
@@ -429,7 +430,10 @@
|
||||||
{
|
{
|
||||||
Potion potion = potioneffect.func_188419_a();
|
Potion potion = potioneffect.func_188419_a();
|
||||||
|
|
||||||
@@ -22,7 +22,7 @@
|
|||||||
{
|
{
|
||||||
int k = p_184048_1_.func_78326_a();
|
int k = p_184048_1_.func_78326_a();
|
||||||
int l = 1;
|
int l = 1;
|
||||||
@@ -455,7 +459,10 @@
|
@@ -472,7 +476,10 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
GlStateManager.func_179131_c(1.0F, 1.0F, 1.0F, f);
|
GlStateManager.func_179131_c(1.0F, 1.0F, 1.0F, f);
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
--- ../src-base/minecraft/net/minecraft/client/gui/GuiListWorldSelectionEntry.java
|
--- ../src-base/minecraft/net/minecraft/client/gui/GuiListWorldSelectionEntry.java
|
||||||
+++ ../src-work/minecraft/net/minecraft/client/gui/GuiListWorldSelectionEntry.java
|
+++ ../src-work/minecraft/net/minecraft/client/gui/GuiListWorldSelectionEntry.java
|
||||||
@@ -242,7 +242,7 @@
|
@@ -246,7 +246,7 @@
|
||||||
|
|
||||||
if (this.field_186784_e.func_71359_d().func_90033_f(this.field_186786_g.func_75786_a()))
|
if (this.field_186784_e.func_71359_d().func_90033_f(this.field_186786_g.func_75786_a()))
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
--- ../src-base/minecraft/net/minecraft/client/gui/GuiMainMenu.java
|
--- ../src-base/minecraft/net/minecraft/client/gui/GuiMainMenu.java
|
||||||
+++ ../src-work/minecraft/net/minecraft/client/gui/GuiMainMenu.java
|
+++ ../src-work/minecraft/net/minecraft/client/gui/GuiMainMenu.java
|
||||||
@@ -67,6 +67,8 @@
|
@@ -65,6 +65,8 @@
|
||||||
private GuiButton field_175372_K;
|
private GuiButton field_175372_K;
|
||||||
private boolean field_183502_L;
|
private boolean field_183502_L;
|
||||||
private GuiScreen field_183503_M;
|
private GuiScreen field_183503_M;
|
||||||
@@ -9,7 +9,7 @@
|
|||||||
|
|
||||||
public GuiMainMenu()
|
public GuiMainMenu()
|
||||||
{
|
{
|
||||||
@@ -209,13 +211,15 @@
|
@@ -216,13 +218,15 @@
|
||||||
this.field_183503_M.func_183500_a(this.field_146294_l, this.field_146295_m);
|
this.field_183503_M.func_183500_a(this.field_146294_l, this.field_146295_m);
|
||||||
this.field_183503_M.func_73866_w_();
|
this.field_183503_M.func_73866_w_();
|
||||||
}
|
}
|
||||||
@@ -26,7 +26,7 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
private void func_73972_b(int p_73972_1_, int p_73972_2_)
|
private void func_73972_b(int p_73972_1_, int p_73972_2_)
|
||||||
@@ -263,6 +267,11 @@
|
@@ -270,6 +274,11 @@
|
||||||
this.field_146297_k.func_71400_g();
|
this.field_146297_k.func_71400_g();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -38,7 +38,7 @@
|
|||||||
if (p_146284_1_.field_146127_k == 11)
|
if (p_146284_1_.field_146127_k == 11)
|
||||||
{
|
{
|
||||||
this.field_146297_k.func_71371_a("Demo_World", "Demo_World", DemoWorldServer.field_73071_a);
|
this.field_146297_k.func_71371_a("Demo_World", "Demo_World", DemoWorldServer.field_73071_a);
|
||||||
@@ -490,6 +499,8 @@
|
@@ -501,6 +510,8 @@
|
||||||
this.func_73729_b(j + 155, 30, 0, 45, 155, 44);
|
this.func_73729_b(j + 155, 30, 0, 45, 155, 44);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -47,7 +47,7 @@
|
|||||||
GlStateManager.func_179094_E();
|
GlStateManager.func_179094_E();
|
||||||
GlStateManager.func_179109_b((float)(this.field_146294_l / 2 + 90), 70.0F, 0.0F);
|
GlStateManager.func_179109_b((float)(this.field_146294_l / 2 + 90), 70.0F, 0.0F);
|
||||||
GlStateManager.func_179114_b(-20.0F, 0.0F, 0.0F, 1.0F);
|
GlStateManager.func_179114_b(-20.0F, 0.0F, 0.0F, 1.0F);
|
||||||
@@ -509,7 +520,15 @@
|
@@ -520,7 +531,15 @@
|
||||||
s = s + ("release".equalsIgnoreCase(this.field_146297_k.func_184123_d()) ? "" : "/" + this.field_146297_k.func_184123_d());
|
s = s + ("release".equalsIgnoreCase(this.field_146297_k.func_184123_d()) ? "" : "/" + this.field_146297_k.func_184123_d());
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -64,7 +64,7 @@
|
|||||||
String s1 = "Copyright Mojang AB. Do not distribute!";
|
String s1 = "Copyright Mojang AB. Do not distribute!";
|
||||||
this.func_73731_b(this.field_146289_q, "Copyright Mojang AB. Do not distribute!", this.field_146294_l - this.field_146289_q.func_78256_a("Copyright Mojang AB. Do not distribute!") - 2, this.field_146295_m - 10, -1);
|
this.func_73731_b(this.field_146289_q, "Copyright Mojang AB. Do not distribute!", this.field_146294_l - this.field_146289_q.func_78256_a("Copyright Mojang AB. Do not distribute!") - 2, this.field_146295_m - 10, -1);
|
||||||
|
|
||||||
@@ -526,6 +545,7 @@
|
@@ -537,6 +556,7 @@
|
||||||
{
|
{
|
||||||
this.field_183503_M.func_73863_a(p_73863_1_, p_73863_2_, p_73863_3_);
|
this.field_183503_M.func_73863_a(p_73863_1_, p_73863_2_, p_73863_3_);
|
||||||
}
|
}
|
||||||
@@ -72,7 +72,7 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
protected void func_73864_a(int p_73864_1_, int p_73864_2_, int p_73864_3_) throws IOException
|
protected void func_73864_a(int p_73864_1_, int p_73864_2_, int p_73864_3_) throws IOException
|
||||||
@@ -546,6 +566,8 @@
|
@@ -557,6 +577,8 @@
|
||||||
{
|
{
|
||||||
this.field_183503_M.func_73864_a(p_73864_1_, p_73864_2_, p_73864_3_);
|
this.field_183503_M.func_73864_a(p_73864_1_, p_73864_2_, p_73864_3_);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
--- ../src-base/minecraft/net/minecraft/client/gui/GuiOverlayDebug.java
|
--- ../src-base/minecraft/net/minecraft/client/gui/GuiOverlayDebug.java
|
||||||
+++ ../src-work/minecraft/net/minecraft/client/gui/GuiOverlayDebug.java
|
+++ ../src-work/minecraft/net/minecraft/client/gui/GuiOverlayDebug.java
|
||||||
@@ -188,6 +188,9 @@
|
@@ -189,6 +189,9 @@
|
||||||
long l = j - k;
|
long l = j - k;
|
||||||
List<String> list = Lists.newArrayList(new String[] {String.format("Java: %s %dbit", new Object[]{System.getProperty("java.version"), Integer.valueOf(this.field_175242_a.func_147111_S() ? 64 : 32)}), String.format("Mem: % 2d%% %03d/%03dMB", new Object[]{Long.valueOf(l * 100L / i), Long.valueOf(func_175240_a(l)), Long.valueOf(func_175240_a(i))}), String.format("Allocated: % 2d%% %03dMB", new Object[]{Long.valueOf(j * 100L / i), Long.valueOf(func_175240_a(j))}), "", String.format("CPU: %s", new Object[]{OpenGlHelper.func_183029_j()}), "", String.format("Display: %dx%d (%s)", new Object[]{Integer.valueOf(Display.getWidth()), Integer.valueOf(Display.getHeight()), GlStateManager.func_187416_u(7936)}), GlStateManager.func_187416_u(7937), GlStateManager.func_187416_u(7938)});
|
List<String> list = Lists.newArrayList(new String[] {String.format("Java: %s %dbit", new Object[]{System.getProperty("java.version"), Integer.valueOf(this.field_175242_a.func_147111_S() ? 64 : 32)}), String.format("Mem: % 2d%% %03d/%03dMB", new Object[]{Long.valueOf(l * 100L / i), Long.valueOf(func_175240_a(l)), Long.valueOf(func_175240_a(i))}), String.format("Allocated: % 2d%% %03dMB", new Object[]{Long.valueOf(j * 100L / i), Long.valueOf(func_175240_a(j))}), "", String.format("CPU: %s", new Object[]{OpenGlHelper.func_183029_j()}), "", String.format("Display: %dx%d (%s)", new Object[]{Integer.valueOf(Display.getWidth()), Integer.valueOf(Display.getHeight()), GlStateManager.func_187416_u(7936)}), GlStateManager.func_187416_u(7937), GlStateManager.func_187416_u(7938)});
|
||||||
|
|
||||||
|
|||||||
@@ -1,21 +1,31 @@
|
|||||||
--- ../src-base/minecraft/net/minecraft/client/gui/GuiScreen.java
|
--- ../src-base/minecraft/net/minecraft/client/gui/GuiScreen.java
|
||||||
+++ ../src-work/minecraft/net/minecraft/client/gui/GuiScreen.java
|
+++ ../src-work/minecraft/net/minecraft/client/gui/GuiScreen.java
|
||||||
@@ -147,7 +147,8 @@
|
@@ -63,6 +63,7 @@
|
||||||
|
private long field_146288_g;
|
||||||
|
private int field_146298_h;
|
||||||
|
private URI field_175286_t;
|
||||||
|
+ protected boolean keyHandled, mouseHandled; // Forge: allow canceling key and mouse Post events from handleMouseInput and handleKeyboardInput
|
||||||
|
|
||||||
|
public void func_73863_a(int p_73863_1_, int p_73863_2_, float p_73863_3_)
|
||||||
|
{
|
||||||
|
@@ -147,7 +148,10 @@
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
- this.func_146283_a(list, p_146285_2_, p_146285_3_);
|
- this.func_146283_a(list, p_146285_2_, p_146285_3_);
|
||||||
+ FontRenderer font = p_146285_1_.func_77973_b().getFontRenderer(p_146285_1_);
|
+ FontRenderer font = p_146285_1_.func_77973_b().getFontRenderer(p_146285_1_);
|
||||||
|
+ net.minecraftforge.fml.client.config.GuiUtils.preItemToolTip(p_146285_1_);
|
||||||
+ this.drawHoveringText(list, p_146285_2_, p_146285_3_, (font == null ? field_146289_q : font));
|
+ this.drawHoveringText(list, p_146285_2_, p_146285_3_, (font == null ? field_146289_q : font));
|
||||||
|
+ net.minecraftforge.fml.client.config.GuiUtils.postItemToolTip();
|
||||||
}
|
}
|
||||||
|
|
||||||
protected void func_146279_a(String p_146279_1_, int p_146279_2_, int p_146279_3_)
|
protected void func_146279_a(String p_146279_1_, int p_146279_2_, int p_146279_3_)
|
||||||
@@ -157,7 +158,13 @@
|
@@ -157,7 +161,13 @@
|
||||||
|
|
||||||
protected void func_146283_a(List<String> p_146283_1_, int p_146283_2_, int p_146283_3_)
|
protected void func_146283_a(List<String> p_146283_1_, int p_146283_2_, int p_146283_3_)
|
||||||
{
|
{
|
||||||
- if (!p_146283_1_.isEmpty())
|
- if (!p_146283_1_.isEmpty())
|
||||||
+ drawHoveringText(p_146283_1_, p_146283_2_, p_146283_3_, field_146289_q);
|
+ drawHoveringText(p_146283_1_, p_146283_2_, p_146283_3_, field_146289_q);
|
||||||
+ }
|
+ }
|
||||||
+
|
+
|
||||||
+ protected void drawHoveringText(List<String> p_146283_1_, int p_146283_2_, int p_146283_3_, FontRenderer font)
|
+ protected void drawHoveringText(List<String> p_146283_1_, int p_146283_2_, int p_146283_3_, FontRenderer font)
|
||||||
@@ -25,7 +35,13 @@
|
|||||||
{
|
{
|
||||||
GlStateManager.func_179101_C();
|
GlStateManager.func_179101_C();
|
||||||
RenderHelper.func_74518_a();
|
RenderHelper.func_74518_a();
|
||||||
@@ -427,6 +434,7 @@
|
@@ -414,10 +424,13 @@
|
||||||
|
|
||||||
|
public void func_175281_b(String p_175281_1_, boolean p_175281_2_)
|
||||||
|
{
|
||||||
|
+ p_175281_1_ = net.minecraftforge.event.ForgeEventFactory.onClientSendMessage(p_175281_1_);
|
||||||
|
+ if (p_175281_1_.isEmpty()) return;
|
||||||
|
if (p_175281_2_)
|
||||||
{
|
{
|
||||||
this.field_146297_k.field_71456_v.func_146158_b().func_146239_a(p_175281_1_);
|
this.field_146297_k.field_71456_v.func_146158_b().func_146239_a(p_175281_1_);
|
||||||
}
|
}
|
||||||
@@ -33,7 +49,7 @@
|
|||||||
|
|
||||||
this.field_146297_k.field_71439_g.func_71165_d(p_175281_1_);
|
this.field_146297_k.field_71439_g.func_71165_d(p_175281_1_);
|
||||||
}
|
}
|
||||||
@@ -441,9 +449,15 @@
|
@@ -432,9 +445,15 @@
|
||||||
|
|
||||||
if (guibutton.func_146116_c(this.field_146297_k, p_73864_1_, p_73864_2_))
|
if (guibutton.func_146116_c(this.field_146297_k, p_73864_1_, p_73864_2_))
|
||||||
{
|
{
|
||||||
@@ -49,7 +65,7 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -473,8 +487,12 @@
|
@@ -464,8 +483,12 @@
|
||||||
this.field_146289_q = p_146280_1_.field_71466_p;
|
this.field_146289_q = p_146280_1_.field_71466_p;
|
||||||
this.field_146294_l = p_146280_2_;
|
this.field_146294_l = p_146280_2_;
|
||||||
this.field_146295_m = p_146280_3_;
|
this.field_146295_m = p_146280_3_;
|
||||||
@@ -62,27 +78,29 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
public void func_183500_a(int p_183500_1_, int p_183500_2_)
|
public void func_183500_a(int p_183500_1_, int p_183500_2_)
|
||||||
@@ -493,7 +511,9 @@
|
@@ -484,7 +507,10 @@
|
||||||
{
|
{
|
||||||
while (Mouse.next())
|
while (Mouse.next())
|
||||||
{
|
{
|
||||||
|
+ this.mouseHandled = false;
|
||||||
+ if (net.minecraftforge.common.MinecraftForge.EVENT_BUS.post(new net.minecraftforge.client.event.GuiScreenEvent.MouseInputEvent.Pre(this))) continue;
|
+ if (net.minecraftforge.common.MinecraftForge.EVENT_BUS.post(new net.minecraftforge.client.event.GuiScreenEvent.MouseInputEvent.Pre(this))) continue;
|
||||||
this.func_146274_d();
|
this.func_146274_d();
|
||||||
+ if (this.equals(this.field_146297_k.field_71462_r)) net.minecraftforge.common.MinecraftForge.EVENT_BUS.post(new net.minecraftforge.client.event.GuiScreenEvent.MouseInputEvent.Post(this));
|
+ if (this.equals(this.field_146297_k.field_71462_r) && !this.mouseHandled) net.minecraftforge.common.MinecraftForge.EVENT_BUS.post(new net.minecraftforge.client.event.GuiScreenEvent.MouseInputEvent.Post(this));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -501,7 +521,9 @@
|
@@ -492,7 +518,10 @@
|
||||||
{
|
{
|
||||||
while (Keyboard.next())
|
while (Keyboard.next())
|
||||||
{
|
{
|
||||||
|
+ this.keyHandled = false;
|
||||||
+ if (net.minecraftforge.common.MinecraftForge.EVENT_BUS.post(new net.minecraftforge.client.event.GuiScreenEvent.KeyboardInputEvent.Pre(this))) continue;
|
+ if (net.minecraftforge.common.MinecraftForge.EVENT_BUS.post(new net.minecraftforge.client.event.GuiScreenEvent.KeyboardInputEvent.Pre(this))) continue;
|
||||||
this.func_146282_l();
|
this.func_146282_l();
|
||||||
+ if (this.equals(this.field_146297_k.field_71462_r)) net.minecraftforge.common.MinecraftForge.EVENT_BUS.post(new net.minecraftforge.client.event.GuiScreenEvent.KeyboardInputEvent.Post(this));
|
+ if (this.equals(this.field_146297_k.field_71462_r) && !this.keyHandled) net.minecraftforge.common.MinecraftForge.EVENT_BUS.post(new net.minecraftforge.client.event.GuiScreenEvent.KeyboardInputEvent.Post(this));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -563,6 +585,7 @@
|
@@ -554,6 +583,7 @@
|
||||||
public void func_146276_q_()
|
public void func_146276_q_()
|
||||||
{
|
{
|
||||||
this.func_146270_b(0);
|
this.func_146270_b(0);
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
--- ../src-base/minecraft/net/minecraft/client/gui/GuiScreenDemo.java
|
--- ../src-base/minecraft/net/minecraft/client/gui/GuiScreenDemo.java
|
||||||
+++ ../src-work/minecraft/net/minecraft/client/gui/GuiScreenDemo.java
|
+++ ../src-work/minecraft/net/minecraft/client/gui/GuiScreenDemo.java
|
||||||
@@ -73,10 +73,10 @@
|
@@ -68,10 +68,10 @@
|
||||||
this.field_146289_q.func_78276_b(I18n.func_135052_a("demo.help.title", new Object[0]), i, j, 2039583);
|
this.field_146289_q.func_78276_b(I18n.func_135052_a("demo.help.title", new Object[0]), i, j, 2039583);
|
||||||
j = j + 12;
|
j = j + 12;
|
||||||
GameSettings gamesettings = this.field_146297_k.field_71474_y;
|
GameSettings gamesettings = this.field_146297_k.field_71474_y;
|
||||||
|
|||||||
@@ -0,0 +1,15 @@
|
|||||||
|
--- ../src-base/minecraft/net/minecraft/client/gui/GuiVideoSettings.java
|
||||||
|
+++ ../src-work/minecraft/net/minecraft/client/gui/GuiVideoSettings.java
|
||||||
|
@@ -117,4 +117,12 @@
|
||||||
|
this.func_73732_a(this.field_146289_q, this.field_146500_a, this.field_146294_l / 2, 5, 16777215);
|
||||||
|
super.func_73863_a(p_73863_1_, p_73863_2_, p_73863_3_);
|
||||||
|
}
|
||||||
|
+
|
||||||
|
+ // FORGE: fix for MC-64581 very laggy mipmap slider
|
||||||
|
+ @Override
|
||||||
|
+ public void func_146281_b()
|
||||||
|
+ {
|
||||||
|
+ super.func_146281_b();
|
||||||
|
+ this.field_146297_k.field_71474_y.onGuiClosed();
|
||||||
|
+ }
|
||||||
|
}
|
||||||
@@ -1,7 +1,7 @@
|
|||||||
--- ../src-base/minecraft/net/minecraft/client/gui/ServerListEntryNormal.java
|
--- ../src-base/minecraft/net/minecraft/client/gui/ServerListEntryNormal.java
|
||||||
+++ ../src-work/minecraft/net/minecraft/client/gui/ServerListEntryNormal.java
|
+++ ../src-work/minecraft/net/minecraft/client/gui/ServerListEntryNormal.java
|
||||||
@@ -82,7 +82,7 @@
|
@@ -82,7 +82,7 @@
|
||||||
boolean flag1 = this.field_148301_e.field_82821_f < 210;
|
boolean flag1 = this.field_148301_e.field_82821_f < 316;
|
||||||
boolean flag2 = flag || flag1;
|
boolean flag2 = flag || flag1;
|
||||||
this.field_148300_d.field_71466_p.func_78276_b(this.field_148301_e.field_78847_a, p_180790_2_ + 32 + 3, p_180790_3_ + 1, 16777215);
|
this.field_148300_d.field_71466_p.func_78276_b(this.field_148301_e.field_78847_a, p_180790_2_ + 32 + 3, p_180790_3_ + 1, 16777215);
|
||||||
- List<String> list = this.field_148300_d.field_71466_p.func_78271_c(this.field_148301_e.field_78843_d, p_180790_4_ - 32 - 2);
|
- List<String> list = this.field_148300_d.field_71466_p.func_78271_c(this.field_148301_e.field_78843_d, p_180790_4_ - 32 - 2);
|
||||||
|
|||||||
@@ -1,21 +1,20 @@
|
|||||||
--- ../src-base/minecraft/net/minecraft/client/gui/inventory/GuiContainer.java
|
--- ../src-base/minecraft/net/minecraft/client/gui/inventory/GuiContainer.java
|
||||||
+++ ../src-work/minecraft/net/minecraft/client/gui/inventory/GuiContainer.java
|
+++ ../src-work/minecraft/net/minecraft/client/gui/inventory/GuiContainer.java
|
||||||
@@ -176,8 +176,11 @@
|
@@ -180,8 +180,10 @@
|
||||||
GlStateManager.func_179109_b(0.0F, 0.0F, 32.0F);
|
GlStateManager.func_179109_b(0.0F, 0.0F, 32.0F);
|
||||||
this.field_73735_i = 200.0F;
|
this.field_73735_i = 200.0F;
|
||||||
this.field_146296_j.field_77023_b = 200.0F;
|
this.field_146296_j.field_77023_b = 200.0F;
|
||||||
+ net.minecraft.client.gui.FontRenderer font = null;
|
+ net.minecraft.client.gui.FontRenderer font = p_146982_1_.func_77973_b().getFontRenderer(p_146982_1_);
|
||||||
+ if (p_146982_1_ != null) font = p_146982_1_.func_77973_b().getFontRenderer(p_146982_1_);
|
|
||||||
+ if (font == null) font = field_146289_q;
|
+ if (font == null) font = field_146289_q;
|
||||||
this.field_146296_j.func_180450_b(p_146982_1_, p_146982_2_, p_146982_3_);
|
this.field_146296_j.func_180450_b(p_146982_1_, p_146982_2_, p_146982_3_);
|
||||||
- this.field_146296_j.func_180453_a(this.field_146289_q, p_146982_1_, p_146982_2_, p_146982_3_ - (this.field_147012_x == null ? 0 : 8), p_146982_4_);
|
- this.field_146296_j.func_180453_a(this.field_146289_q, p_146982_1_, p_146982_2_, p_146982_3_ - (this.field_147012_x.func_190926_b() ? 0 : 8), p_146982_4_);
|
||||||
+ this.field_146296_j.func_180453_a(font, p_146982_1_, p_146982_2_, p_146982_3_ - (this.field_147012_x == null ? 0 : 8), p_146982_4_);
|
+ this.field_146296_j.func_180453_a(font, p_146982_1_, p_146982_2_, p_146982_3_ - (this.field_147012_x.func_190926_b() ? 0 : 8), p_146982_4_);
|
||||||
this.field_73735_i = 0.0F;
|
this.field_73735_i = 0.0F;
|
||||||
this.field_146296_j.field_77023_b = 0.0F;
|
this.field_146296_j.field_77023_b = 0.0F;
|
||||||
}
|
}
|
||||||
@@ -240,13 +243,12 @@
|
@@ -239,13 +241,12 @@
|
||||||
|
|
||||||
if (itemstack == null && p_146977_1_.func_111238_b())
|
if (itemstack.func_190926_b() && p_146977_1_.func_111238_b())
|
||||||
{
|
{
|
||||||
- String s1 = p_146977_1_.func_178171_c();
|
- String s1 = p_146977_1_.func_178171_c();
|
||||||
+ TextureAtlasSprite textureatlassprite = p_146977_1_.getBackgroundSprite();
|
+ TextureAtlasSprite textureatlassprite = p_146977_1_.getBackgroundSprite();
|
||||||
@@ -30,7 +29,7 @@
|
|||||||
this.func_175175_a(i, j, textureatlassprite, 16, 16);
|
this.func_175175_a(i, j, textureatlassprite, 16, 16);
|
||||||
GlStateManager.func_179145_e();
|
GlStateManager.func_179145_e();
|
||||||
flag1 = true;
|
flag1 = true;
|
||||||
@@ -316,7 +318,7 @@
|
@@ -319,7 +320,7 @@
|
||||||
protected void func_73864_a(int p_73864_1_, int p_73864_2_, int p_73864_3_) throws IOException
|
protected void func_73864_a(int p_73864_1_, int p_73864_2_, int p_73864_3_) throws IOException
|
||||||
{
|
{
|
||||||
super.func_73864_a(p_73864_1_, p_73864_2_, p_73864_3_);
|
super.func_73864_a(p_73864_1_, p_73864_2_, p_73864_3_);
|
||||||
@@ -39,7 +38,7 @@
|
|||||||
Slot slot = this.func_146975_c(p_73864_1_, p_73864_2_);
|
Slot slot = this.func_146975_c(p_73864_1_, p_73864_2_);
|
||||||
long i = Minecraft.func_71386_F();
|
long i = Minecraft.func_71386_F();
|
||||||
this.field_146993_M = this.field_146998_K == slot && i - this.field_146997_J < 250L && this.field_146992_L == p_73864_3_;
|
this.field_146993_M = this.field_146998_K == slot && i - this.field_146997_J < 250L && this.field_146992_L == p_73864_3_;
|
||||||
@@ -327,6 +329,7 @@
|
@@ -330,6 +331,7 @@
|
||||||
int j = this.field_147003_i;
|
int j = this.field_147003_i;
|
||||||
int k = this.field_147009_r;
|
int k = this.field_147009_r;
|
||||||
boolean flag1 = p_73864_1_ < j || p_73864_2_ < k || p_73864_1_ >= j + this.field_146999_f || p_73864_2_ >= k + this.field_147000_g;
|
boolean flag1 = p_73864_1_ < j || p_73864_2_ < k || p_73864_1_ >= j + this.field_146999_f || p_73864_2_ >= k + this.field_147000_g;
|
||||||
@@ -47,16 +46,16 @@
|
|||||||
int l = -1;
|
int l = -1;
|
||||||
|
|
||||||
if (slot != null)
|
if (slot != null)
|
||||||
@@ -364,7 +367,7 @@
|
@@ -367,7 +369,7 @@
|
||||||
{
|
{
|
||||||
if (this.field_146297_k.field_71439_g.field_71071_by.func_70445_o() == null)
|
if (this.field_146297_k.field_71439_g.field_71071_by.func_70445_o().func_190926_b())
|
||||||
{
|
{
|
||||||
- if (p_73864_3_ == this.field_146297_k.field_71474_y.field_74322_I.func_151463_i() + 100)
|
- if (p_73864_3_ == this.field_146297_k.field_71474_y.field_74322_I.func_151463_i() + 100)
|
||||||
+ if (this.field_146297_k.field_71474_y.field_74322_I.isActiveAndMatches(p_73864_3_ - 100))
|
+ if (this.field_146297_k.field_71474_y.field_74322_I.isActiveAndMatches(p_73864_3_ - 100))
|
||||||
{
|
{
|
||||||
this.func_184098_a(slot, l, p_73864_3_, ClickType.CLONE);
|
this.func_184098_a(slot, l, p_73864_3_, ClickType.CLONE);
|
||||||
}
|
}
|
||||||
@@ -402,7 +405,7 @@
|
@@ -405,7 +407,7 @@
|
||||||
{
|
{
|
||||||
this.field_146987_F = 1;
|
this.field_146987_F = 1;
|
||||||
}
|
}
|
||||||
@@ -65,7 +64,7 @@
|
|||||||
{
|
{
|
||||||
this.field_146987_F = 2;
|
this.field_146987_F = 2;
|
||||||
}
|
}
|
||||||
@@ -464,10 +467,12 @@
|
@@ -467,10 +469,12 @@
|
||||||
|
|
||||||
protected void func_146286_b(int p_146286_1_, int p_146286_2_, int p_146286_3_)
|
protected void func_146286_b(int p_146286_1_, int p_146286_2_, int p_146286_3_)
|
||||||
{
|
{
|
||||||
@@ -78,7 +77,7 @@
|
|||||||
int k = -1;
|
int k = -1;
|
||||||
|
|
||||||
if (slot != null)
|
if (slot != null)
|
||||||
@@ -488,7 +493,7 @@
|
@@ -491,7 +495,7 @@
|
||||||
{
|
{
|
||||||
for (Slot slot2 : this.field_147002_h.field_75151_b)
|
for (Slot slot2 : this.field_147002_h.field_75151_b)
|
||||||
{
|
{
|
||||||
@@ -87,16 +86,16 @@
|
|||||||
{
|
{
|
||||||
this.func_184098_a(slot2, slot2.field_75222_d, p_146286_3_, ClickType.QUICK_MOVE);
|
this.func_184098_a(slot2, slot2.field_75222_d, p_146286_3_, ClickType.QUICK_MOVE);
|
||||||
}
|
}
|
||||||
@@ -575,7 +580,7 @@
|
@@ -578,7 +582,7 @@
|
||||||
}
|
}
|
||||||
else if (this.field_146297_k.field_71439_g.field_71071_by.func_70445_o() != null)
|
else if (!this.field_146297_k.field_71439_g.field_71071_by.func_70445_o().func_190926_b())
|
||||||
{
|
{
|
||||||
- if (p_146286_3_ == this.field_146297_k.field_71474_y.field_74322_I.func_151463_i() + 100)
|
- if (p_146286_3_ == this.field_146297_k.field_71474_y.field_74322_I.func_151463_i() + 100)
|
||||||
+ if (this.field_146297_k.field_71474_y.field_74322_I.isActiveAndMatches(p_146286_3_ - 100))
|
+ if (this.field_146297_k.field_71474_y.field_74322_I.isActiveAndMatches(p_146286_3_ - 100))
|
||||||
{
|
{
|
||||||
this.func_184098_a(slot, k, p_146286_3_, ClickType.CLONE);
|
this.func_184098_a(slot, k, p_146286_3_, ClickType.CLONE);
|
||||||
}
|
}
|
||||||
@@ -627,7 +632,7 @@
|
@@ -630,7 +634,7 @@
|
||||||
|
|
||||||
protected void func_73869_a(char p_73869_1_, int p_73869_2_) throws IOException
|
protected void func_73869_a(char p_73869_1_, int p_73869_2_) throws IOException
|
||||||
{
|
{
|
||||||
@@ -105,7 +104,7 @@
|
|||||||
{
|
{
|
||||||
this.field_146297_k.field_71439_g.func_71053_j();
|
this.field_146297_k.field_71439_g.func_71053_j();
|
||||||
}
|
}
|
||||||
@@ -636,11 +641,11 @@
|
@@ -639,11 +643,11 @@
|
||||||
|
|
||||||
if (this.field_147006_u != null && this.field_147006_u.func_75216_d())
|
if (this.field_147006_u != null && this.field_147006_u.func_75216_d())
|
||||||
{
|
{
|
||||||
@@ -119,7 +118,7 @@
|
|||||||
{
|
{
|
||||||
this.func_184098_a(this.field_147006_u, this.field_147006_u.field_75222_d, func_146271_m() ? 1 : 0, ClickType.THROW);
|
this.func_184098_a(this.field_147006_u, this.field_147006_u.field_75222_d, func_146271_m() ? 1 : 0, ClickType.THROW);
|
||||||
}
|
}
|
||||||
@@ -653,7 +658,7 @@
|
@@ -656,7 +660,7 @@
|
||||||
{
|
{
|
||||||
for (int i = 0; i < 9; ++i)
|
for (int i = 0; i < 9; ++i)
|
||||||
{
|
{
|
||||||
@@ -128,7 +127,7 @@
|
|||||||
{
|
{
|
||||||
this.func_184098_a(this.field_147006_u, this.field_147006_u.field_75222_d, i, ClickType.SWAP);
|
this.func_184098_a(this.field_147006_u, this.field_147006_u.field_75222_d, i, ClickType.SWAP);
|
||||||
return true;
|
return true;
|
||||||
@@ -686,4 +691,16 @@
|
@@ -689,4 +693,18 @@
|
||||||
this.field_146297_k.field_71439_g.func_71053_j();
|
this.field_146297_k.field_71439_g.func_71053_j();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -138,10 +137,12 @@
|
|||||||
+ /**
|
+ /**
|
||||||
+ * Returns the slot that is currently displayed under the mouse.
|
+ * Returns the slot that is currently displayed under the mouse.
|
||||||
+ */
|
+ */
|
||||||
+ public Slot getSlotUnderMouse()
|
+ @javax.annotation.Nullable
|
||||||
+ {
|
+ public Slot getSlotUnderMouse() { return this.field_147006_u; }
|
||||||
+ return this.field_147006_u;
|
+ public int getGuiLeft() { return field_147003_i; }
|
||||||
+ }
|
+ public int getGuiTop() { return field_147009_r; }
|
||||||
|
+ public int getXSize() { return field_146999_f; }
|
||||||
|
+ public int getYSize() { return field_147000_g; }
|
||||||
+
|
+
|
||||||
+ /* ======================================== FORGE END =====================================*/
|
+ /* ======================================== FORGE END =====================================*/
|
||||||
}
|
}
|
||||||
+66
-18
@@ -1,6 +1,6 @@
|
|||||||
--- ../src-base/minecraft/net/minecraft/client/gui/inventory/GuiContainerCreative.java
|
--- ../src-base/minecraft/net/minecraft/client/gui/inventory/GuiContainerCreative.java
|
||||||
+++ ../src-work/minecraft/net/minecraft/client/gui/inventory/GuiContainerCreative.java
|
+++ ../src-work/minecraft/net/minecraft/client/gui/inventory/GuiContainerCreative.java
|
||||||
@@ -50,6 +50,8 @@
|
@@ -52,6 +52,8 @@
|
||||||
private Slot field_147064_C;
|
private Slot field_147064_C;
|
||||||
private boolean field_147057_D;
|
private boolean field_147057_D;
|
||||||
private CreativeCrafting field_147059_E;
|
private CreativeCrafting field_147059_E;
|
||||||
@@ -9,7 +9,7 @@
|
|||||||
|
|
||||||
public GuiContainerCreative(EntityPlayer p_i1088_1_)
|
public GuiContainerCreative(EntityPlayer p_i1088_1_)
|
||||||
{
|
{
|
||||||
@@ -259,6 +261,13 @@
|
@@ -272,6 +274,13 @@
|
||||||
this.func_147050_b(CreativeTabs.field_78032_a[i]);
|
this.func_147050_b(CreativeTabs.field_78032_a[i]);
|
||||||
this.field_147059_E = new CreativeCrafting(this.field_146297_k);
|
this.field_147059_E = new CreativeCrafting(this.field_146297_k);
|
||||||
this.field_146297_k.field_71439_g.field_71069_bz.func_75132_a(this.field_147059_E);
|
this.field_146297_k.field_71439_g.field_71069_bz.func_75132_a(this.field_147059_E);
|
||||||
@@ -18,12 +18,12 @@
|
|||||||
+ {
|
+ {
|
||||||
+ field_146292_n.add(new GuiButton(101, field_147003_i, field_147009_r - 50, 20, 20, "<"));
|
+ field_146292_n.add(new GuiButton(101, field_147003_i, field_147009_r - 50, 20, 20, "<"));
|
||||||
+ field_146292_n.add(new GuiButton(102, field_147003_i + field_146999_f - 20, field_147009_r - 50, 20, 20, ">"));
|
+ field_146292_n.add(new GuiButton(102, field_147003_i + field_146999_f - 20, field_147009_r - 50, 20, 20, ">"));
|
||||||
+ maxPages = ((tabCount - 12) / 10) + 1;
|
+ maxPages = (int) Math.ceil((tabCount - 12) / 10D);
|
||||||
+ }
|
+ }
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@@ -280,7 +289,7 @@
|
@@ -293,7 +302,7 @@
|
||||||
|
|
||||||
protected void func_73869_a(char p_73869_1_, int p_73869_2_) throws IOException
|
protected void func_73869_a(char p_73869_1_, int p_73869_2_) throws IOException
|
||||||
{
|
{
|
||||||
@@ -32,7 +32,7 @@
|
|||||||
{
|
{
|
||||||
if (GameSettings.func_100015_a(this.field_146297_k.field_71474_y.field_74310_D))
|
if (GameSettings.func_100015_a(this.field_146297_k.field_71474_y.field_74310_D))
|
||||||
{
|
{
|
||||||
@@ -318,6 +327,14 @@
|
@@ -331,6 +340,14 @@
|
||||||
GuiContainerCreative.ContainerCreative guicontainercreative$containercreative = (GuiContainerCreative.ContainerCreative)this.field_147002_h;
|
GuiContainerCreative.ContainerCreative guicontainercreative$containercreative = (GuiContainerCreative.ContainerCreative)this.field_147002_h;
|
||||||
guicontainercreative$containercreative.field_148330_a.clear();
|
guicontainercreative$containercreative.field_148330_a.clear();
|
||||||
|
|
||||||
@@ -47,7 +47,7 @@
|
|||||||
for (Item item : Item.field_150901_e)
|
for (Item item : Item.field_150901_e)
|
||||||
{
|
{
|
||||||
if (item != null && item.func_77640_w() != null)
|
if (item != null && item.func_77640_w() != null)
|
||||||
@@ -325,7 +342,13 @@
|
@@ -338,7 +355,13 @@
|
||||||
item.func_150895_a(item, (CreativeTabs)null, guicontainercreative$containercreative.field_148330_a);
|
item.func_150895_a(item, (CreativeTabs)null, guicontainercreative$containercreative.field_148330_a);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -61,15 +61,15 @@
|
|||||||
for (Enchantment enchantment : Enchantment.field_185264_b)
|
for (Enchantment enchantment : Enchantment.field_185264_b)
|
||||||
{
|
{
|
||||||
if (enchantment != null && enchantment.field_77351_y != null)
|
if (enchantment != null && enchantment.field_77351_y != null)
|
||||||
@@ -333,7 +356,6 @@
|
@@ -346,7 +369,6 @@
|
||||||
Items.field_151134_bR.func_92113_a(enchantment, guicontainercreative$containercreative.field_148330_a);
|
Items.field_151134_bR.func_92113_a(enchantment, guicontainercreative$containercreative.field_148330_a);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
-
|
-
|
||||||
Iterator<ItemStack> iterator = guicontainercreative$containercreative.field_148330_a.iterator();
|
Iterator<ItemStack> iterator = guicontainercreative$containercreative.field_148330_a.iterator();
|
||||||
String s1 = this.field_147062_A.func_146179_b().toLowerCase();
|
String s1 = this.field_147062_A.func_146179_b().toLowerCase(Locale.ROOT);
|
||||||
|
|
||||||
@@ -365,7 +387,7 @@
|
@@ -378,7 +400,7 @@
|
||||||
{
|
{
|
||||||
CreativeTabs creativetabs = CreativeTabs.field_78032_a[field_147058_w];
|
CreativeTabs creativetabs = CreativeTabs.field_78032_a[field_147058_w];
|
||||||
|
|
||||||
@@ -78,7 +78,7 @@
|
|||||||
{
|
{
|
||||||
GlStateManager.func_179084_k();
|
GlStateManager.func_179084_k();
|
||||||
this.field_146289_q.func_78276_b(I18n.func_135052_a(creativetabs.func_78024_c(), new Object[0]), 8, 6, 4210752);
|
this.field_146289_q.func_78276_b(I18n.func_135052_a(creativetabs.func_78024_c(), new Object[0]), 8, 6, 4210752);
|
||||||
@@ -400,7 +422,7 @@
|
@@ -413,7 +435,7 @@
|
||||||
|
|
||||||
for (CreativeTabs creativetabs : CreativeTabs.field_78032_a)
|
for (CreativeTabs creativetabs : CreativeTabs.field_78032_a)
|
||||||
{
|
{
|
||||||
@@ -87,7 +87,7 @@
|
|||||||
{
|
{
|
||||||
this.func_147050_b(creativetabs);
|
this.func_147050_b(creativetabs);
|
||||||
return;
|
return;
|
||||||
@@ -413,11 +435,13 @@
|
@@ -426,11 +448,13 @@
|
||||||
|
|
||||||
private boolean func_147055_p()
|
private boolean func_147055_p()
|
||||||
{
|
{
|
||||||
@@ -101,7 +101,7 @@
|
|||||||
int i = field_147058_w;
|
int i = field_147058_w;
|
||||||
field_147058_w = p_147050_1_.func_78021_a();
|
field_147058_w = p_147050_1_.func_78021_a();
|
||||||
GuiContainerCreative.ContainerCreative guicontainercreative$containercreative = (GuiContainerCreative.ContainerCreative)this.field_147002_h;
|
GuiContainerCreative.ContainerCreative guicontainercreative$containercreative = (GuiContainerCreative.ContainerCreative)this.field_147002_h;
|
||||||
@@ -488,12 +512,14 @@
|
@@ -501,12 +525,14 @@
|
||||||
|
|
||||||
if (this.field_147062_A != null)
|
if (this.field_147062_A != null)
|
||||||
{
|
{
|
||||||
@@ -117,7 +117,7 @@
|
|||||||
this.func_147053_i();
|
this.func_147053_i();
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
@@ -563,20 +589,43 @@
|
@@ -576,20 +602,43 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
super.func_73863_a(p_73863_1_, p_73863_2_, p_73863_3_);
|
super.func_73863_a(p_73863_1_, p_73863_2_, p_73863_3_);
|
||||||
@@ -162,7 +162,17 @@
|
|||||||
GlStateManager.func_179131_c(1.0F, 1.0F, 1.0F, 1.0F);
|
GlStateManager.func_179131_c(1.0F, 1.0F, 1.0F, 1.0F);
|
||||||
GlStateManager.func_179140_f();
|
GlStateManager.func_179140_f();
|
||||||
}
|
}
|
||||||
@@ -638,16 +687,35 @@
|
@@ -637,7 +686,9 @@
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
+ net.minecraftforge.fml.client.config.GuiUtils.preItemToolTip(p_146285_1_);
|
||||||
|
this.func_146283_a(list, p_146285_2_, p_146285_3_);
|
||||||
|
+ net.minecraftforge.fml.client.config.GuiUtils.postItemToolTip();
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
@@ -651,16 +702,35 @@
|
||||||
RenderHelper.func_74520_c();
|
RenderHelper.func_74520_c();
|
||||||
CreativeTabs creativetabs = CreativeTabs.field_78032_a[field_147058_w];
|
CreativeTabs creativetabs = CreativeTabs.field_78032_a[field_147058_w];
|
||||||
|
|
||||||
@@ -199,7 +209,7 @@
|
|||||||
this.field_146297_k.func_110434_K().func_110577_a(new ResourceLocation("textures/gui/container/creative_inventory/tab_" + creativetabs.func_78015_f()));
|
this.field_146297_k.func_110434_K().func_110577_a(new ResourceLocation("textures/gui/container/creative_inventory/tab_" + creativetabs.func_78015_f()));
|
||||||
this.func_73729_b(this.field_147003_i, this.field_147009_r, 0, 0, this.field_146999_f, this.field_147000_g);
|
this.func_73729_b(this.field_147003_i, this.field_147009_r, 0, 0, this.field_146999_f, this.field_147000_g);
|
||||||
this.field_147062_A.func_146194_f();
|
this.field_147062_A.func_146194_f();
|
||||||
@@ -662,6 +730,14 @@
|
@@ -675,6 +745,14 @@
|
||||||
this.func_73729_b(i, j + (int)((float)(k - j - 17) * this.field_147067_x), 232 + (this.func_147055_p() ? 0 : 12), 0, 12, 15);
|
this.func_73729_b(i, j + (int)((float)(k - j - 17) * this.field_147067_x), 232 + (this.func_147055_p() ? 0 : 12), 0, 12, 15);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -214,7 +224,7 @@
|
|||||||
this.func_147051_a(creativetabs);
|
this.func_147051_a(creativetabs);
|
||||||
|
|
||||||
if (creativetabs == CreativeTabs.field_78036_m)
|
if (creativetabs == CreativeTabs.field_78036_m)
|
||||||
@@ -672,6 +748,14 @@
|
@@ -685,6 +763,14 @@
|
||||||
|
|
||||||
protected boolean func_147049_a(CreativeTabs p_147049_1_, int p_147049_2_, int p_147049_3_)
|
protected boolean func_147049_a(CreativeTabs p_147049_1_, int p_147049_2_, int p_147049_3_)
|
||||||
{
|
{
|
||||||
@@ -229,7 +239,7 @@
|
|||||||
int i = p_147049_1_.func_78020_k();
|
int i = p_147049_1_.func_78020_k();
|
||||||
int j = 28 * i;
|
int j = 28 * i;
|
||||||
int k = 0;
|
int k = 0;
|
||||||
@@ -768,6 +852,8 @@
|
@@ -781,6 +867,8 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
GlStateManager.func_179140_f();
|
GlStateManager.func_179140_f();
|
||||||
@@ -238,7 +248,7 @@
|
|||||||
this.func_73729_b(l, i1, j, k, 28, 32);
|
this.func_73729_b(l, i1, j, k, 28, 32);
|
||||||
this.field_73735_i = 100.0F;
|
this.field_73735_i = 100.0F;
|
||||||
this.field_146296_j.field_77023_b = 100.0F;
|
this.field_146296_j.field_77023_b = 100.0F;
|
||||||
@@ -794,6 +880,15 @@
|
@@ -807,6 +895,15 @@
|
||||||
{
|
{
|
||||||
this.field_146297_k.func_147108_a(new GuiStats(this, this.field_146297_k.field_71439_g.func_146107_m()));
|
this.field_146297_k.func_147108_a(new GuiStats(this, this.field_146297_k.field_71439_g.func_146107_m()));
|
||||||
}
|
}
|
||||||
@@ -254,3 +264,41 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
public int func_147056_g()
|
public int func_147056_g()
|
||||||
|
@@ -984,5 +1081,37 @@
|
||||||
|
{
|
||||||
|
return this.field_148332_b.func_82869_a(p_82869_1_);
|
||||||
|
}
|
||||||
|
+
|
||||||
|
+ /*========================================= FORGE START =====================================*/
|
||||||
|
+ public net.minecraft.util.ResourceLocation getBackgroundLocation()
|
||||||
|
+ {
|
||||||
|
+ return this.field_148332_b.getBackgroundLocation();
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ public void setBackgroundLocation(net.minecraft.util.ResourceLocation texture)
|
||||||
|
+ {
|
||||||
|
+ this.field_148332_b.setBackgroundLocation(texture);
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ public void setBackgroundName(String name)
|
||||||
|
+ {
|
||||||
|
+ this.field_148332_b.setBackgroundName(name);
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ public net.minecraft.client.renderer.texture.TextureAtlasSprite getBackgroundSprite()
|
||||||
|
+ {
|
||||||
|
+ return this.field_148332_b.getBackgroundSprite();
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ public int getSlotIndex()
|
||||||
|
+ {
|
||||||
|
+ return this.field_148332_b.getSlotIndex();
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ public boolean isSameInventory(Slot other)
|
||||||
|
+ {
|
||||||
|
+ return this.field_148332_b.isSameInventory(other);
|
||||||
|
+ }
|
||||||
|
+ /*========================================= FORGE END =====================================*/
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
--- ../src-base/minecraft/net/minecraft/client/multiplayer/ChunkProviderClient.java
|
--- ../src-base/minecraft/net/minecraft/client/multiplayer/ChunkProviderClient.java
|
||||||
+++ ../src-work/minecraft/net/minecraft/client/multiplayer/ChunkProviderClient.java
|
+++ ../src-work/minecraft/net/minecraft/client/multiplayer/ChunkProviderClient.java
|
||||||
@@ -59,6 +59,7 @@
|
@@ -60,6 +60,7 @@
|
||||||
{
|
{
|
||||||
Chunk chunk = new Chunk(this.field_73235_d, p_73158_1_, p_73158_2_);
|
Chunk chunk = new Chunk(this.field_73235_d, p_73158_1_, p_73158_2_);
|
||||||
this.field_73236_b.put(ChunkPos.func_77272_a(p_73158_1_, p_73158_2_), chunk);
|
this.field_73236_b.put(ChunkPos.func_77272_a(p_73158_1_, p_73158_2_), chunk);
|
||||||
|
|||||||
@@ -4,8 +4,8 @@
|
|||||||
inetaddress = InetAddress.getByName(p_146367_1_);
|
inetaddress = InetAddress.getByName(p_146367_1_);
|
||||||
GuiConnecting.this.field_146371_g = NetworkManager.func_181124_a(inetaddress, p_146367_2_, GuiConnecting.this.field_146297_k.field_71474_y.func_181148_f());
|
GuiConnecting.this.field_146371_g = NetworkManager.func_181124_a(inetaddress, p_146367_2_, GuiConnecting.this.field_146297_k.field_71474_y.func_181148_f());
|
||||||
GuiConnecting.this.field_146371_g.func_150719_a(new NetHandlerLoginClient(GuiConnecting.this.field_146371_g, GuiConnecting.this.field_146297_k, GuiConnecting.this.field_146374_i));
|
GuiConnecting.this.field_146371_g.func_150719_a(new NetHandlerLoginClient(GuiConnecting.this.field_146371_g, GuiConnecting.this.field_146297_k, GuiConnecting.this.field_146374_i));
|
||||||
- GuiConnecting.this.field_146371_g.func_179290_a(new C00Handshake(210, p_146367_1_, p_146367_2_, EnumConnectionState.LOGIN));
|
- GuiConnecting.this.field_146371_g.func_179290_a(new C00Handshake(316, p_146367_1_, p_146367_2_, EnumConnectionState.LOGIN));
|
||||||
+ GuiConnecting.this.field_146371_g.func_179290_a(new C00Handshake(210, p_146367_1_, p_146367_2_, EnumConnectionState.LOGIN, true));
|
+ GuiConnecting.this.field_146371_g.func_179290_a(new C00Handshake(316, p_146367_1_, p_146367_2_, EnumConnectionState.LOGIN, true));
|
||||||
GuiConnecting.this.field_146371_g.func_179290_a(new CPacketLoginStart(GuiConnecting.this.field_146297_k.func_110432_I().func_148256_e()));
|
GuiConnecting.this.field_146371_g.func_179290_a(new CPacketLoginStart(GuiConnecting.this.field_146297_k.func_110432_I().func_148256_e()));
|
||||||
}
|
}
|
||||||
catch (UnknownHostException unknownhostexception)
|
catch (UnknownHostException unknownhostexception)
|
||||||
@@ -1,19 +1,24 @@
|
|||||||
--- ../src-base/minecraft/net/minecraft/client/multiplayer/PlayerControllerMP.java
|
--- ../src-base/minecraft/net/minecraft/client/multiplayer/PlayerControllerMP.java
|
||||||
+++ ../src-work/minecraft/net/minecraft/client/multiplayer/PlayerControllerMP.java
|
+++ ../src-work/minecraft/net/minecraft/client/multiplayer/PlayerControllerMP.java
|
||||||
@@ -123,6 +123,12 @@
|
@@ -122,10 +122,16 @@
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
- if (this.field_78779_k.func_77145_d() && !this.field_78776_a.field_71439_g.func_184614_ca().func_190926_b() && this.field_78776_a.field_71439_g.func_184614_ca().func_77973_b() instanceof ItemSword)
|
||||||
+ ItemStack stack = field_78776_a.field_71439_g.func_184614_ca();
|
+ ItemStack stack = field_78776_a.field_71439_g.func_184614_ca();
|
||||||
+ if (stack != null && stack.func_77973_b() != null && stack.func_77973_b().onBlockStartBreak(stack, p_187103_1_, field_78776_a.field_71439_g))
|
+ if (!stack.func_190926_b() && stack.func_77973_b().onBlockStartBreak(stack, p_187103_1_, field_78776_a.field_71439_g))
|
||||||
|
{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
+
|
||||||
|
+ if (this.field_78779_k.func_77145_d() && !stack.func_190926_b() && !stack.func_77973_b().canDestroyBlockInCreative(field_78776_a.field_71441_e, p_187103_1_, stack, field_78776_a.field_71439_g))
|
||||||
+ {
|
+ {
|
||||||
+ return false;
|
+ return false;
|
||||||
+ }
|
+ }
|
||||||
+
|
else
|
||||||
if (this.field_78779_k.func_77145_d() && this.field_78776_a.field_71439_g.func_184614_ca() != null && this.field_78776_a.field_71439_g.func_184614_ca().func_77973_b() instanceof ItemSword)
|
|
||||||
{
|
{
|
||||||
return false;
|
World world = this.field_78776_a.field_71441_e;
|
||||||
@@ -144,14 +150,7 @@
|
@@ -143,19 +149,13 @@
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
world.func_175718_b(2001, p_187103_1_, Block.func_176210_f(iblockstate));
|
world.func_175718_b(2001, p_187103_1_, Block.func_176210_f(iblockstate));
|
||||||
@@ -28,15 +33,18 @@
|
|||||||
this.field_178895_c = new BlockPos(this.field_178895_c.func_177958_n(), -1, this.field_178895_c.func_177952_p());
|
this.field_178895_c = new BlockPos(this.field_178895_c.func_177958_n(), -1, this.field_178895_c.func_177952_p());
|
||||||
|
|
||||||
if (!this.field_78779_k.func_77145_d())
|
if (!this.field_78779_k.func_77145_d())
|
||||||
@@ -162,13 +161,20 @@
|
{
|
||||||
{
|
ItemStack itemstack1 = this.field_78776_a.field_71439_g.func_184614_ca();
|
||||||
itemstack1.func_179548_a(world, iblockstate, p_187103_1_, this.field_78776_a.field_71439_g);
|
+ ItemStack copyBeforeUse = itemstack1.func_77946_l();
|
||||||
|
|
||||||
- if (itemstack1.field_77994_a == 0)
|
if (!itemstack1.func_190926_b())
|
||||||
+ if (itemstack1.field_77994_a <= 0)
|
{
|
||||||
|
@@ -163,11 +163,18 @@
|
||||||
|
|
||||||
|
if (itemstack1.func_190926_b())
|
||||||
{
|
{
|
||||||
+ net.minecraftforge.event.ForgeEventFactory.onPlayerDestroyItem(this.field_78776_a.field_71439_g, itemstack1, EnumHand.MAIN_HAND);
|
+ net.minecraftforge.event.ForgeEventFactory.onPlayerDestroyItem(this.field_78776_a.field_71439_g, copyBeforeUse, EnumHand.MAIN_HAND);
|
||||||
this.field_78776_a.field_71439_g.func_184611_a(EnumHand.MAIN_HAND, (ItemStack)null);
|
this.field_78776_a.field_71439_g.func_184611_a(EnumHand.MAIN_HAND, ItemStack.field_190927_a);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -50,7 +58,7 @@
|
|||||||
return flag;
|
return flag;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -208,6 +214,7 @@
|
@@ -207,6 +214,7 @@
|
||||||
if (this.field_78779_k.func_77145_d())
|
if (this.field_78779_k.func_77145_d())
|
||||||
{
|
{
|
||||||
this.field_78774_b.func_147297_a(new CPacketPlayerDigging(CPacketPlayerDigging.Action.START_DESTROY_BLOCK, p_180511_1_, p_180511_2_));
|
this.field_78774_b.func_147297_a(new CPacketPlayerDigging(CPacketPlayerDigging.Action.START_DESTROY_BLOCK, p_180511_1_, p_180511_2_));
|
||||||
@@ -58,7 +66,7 @@
|
|||||||
func_178891_a(this.field_78776_a, this, p_180511_1_, p_180511_2_);
|
func_178891_a(this.field_78776_a, this, p_180511_1_, p_180511_2_);
|
||||||
this.field_78781_i = 5;
|
this.field_78781_i = 5;
|
||||||
}
|
}
|
||||||
@@ -219,14 +226,17 @@
|
@@ -218,14 +226,17 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
this.field_78774_b.func_147297_a(new CPacketPlayerDigging(CPacketPlayerDigging.Action.START_DESTROY_BLOCK, p_180511_1_, p_180511_2_));
|
this.field_78774_b.func_147297_a(new CPacketPlayerDigging(CPacketPlayerDigging.Action.START_DESTROY_BLOCK, p_180511_1_, p_180511_2_));
|
||||||
@@ -77,96 +85,119 @@
|
|||||||
if (flag && iblockstate.func_185903_a(this.field_78776_a.field_71439_g, this.field_78776_a.field_71439_g.field_70170_p, p_180511_1_) >= 1.0F)
|
if (flag && iblockstate.func_185903_a(this.field_78776_a.field_71439_g, this.field_78776_a.field_71439_g.field_70170_p, p_180511_1_) >= 1.0F)
|
||||||
{
|
{
|
||||||
this.func_187103_a(p_180511_1_);
|
this.func_187103_a(p_180511_1_);
|
||||||
@@ -373,13 +383,32 @@
|
@@ -289,7 +300,7 @@
|
||||||
|
|
||||||
|
if (this.field_78780_h % 4.0F == 0.0F)
|
||||||
|
{
|
||||||
|
- SoundType soundtype = block.func_185467_w();
|
||||||
|
+ SoundType soundtype = block.getSoundType(iblockstate, field_78776_a.field_71441_e, p_180512_1_, field_78776_a.field_71439_g);
|
||||||
|
this.field_78776_a.func_147118_V().func_147682_a(new PositionedSoundRecord(soundtype.func_185846_f(), SoundCategory.NEUTRAL, (soundtype.func_185843_a() + 1.0F) / 8.0F, soundtype.func_185847_b() * 0.5F, p_180512_1_));
|
||||||
|
}
|
||||||
|
|
||||||
|
@@ -341,7 +352,7 @@
|
||||||
|
|
||||||
|
if (!this.field_85183_f.func_190926_b() && !itemstack.func_190926_b())
|
||||||
|
{
|
||||||
|
- flag = itemstack.func_77973_b() == this.field_85183_f.func_77973_b() && ItemStack.func_77970_a(itemstack, this.field_85183_f) && (itemstack.func_77984_f() || itemstack.func_77960_j() == this.field_85183_f.func_77960_j());
|
||||||
|
+ flag = !net.minecraftforge.client.ForgeHooksClient.shouldCauseBlockBreakReset(this.field_85183_f, itemstack);
|
||||||
|
}
|
||||||
|
|
||||||
|
return p_178893_1_.equals(this.field_178895_c) && flag;
|
||||||
|
@@ -373,13 +384,34 @@
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
+ net.minecraftforge.event.entity.player.PlayerInteractEvent.RightClickBlock event = net.minecraftforge.common.ForgeHooks
|
+ net.minecraftforge.event.entity.player.PlayerInteractEvent.RightClickBlock event = net.minecraftforge.common.ForgeHooks
|
||||||
+ .onRightClickBlock(p_187099_1_, p_187099_7_, p_187099_3_, p_187099_4_, p_187099_5_, net.minecraftforge.common.ForgeHooks.rayTraceEyeHitVec(p_187099_1_, func_78757_d() + 1));
|
+ .onRightClickBlock(p_187099_1_, p_187099_6_, p_187099_3_, p_187099_4_, net.minecraftforge.common.ForgeHooks.rayTraceEyeHitVec(p_187099_1_, func_78757_d() + 1));
|
||||||
+ if (event.isCanceled())
|
+ if (event.isCanceled())
|
||||||
+ {
|
+ {
|
||||||
+ // Give the server a chance to fire event as well. That way server event is not dependant on client event.
|
+ // Give the server a chance to fire event as well. That way server event is not dependant on client event.
|
||||||
+ this.field_78774_b.func_147297_a(new CPacketPlayerTryUseItemOnBlock(p_187099_4_, p_187099_5_, p_187099_7_, f, f1, f2));
|
+ this.field_78774_b.func_147297_a(new CPacketPlayerTryUseItemOnBlock(p_187099_3_, p_187099_4_, p_187099_6_, f, f1, f2));
|
||||||
+ return EnumActionResult.PASS;
|
+ return event.getCancellationResult();
|
||||||
+ }
|
+ }
|
||||||
+ EnumActionResult result = EnumActionResult.PASS;
|
+ EnumActionResult result = EnumActionResult.PASS;
|
||||||
+
|
+
|
||||||
if (this.field_78779_k != GameType.SPECTATOR)
|
if (this.field_78779_k != GameType.SPECTATOR)
|
||||||
{
|
{
|
||||||
+ net.minecraft.item.Item item = p_187099_3_ == null ? null : p_187099_3_.func_77973_b();
|
+ EnumActionResult ret = itemstack.onItemUseFirst(p_187099_1_, p_187099_2_, p_187099_3_, p_187099_6_, p_187099_4_, f, f1, f2);
|
||||||
+ EnumActionResult ret = item == null ? EnumActionResult.PASS : item.onItemUseFirst(p_187099_3_, p_187099_1_, p_187099_2_, p_187099_4_, p_187099_5_, f, f1, f2, p_187099_7_);
|
+ if (ret != EnumActionResult.PASS)
|
||||||
+ if (ret != EnumActionResult.PASS) return ret;
|
+ {
|
||||||
|
+ // The server needs to process the item use as well. Otherwise onItemUseFirst won't ever be called on the server without causing weird bugs
|
||||||
|
+ this.field_78774_b.func_147297_a(new CPacketPlayerTryUseItemOnBlock(p_187099_3_, p_187099_4_, p_187099_6_, f, f1, f2));
|
||||||
|
+ return ret;
|
||||||
|
+ }
|
||||||
+
|
+
|
||||||
IBlockState iblockstate = p_187099_2_.func_180495_p(p_187099_4_);
|
IBlockState iblockstate = p_187099_2_.func_180495_p(p_187099_3_);
|
||||||
+ boolean bypass = true;
|
+ boolean bypass = itemstack.func_190926_b() || itemstack.func_77973_b().doesSneakBypassUse(itemstack, p_187099_2_, p_187099_3_, p_187099_1_);
|
||||||
+ for (ItemStack s : new ItemStack[]{p_187099_1_.func_184614_ca(), p_187099_1_.func_184592_cb()}) //TODO: Expand to more hands? player.inv.getHands()?
|
|
||||||
+ bypass = bypass && (s == null || s.func_77973_b().doesSneakBypassUse(s, p_187099_2_, p_187099_4_, p_187099_1_));
|
|
||||||
|
|
||||||
- if ((!p_187099_1_.func_70093_af() || p_187099_1_.func_184614_ca() == null && p_187099_1_.func_184592_cb() == null) && iblockstate.func_177230_c().func_180639_a(p_187099_2_, p_187099_4_, iblockstate, p_187099_1_, p_187099_7_, p_187099_3_, p_187099_5_, f, f1, f2))
|
- if ((!p_187099_1_.func_70093_af() || p_187099_1_.func_184614_ca().func_190926_b() && p_187099_1_.func_184592_cb().func_190926_b()) && iblockstate.func_177230_c().func_180639_a(p_187099_2_, p_187099_3_, iblockstate, p_187099_1_, p_187099_6_, p_187099_4_, f, f1, f2))
|
||||||
+ if (!p_187099_1_.func_70093_af() || bypass || event.getUseBlock() == net.minecraftforge.fml.common.eventhandler.Event.Result.ALLOW)
|
+ if ((!p_187099_1_.func_70093_af() || bypass || event.getUseBlock() == net.minecraftforge.fml.common.eventhandler.Event.Result.ALLOW))
|
||||||
{
|
{
|
||||||
- flag = true;
|
- flag = true;
|
||||||
+ if(event.getUseBlock() != net.minecraftforge.fml.common.eventhandler.Event.Result.DENY)
|
+ if (event.getUseBlock() != net.minecraftforge.fml.common.eventhandler.Event.Result.DENY)
|
||||||
+ flag = iblockstate.func_177230_c().func_180639_a(p_187099_2_, p_187099_4_, iblockstate, p_187099_1_, p_187099_7_, p_187099_3_, p_187099_5_, f, f1, f2);
|
+ flag = iblockstate.func_177230_c().func_180639_a(p_187099_2_, p_187099_3_, iblockstate, p_187099_1_, p_187099_6_, p_187099_4_, f, f1, f2);
|
||||||
+ if(flag) result = EnumActionResult.SUCCESS;
|
+ if (flag) result = EnumActionResult.SUCCESS;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!flag && p_187099_3_ != null && p_187099_3_.func_77973_b() instanceof ItemBlock)
|
if (!flag && itemstack.func_77973_b() instanceof ItemBlock)
|
||||||
@@ -395,7 +424,7 @@
|
@@ -395,7 +427,7 @@
|
||||||
|
|
||||||
this.field_78774_b.func_147297_a(new CPacketPlayerTryUseItemOnBlock(p_187099_4_, p_187099_5_, p_187099_7_, f, f1, f2));
|
this.field_78774_b.func_147297_a(new CPacketPlayerTryUseItemOnBlock(p_187099_3_, p_187099_4_, p_187099_6_, f, f1, f2));
|
||||||
|
|
||||||
- if (!flag && this.field_78779_k != GameType.SPECTATOR)
|
- if (!flag && this.field_78779_k != GameType.SPECTATOR)
|
||||||
+ if (!flag && this.field_78779_k != GameType.SPECTATOR || event.getUseItem() == net.minecraftforge.fml.common.eventhandler.Event.Result.ALLOW)
|
+ if (!flag && this.field_78779_k != GameType.SPECTATOR || event.getUseItem() == net.minecraftforge.fml.common.eventhandler.Event.Result.ALLOW)
|
||||||
{
|
{
|
||||||
if (p_187099_3_ == null)
|
if (itemstack.func_190926_b())
|
||||||
{
|
{
|
||||||
@@ -421,14 +450,19 @@
|
@@ -421,14 +453,20 @@
|
||||||
{
|
{
|
||||||
int i = p_187099_3_.func_77960_j();
|
int i = itemstack.func_77960_j();
|
||||||
int j = p_187099_3_.field_77994_a;
|
int j = itemstack.func_190916_E();
|
||||||
+ if (event.getUseItem() != net.minecraftforge.fml.common.eventhandler.Event.Result.DENY) {
|
+ if (event.getUseItem() != net.minecraftforge.fml.common.eventhandler.Event.Result.DENY) {
|
||||||
EnumActionResult enumactionresult = p_187099_3_.func_179546_a(p_187099_1_, p_187099_2_, p_187099_4_, p_187099_7_, p_187099_5_, f, f1, f2);
|
EnumActionResult enumactionresult = itemstack.func_179546_a(p_187099_1_, p_187099_2_, p_187099_3_, p_187099_6_, p_187099_4_, f, f1, f2);
|
||||||
p_187099_3_.func_77964_b(i);
|
itemstack.func_77964_b(i);
|
||||||
p_187099_3_.field_77994_a = j;
|
itemstack.func_190920_e(j);
|
||||||
return enumactionresult;
|
return enumactionresult;
|
||||||
+ } else return result;
|
+ } else return result;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
- return p_187099_3_.func_179546_a(p_187099_1_, p_187099_2_, p_187099_4_, p_187099_7_, p_187099_5_, f, f1, f2);
|
- return itemstack.func_179546_a(p_187099_1_, p_187099_2_, p_187099_3_, p_187099_6_, p_187099_4_, f, f1, f2);
|
||||||
|
+ ItemStack copyForUse = itemstack.func_77946_l();
|
||||||
+ if (event.getUseItem() != net.minecraftforge.fml.common.eventhandler.Event.Result.DENY)
|
+ if (event.getUseItem() != net.minecraftforge.fml.common.eventhandler.Event.Result.DENY)
|
||||||
+ result = p_187099_3_.func_179546_a(p_187099_1_, p_187099_2_, p_187099_4_, p_187099_7_, p_187099_5_, f, f1, f2);
|
+ result = itemstack.func_179546_a(p_187099_1_, p_187099_2_, p_187099_3_, p_187099_6_, p_187099_4_, f, f1, f2);
|
||||||
+ if (p_187099_3_.field_77994_a <= 0) net.minecraftforge.event.ForgeEventFactory.onPlayerDestroyItem(p_187099_1_, p_187099_3_, p_187099_7_);
|
+ if (itemstack.func_190926_b()) net.minecraftforge.event.ForgeEventFactory.onPlayerDestroyItem(p_187099_1_, copyForUse, p_187099_6_);
|
||||||
+ return result;
|
+ return result;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -456,6 +490,7 @@
|
@@ -457,6 +495,8 @@
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
+ if (net.minecraftforge.common.ForgeHooks.onItemRightClick(p_187101_1_, p_187101_4_, p_187101_3_)) return net.minecraft.util.EnumActionResult.PASS;
|
+ EnumActionResult cancelResult = net.minecraftforge.common.ForgeHooks.onItemRightClickAction(p_187101_1_, p_187101_3_);
|
||||||
int i = p_187101_3_.field_77994_a;
|
+ if (cancelResult != null) return cancelResult;
|
||||||
ActionResult<ItemStack> actionresult = p_187101_3_.func_77957_a(p_187101_2_, p_187101_1_, p_187101_4_);
|
int i = itemstack.func_190916_E();
|
||||||
ItemStack itemstack = (ItemStack)actionresult.func_188398_b();
|
ActionResult<ItemStack> actionresult = itemstack.func_77957_a(p_187101_2_, p_187101_1_, p_187101_3_);
|
||||||
@@ -464,9 +499,10 @@
|
ItemStack itemstack1 = (ItemStack)actionresult.func_188398_b();
|
||||||
|
@@ -464,6 +504,10 @@
|
||||||
|
if (itemstack1 != itemstack || itemstack1.func_190916_E() != i)
|
||||||
{
|
{
|
||||||
p_187101_1_.func_184611_a(p_187101_4_, itemstack);
|
p_187101_1_.func_184611_a(p_187101_3_, itemstack1);
|
||||||
|
+ if (itemstack1.func_190926_b())
|
||||||
- if (itemstack.field_77994_a == 0)
|
+ {
|
||||||
+ if (itemstack.field_77994_a <= 0)
|
+ net.minecraftforge.event.ForgeEventFactory.onPlayerDestroyItem(p_187101_1_, itemstack, p_187101_3_);
|
||||||
{
|
+ }
|
||||||
p_187101_1_.func_184611_a(p_187101_4_, (ItemStack)null);
|
|
||||||
+ net.minecraftforge.event.ForgeEventFactory.onPlayerDestroyItem(p_187101_1_, itemstack, p_187101_4_);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -504,6 +540,7 @@
|
return actionresult.func_188397_a();
|
||||||
|
@@ -500,6 +544,9 @@
|
||||||
this.func_78750_j();
|
this.func_78750_j();
|
||||||
Vec3d vec3d = new Vec3d(p_187102_3_.field_72307_f.field_72450_a - p_187102_2_.field_70165_t, p_187102_3_.field_72307_f.field_72448_b - p_187102_2_.field_70163_u, p_187102_3_.field_72307_f.field_72449_c - p_187102_2_.field_70161_v);
|
Vec3d vec3d = new Vec3d(p_187102_3_.field_72307_f.field_72450_a - p_187102_2_.field_70165_t, p_187102_3_.field_72307_f.field_72448_b - p_187102_2_.field_70163_u, p_187102_3_.field_72307_f.field_72449_c - p_187102_2_.field_70161_v);
|
||||||
this.field_78774_b.func_147297_a(new CPacketUseEntity(p_187102_2_, p_187102_5_, vec3d));
|
this.field_78774_b.func_147297_a(new CPacketUseEntity(p_187102_2_, p_187102_4_, vec3d));
|
||||||
+ if(net.minecraftforge.common.ForgeHooks.onInteractEntityAt(p_187102_1_, p_187102_2_, p_187102_3_, p_187102_1_.func_184586_b(p_187102_5_), p_187102_5_)) return EnumActionResult.PASS;
|
+ if (this.field_78779_k == GameType.SPECTATOR) return EnumActionResult.PASS; // don't fire for spectators to match non-specific EntityInteract
|
||||||
return this.field_78779_k == GameType.SPECTATOR ? EnumActionResult.PASS : p_187102_2_.func_184199_a(p_187102_1_, vec3d, p_187102_4_, p_187102_5_);
|
+ EnumActionResult cancelResult = net.minecraftforge.common.ForgeHooks.onInteractEntityAtAction(p_187102_1_, p_187102_2_, p_187102_3_, p_187102_4_);
|
||||||
|
+ if(cancelResult != null) return cancelResult;
|
||||||
|
return this.field_78779_k == GameType.SPECTATOR ? EnumActionResult.PASS : p_187102_2_.func_184199_a(p_187102_1_, vec3d, p_187102_4_);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
--- ../src-base/minecraft/net/minecraft/client/multiplayer/WorldClient.java
|
--- ../src-base/minecraft/net/minecraft/client/multiplayer/WorldClient.java
|
||||||
+++ ../src-work/minecraft/net/minecraft/client/multiplayer/WorldClient.java
|
+++ ../src-work/minecraft/net/minecraft/client/multiplayer/WorldClient.java
|
||||||
@@ -60,17 +60,18 @@
|
@@ -60,17 +60,19 @@
|
||||||
|
|
||||||
public WorldClient(NetHandlerPlayClient p_i45063_1_, WorldSettings p_i45063_2_, int p_i45063_3_, EnumDifficulty p_i45063_4_, Profiler p_i45063_5_)
|
public WorldClient(NetHandlerPlayClient p_i45063_1_, WorldSettings p_i45063_2_, int p_i45063_3_, EnumDifficulty p_i45063_4_, Profiler p_i45063_5_)
|
||||||
{
|
{
|
||||||
@@ -17,6 +17,7 @@
|
|||||||
this.field_72988_C = new SaveDataMemoryStorage();
|
this.field_72988_C = new SaveDataMemoryStorage();
|
||||||
this.func_72966_v();
|
this.func_72966_v();
|
||||||
this.func_72947_a();
|
this.func_72947_a();
|
||||||
|
+ this.initCapabilities();
|
||||||
+ net.minecraftforge.common.MinecraftForge.EVENT_BUS.post(new net.minecraftforge.event.world.WorldEvent.Load(this));
|
+ net.minecraftforge.common.MinecraftForge.EVENT_BUS.post(new net.minecraftforge.event.world.WorldEvent.Load(this));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
--- ../src-base/minecraft/net/minecraft/client/network/NetHandlerLoginClient.java
|
--- ../src-base/minecraft/net/minecraft/client/network/NetHandlerLoginClient.java
|
||||||
+++ ../src-work/minecraft/net/minecraft/client/network/NetHandlerLoginClient.java
|
+++ ../src-work/minecraft/net/minecraft/client/network/NetHandlerLoginClient.java
|
||||||
@@ -106,7 +106,10 @@
|
@@ -108,7 +108,10 @@
|
||||||
{
|
{
|
||||||
this.field_175091_e = p_147390_1_.func_179730_a();
|
this.field_175091_e = p_147390_1_.func_179730_a();
|
||||||
this.field_147393_d.func_150723_a(EnumConnectionState.PLAY);
|
this.field_147393_d.func_150723_a(EnumConnectionState.PLAY);
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
--- ../src-base/minecraft/net/minecraft/client/network/NetHandlerPlayClient.java
|
--- ../src-base/minecraft/net/minecraft/client/network/NetHandlerPlayClient.java
|
||||||
+++ ../src-work/minecraft/net/minecraft/client/network/NetHandlerPlayClient.java
|
+++ ../src-work/minecraft/net/minecraft/client/network/NetHandlerPlayClient.java
|
||||||
@@ -271,7 +271,7 @@
|
@@ -280,7 +280,7 @@
|
||||||
{
|
{
|
||||||
PacketThreadUtil.func_180031_a(p_147282_1_, this, this.field_147299_f);
|
PacketThreadUtil.func_180031_a(p_147282_1_, this, this.field_147299_f);
|
||||||
this.field_147299_f.field_71442_b = new PlayerControllerMP(this.field_147299_f, this);
|
this.field_147299_f.field_71442_b = new PlayerControllerMP(this.field_147299_f, this);
|
||||||
@@ -9,7 +9,7 @@
|
|||||||
this.field_147299_f.field_71474_y.field_74318_M = p_147282_1_.func_149192_g();
|
this.field_147299_f.field_71474_y.field_74318_M = p_147282_1_.func_149192_g();
|
||||||
this.field_147299_f.func_71403_a(this.field_147300_g);
|
this.field_147299_f.func_71403_a(this.field_147300_g);
|
||||||
this.field_147299_f.field_71439_g.field_71093_bK = p_147282_1_.func_149194_f();
|
this.field_147299_f.field_71439_g.field_71093_bK = p_147282_1_.func_149194_f();
|
||||||
@@ -725,7 +725,7 @@
|
@@ -742,7 +742,7 @@
|
||||||
|
|
||||||
if (tileentity != null)
|
if (tileentity != null)
|
||||||
{
|
{
|
||||||
@@ -18,7 +18,7 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -803,14 +803,16 @@
|
@@ -825,14 +825,16 @@
|
||||||
public void func_147251_a(SPacketChat p_147251_1_)
|
public void func_147251_a(SPacketChat p_147251_1_)
|
||||||
{
|
{
|
||||||
PacketThreadUtil.func_180031_a(p_147251_1_, this, this.field_147299_f);
|
PacketThreadUtil.func_180031_a(p_147251_1_, this, this.field_147299_f);
|
||||||
@@ -37,19 +37,7 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -866,6 +868,11 @@
|
@@ -964,7 +966,7 @@
|
||||||
float f = (float)(p_147281_1_.func_149028_l() * 360) / 256.0F;
|
|
||||||
float f1 = (float)(p_147281_1_.func_149030_m() * 360) / 256.0F;
|
|
||||||
EntityLivingBase entitylivingbase = (EntityLivingBase)EntityList.func_75616_a(p_147281_1_.func_149025_e(), this.field_147299_f.field_71441_e);
|
|
||||||
+ if (entitylivingbase == null)
|
|
||||||
+ {
|
|
||||||
+ net.minecraftforge.fml.common.FMLLog.info("Server attempted to spawn an unknown entity using ID: {0} at ({1}, {2}, {3}) Skipping!", p_147281_1_.func_149025_e(), d0, d1, d2);
|
|
||||||
+ return;
|
|
||||||
+ }
|
|
||||||
EntityTracker.func_187254_a(entitylivingbase, d0, d1, d2);
|
|
||||||
entitylivingbase.field_70761_aq = (float)(p_147281_1_.func_149032_n() * 360) / 256.0F;
|
|
||||||
entitylivingbase.field_70759_as = (float)(p_147281_1_.func_149032_n() * 360) / 256.0F;
|
|
||||||
@@ -938,7 +945,7 @@
|
|
||||||
|
|
||||||
if (entity1 == this.field_147299_f.field_71439_g && !flag)
|
if (entity1 == this.field_147299_f.field_71439_g && !flag)
|
||||||
{
|
{
|
||||||
@@ -58,18 +46,23 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1169,6 +1176,10 @@
|
@@ -1211,6 +1213,15 @@
|
||||||
{
|
{
|
||||||
tileentity.func_145839_a(p_147273_1_.func_148857_g());
|
tileentity.func_145839_a(p_147273_1_.func_148857_g());
|
||||||
}
|
}
|
||||||
+ else
|
+ else
|
||||||
+ {
|
+ {
|
||||||
|
+ if(tileentity == null)
|
||||||
|
+ {
|
||||||
|
+ field_147301_d.error("Received invalid update packet for null tile entity at {} with data: {}", p_147273_1_.func_179823_a(), p_147273_1_.func_148857_g());
|
||||||
|
+ return;
|
||||||
|
+ }
|
||||||
+ tileentity.onDataPacket(field_147302_e, p_147273_1_);
|
+ tileentity.onDataPacket(field_147302_e, p_147273_1_);
|
||||||
+ }
|
+ }
|
||||||
|
|
||||||
if (flag && this.field_147299_f.field_71462_r instanceof GuiCommandBlock)
|
if (flag && this.field_147299_f.field_71462_r instanceof GuiCommandBlock)
|
||||||
{
|
{
|
||||||
@@ -1266,15 +1277,15 @@
|
@@ -1308,15 +1319,15 @@
|
||||||
}
|
}
|
||||||
else if (f == 101.0F)
|
else if (f == 101.0F)
|
||||||
{
|
{
|
||||||
@@ -88,7 +81,7 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
else if (i == 6)
|
else if (i == 6)
|
||||||
@@ -1368,7 +1379,7 @@
|
@@ -1430,7 +1441,7 @@
|
||||||
|
|
||||||
if (entity instanceof EntityLivingBase)
|
if (entity instanceof EntityLivingBase)
|
||||||
{
|
{
|
||||||
|
|||||||
Loaded 100 of 825 files, more files were not shown because too many files have changed in this diff.
Show more
Reference in new issue
Block a user