mirror of
https://github.com/GTNewHorizons/Botania.git
synced 2026-11-17 19:05:16 +00:00
update forge
This commit is contained in:
1 parent
922eb9f741
commit
faeac4494c
13 files changed
+32
-21
No files matched your search
@@ -58,4 +58,9 @@ public class InventoryFlowerBag implements IItemHandlerModifiable {
|
||||
public int getSlotLimit(int slot) {
|
||||
return bagInv.getSlotLimit(slot);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isItemValid(int slot, @Nonnull ItemStack stack) {
|
||||
return bagInv.isItemValid(slot, stack);
|
||||
}
|
||||
}
|
||||
@@ -76,7 +76,7 @@ public class BlockLightLauncher extends BlockMod implements ILexiconable {
|
||||
|
||||
private void pickUpEntities(World world, BlockPos pos) {
|
||||
List<TileLightRelay> relays = new ArrayList<>();
|
||||
for(EnumFacing dir : EnumFacing.BY_INDEX) {
|
||||
for(EnumFacing dir : EnumFacing.values()) {
|
||||
TileEntity tile = world.getTileEntity(pos.offset(dir));
|
||||
if(tile instanceof TileLightRelay) {
|
||||
TileLightRelay relay = (TileLightRelay) tile;
|
||||
|
||||
+1
-1
@@ -74,7 +74,7 @@ public class SubTileHydroangeas extends SubTileGenerating {
|
||||
supertile.getWorld().setBlockState(pos, Blocks.AIR.getDefaultState());
|
||||
else {
|
||||
int waterAround = 0;
|
||||
for(EnumFacing dir : EnumFacing.BY_INDEX)
|
||||
for(EnumFacing dir : EnumFacing.values())
|
||||
if(supertile.getWorld().getFluidState(pos.offset(dir)).isTagged(search))
|
||||
waterAround++;
|
||||
|
||||
|
||||
@@ -47,7 +47,7 @@ public class TileAvatar extends TileSimpleInventory implements IAvatarTile, ITic
|
||||
@Override
|
||||
public void tick() {
|
||||
enabled = true;
|
||||
for(EnumFacing dir : EnumFacing.BY_INDEX) {
|
||||
for(EnumFacing dir : EnumFacing.values()) {
|
||||
int redstoneSide = world.getRedstonePower(pos.offset(dir), dir);
|
||||
if(redstoneSide > 0) {
|
||||
enabled = false;
|
||||
|
||||
@@ -45,7 +45,7 @@ public class TileFloatingSpecialFlower extends TileSpecialFlower implements IFlo
|
||||
@Override
|
||||
public void writePacketNBT(NBTTagCompound cmp) {
|
||||
super.writePacketNBT(cmp);
|
||||
cmp.setString(TAG_ISLAND_TYPE, type.toString());
|
||||
cmp.putString(TAG_ISLAND_TYPE, type.toString());
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -81,7 +81,7 @@ public class TileHourglass extends TileSimpleInventory implements ITickable {
|
||||
world.getPendingBlockTicks().scheduleTick(pos, getBlockState().getBlock(), getBlockState().getBlock().tickRate(world));
|
||||
}
|
||||
|
||||
for(EnumFacing facing : EnumFacing.BY_INDEX) {
|
||||
for(EnumFacing facing : EnumFacing.values()) {
|
||||
BlockPos pos = getPos().offset(facing);
|
||||
IBlockState state = world.getBlockState(pos);
|
||||
if(state.getBlock() instanceof IHourglassTrigger)
|
||||
|
||||
@@ -74,7 +74,7 @@ public class TilePump extends TileMod implements ITickable {
|
||||
@Override
|
||||
public void tick() {
|
||||
hasRedstone = false;
|
||||
for(EnumFacing dir : EnumFacing.BY_INDEX) {
|
||||
for(EnumFacing dir : EnumFacing.values()) {
|
||||
int redstoneSide = world.getRedstonePower(pos.offset(dir), dir);
|
||||
if(redstoneSide > 0) {
|
||||
hasRedstone = true;
|
||||
|
||||
@@ -198,7 +198,7 @@ public class TileSpreader extends TileSimpleInventory implements IManaCollector,
|
||||
|
||||
boolean redstone = false;
|
||||
|
||||
for(EnumFacing dir : EnumFacing.BY_INDEX) {
|
||||
for(EnumFacing dir : EnumFacing.values()) {
|
||||
TileEntity tileAt = world.getTileEntity(pos.offset(dir));
|
||||
if(world.isBlockLoaded(pos.offset(dir), false) && tileAt instanceof IManaPool) {
|
||||
IManaPool pool = (IManaPool) tileAt;
|
||||
|
||||
@@ -185,7 +185,7 @@ public class ItemSextant extends ItemMod {
|
||||
@Override
|
||||
public Map<EnumFacing, Multiblock> createRotations() {
|
||||
Map<EnumFacing, Multiblock> ret = new EnumMap<>(EnumFacing.class);
|
||||
for (EnumFacing e : EnumFacing.BY_INDEX) {
|
||||
for (EnumFacing e : EnumFacing.values()) {
|
||||
ret.put(e, this);
|
||||
}
|
||||
return ret;
|
||||
|
||||
@@ -166,7 +166,7 @@ public class ItemItemFinder extends ItemBauble implements IBaubleRender {
|
||||
TileEntity tile = player.world.getTileEntity(pos_);
|
||||
if(tile != null) {
|
||||
boolean foundCap = false;
|
||||
for(EnumFacing e : EnumFacing.BY_INDEX) {
|
||||
for(EnumFacing e : EnumFacing.values()) {
|
||||
if(scanInventory(tile.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, e), pstack)) {
|
||||
blockPosBuilder.add(new NBTTagLong(pos_.toLong()));
|
||||
foundCap = true;
|
||||
|
||||
@@ -58,7 +58,7 @@ public class LensPaint extends Lens {
|
||||
coordsFound.remove(coords);
|
||||
coordsToPaint.add(coords);
|
||||
|
||||
for(EnumFacing dir : EnumFacing.BY_INDEX) {
|
||||
for(EnumFacing dir : EnumFacing.values()) {
|
||||
IBlockState state_ = entity.world.getBlockState(coords.offset(dir));
|
||||
BlockPos coords_ = new BlockPos(coords.offset(dir));
|
||||
if(state_ == state && !coordsFound.contains(coords_) && !coordsToPaint.contains(coords_))
|
||||
|
||||
@@ -189,7 +189,7 @@ public class ItemExchangeRod extends ItemMod implements IManaUsingItem, IWirefra
|
||||
continue;
|
||||
|
||||
// Check to see if the block is visible on any side:
|
||||
for(EnumFacing dir : EnumFacing.BY_INDEX) {
|
||||
for(EnumFacing dir : EnumFacing.values()) {
|
||||
BlockPos adjPos = pos_.offset(dir);
|
||||
IBlockState adjState = world.getBlockState(adjPos);
|
||||
|
||||
|
||||
Reference in new issue
Block a user