keith
/
ForgePatch
1
0
Fork 0
Code Issues Pull Requests Projects Releases 2 Wiki Activity

Merge pull request #2429 from AlgorithmX2/in_material_hooks 

In Material Hooks - For Swimming, Overlays, Boats, and Fishing.
This commit is contained in:
LexManos 2016-02-18 13:40:41 -08:00
parent 1b3699d90b 3c4a2b0f42
commit c0915526ff
3 changed files with 103 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
patches/minecraft/net/minecraft/block/Block.java.patch
View File

@ -188,7 +188,7 @@
} }
protected ItemStack func_180643_i(IBlockState p_180643_1_) protected ItemStack func_180643_i(IBlockState p_180643_1_)
@@ -1010,6 +1030,1114 @@ @@ -1010,6 +1030,1147 @@
return "Block{" + field_149771_c.func_177774_c(this) + "}"; return "Block{" + field_149771_c.func_177774_c(this) + "}";
} }
@ -1218,6 +1218,39 @@
+ } + }
+ +
+ /** + /**
+ * Called when the entity is inside this block, may be used to determined if the entity can breathing,
+ * display material overlays, or if the entity can swim inside a block.
+ *
+ * @param world that is being tested.
+ * @param blockpos position thats being tested.
+ * @param iblockstate state at world/blockpos
+ * @param entity that is being tested.
+ * @param yToTest, primarily for testingHead, which sends the the eye level of the entity, other wise it sends a y that can be tested vs liquid height.
+ * @param materialIn to test for.
+ * @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.
+ */
+ public Boolean isEntityInsideMaterial(World world, BlockPos blockpos, IBlockState iblockstate, Entity entity, double yToTest, Material materialIn, boolean testingHead)
+ {
+ return null;
+ }
+
+ /**
+ * Called when boats or fishing hooks are inside the block to check if they are inside
+ * the material requested.
+ *
+ * @param world world that is being tested.
+ * @param pos block thats being tested.
+ * @param boundingBox box to test, generally the bounds of an entity that are besting tested.
+ * @param materialIn to check for.
+ * @return null for default behavior, true if the box is within the material, false if it was not.
+ */
+ public Boolean isAABBInsideMaterial(World world, BlockPos pos, AxisAlignedBB boundingBox, Material materialIn)
+ {
+ return null;
+ }
+
+ /**
+ * Queries if this block should render in a given layer. + * Queries if this block should render in a given layer.
+ * ISmartBlockModel can use MinecraftForgeClient.getRenderLayer to alter their model based on layer + * ISmartBlockModel can use MinecraftForgeClient.getRenderLayer to alter their model based on layer
+ */ + */

21
patches/minecraft/net/minecraft/entity/Entity.java.patch
View File

@ -35,8 +35,13 @@
} }
protected abstract void func_70088_a(); protected abstract void func_70088_a();
@@ -998,10 +1010,7 @@ @@ -996,12 +1008,12 @@
IBlockState iblockstate = this.field_70170_p.func_180495_p(blockpos);
Block block = iblockstate.func_177230_c();
+ Boolean result = block.isEntityInsideMaterial(this.field_70170_p, blockpos, iblockstate, this, d0, p_70055_1_, true);
+ if (result != null) return result;
+
if (block.func_149688_o() == p_70055_1_) if (block.func_149688_o() == p_70055_1_)
{ {
- float f = BlockLiquid.func_149801_b(iblockstate.func_177230_c().func_176201_c(iblockstate)) - 0.11111111F; - float f = BlockLiquid.func_149801_b(iblockstate.func_177230_c().func_176201_c(iblockstate)) - 0.11111111F;
@ -47,7 +52,7 @@
} }
else else
{ {
@@ -1356,6 +1365,23 @@ @@ -1356,6 +1368,23 @@
p_70109_1_.func_74757_a("Silent", this.func_174814_R()); p_70109_1_.func_74757_a("Silent", this.func_174814_R());
} }
@ -71,7 +76,7 @@
this.func_70014_b(p_70109_1_); this.func_70014_b(p_70109_1_);
if (this.field_70154_o != null) if (this.field_70154_o != null)
@@ -1438,6 +1464,30 @@ @@ -1438,6 +1467,30 @@
this.func_174805_g(p_70020_1_.func_74767_n("CustomNameVisible")); this.func_174805_g(p_70020_1_.func_74767_n("CustomNameVisible"));
this.field_174837_as.func_179668_a(p_70020_1_); this.field_174837_as.func_179668_a(p_70020_1_);
this.func_174810_b(p_70020_1_.func_74767_n("Silent")); this.func_174810_b(p_70020_1_.func_74767_n("Silent"));
@ -102,7 +107,7 @@
this.func_70037_a(p_70020_1_); this.func_70037_a(p_70020_1_);
if (this.func_142008_O()) if (this.func_142008_O())
@@ -1512,7 +1562,10 @@ @@ -1512,7 +1565,10 @@
{ {
EntityItem entityitem = new EntityItem(this.field_70170_p, this.field_70165_t, this.field_70163_u + (double)p_70099_2_, this.field_70161_v, p_70099_1_); EntityItem entityitem = new EntityItem(this.field_70170_p, this.field_70165_t, this.field_70163_u + (double)p_70099_2_, this.field_70161_v, p_70099_1_);
entityitem.func_174869_p(); entityitem.func_174869_p();
@ -114,7 +119,7 @@
return entityitem; return entityitem;
} }
else else
@@ -1655,6 +1708,7 @@ @@ -1655,6 +1711,7 @@
public void func_70078_a(Entity p_70078_1_) public void func_70078_a(Entity p_70078_1_)
{ {
@ -122,7 +127,7 @@
this.field_70149_e = 0.0D; this.field_70149_e = 0.0D;
this.field_70147_f = 0.0D; this.field_70147_f = 0.0D;
@@ -2049,6 +2103,7 @@ @@ -2049,6 +2106,7 @@
{ {
if (!this.field_70170_p.field_72995_K && !this.field_70128_L) if (!this.field_70170_p.field_72995_K && !this.field_70128_L)
{ {
@ -130,7 +135,7 @@
this.field_70170_p.field_72984_F.func_76320_a("changeDimension"); this.field_70170_p.field_72984_F.func_76320_a("changeDimension");
MinecraftServer minecraftserver = MinecraftServer.func_71276_C(); MinecraftServer minecraftserver = MinecraftServer.func_71276_C();
int i = this.field_71093_bK; int i = this.field_71093_bK;
@@ -2092,7 +2147,7 @@ @@ -2092,7 +2150,7 @@
public float func_180428_a(Explosion p_180428_1_, World p_180428_2_, BlockPos p_180428_3_, IBlockState p_180428_4_) public float func_180428_a(Explosion p_180428_1_, World p_180428_2_, BlockPos p_180428_3_, IBlockState p_180428_4_)
{ {
@ -139,7 +144,7 @@
} }
public boolean func_174816_a(Explosion p_174816_1_, World p_174816_2_, BlockPos p_174816_3_, IBlockState p_174816_4_, float p_174816_5_) public boolean func_174816_a(Explosion p_174816_1_, World p_174816_2_, BlockPos p_174816_3_, IBlockState p_174816_4_, float p_174816_5_)
@@ -2353,4 +2408,209 @@ @@ -2353,4 +2411,209 @@
EnchantmentHelper.func_151385_b(p_174815_1_, p_174815_2_); EnchantmentHelper.func_151385_b(p_174815_1_, p_174815_2_);
} }

85
patches/minecraft/net/minecraft/world/World.java.patch
View File

@ -470,7 +470,34 @@
} }
} }
} }
@@ -2034,6 +2176,7 @@ @@ -1930,6 +2072,16 @@
blockpos$mutableblockpos.func_181079_c(k1, l1, i2);
IBlockState iblockstate = this.func_180495_p(blockpos$mutableblockpos);
Block block = iblockstate.func_177230_c();
+
+ Boolean result = block.isEntityInsideMaterial(this, blockpos$mutableblockpos, iblockstate, p_72918_3_, (double)l, p_72918_2_, false);
+ if (result != null && result == true)
+ {
+ // Forge: When requested call blocks modifyAcceleration method, and more importantly cause this method to return true, which results in an entity being "inWater"
+ flag = true;
+ vec3 = block.func_176197_a(this, blockpos$mutableblockpos, p_72918_3_, vec3);
+ continue;
+ }
+ else if (result != null && result == false) continue;
if (block.func_149688_o() == p_72918_2_)
{
@@ -2004,6 +2156,9 @@
IBlockState iblockstate = this.func_180495_p(blockpos$mutableblockpos.func_181079_c(k1, l1, i2));
Block block = iblockstate.func_177230_c();
+ Boolean result = block.isAABBInsideMaterial(this, blockpos$mutableblockpos, p_72830_1_, p_72830_2_);
+ if (result != null) return result;
+
if (block.func_149688_o() == p_72830_2_)
{
int j2 = ((Integer)iblockstate.func_177229_b(BlockLiquid.field_176367_b)).intValue();
@@ -2034,6 +2189,7 @@
public Explosion func_72885_a(Entity p_72885_1_, double p_72885_2_, double p_72885_4_, double p_72885_6_, float p_72885_8_, boolean p_72885_9_, boolean p_72885_10_) public Explosion func_72885_a(Entity p_72885_1_, double p_72885_2_, double p_72885_4_, double p_72885_6_, float p_72885_8_, boolean p_72885_9_, boolean p_72885_10_)
{ {
Explosion explosion = new Explosion(this, p_72885_1_, p_72885_2_, p_72885_4_, p_72885_6_, p_72885_8_, p_72885_9_, p_72885_10_); Explosion explosion = new Explosion(this, p_72885_1_, p_72885_2_, p_72885_4_, p_72885_6_, p_72885_8_, p_72885_9_, p_72885_10_);
@ -478,7 +505,7 @@
explosion.func_77278_a(); explosion.func_77278_a();
explosion.func_77279_a(true); explosion.func_77279_a(true);
return explosion; return explosion;
@@ -2180,19 +2323,27 @@ @@ -2180,19 +2336,27 @@
else else
{ {
this.func_175700_a(p_175690_2_); this.func_175700_a(p_175690_2_);
@ -507,7 +534,7 @@
} }
else else
{ {
@@ -2205,6 +2356,7 @@ @@ -2205,6 +2369,7 @@
this.func_175726_f(p_175713_1_).func_177425_e(p_175713_1_); this.func_175726_f(p_175713_1_).func_177425_e(p_175713_1_);
} }
@ -515,7 +542,7 @@
} }
public void func_147457_a(TileEntity p_147457_1_) public void func_147457_a(TileEntity p_147457_1_)
@@ -2223,7 +2375,7 @@ @@ -2223,7 +2388,7 @@
{ {
IBlockState iblockstate = p_175683_0_.func_180495_p(p_175683_1_); IBlockState iblockstate = p_175683_0_.func_180495_p(p_175683_1_);
Block block = iblockstate.func_177230_c(); Block block = iblockstate.func_177230_c();
@ -524,7 +551,7 @@
} }
public boolean func_175677_d(BlockPos p_175677_1_, boolean p_175677_2_) public boolean func_175677_d(BlockPos p_175677_1_, boolean p_175677_2_)
@@ -2243,7 +2395,7 @@ @@ -2243,7 +2408,7 @@
else else
{ {
Block block = this.func_180495_p(p_175677_1_).func_177230_c(); Block block = this.func_180495_p(p_175677_1_).func_177230_c();
@ -533,7 +560,7 @@
} }
} }
} }
@@ -2262,6 +2414,7 @@ @@ -2262,6 +2427,7 @@
{ {
this.field_72985_G = p_72891_1_; this.field_72985_G = p_72891_1_;
this.field_72992_H = p_72891_2_; this.field_72992_H = p_72891_2_;
@ -541,7 +568,7 @@
} }
public void func_72835_b() public void func_72835_b()
@@ -2271,6 +2424,11 @@ @@ -2271,6 +2437,11 @@
protected void func_72947_a() protected void func_72947_a()
{ {
@ -553,7 +580,7 @@
if (this.field_72986_A.func_76059_o()) if (this.field_72986_A.func_76059_o())
{ {
this.field_73004_o = 1.0F; this.field_73004_o = 1.0F;
@@ -2284,6 +2442,11 @@ @@ -2284,6 +2455,11 @@
protected void func_72979_l() protected void func_72979_l()
{ {
@ -565,7 +592,7 @@
if (!this.field_73011_w.func_177495_o()) if (!this.field_73011_w.func_177495_o())
{ {
if (!this.field_72995_K) if (!this.field_72995_K)
@@ -2378,6 +2541,7 @@ @@ -2378,6 +2554,7 @@
{ {
this.field_72993_I.clear(); this.field_72993_I.clear();
this.field_72984_F.func_76320_a("buildList"); this.field_72984_F.func_76320_a("buildList");
@ -573,7 +600,7 @@
for (int i = 0; i < this.field_73010_i.size(); ++i) for (int i = 0; i < this.field_73010_i.size(); ++i)
{ {
@@ -2434,8 +2598,9 @@ @@ -2434,8 +2611,9 @@
Block block = p_147467_3_.func_177428_a(blockpos); Block block = p_147467_3_.func_177428_a(blockpos);
j = j + p_147467_1_; j = j + p_147467_1_;
k = k + p_147467_2_; k = k + p_147467_2_;
@ -584,7 +611,7 @@
{ {
EntityPlayer entityplayer = this.func_72977_a((double)j + 0.5D, (double)l + 0.5D, (double)k + 0.5D, 8.0D); EntityPlayer entityplayer = this.func_72977_a((double)j + 0.5D, (double)l + 0.5D, (double)k + 0.5D, 8.0D);
@@ -2475,6 +2640,11 @@ @@ -2475,6 +2653,11 @@
public boolean func_175670_e(BlockPos p_175670_1_, boolean p_175670_2_) public boolean func_175670_e(BlockPos p_175670_1_, boolean p_175670_2_)
{ {
@ -596,7 +623,7 @@
BiomeGenBase biomegenbase = this.func_180494_b(p_175670_1_); BiomeGenBase biomegenbase = this.func_180494_b(p_175670_1_);
float f = biomegenbase.func_180626_a(p_175670_1_); float f = biomegenbase.func_180626_a(p_175670_1_);
@@ -2516,6 +2686,11 @@ @@ -2516,6 +2699,11 @@
public boolean func_175708_f(BlockPos p_175708_1_, boolean p_175708_2_) public boolean func_175708_f(BlockPos p_175708_1_, boolean p_175708_2_)
{ {
@ -608,7 +635,7 @@
BiomeGenBase biomegenbase = this.func_180494_b(p_175708_1_); BiomeGenBase biomegenbase = this.func_180494_b(p_175708_1_);
float f = biomegenbase.func_180626_a(p_175708_1_); float f = biomegenbase.func_180626_a(p_175708_1_);
@@ -2533,7 +2708,7 @@ @@ -2533,7 +2721,7 @@
{ {
Block block = this.func_180495_p(p_175708_1_).func_177230_c(); Block block = this.func_180495_p(p_175708_1_).func_177230_c();
@ -617,7 +644,7 @@
{ {
return true; return true;
} }
@@ -2565,10 +2740,11 @@ @@ -2565,10 +2753,11 @@
else else
{ {
Block block = this.func_180495_p(p_175638_1_).func_177230_c(); Block block = this.func_180495_p(p_175638_1_).func_177230_c();
@ -632,7 +659,7 @@
{ {
j = 1; j = 1;
} }
@@ -2768,10 +2944,10 @@ @@ -2768,10 +2957,10 @@
public List<Entity> func_175674_a(Entity p_175674_1_, AxisAlignedBB p_175674_2_, Predicate <? super Entity > p_175674_3_) public List<Entity> func_175674_a(Entity p_175674_1_, AxisAlignedBB p_175674_2_, Predicate <? super Entity > p_175674_3_)
{ {
List<Entity> list = Lists.<Entity>newArrayList(); List<Entity> list = Lists.<Entity>newArrayList();
@ -647,7 +674,7 @@
for (int i1 = i; i1 <= j; ++i1) for (int i1 = i; i1 <= j; ++i1)
{ {
@@ -2824,10 +3000,10 @@ @@ -2824,10 +3013,10 @@
public <T extends Entity> List<T> func_175647_a(Class <? extends T > p_175647_1_, AxisAlignedBB p_175647_2_, Predicate <? super T > p_175647_3_) public <T extends Entity> List<T> func_175647_a(Class <? extends T > p_175647_1_, AxisAlignedBB p_175647_2_, Predicate <? super T > p_175647_3_)
{ {
@ -662,7 +689,7 @@
List<T> list = Lists.<T>newArrayList(); List<T> list = Lists.<T>newArrayList();
for (int i1 = i; i1 <= j; ++i1) for (int i1 = i; i1 <= j; ++i1)
@@ -2905,11 +3081,13 @@ @@ -2905,11 +3094,13 @@
public void func_175650_b(Collection<Entity> p_175650_1_) public void func_175650_b(Collection<Entity> p_175650_1_)
{ {
@ -679,7 +706,7 @@
} }
} }
@@ -2922,7 +3100,9 @@ @@ -2922,7 +3113,9 @@
{ {
Block block = this.func_180495_p(p_175716_2_).func_177230_c(); Block block = this.func_180495_p(p_175716_2_).func_177230_c();
AxisAlignedBB axisalignedbb = p_175716_3_ ? null : p_175716_1_.func_180640_a(this, p_175716_2_, p_175716_1_.func_176223_P()); AxisAlignedBB axisalignedbb = p_175716_3_ ? null : p_175716_1_.func_180640_a(this, p_175716_2_, p_175716_1_.func_176223_P());
@ -690,7 +717,7 @@
} }
public int func_181545_F() public int func_181545_F()
@@ -3007,7 +3187,7 @@ @@ -3007,7 +3200,7 @@
{ {
IBlockState iblockstate = this.func_180495_p(p_175651_1_); IBlockState iblockstate = this.func_180495_p(p_175651_1_);
Block block = iblockstate.func_177230_c(); Block block = iblockstate.func_177230_c();
@ -699,7 +726,7 @@
} }
public boolean func_175640_z(BlockPos p_175640_1_) public boolean func_175640_z(BlockPos p_175640_1_)
@@ -3134,7 +3314,7 @@ @@ -3134,7 +3327,7 @@
public long func_72905_C() public long func_72905_C()
{ {
@ -708,7 +735,7 @@
} }
public long func_82737_E() public long func_82737_E()
@@ -3144,17 +3324,17 @@ @@ -3144,17 +3337,17 @@
public long func_72820_D() public long func_72820_D()
{ {
@ -729,7 +756,7 @@
if (!this.func_175723_af().func_177746_a(blockpos)) if (!this.func_175723_af().func_177746_a(blockpos))
{ {
@@ -3166,7 +3346,7 @@ @@ -3166,7 +3359,7 @@
public void func_175652_B(BlockPos p_175652_1_) public void func_175652_B(BlockPos p_175652_1_)
{ {
@ -738,7 +765,7 @@
} }
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
@@ -3186,12 +3366,18 @@ @@ -3186,12 +3379,18 @@
if (!this.field_72996_f.contains(p_72897_1_)) if (!this.field_72996_f.contains(p_72897_1_))
{ {
@ -757,7 +784,7 @@
return true; return true;
} }
@@ -3285,8 +3471,7 @@ @@ -3285,8 +3484,7 @@
public boolean func_180502_D(BlockPos p_180502_1_) public boolean func_180502_D(BlockPos p_180502_1_)
{ {
@ -767,7 +794,7 @@
} }
public MapStorage func_175693_T() public MapStorage func_175693_T()
@@ -3345,12 +3530,12 @@ @@ -3345,12 +3543,12 @@
public int func_72800_K() public int func_72800_K()
{ {
@ -782,7 +809,7 @@
} }
public Random func_72843_D(int p_72843_1_, int p_72843_2_, int p_72843_3_) public Random func_72843_D(int p_72843_1_, int p_72843_2_, int p_72843_3_)
@@ -3405,7 +3590,7 @@ @@ -3405,7 +3603,7 @@
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
public double func_72919_O() public double func_72919_O()
{ {
@ -791,7 +818,7 @@
} }
public void func_175715_c(int p_175715_1_, BlockPos p_175715_2_, int p_175715_3_) public void func_175715_c(int p_175715_1_, BlockPos p_175715_2_, int p_175715_3_)
@@ -3439,7 +3624,7 @@ @@ -3439,7 +3637,7 @@
public void func_175666_e(BlockPos p_175666_1_, Block p_175666_2_) public void func_175666_e(BlockPos p_175666_1_, Block p_175666_2_)
{ {
@ -800,7 +827,7 @@
{ {
BlockPos blockpos = p_175666_1_.func_177972_a(enumfacing); BlockPos blockpos = p_175666_1_.func_177972_a(enumfacing);
@@ -3447,18 +3632,14 @@ @@ -3447,18 +3645,14 @@
{ {
IBlockState iblockstate = this.func_180495_p(blockpos); IBlockState iblockstate = this.func_180495_p(blockpos);
@ -825,7 +852,7 @@
} }
} }
} }
@@ -3528,4 +3709,81 @@ @@ -3528,4 +3722,81 @@
int k = 128; int k = 128;
return i >= -k && i <= k && j >= -k && j <= k; return i >= -k && i <= k && j >= -k && j <= k;
} }