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

Make patched-in StairsBlock constructor public

Browse source 
Also fix supplier generic being too narrow in DeferredRegister#register
This commit is contained in:
tterrag 2019-09-27 17:54:52 -04:00
parent f4bab8b8c1
commit b3631b707c
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
patches/minecraft/net/minecraft/block/StairsBlock.java.patch
View file

@ -14,7 +14,7 @@
+ this.stateSupplier = () -> p_i48321_1_; + this.stateSupplier = () -> p_i48321_1_;
} }
+ protected StairsBlock(java.util.function.Supplier<BlockState> state, Block.Properties properties) { + public StairsBlock(java.util.function.Supplier<BlockState> state, Block.Properties properties) {
+ super(properties); + super(properties);
+ this.func_180632_j(this.field_176227_L.func_177621_b().func_206870_a(field_176309_a, Direction.NORTH).func_206870_a(field_176308_b, Half.BOTTOM).func_206870_a(field_176310_M, StairsShape.STRAIGHT).func_206870_a(field_204513_t, Boolean.valueOf(false))); + this.func_180632_j(this.field_176227_L.func_177621_b().func_206870_a(field_176309_a, Direction.NORTH).func_206870_a(field_176308_b, Half.BOTTOM).func_206870_a(field_176310_M, StairsShape.STRAIGHT).func_206870_a(field_204513_t, Boolean.valueOf(false)));
+ this.field_150149_b = Blocks.field_150350_a; // These are unused, fields are redirected + this.field_150149_b = Blocks.field_150350_a; // These are unused, fields are redirected

2
src/main/java/net/minecraftforge/registries/DeferredRegister.java
View file

@ -71,7 +71,7 @@ public class DeferredRegister<T extends IForgeRegistryEntry<T>>
* @return A RegistryObject that will be updated with when the entries in the registry change. * @return A RegistryObject that will be updated with when the entries in the registry change.
*/ */
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
public <I extends T> RegistryObject<I> register(final String name, final Supplier<I> sup) public <I extends T> RegistryObject<I> register(final String name, final Supplier<? extends I> sup)
{ {
Objects.requireNonNull(name); Objects.requireNonNull(name);
Objects.requireNonNull(sup); Objects.requireNonNull(sup);