Add/Change some missing code for the 1.11.2 upgrade
This commit is contained in:
parent
5fff8310d6
commit
86dd8193f7
2 changed files with 37 additions and 2 deletions
|
@ -112,7 +112,7 @@ public abstract class AEBaseBlock extends Block
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void addCollisionBoxToList( final IBlockState state, final World w, final BlockPos pos, final AxisAlignedBB bb, final List<AxisAlignedBB> out, final Entity e )
|
public void addCollisionBoxToList( final IBlockState state, final World w, final BlockPos pos, final AxisAlignedBB bb, final List<AxisAlignedBB> out, @Nullable final Entity e, boolean p_185477_7_)
|
||||||
{
|
{
|
||||||
final ICustomCollision collisionHandler = this.getCustomCollision( w, pos );
|
final ICustomCollision collisionHandler = this.getCustomCollision( w, pos );
|
||||||
|
|
||||||
|
@ -131,7 +131,7 @@ public abstract class AEBaseBlock extends Block
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
super.addCollisionBoxToList( state, w, pos, bb, out, e );
|
super.addCollisionBoxToList( state, w, pos, bb, out, e, p_185477_7_ );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -35,6 +35,41 @@ public class AEConfigGuiFactory implements IModGuiFactory
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* If this method returns false, the config button in the mod list will be disabled
|
||||||
|
*
|
||||||
|
* @return true if this object provides a config gui screen, false otherwise
|
||||||
|
*/
|
||||||
|
@Override
|
||||||
|
public boolean hasConfigGui() {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Return an initialized {@link GuiScreen}. This screen will be displayed
|
||||||
|
* when the "config" button is pressed in the mod list. It will
|
||||||
|
* have a single argument constructor - the "parent" screen, the same as all
|
||||||
|
* Minecraft GUIs. The expected behaviour is that this screen will replace the
|
||||||
|
* "mod list" screen completely, and will return to the mod list screen through
|
||||||
|
* the parent link, once the appropriate action is taken from the config screen.
|
||||||
|
* <p>
|
||||||
|
* This config GUI is anticipated to provide configuration to the mod in a friendly
|
||||||
|
* visual way. It should not be abused to set internals such as IDs (they're gonna
|
||||||
|
* keep disappearing anyway), but rather, interesting behaviours. This config GUI
|
||||||
|
* is never run when a server game is running, and should be used to configure
|
||||||
|
* desired behaviours that affect server state. Costs, mod game modes, stuff like that
|
||||||
|
* can be changed here.
|
||||||
|
*
|
||||||
|
* @param parentScreen The screen to which must be returned when closing the
|
||||||
|
* returned screen.
|
||||||
|
* @return A class that will be instantiated on clicks on the config button
|
||||||
|
* or null if no GUI is desired.
|
||||||
|
*/
|
||||||
|
@Override
|
||||||
|
public GuiScreen createConfigGui(GuiScreen parentScreen) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public Class<? extends GuiScreen> mainConfigGuiClass()
|
public Class<? extends GuiScreen> mainConfigGuiClass()
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in a new issue