Make some constructors of abstract classes protected.
This commit is contained in:
@@ -243,7 +243,7 @@ public class ConstructorNetworkNode extends NetworkNode implements IComparable,
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public IItemHandler getDrops() {
|
public IItemHandler getDrops() {
|
||||||
return upgrades;
|
return getUpgrades();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@@ -207,19 +207,19 @@ public class DestructorNetworkNode extends NetworkNode implements IComparable, I
|
|||||||
}
|
}
|
||||||
|
|
||||||
private ItemStack createTool() {
|
private ItemStack createTool() {
|
||||||
ItemStack tool = new ItemStack(Items.DIAMOND_PICKAXE);
|
ItemStack newTool = new ItemStack(Items.DIAMOND_PICKAXE);
|
||||||
|
|
||||||
if (upgrades.hasUpgrade(UpgradeItem.Type.SILK_TOUCH)) {
|
if (upgrades.hasUpgrade(UpgradeItem.Type.SILK_TOUCH)) {
|
||||||
tool.addEnchantment(Enchantments.SILK_TOUCH, 1);
|
newTool.addEnchantment(Enchantments.SILK_TOUCH, 1);
|
||||||
} else if (upgrades.hasUpgrade(UpgradeItem.Type.FORTUNE_3)) {
|
} else if (upgrades.hasUpgrade(UpgradeItem.Type.FORTUNE_3)) {
|
||||||
tool.addEnchantment(Enchantments.FORTUNE, 3);
|
newTool.addEnchantment(Enchantments.FORTUNE, 3);
|
||||||
} else if (upgrades.hasUpgrade(UpgradeItem.Type.FORTUNE_2)) {
|
} else if (upgrades.hasUpgrade(UpgradeItem.Type.FORTUNE_2)) {
|
||||||
tool.addEnchantment(Enchantments.FORTUNE, 2);
|
newTool.addEnchantment(Enchantments.FORTUNE, 2);
|
||||||
} else if (upgrades.hasUpgrade(UpgradeItem.Type.FORTUNE_1)) {
|
} else if (upgrades.hasUpgrade(UpgradeItem.Type.FORTUNE_1)) {
|
||||||
tool.addEnchantment(Enchantments.FORTUNE, 1);
|
newTool.addEnchantment(Enchantments.FORTUNE, 1);
|
||||||
}
|
}
|
||||||
|
|
||||||
return tool;
|
return newTool;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@@ -61,7 +61,7 @@ public abstract class NetworkNode implements INetworkNode, INetworkNodeVisitor {
|
|||||||
private boolean couldUpdate;
|
private boolean couldUpdate;
|
||||||
private int ticksSinceUpdateChanged;
|
private int ticksSinceUpdateChanged;
|
||||||
|
|
||||||
public NetworkNode(World world, BlockPos pos) {
|
protected NetworkNode(World world, BlockPos pos) {
|
||||||
if (world == null) {
|
if (world == null) {
|
||||||
throw new IllegalArgumentException("World cannot be null");
|
throw new IllegalArgumentException("World cannot be null");
|
||||||
}
|
}
|
||||||
|
@@ -9,7 +9,7 @@ import net.minecraft.util.math.BlockPos;
|
|||||||
import net.minecraft.world.World;
|
import net.minecraft.world.World;
|
||||||
|
|
||||||
public abstract class BaseBlock extends Block {
|
public abstract class BaseBlock extends Block {
|
||||||
public BaseBlock(Properties properties) {
|
protected BaseBlock(Properties properties) {
|
||||||
super(properties);
|
super(properties);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -5,6 +5,7 @@ import com.refinedmods.refinedstorage.api.network.node.INetworkNodeProxy;
|
|||||||
import com.refinedmods.refinedstorage.apiimpl.API;
|
import com.refinedmods.refinedstorage.apiimpl.API;
|
||||||
import com.refinedmods.refinedstorage.apiimpl.network.node.NetworkNode;
|
import com.refinedmods.refinedstorage.apiimpl.network.node.NetworkNode;
|
||||||
import com.refinedmods.refinedstorage.tile.NetworkNodeTile;
|
import com.refinedmods.refinedstorage.tile.NetworkNodeTile;
|
||||||
|
import net.minecraft.block.AbstractBlock;
|
||||||
import net.minecraft.block.Block;
|
import net.minecraft.block.Block;
|
||||||
import net.minecraft.block.BlockState;
|
import net.minecraft.block.BlockState;
|
||||||
import net.minecraft.inventory.InventoryHelper;
|
import net.minecraft.inventory.InventoryHelper;
|
||||||
@@ -22,7 +23,7 @@ import net.minecraftforge.items.IItemHandler;
|
|||||||
public abstract class NetworkNodeBlock extends BaseBlock {
|
public abstract class NetworkNodeBlock extends BaseBlock {
|
||||||
public static final BooleanProperty CONNECTED = BooleanProperty.create("connected");
|
public static final BooleanProperty CONNECTED = BooleanProperty.create("connected");
|
||||||
|
|
||||||
public NetworkNodeBlock(Block.Properties props) {
|
protected NetworkNodeBlock(AbstractBlock.Properties props) {
|
||||||
super(props);
|
super(props);
|
||||||
|
|
||||||
if (hasConnectedState()) {
|
if (hasConnectedState()) {
|
||||||
|
@@ -36,7 +36,7 @@ public abstract class BaseContainer extends Container {
|
|||||||
private final List<FluidFilterSlot> fluidSlots = new ArrayList<>();
|
private final List<FluidFilterSlot> fluidSlots = new ArrayList<>();
|
||||||
private final List<FluidStack> fluids = new ArrayList<>();
|
private final List<FluidStack> fluids = new ArrayList<>();
|
||||||
|
|
||||||
public BaseContainer(@Nullable ContainerType<?> type, @Nullable BaseTile tile, PlayerEntity player, int windowId) {
|
protected BaseContainer(@Nullable ContainerType<?> type, @Nullable BaseTile tile, PlayerEntity player, int windowId) {
|
||||||
super(type, windowId);
|
super(type, windowId);
|
||||||
|
|
||||||
this.tile = tile;
|
this.tile = tile;
|
||||||
|
@@ -22,7 +22,7 @@ public abstract class EnergyItem extends Item {
|
|||||||
private final Supplier<Integer> energyCapacity;
|
private final Supplier<Integer> energyCapacity;
|
||||||
private final boolean creative;
|
private final boolean creative;
|
||||||
|
|
||||||
public EnergyItem(Item.Properties properties, boolean creative, Supplier<Integer> energyCapacity) {
|
protected EnergyItem(Item.Properties properties, boolean creative, Supplier<Integer> energyCapacity) {
|
||||||
super(properties);
|
super(properties);
|
||||||
|
|
||||||
this.creative = creative;
|
this.creative = creative;
|
||||||
|
@@ -29,7 +29,7 @@ public abstract class NetworkItem extends EnergyItem implements INetworkItemProv
|
|||||||
private static final String NBT_NODE_Z = "NodeZ";
|
private static final String NBT_NODE_Z = "NodeZ";
|
||||||
private static final String NBT_DIMENSION = "Dimension";
|
private static final String NBT_DIMENSION = "Dimension";
|
||||||
|
|
||||||
public NetworkItem(Item.Properties item, boolean creative, Supplier<Integer> energyCapacity) {
|
protected NetworkItem(Item.Properties item, boolean creative, Supplier<Integer> energyCapacity) {
|
||||||
super(item, creative, energyCapacity);
|
super(item, creative, energyCapacity);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -23,7 +23,7 @@ public abstract class EnergyBlockItem extends BaseBlockItem {
|
|||||||
private final Supplier<Integer> energyCapacity;
|
private final Supplier<Integer> energyCapacity;
|
||||||
private final boolean creative;
|
private final boolean creative;
|
||||||
|
|
||||||
public EnergyBlockItem(BaseBlock block, Item.Properties properties, boolean creative, Supplier<Integer> energyCapacity) {
|
protected EnergyBlockItem(BaseBlock block, Item.Properties properties, boolean creative, Supplier<Integer> energyCapacity) {
|
||||||
super(block, properties);
|
super(block, properties);
|
||||||
|
|
||||||
this.creative = creative;
|
this.creative = creative;
|
||||||
|
@@ -20,7 +20,7 @@ public abstract class AmountSpecifyingScreen<T extends Container> extends BaseSc
|
|||||||
protected Button okButton;
|
protected Button okButton;
|
||||||
protected Button cancelButton;
|
protected Button cancelButton;
|
||||||
|
|
||||||
public AmountSpecifyingScreen(BaseScreen<T> parent, T container, int width, int height, PlayerInventory playerInventory, ITextComponent title) {
|
protected AmountSpecifyingScreen(BaseScreen<T> parent, T container, int width, int height, PlayerInventory playerInventory, ITextComponent title) {
|
||||||
super(container, width, height, playerInventory, title);
|
super(container, width, height, playerInventory, title);
|
||||||
|
|
||||||
this.parent = parent;
|
this.parent = parent;
|
||||||
|
@@ -53,7 +53,7 @@ public abstract class BaseScreen<T extends Container> extends ContainerScreen<T>
|
|||||||
|
|
||||||
private int sideButtonY;
|
private int sideButtonY;
|
||||||
|
|
||||||
public BaseScreen(T container, int xSize, int ySize, PlayerInventory inventory, ITextComponent title) {
|
protected BaseScreen(T container, int xSize, int ySize, PlayerInventory inventory, ITextComponent title) {
|
||||||
super(container, inventory, title);
|
super(container, inventory, title);
|
||||||
|
|
||||||
this.xSize = xSize;
|
this.xSize = xSize;
|
||||||
|
@@ -21,7 +21,7 @@ public abstract class BaseGridView implements IGridView {
|
|||||||
private List<IGridStack> stacks = new ArrayList<>();
|
private List<IGridStack> stacks = new ArrayList<>();
|
||||||
protected final Map<UUID, IGridStack> map = new HashMap<>();
|
protected final Map<UUID, IGridStack> map = new HashMap<>();
|
||||||
|
|
||||||
public BaseGridView(GridScreen screen, IGridSorter defaultSorter, List<IGridSorter> sorters) {
|
protected BaseGridView(GridScreen screen, IGridSorter defaultSorter, List<IGridSorter> sorters) {
|
||||||
this.screen = screen;
|
this.screen = screen;
|
||||||
this.defaultSorter = defaultSorter;
|
this.defaultSorter = defaultSorter;
|
||||||
this.sorters = sorters;
|
this.sorters = sorters;
|
||||||
|
@@ -18,7 +18,7 @@ public abstract class SideButton extends Button {
|
|||||||
|
|
||||||
protected final BaseScreen<?> screen;
|
protected final BaseScreen<?> screen;
|
||||||
|
|
||||||
public SideButton(BaseScreen<?> screen) {
|
protected SideButton(BaseScreen<?> screen) {
|
||||||
super(-1, -1, WIDTH, HEIGHT, StringTextComponent.EMPTY, NO_ACTION);
|
super(-1, -1, WIDTH, HEIGHT, StringTextComponent.EMPTY, NO_ACTION);
|
||||||
|
|
||||||
this.screen = screen;
|
this.screen = screen;
|
||||||
|
@@ -11,7 +11,7 @@ import net.minecraft.tileentity.TileEntityType;
|
|||||||
public abstract class BaseTile extends TileEntity {
|
public abstract class BaseTile extends TileEntity {
|
||||||
protected final TileDataManager dataManager = new TileDataManager(this);
|
protected final TileDataManager dataManager = new TileDataManager(this);
|
||||||
|
|
||||||
public BaseTile(TileEntityType<?> tileType) {
|
protected BaseTile(TileEntityType<?> tileType) {
|
||||||
super(tileType);
|
super(tileType);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -29,7 +29,7 @@ public abstract class NetworkNodeTile<N extends NetworkNode> extends BaseTile im
|
|||||||
|
|
||||||
private final LazyOptional<INetworkNodeProxy<N>> networkNodeProxy = LazyOptional.of(() -> this);
|
private final LazyOptional<INetworkNodeProxy<N>> networkNodeProxy = LazyOptional.of(() -> this);
|
||||||
|
|
||||||
public NetworkNodeTile(TileEntityType<?> tileType) {
|
protected NetworkNodeTile(TileEntityType<?> tileType) {
|
||||||
super(tileType);
|
super(tileType);
|
||||||
|
|
||||||
dataManager.addWatchedParameter(REDSTONE_MODE);
|
dataManager.addWatchedParameter(REDSTONE_MODE);
|
||||||
|
Reference in New Issue
Block a user